hydra-keycloak-client 0.1.18 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a2e948b3a20ed2ba3bbbfa11c0d8095d1d2668ab7b84ab9c84ee141b4ffd858
-  data.tar.gz: 470d447468b40bb7f22ba97126702a7c99952cf9038005097b44651ce900a0c3
+  metadata.gz: 35234032d35ae9df65326d2fcf5aff4069ea07a297ce355f64076b3245d3a61a
+  data.tar.gz: '08998c74ca706bed47d8b99cb048c942f06f7e9a094482a1fee299dca932a00d'
 SHA512:
-  metadata.gz: ce821ea5c0d68d23c1e57c5696013b4a3cdec84e4bd70e1ad484c2c394e1fa5699f7b685311732c4ed8d176406faeece9b78e722cb53fae7666c69e77cb9dfa5
-  data.tar.gz: fdb9094dd2861753b689f2a83b367116460b49f0a3817d2ba01b1c2fcf5ea705d2e4c7f903b6131c6d137c2785a8e5572ed9c80f74959447a37e9238a2eadecb
+  metadata.gz: ea3bba9ffc1c8829df7e38f6762ebf646aa6531a3a520eeab89e043e7fb74e220a88a50bb9af663c67c24a4efe1a7e318c01b3d45e2714494ea8fb99fafe42d3
+  data.tar.gz: 571e13491706bed3dd0e6e03b71cd8492217195f33fd56140735e16cbfdf56dbe0247d058c8882255a317e45343dac83c5ccd28378b78050c2eb4414ebf0c21d

data/.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
       run: docker cp hkc_image:/app/coverage/coverage.xml coverage.xml
 
     - name: "Upload coverage report"
-      run: pip install --user codecov==2.0.22 && python -m codecov --required --url="http://coverage.dev.latera.ru/api" --branch="${{ github.ref_name }}" --token="17989959" --slug="hydra-billing/hydra-keycloak-client"
+      run: pip install --user codecov==2.1.13 && python -m codecov --required --url="http://coverage.dev.latera.ru/api" --branch="${{ github.ref_name }}" --token="17989959" --slug="hydra-billing/hydra-keycloak-client"
 
     - name: Clean up container
       if: always()

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hydra-keycloak-client (0.1.18)
+    hydra-keycloak-client (0.1.20)
       dry-auto_inject
       dry-container
       dry-monads
@@ -13,91 +13,103 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    base64 (0.2.0)
     coderay (1.1.3)
-    concurrent-ruby (1.2.0)
-    connection_pool (2.3.0)
-    dalli (3.2.0)
-    diff-lcs (1.5.0)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    dalli (3.2.8)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    dry-auto_inject (0.7.0)
-      dry-container (>= 0.3.4)
-    dry-configurable (0.12.1)
+    dry-auto_inject (1.0.1)
+      dry-core (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
+    dry-core (1.0.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.6.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-initializer (3.0.4)
-    dry-logic (1.2.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-monads (1.6.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-monads (1.3.5)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.4)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer
-    dry-schema (1.6.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.8, >= 0.8.3)
-      dry-core (~> 0.5, >= 0.5)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-logic (~> 1.0)
-      dry-types (~> 1.5)
-    dry-struct (1.4.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-types (~> 1.5)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-struct (1.6.0)
+      dry-core (~> 1.0, < 2)
+      dry-types (>= 1.7, < 2)
       ice_nine (~> 0.11)
-    dry-types (1.5.1)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.1)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
     ice_nine (0.11.2)
-    jwt (2.7.0)
-    method_source (1.0.0)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    json (2.7.2)
+    jwt (2.8.1)
+      base64
+    language_server-protocol (3.17.0.3)
+    method_source (1.1.0)
+    parallel (1.24.0)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
+      racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.8.0)
     rainbow (3.1.1)
     rake (12.3.3)
-    redis (5.0.6)
-      redis-client (>= 0.9.0)
-    redis-client (0.11.2)
+    redis (5.2.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.22.2)
       connection_pool
-    regexp_parser (2.2.1)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    regexp_parser (2.9.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.3)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.27.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.64.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -107,7 +119,9 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (2.4.2)
+    strscan (3.1.0)
+    unicode-display_width (2.5.0)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby

data/lib/hydra/keycloak/client.rb

@@ -177,14 +177,10 @@ module Hydra
 
       def access_token(session_state)
         fetch_token(session_state, 'access_token')
-          .or(Failure(code: :not_authenticated,
-                      context: { args: { session_state: session_state } }))
       end
 
       def authorize!(session_state)
         access_token = yield fetch_token(session_state, 'access_token')
-                       .or(Failure(code: :not_authenticated,
-                                   context: { args: { session_state: session_state } }))
         if token_expired?(access_token)
           yield refresh_tokens(session_state)
 
@@ -195,9 +191,7 @@ module Hydra
       end
 
       def access_token_jti(session_state)
-        fetch_token(session_state, 'access_token')
-          .either(->(token) { Success(token[:jti]) },
-                  ->(_) { Failure(code: :not_authenticated, context: { args: { session_state: session_state } }) })
+        fetch_token(session_state, 'access_token').fmap { |token| token[:jti] }
       end
 
       def logout!(session_state)
@@ -225,7 +219,8 @@ module Hydra
           else
             Failure(code: :token_not_found,
                     context: { args: { session_state: session_state,
-                                       token_name: token_name } })
+                                       token_name: token_name },
+                               caller: caller })
           end
         end
       end

data/lib/hydra/keycloak/store/memcached_client.rb

@@ -16,13 +16,15 @@ module Hydra
 
           Success(:ok)
         rescue Dalli::DalliError => e
-          Failure(code: :memcached_unavailable, context: { args: { key: key }, action: :set, error: e.message })
+          Failure(code: :memcached_unavailable,
+                  context: { args: { key: key }, action: :set, error: e.message, caller: caller })
         end
 
         def get(key)
           Success(dalli.get(key))
         rescue Dalli::DalliError => e
-          Failure(code: :memcached_unavailable, context: { args: { key: key }, action: :get, error: e.message })
+          Failure(code: :memcached_unavailable,
+                  context: { args: { key: key }, action: :get, error: e.message, caller: caller })
         end
 
         def delete(key)
@@ -30,7 +32,8 @@ module Hydra
 
           Success(:ok)
         rescue Dalli::DalliError => e
-          Failure(code: :memcached_unavailable, context: { args: { key: key }, action: :delete, error: e.message })
+          Failure(code: :memcached_unavailable,
+                  context: { args: { key: key }, action: :delete, error: e.message, caller: caller })
         end
       end
     end

data/lib/hydra/keycloak/store/redis_client.rb

@@ -16,13 +16,15 @@ module Hydra
 
           Success(:ok)
         rescue Redis::BaseError => e
-          Failure(code: :redis_unavailable, context: { args: { key: key }, action: :set, error: e.message })
+          Failure(code: :redis_unavailable,
+                  context: { args: { key: key }, action: :set, error: e.message, caller: caller })
         end
 
         def get(key)
           Success(redis.get(key))
         rescue Redis::BaseError => e
-          Failure(code: :redis_unavailable, context: { args: { key: key }, action: :get, error: e.message })
+          Failure(code: :redis_unavailable,
+                  context: { args: { key: key }, action: :get, error: e.message, caller: caller })
         end
 
         def delete(key)
@@ -30,7 +32,8 @@ module Hydra
 
           Success(:ok)
         rescue Redis::BaseError => e
-          Failure(code: :redis_unavailable, context: { args: { key: key }, action: :delete, error: e.message })
+          Failure(code: :redis_unavailable,
+                  context: { args: { key: key }, action: :delete, error: e.message, caller: caller })
         end
       end
     end

data/lib/hydra/keycloak/tokens/gateway.rb

@@ -40,18 +40,19 @@ module Hydra
             Failure(code: :bad_keycloak_response,
                     context: { args: { path: path,
                                        body: hide_secrets(body) },
+                               caller: caller,
                                method: :post,
                                response: { code: response.code,
                                            body: response.body } })
           end
         rescue *NETWORK_ERRORS => e
-          Failure(code: :keycloak_unavailable, context: { error: e.message })
+          Failure(code: :keycloak_unavailable, context: { error: e.message, caller: caller })
         end
 
         def parse_response(body)
           Success(JSON.parse(body))
         rescue JSON::ParserError => e
-          Failure(code: :json_parser_error, context: { args: { body: body }, error: e.message })
+          Failure(code: :json_parser_error, context: { args: { body: body }, error: e.message, caller: caller })
         end
 
         def hide_secrets(body)

data/lib/hydra/keycloak/tokens/repo.rb

@@ -14,7 +14,7 @@ module Hydra
         inject['tokens_gateway', 'urls']
 
         def get_tokens(auth_code, code_verifier)
-          return Failure(code: :auth_code_was_not_received) unless auth_code
+          return Failure(code: :auth_code_was_not_received, context: { caller: caller }) unless auth_code
 
           result = tokens_gateway.post(
             urls.token_endpoint,
@@ -31,7 +31,10 @@ module Hydra
         end
 
         def get_tokens_by_password(username, password)
-          return Failure(code: :username_or_password_is_empty) if username.nil? || password.nil?
+          if username.nil? || password.nil?
+            return Failure(code: :username_or_password_is_empty,
+                           context: { caller: caller })
+          end
 
           result = tokens_gateway.post(
             urls.token_endpoint,
@@ -55,7 +58,7 @@ module Hydra
             if result['active']
               Success(result)
             else
-              Failure(code: :token_not_active)
+              Failure(code: :token_not_active, caller: caller)
             end
           end
         end

data/lib/hydra/keycloak/version.rb

@@ -2,6 +2,6 @@
 
 module Hydra
   module Keycloak
-    VERSION = '0.1.18'
+    VERSION = '0.1.20'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-keycloak-client
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.20
 platform: ruby
 authors:
 - Fedor Kosolapov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt