authkeeper 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fb703b887c4415e68a9ed91bea0a41cf1c682ccf20742d18c26700205f37a72
-  data.tar.gz: f9ff63172357aab12de6252c5c58a764ec9e354921fc9199826d0876778ecbfb
+  metadata.gz: cc7ae5d07c1884c346b471c2544044d042579ca4da69350887b654ab3b27a404
+  data.tar.gz: ede7994f9a7449091488b9a0fcd5ecb7d42496bf1094b327500a7e24a2070f2f
 SHA512:
-  metadata.gz: 633d17c8e59833d357dca0861cbfef908813a8668102ddff1e6760cc6e9aa3dc1fe249b3f7a194f4324d7c1722b97ba2684c2ed14b88993afea003943630bb73
-  data.tar.gz: 902eef36cfcee239262871e13d1fd1eace8eca90f0b99449541d31ae46e94002c8943cc492d2b823861e2b2dff1c04f44bb5b51a68cef236b6a8a88553eb16c6
+  metadata.gz: 8e27b133c53d951fba9dc9c8167b908ebea118eaf0289915e8d8ef4318621b07f2be929a5d9a54bbadd6f169cc0db22be60a69a318ae825d2c90b5c69786367e
+  data.tar.gz: 4a2729b12b89b87f14d4be182c9b444c4dfe2a39fc95ec8bdea3edf9c29881d5e782695e89a8c8bad1487985d1258b6c942d92329222d95ad4e720861cb2d2e9

data/app/helpers/authkeeper/application_helper.rb

@@ -32,7 +32,7 @@ module Authkeeper
     end
 
     def vk_oauth_link(oauth_data)
-      "https://id.vk.com/authorize?scope=email&response_type=code&client_id=#{value(:vk, :client_id)}&code_challenge=#{oauth_data[:code_challenge]}&code_challenge_method=S256&redirect_uri=#{value(:vk, :redirect_url)}&state=#{oauth_data[:state]}"
+      "https://id.vk.com/authorize?scope=email%20phone%20ads&response_type=code&client_id=#{value(:vk, :client_id)}&code_challenge=#{oauth_data[:code_challenge]}&code_challenge_method=S256&redirect_uri=#{value(:vk, :redirect_url)}&state=#{oauth_data[:state]}"
     end
     # rubocop: enable Layout/LineLength
 

data/app/lib/authkeeper/yandex_auth_api/client.rb

@@ -3,7 +3,7 @@
 module Authkeeper
   module YandexAuthApi
     class Client < HttpService::Client
-      include Requests::FetchAccessToken
+      include Requests::AccessToken
 
       BASE_URL = 'https://oauth.yandex.ru/'
 

data/app/lib/authkeeper/yandex_auth_api/requests/access_token.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'uri'
+require 'base64'
+
+module Authkeeper
+  module YandexAuthApi
+    module Requests
+      module AccessToken
+        def fetch_access_token(client_id:, client_secret:, code:)
+          post(
+            path: 'token',
+            body: URI.encode_www_form({
+              grant_type: 'authorization_code',
+              client_id: client_id,
+              client_secret: client_secret,
+              code: code
+            }),
+            headers: {
+              'Content-Type' => 'application/x-www-form-urlencoded'
+            }
+          )
+        end
+
+        def refresh_access_token(client_id:, client_secret:, refresh_token:)
+          post(
+            path: 'token',
+            body: URI.encode_www_form({
+              grant_type: 'refresh_token',
+              refresh_token: refresh_token
+            }),
+            headers: {
+              'Content-Type' => 'application/x-www-form-urlencoded',
+              'Authorization' => "Basic #{authorization(client_id, client_secret)}"
+            }
+          )
+        end
+
+        private
+
+        def authorization(client_id, client_secret)
+          Base64.encode64("#{client_id}:#{client_secret}").gsub("\n", '')
+        end
+      end
+    end
+  end
+end

data/lib/authkeeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Authkeeper
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authkeeper
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-29 00:00:00.000000000 Z
+date: 2024-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.2.2
 description: Authentication engine for Ruby on Rails projects.
 email:
 - kortirso@gmail.com
@@ -58,7 +58,7 @@ files:
 - app/lib/authkeeper/yandex_api/client.rb
 - app/lib/authkeeper/yandex_api/requests/info.rb
 - app/lib/authkeeper/yandex_auth_api/client.rb
-- app/lib/authkeeper/yandex_auth_api/requests/fetch_access_token.rb
+- app/lib/authkeeper/yandex_auth_api/requests/access_token.rb
 - app/mailers/authkeeper/application_mailer.rb
 - app/models/authkeeper/application_record.rb
 - app/services/authkeeper/fetch_session_service.rb

data/app/lib/authkeeper/yandex_auth_api/requests/fetch_access_token.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'uri'
-
-module Authkeeper
-  module YandexAuthApi
-    module Requests
-      module FetchAccessToken
-        def fetch_access_token(client_id:, client_secret:, code:)
-          post(
-            path: 'token',
-            body: URI.encode_www_form({
-              grant_type: 'authorization_code',
-              client_id: client_id,
-              client_secret: client_secret,
-              code: code
-            }),
-            headers: {
-              'Content-Type' => 'application/x-www-form-urlencoded'
-            }
-          )
-        end
-      end
-    end
-  end
-end