authkeeper 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35fee3ca91b02463c3ae188eaac29ec61a1648037e9d9fe4afc22c7111cd14f9
-  data.tar.gz: a5dfcc76f5178fcd781dc11953caf07c0b2642ce67df97cd9ab2321bd84bda33
+  metadata.gz: f81527eb51e201f297210d2bc14ac073bcbdc24819d401eb5d1019db8b19349e
+  data.tar.gz: 9d40216d7d9f835854fee8d8f7aa02cfd216c7d13fe784fd2d4199a86208afc0
 SHA512:
-  metadata.gz: 87bbb1e064c3895257a4e52f7562fd01c4bea1fec9bc42a9d09672990af592105a598b26e89a9edfba421704f06443e33f3a653f61690b419744198cd780c8b1
-  data.tar.gz: 5e4390d669b30a5bab62ead49016f407b201b7c2c5c97240ddfe6b2c266ee110bbd203e93d903dc53904616ce973ae6f4b40768e7a53bd16084a2a882622042b
+  metadata.gz: a663f043f533de2b93f07d605d8fb2e0f303bdcda51b49f7c3c59e3531323c86ede88be5b71e4e510a2046843f579586645ebbb727a3eda9dced0588482e5897
+  data.tar.gz: 1b379e30dcc3838f5461a0e7ed83f938beed89399671473a7f8a47ff42858bdc2ec72f1fbf1eeb7583e2bf3a3f3f5d78638eba8f41b66bf1e2fea27077a0da91

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/lib/authkeeper/controllers/authentication.rb

@@ -14,7 +14,7 @@ module Authkeeper
       private
 
       def set_current_user
-        return find_user if Authkeeper.configuration.current_user_cache_minutes.nil?
+        return find_authkeeper_user if Authkeeper.configuration.current_user_cache_minutes.nil?
 
         access_token = cookies_token.presence || bearer_token.presence || params_token
         return unless access_token
@@ -28,13 +28,13 @@ module Authkeeper
             expires_in: Authkeeper.configuration.current_user_cache_minutes.minutes,
             race_condition_ttl: 10.seconds
           ) do
-            find_user
+            find_authkeeper_user
             current_user&.id
           end
         @current_user ||= User.find_by(id: user_id)
       end
 
-      def find_user
+      def find_authkeeper_user
         access_token = cookies_token.presence || bearer_token.presence || params_token
         return unless access_token
 

data/lib/authkeeper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authkeeper
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-24 00:00:00.000000000 Z
+date: 2025-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails