Данные для ВК в переменных окружения (#49)

* hide vk redirect url and vk app to env vars
evrone · Jul 19, 2024 · 08c0441 · 08c0441
1 parent b7858ec
commit 08c0441
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 55 deletions.
diff --git a/.env.example b/.env.example
@@ -4,3 +4,5 @@ POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 DATABASE_URL=postgresql://postgres@postgres:5432
 REDIS_URL=redis://redis:6379/1
+VK_AUTH_REDIRECT_URL=http://localhost/auth/vkontakte/callback
+VK_APP_ID=51989509
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,6 +80,6 @@ jobs:
 
   #     - name: Load container
   #       run: docker load --input /tmp/bmstu_2024-app.tar
-      
+
   #     - name: Healthcheck
   #       run: make ci-up-healthy
diff --git a/app/javascript/controllers/vkid_controller.js b/app/javascript/controllers/vkid_controller.js
@@ -1,32 +1,32 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static values ={
-    pkce: Object
-  }
-
-  connect() {
-    const VKID = window.VKIDSDK;
-    const data = this.pkceValue
-    const challenge = data.challenge
-    const state = data.state
-        // Fetch the JSON data from 'auth/challenge'
-          // Set VKID config with fetched data
-          VKID.Config.init({
-            app: 51989509, // Идентификатор приложения.
-            redirectUrl: 'http://localhost:3000/auth/vkontakte/callback', // Адрес для перехода после авторизации.
-            codeChallenge: challenge,
-            state: state,
-            //scope: "friends wall"
-          });
-          // Создание экземпляра кнопки.
-          const oneTap = new VKID.OneTap();
-          // Получение контейнера из разметки.
-          const container = document.getElementById('VkIdSdkOneTap');
-          // Проверка наличия кнопки в разметке.
-          if (container) {
-            // Отрисовка кнопки в контейнере с именем приложения APP_NAME, светлой темой и на русском языке.
-            const res = oneTap.render({ container: container, scheme: VKID.Scheme.LIGHT, lang: VKID.Languages.RUS })
-          }
-               
-  }};
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static values ={
+    pkce: Object
+  }
+
+  connect() {
+    const VKID = window.VKIDSDK;
+    const data = this.pkceValue;
+    const challenge = data.challenge;
+    const state = data.state;
+    // Fetch the JSON data from 'auth/challenge'
+    // Set VKID config with fetched data
+    VKID.Config.init({
+      app: window.VK_APP_ID, // Идентификатор приложения.
+      redirectUrl: window.VK_AUTH_REDIRECT_URL, // Адрес для перехода после авторизации.
+      codeChallenge: challenge,
+      state: state,
+      //scope: "friends wall"
+    });
+    // Создание экземпляра кнопки.
+    const oneTap = new VKID.OneTap();
+    // Получение контейнера из разметки.
+    const container = document.getElementById('VkIdSdkOneTap');
+    // Проверка наличия кнопки в разметке.
+    if (container) {
+      // Отрисовка кнопки в контейнере с именем приложения APP_NAME, светлой темой и на русском языке.
+      const res = oneTap.render({ container: container, scheme: VKID.Scheme.LIGHT, lang: VKID.Languages.RUS })
+    }
+  }
+};
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,22 +1,26 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Where my likes</title>
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-    <%= csrf_meta_tags %>
-    <%= csp_meta_tag %>
-    <script src="https://unpkg.com/@vkid/sdk@<3.0.0/dist-sdk/umd/index.js"></script>
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Raleway:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
-     <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
-  </head>
-  <body>
-    <%= render partial: "partial_content/navbar"%>
-    <main class="raleway">
-      <%= yield %>
-    </main>
-    <%= render partial: "partial_content/footer"%>
-  </body>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Where my likes</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+    <script src="https://unpkg.com/@vkid/sdk@<3.0.0/dist-sdk/umd/index.js"></script>
+    <script>
+      window.VK_AUTH_REDIRECT_URL = "<%= Rails.VK_AUTH_REDIRECT_URL %>"
+      window.VK_APP_ID = "<%= Rails.VK_APP_ID %>"
+    </script>
+    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Raleway:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
+     <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
+  </head>
+  <body>
+    <%= render partial: "partial_content/navbar"%>
+    <main class="raleway">
+      <%= yield %>
+    </main>
+    <%= render partial: "partial_content/footer"%>
+  </body>