authkeeper 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc7ae5d07c1884c346b471c2544044d042579ca4da69350887b654ab3b27a404
-  data.tar.gz: ede7994f9a7449091488b9a0fcd5ecb7d42496bf1094b327500a7e24a2070f2f
+  metadata.gz: 4df1a975a6ed32b2e3c7a1c7371796e8112db93c7fe74cac15a7aaf7bb8d3d21
+  data.tar.gz: 65d219ac4b2d153c3846dd4c70a9cacb5798ba6c41b2aea76ab9e749c61138e1
 SHA512:
-  metadata.gz: 8e27b133c53d951fba9dc9c8167b908ebea118eaf0289915e8d8ef4318621b07f2be929a5d9a54bbadd6f169cc0db22be60a69a318ae825d2c90b5c69786367e
-  data.tar.gz: 4a2729b12b89b87f14d4be182c9b444c4dfe2a39fc95ec8bdea3edf9c29881d5e782695e89a8c8bad1487985d1258b6c942d92329222d95ad4e720861cb2d2e9
+  metadata.gz: bb12a72dbace108366d05d6051183dbe651bbc0e92eb5d8365bdec4f5e5d1b23b110cf8c3c9880e4ea1415be7a7331241f1bd7fef776197c811196852ae79e0e
+  data.tar.gz: d9db1df5121f1c583f94a74c97915038bc0ae3154a775adb7e8abe11649134bc9951ada4b975d50a91a65aacb944f1eb1e93e25eeb3bfd06dc24a89041fdf680

data/app/lib/authkeeper/jwt_encoder.rb

@@ -3,7 +3,6 @@
 module Authkeeper
   class JwtEncoder
     HMAC_SECRET = Rails.application.secret_key_base
-    EXPIRATION_SECONDS = 604_800 # 1.week
 
     def encode(payload:, secret: HMAC_SECRET)
       JWT.encode(modify_payload(payload), secret)
@@ -18,8 +17,14 @@ module Authkeeper
     def modify_payload(payload)
       payload.merge!(
         random: SecureRandom.hex,
-        exp: DateTime.now.to_i + EXPIRATION_SECONDS
+        exp: DateTime.now.to_i + token_expiration_seconds
       )
     end
+
+    private
+
+    def token_expiration_seconds
+      @token_expiration_seconds ||= Authkeeper.configuration.token_expiration_seconds
+    end
   end
 end

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

@@ -3,7 +3,7 @@
 module Authkeeper
   module VkAuthApi
     class Client < HttpService::Client
-      include Requests::FetchAccessToken
+      include Requests::AccessToken
       include Requests::Info
 
       BASE_URL = 'https://id.vk.com/'

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

@@ -5,7 +5,7 @@ require 'uri'
 module Authkeeper
   module VkAuthApi
     module Requests
-      module FetchAccessToken
+      module AccessToken
         def fetch_access_token(client_id:, redirect_url:, device_id:, code:, state:, code_verifier:)
           post(
             path: 'oauth2/auth',
@@ -23,6 +23,22 @@ module Authkeeper
             }
           )
         end
+
+        def refresh_access_token(client_id:, refresh_token:, device_id:, state:)
+          post(
+            path: 'oauth2/auth',
+            body: URI.encode_www_form({
+              grant_type: 'refresh_token',
+              client_id: client_id,
+              device_id: device_id,
+              refresh_token: refresh_token,
+              state: state
+            }),
+            headers: {
+              'Content-Type' => 'application/x-www-form-urlencoded'
+            }
+          )
+        end
       end
     end
   end

data/app/services/authkeeper/providers/vk.rb

@@ -17,7 +17,7 @@ module Authkeeper
         #   "expires_in" => 3600,
         #   "user_id" => 176780000,
         #   "state" => "ce4a09792e2cc8065a96074906709765",
-        #   "scope" => "vkid.personal_info email"
+        #   "scope" => "vkid.personal_info email phone ads"
         # }
 
         user_info = fetch_user_info(auth_info['access_token'])
@@ -36,7 +36,7 @@ module Authkeeper
 
         {
           result: {
-            auth_info: auth_info.symbolize_keys,
+            auth_info: auth_info.symbolize_keys.merge(device_id: params[:device_id]),
             user_info: {
               uid: user_info.dig('user', 'user_id'),
               provider: 'vk',

data/lib/authkeeper/configuration.rb

@@ -5,6 +5,7 @@ module Authkeeper
     InitializeError = Class.new(StandardError)
 
     attr_accessor :user_model, :user_session_model, :access_token_name, :domain, :fallback_url_session_name, :omniauth_providers
+                  :token_expiration_seconds
     attr_reader :omniauth_configs
 
     def initialize
@@ -17,6 +18,8 @@ module Authkeeper
 
       @omniauth_providers = []
       @omniauth_configs = {}
+
+      @token_expiration_seconds = 18_144_000 # 30.days
     end
 
     def validate

data/lib/authkeeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authkeeper
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-02 00:00:00.000000000 Z
+date: 2025-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,7 +53,7 @@ files:
 - 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/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