fix vk

evrone · Jul 18, 2024 · 5d68a1a · 5d68a1a
1 parent e547bb5
commit 5d68a1a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 24 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -37,4 +37,4 @@
 /public/assets
 
 *.private
-/node_modules
+/node_modules
diff --git a/app/javascript/controllers/vkid_controller.js b/app/javascript/controllers/vkid_controller.js
@@ -1,12 +1,12 @@
-import { Controller } from "@hotwired/stimulus"
-import * as VKID from "@vkid/sdk"
+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;
@@ -15,7 +15,7 @@ export default class extends Controller {
     // Set VKID config with fetched data
     VKID.Config.init({
       app: 51989509, // Идентификатор приложения.
-      redirectUrl: 'http://localhost:3000/auth/vkontakte/callback', // Адрес для перехода после авторизации.
+      redirectUrl: 'http://localhost/auth/vkontakte/callback', // Адрес для перехода после авторизации.
       codeChallenge: challenge,
       state: state,
       //scope: "friends wall"

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,11 +4,11 @@
     <meta charset="utf-8">
     <title>Where my likes</title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
+    <script src="https://unpkg.com/@vkid/sdk@<3.0.0/dist-sdk/umd/index.js"></script>
+    <%= javascript_importmap_tags %>
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
-
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_importmap_tags %>
   </head>
 
   <body>

diff --git a/config/importmap.rb b/config/importmap.rb
@@ -7,10 +7,8 @@
 
 pin '@hotwired/stimulus', to: '@hotwired--stimulus.js' # @3.2.2
 pin '@stimulus/webpack-helpers', to: '@stimulus--webpack-helpers.js' # @2.0.0
-pin 'crypto' # @2.0.1
-pin 'crypto-js/enc-base64', to: 'crypto-js--enc-base64.js' # @4.2.0
-pin 'crypto-js/sha256', to: 'crypto-js--sha256.js' # @4.2.0
 pin '@hotwired/turbo', to: '@hotwired--turbo.js' # @8.0.4
 pin '@rails/actioncable/src', to: '@rails--actioncable--src.js' # @7.1.3
-pin '@vkid/sdk', to: '@vkid--sdk.js' # @1.1.1
 pin '@hotwired/turbo-rails', to: '@hotwired--turbo-rails.js' # @8.0.4
+
+# pin '@hotwired/stimulus-loading', to: 'stimulus-loading.js'
diff --git a/db/schema.rb b/db/schema.rb