authkeeper 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1ad0732c58c2aea200daefc4fa356863cd200bec250dacb6daa04d0185ff51f
-  data.tar.gz: 4045f3010b507092e6afab4ebe7e1b46a68f0b63adcf3910e18ddffcb68f2b86
+  metadata.gz: 780d37ca518a657c6988521b2ded293eba9caf428f624f8e4b8f38d4e10daaf3
+  data.tar.gz: f5a8b4aa60061ed901472f5d8d996c27c22909175107d9967b495c5b851ca200
 SHA512:
-  metadata.gz: c9c24eb314938054584b1e2c9e1e84fd24fb9738150d737b3e567caf992fc30ed911d28446874002444236f916917505bf790d6a522094a53f5e34f84f8d678f
-  data.tar.gz: a1430eedecc606ba84cbc78aeb719fe3af468abac86a5637d307f694597b5c3b38ace2dc7b1a8f680dc2ca3e57a524d4b01bbdfac6f1167207fae466393a97e5
+  metadata.gz: 7e50531638b9dde0429275524fb1f57b7108374dc8a4a6c5574a510640ff0623451ab9124fef1a178d11418d839c73412433ac031ff84ffe8cd2ce8e3cf353db
+  data.tar.gz: 4049c78bf133b9a40ba4184460b0306aa8536dc31f7b136031739cf17a275d28df361fd8cfb8f2f50aa8327daa01b8eb62f473d40cff6c719666f5fd26b9afa5

data/app/controllers/authkeeper/omniauth_callbacks_controller.rb

@@ -12,6 +12,7 @@ module Authkeeper
     TELEGRAM = 'telegram'
     GOOGLE = 'google'
     YANDEX = 'yandex'
+    VK = 'vk'
 
     skip_before_action :verify_authenticity_token
     skip_before_action :authenticate, only: %i[create]
@@ -49,7 +50,12 @@ module Authkeeper
     end
 
     def auth
-      @auth ||= provider_service(params[:provider]).call(params: params)[:result]
+      @auth ||=
+        provider_service(params[:provider]).call(params: params.merge(oauth_data))[:result]
+    end
+
+    def oauth_data
+      Rails.cache.read("oauth_data_#{params[:state]}") || {}
     end
 
     def provider_service(provider)

data/app/helpers/authkeeper/application_helper.rb

@@ -2,12 +2,13 @@
 
 module Authkeeper
   module ApplicationHelper
-    def omniauth_link(provider)
+    def omniauth_link(provider, oauth_data=nil)
       case provider
       when :github then github_oauth_link
       when :gitlab then gitlab_oauth_link
       when :google then google_oauth_link
       when :yandex then yandex_oauth_link
+      when :vk then vk_oauth_link(oauth_data)
       end
     end
 
@@ -29,6 +30,10 @@ module Authkeeper
     def yandex_oauth_link
       "https://oauth.yandex.ru/authorize?response_type=code&client_id=#{value(:yandex, :client_id)}"
     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]}"
+    end
     # rubocop: enable Layout/LineLength
 
     def value(provider, key)

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Authkeeper
+  module VkAuthApi
+    class Client < HttpService::Client
+      include Requests::FetchAccessToken
+      include Requests::Info
+
+      BASE_URL = 'https://id.vk.com/'
+
+      option :url, default: proc { BASE_URL }
+    end
+  end
+end

data/app/lib/authkeeper/{yandex_auth_api → vk_auth_api}/requests/fetch_access_token.rb

@@ -3,17 +3,20 @@
 require 'uri'
 
 module Authkeeper
-  module YandexAuthApi
+  module VkAuthApi
     module Requests
       module FetchAccessToken
-        def fetch_access_token(client_id:, client_secret:, code:)
+        def fetch_access_token(client_id:, redirect_url:, device_id:, code:, state:, code_verifier:)
           post(
-            path: 'token',
+            path: 'oauth2/auth',
             body: URI.encode_www_form({
               grant_type: 'authorization_code',
               client_id: client_id,
-              client_secret: client_secret,
-              code: code
+              device_id: device_id,
+              code: code,
+              state: state,
+              redirect_uri: redirect_url,
+              code_verifier: code_verifier
             }),
             headers: {
               'Content-Type' => 'application/x-www-form-urlencoded'

data/app/lib/authkeeper/vk_auth_api/requests/info.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Authkeeper
+  module VkAuthApi
+    module Requests
+      module Info
+        def info(access_token:, client_id:)
+          post(
+            path: 'oauth2/user_info',
+            body: {
+              access_token: access_token,
+              client_id: client_id
+            }
+          )
+        end
+      end
+    end
+  end
+end

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/app/services/authkeeper/providers/vk.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Authkeeper
+  module Providers
+    class Vk
+      include AuthkeeperDeps[
+        auth_client: 'api.vk.auth_client'
+      ]
+
+      def call(params: {})
+        auth_info = fetch_auth_info(params)
+        # {
+        #   "refresh_token" => "vk2.a.",
+        #   "access_token" => "vk2.a.",
+        #   "id_token" => "",
+        #   "token_type" => "Bearer",
+        #   "expires_in" => 3600,
+        #   "user_id" => 176780000,
+        #   "state" => "ce4a09792e2cc8065a96074906709765",
+        #   "scope" => "vkid.personal_info email"
+        # }
+
+        user_info = fetch_user_info(auth_info['access_token'])
+        # {
+        #   "user" => {
+        #     "user_id" => "176780000",
+        #     "first_name" => "",
+        #     "last_name" => "",
+        #     "avatar" => "",
+        #     "email" => "",
+        #     "sex" => 2,
+        #     "verified" => false,
+        #     "birthday" => "01.01.2000"
+        #   }
+        # }
+
+        {
+          result: {
+            auth_info: auth_info.symbolize_keys,
+            user_info: {
+              uid: user_info.dig('user', 'user_id'),
+              provider: 'vk',
+              email: user_info.dig('user', 'email'),
+              phone_number: "+#{user_info.dig('user', 'phone')}"
+            }
+          }
+        }
+      end
+
+      private
+
+      def fetch_auth_info(params)
+        auth_client.fetch_access_token(
+          client_id: omniauth_config[:client_id],
+          redirect_url: omniauth_config[:redirect_url],
+          device_id: params[:device_id],
+          code: params[:code],
+          state: params[:state],
+          code_verifier: params[:code_verifier]
+        )
+      end
+
+      def fetch_user_info(access_token)
+        auth_client.info(access_token: access_token, client_id: omniauth_config[:client_id])
+      end
+
+      def omniauth_config
+        @omniauth_config ||= Authkeeper.configuration.omniauth_configs[:vk]
+      end
+    end
+  end
+end

data/lib/authkeeper/container.rb

@@ -25,12 +25,14 @@ module Authkeeper
     register('api.google.client') { Authkeeper::GoogleApi::Client.new }
     register('api.yandex.auth_client') { Authkeeper::YandexAuthApi::Client.new }
     register('api.yandex.client') { Authkeeper::YandexApi::Client.new }
+    register('api.vk.auth_client') { Authkeeper::VkAuthApi::Client.new }
 
     register('services.providers.github') { Authkeeper::Providers::Github.new }
     register('services.providers.gitlab') { Authkeeper::Providers::Gitlab.new }
     register('services.providers.telegram') { Authkeeper::Providers::Telegram.new }
     register('services.providers.google') { Authkeeper::Providers::Google.new }
     register('services.providers.yandex') { Authkeeper::Providers::Yandex.new }
+    register('services.providers.vk') { Authkeeper::Providers::Vk.new }
 
     register('services.fetch_session') { Authkeeper::FetchSessionService.new }
     register('services.generate_token') { Authkeeper::GenerateTokenService.new }

data/lib/authkeeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authkeeper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-27 00:00:00.000000000 Z
+date: 2024-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,10 +52,13 @@ files:
 - app/lib/authkeeper/google_auth_api/client.rb
 - app/lib/authkeeper/google_auth_api/requests/fetch_access_token.rb
 - app/lib/authkeeper/jwt_encoder.rb
+- app/lib/authkeeper/vk_auth_api/client.rb
+- app/lib/authkeeper/vk_auth_api/requests/fetch_access_token.rb
+- app/lib/authkeeper/vk_auth_api/requests/info.rb
 - 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
@@ -64,6 +67,7 @@ files:
 - app/services/authkeeper/providers/gitlab.rb
 - app/services/authkeeper/providers/google.rb
 - app/services/authkeeper/providers/telegram.rb
+- app/services/authkeeper/providers/vk.rb
 - app/services/authkeeper/providers/yandex.rb
 - app/views/layouts/authkeeper/application.html.erb
 - config/routes.rb