authkeeper 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65f8ece85bc4e6ed31e1ed3ae5b142cd2b79b7cfe2e3fdd87009e1537a37a271
-  data.tar.gz: e92f55f1bb92d4c2b910436650fc90aa13749f7f03d3ba3c4d0b1d6b7917d2e9
+  metadata.gz: 35fee3ca91b02463c3ae188eaac29ec61a1648037e9d9fe4afc22c7111cd14f9
+  data.tar.gz: a5dfcc76f5178fcd781dc11953caf07c0b2642ce67df97cd9ab2321bd84bda33
 SHA512:
-  metadata.gz: 8abc1c3a419e87aa6b1e3456ae22152824f9f823ef430fb7748108a2959dd78253331674e510ceef753e73107d59531bbe6a2633aad11c9b66fd43e32957bf21
-  data.tar.gz: a0b54c38844b41e5def8c6ac8a153cbb99c711d25c5ba5044b7c074ebc2169814c3afdcd3b06ba3ce21383a169617bfb0f5cf31b0c006948a287774d51aa8e71
+  metadata.gz: 87bbb1e064c3895257a4e52f7562fd01c4bea1fec9bc42a9d09672990af592105a598b26e89a9edfba421704f06443e33f3a653f61690b419744198cd780c8b1
+  data.tar.gz: 5e4390d669b30a5bab62ead49016f407b201b7c2c5c97240ddfe6b2c266ee110bbd203e93d903dc53904616ce973ae6f4b40768e7a53bd16084a2a882622042b

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

@@ -2,7 +2,7 @@
 
 module Authkeeper
   module DiscordApi
-    class Client < HttpService::Client
+    class Client < Authkeeper::HttpService::Client
       include Requests::User
 
       BASE_URL = 'https://discord.com/api/v10/'

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

@@ -2,7 +2,7 @@
 
 module Authkeeper
   module DiscordAuthApi
-    class Client < HttpService::Client
+    class Client < Authkeeper::HttpService::Client
       include Requests::FetchAccessToken
 
       BASE_URL = 'https://discord.com/api/v10/'

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

@@ -2,7 +2,7 @@
 
 module Authkeeper
   module GithubApi
-    class Client < HttpService::Client
+    class Client < Authkeeper::HttpService::Client
       include Requests::User
       include Requests::UserEmails
 

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

@@ -2,7 +2,7 @@
 
 module Authkeeper
   module GithubAuthApi
-    class Client < HttpService::Client
+    class Client < Authkeeper::HttpService::Client
       include Requests::FetchAccessToken
 
       BASE_URL = 'https://github.com'

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

@@ -2,7 +2,7 @@
 
 module Authkeeper
   module GitlabApi
-    class Client < HttpService::Client
+    class Client < Authkeeper::HttpService::Client
       include Requests::User
 
       BASE_URL = 'https://gitlab.com'

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

@@ -2,7 +2,7 @@
 
 module Authkeeper
   module GitlabAuthApi
-    class Client < HttpService::Client
+    class Client < Authkeeper::HttpService::Client
       include Requests::FetchAccessToken
 
       BASE_URL = 'https://gitlab.com'

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

@@ -2,7 +2,7 @@
 
 module Authkeeper
   module GoogleApi
-    class Client < HttpService::Client
+    class Client < Authkeeper::HttpService::Client
       include Requests::User
 
       BASE_URL = 'https://www.googleapis.com'

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

@@ -2,7 +2,7 @@
 
 module Authkeeper
   module GoogleAuthApi
-    class Client < HttpService::Client
+    class Client < Authkeeper::HttpService::Client
       include Requests::FetchAccessToken
 
       BASE_URL = 'https://www.googleapis.com/'

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'dry/initializer'
+
+module Authkeeper
+  module HttpService
+    class Client
+      extend Dry::Initializer[undefined: false]
+
+      option :url
+      option :connection, default: proc { build_connection }
+
+      def get(path:, params: nil, headers: nil)
+        if Rails.env.test? && connection.adapter != 'Faraday::Adapter::Test'
+          raise StandardError, 'please stub request in test env'
+        end
+
+        response = connection.get(path, params, headers)
+        {
+          success: response.success?,
+          body: response.body
+        }
+      end
+
+      # rubocop: disable Metrics/AbcSize
+      def post(path:, body: nil, headers: nil)
+        if Rails.env.test? && connection.adapter != 'Faraday::Adapter::Test'
+          raise StandardError, 'please stub request in test env'
+        end
+
+        response = connection.post(path, body, headers)
+        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'
+        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 = URI.encode_www_form(body)
+        end
+        response.body if response.success?
+      end
+      # rubocop: enable Metrics/AbcSize
+
+      private
+
+      def build_connection
+        Faraday.new(@url) do |conn|
+          conn.request :url_encoded
+          conn.response :json, content_type: /\bjson$/
+          conn.adapter Faraday.default_adapter
+        end
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@
 
 module Authkeeper
   module VkAuthApi
-    class Client < HttpService::Client
+    class Client < Authkeeper::HttpService::Client
       include Requests::AccessToken
       include Requests::Info
 

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

@@ -2,7 +2,7 @@
 
 module Authkeeper
   module YandexApi
-    class Client < HttpService::Client
+    class Client < Authkeeper::HttpService::Client
       include Requests::Info
 
       BASE_URL = 'https://login.yandex.ru/'

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

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

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.10'
+  VERSION = '0.1.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authkeeper
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-16 00:00:00.000000000 Z
+date: 2025-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -55,6 +55,7 @@ files:
 - app/lib/authkeeper/google_api/requests/user.rb
 - app/lib/authkeeper/google_auth_api/client.rb
 - app/lib/authkeeper/google_auth_api/requests/fetch_access_token.rb
+- app/lib/authkeeper/http_service/client.rb
 - app/lib/authkeeper/jwt_encoder.rb
 - app/lib/authkeeper/vk_auth_api/client.rb
 - app/lib/authkeeper/vk_auth_api/requests/access_token.rb
@@ -66,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