authkeeper 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8105f35b2cee5f3c686c7300ebf3bb41b8c17872ea63fdbe59ba469716a7d370
-  data.tar.gz: c25b539dbca8a4ed37e00efb528ad877c4ca6abb81a49df16f4e9ff0b8142af7
+  metadata.gz: c436194b9b10209087de9a23e793a03cb9dc222748fe9b2d040d17e84b1f0b3b
+  data.tar.gz: 73af525eb9235b3d3e0cc8c31159d5665c42a829b3548ba0ce2e9dfd676791bb
 SHA512:
-  metadata.gz: 07b69c728a18d65e77c65d5b0a3613d6d676b88a96bab31c4d46d9017ad1350cb15e878b505962831e7d899ed08827cc85020fbc8177891611471ce5440a7600
-  data.tar.gz: 3e4e74fb0bf1f8b95e5121cfc8b525b0fe057abe2783045b64fd7be82782522a3566a66d288e0be769c2c77cea4f19a23923da0441856dc23e3e2b1fd12b0090
+  metadata.gz: 4ad5ea1075dfac7c1b18f12b00eb4ce3a3ff17c8aace3a603dd6660fc0210630d672d4496ede00305f8b84b115833c97bb001dd6d5c187ee88367b877053ee7b
+  data.tar.gz: c98938d5da6d1fb5f5c333143384806fcfd0bffed5a2c45fdef6cbdd0e1b338fe20bc1bd285952bee8aec112d72e4bab3b8b7a7add03acc6951ef1c2dd2e0596

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

@@ -5,7 +5,7 @@ module Authkeeper
     module Requests
       module FetchAccessToken
         def fetch_access_token(client_id:, client_secret:, code:, redirect_uri:)
-          post(
+          form_post(
             path: 'oauth2/v4/token',
             params: {
               grant_type: 'authorization_code',

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

@@ -22,8 +22,7 @@ module Authkeeper
         }
       end
 
-      # rubocop: disable Metrics/AbcSize
-      def post(path:, body: nil, headers: nil)
+      def no_params_post(path:, body: nil, headers: nil)
         if Rails.env.test? && connection.adapter != 'Faraday::Adapter::Test'
           raise StandardError, 'please stub request in test env'
         end
@@ -32,6 +31,23 @@ module Authkeeper
         response.body if response.success?
       end
 
+      def post(path:, body: {}, params: {}, headers: {}) # rubocop: disable Metrics/AbcSize
+        if Rails.env.test? && connection.adapter != 'Faraday::Adapter::Test'
+          raise StandardError, 'please stub request in test env'
+        end
+
+        response = connection.post(path) do |request|
+          params.each do |param, value|
+            request.params[param] = value
+          end
+          headers.each do |header, value|
+            request.headers[header] = value
+          end
+          request.body = body.to_json
+        end
+        response.body if response.success?
+      end
+
       def form_post(path:, body: {}, params: {}, headers: {})
         if Rails.env.test? && connection.adapter != 'Faraday::Adapter::Test'
           raise StandardError, 'please stub request in test env'

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

@@ -7,9 +7,9 @@ module Authkeeper
     module Requests
       module AccessToken
         def fetch_access_token(client_id:, redirect_url:, device_id:, code:, state:, code_verifier:)
-          post(
+          form_post(
             path: 'oauth2/auth',
-            body: URI.encode_www_form({
+            body: {
               grant_type: 'authorization_code',
               client_id: client_id,
               device_id: device_id,
@@ -17,7 +17,7 @@ module Authkeeper
               state: state,
               redirect_uri: redirect_url,
               code_verifier: code_verifier
-            }),
+            },
             headers: {
               'Content-Type' => 'application/x-www-form-urlencoded'
             }
@@ -25,15 +25,15 @@ module Authkeeper
         end
 
         def refresh_access_token(client_id:, refresh_token:, device_id:, state:)
-          post(
+          form_post(
             path: 'oauth2/auth',
-            body: URI.encode_www_form({
+            body: {
               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'
             }

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

@@ -8,14 +8,14 @@ module Authkeeper
     module Requests
       module AccessToken
         def fetch_access_token(client_id:, client_secret:, code:)
-          post(
+          form_post(
             path: 'token',
-            body: URI.encode_www_form({
+            body: {
               grant_type: 'authorization_code',
               client_id: client_id,
               client_secret: client_secret,
               code: code
-            }),
+            },
             headers: {
               'Content-Type' => 'application/x-www-form-urlencoded'
             }
@@ -23,12 +23,12 @@ module Authkeeper
         end
 
         def refresh_access_token(client_id:, client_secret:, refresh_token:)
-          post(
+          form_post(
             path: 'token',
-            body: URI.encode_www_form({
+            body: {
               grant_type: 'refresh_token',
               refresh_token: refresh_token
-            }),
+            },
             headers: {
               'Content-Type' => 'application/x-www-form-urlencoded',
               'Authorization' => "Basic #{authorization(client_id, client_secret)}"

data/app/services/authkeeper/fetch_uuid_service.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Authkeeper
+  class FetchUuidService
+    include AuthkeeperDeps[jwt_encoder: 'jwt_encoder']
+
+    def call(token:)
+      payload = extract_uuid(token)
+      return { errors: ['Forbidden'] } if payload.blank?
+      return { errors: ['Forbidden'] } if payload['uuid'].blank?
+
+      { result: payload['uuid'] }
+    end
+
+    private
+
+    def extract_uuid(token)
+      jwt_encoder.decode(token: token)
+    end
+  end
+end

data/lib/authkeeper/configuration.rb

@@ -5,7 +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
+                  :token_expiration_seconds, :current_user_cache_minutes
     attr_reader :omniauth_configs
 
     def initialize
@@ -20,6 +20,8 @@ module Authkeeper
       @omniauth_configs = {}
 
       @token_expiration_seconds = 18_144_000 # 30.days
+
+      @current_user_cache_minutes = nil
     end
 
     def validate

data/lib/authkeeper/container.rb

@@ -37,6 +37,7 @@ module Authkeeper
     register('services.providers.vk') { Authkeeper::Providers::Vk.new }
     register('services.providers.discord') { Authkeeper::Providers::Discord.new }
 
+    register('services.fetch_uuid') { Authkeeper::FetchUuidService.new }
     register('services.fetch_session') { Authkeeper::FetchSessionService.new }
     register('services.generate_token') { Authkeeper::GenerateTokenService.new }
   end

data/lib/authkeeper/controllers/authentication.rb

@@ -14,6 +14,27 @@ module Authkeeper
       private
 
       def set_current_user
+        return find_user if Authkeeper.configuration.current_user_cache_minutes.nil?
+
+        access_token = cookies_token.presence || bearer_token.presence || params_token
+        return unless access_token
+
+        auth_uuid = Authkeeper::Container['services.fetch_uuid'].call(token: access_token)
+        return if auth_uuid[:errors].present?
+
+        user_id =
+          Rails.cache.fetch(
+            "authkeeper_cached_user_v2/#{auth_uuid[:result]}",
+            expires_in: Authkeeper.configuration.current_user_cache_minutes.minutes,
+            race_condition_ttl: 10.seconds
+          ) do
+            find_user
+            current_user&.id
+          end
+        @current_user ||= User.find_by(id: user_id)
+      end
+
+      def find_user
         access_token = cookies_token.presence || bearer_token.presence || params_token
         return unless access_token
 
@@ -65,6 +86,9 @@ module Authkeeper
         if access_token
           auth_call = Authkeeper::Container['services.fetch_session'].call(token: access_token)
           auth_call[:result].destroy if auth_call[:result]
+
+          auth_uuid = Authkeeper::Container['services.fetch_uuid'].call(token: access_token)
+          Rails.cache.delete("authkeeper_cached_user_v2/#{auth_uuid[:result]}") if auth_uuid[:result]
         end
 
         cookies.delete(access_token_name)

data/lib/authkeeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authkeeper
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-14 00:00:00.000000000 Z
+date: 2025-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,6 +67,7 @@ files:
 - app/mailers/authkeeper/application_mailer.rb
 - app/models/authkeeper/application_record.rb
 - app/services/authkeeper/fetch_session_service.rb
+- app/services/authkeeper/fetch_uuid_service.rb
 - app/services/authkeeper/generate_token_service.rb
 - app/services/authkeeper/providers/discord.rb
 - app/services/authkeeper/providers/github.rb