hydra-keycloak-client 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a2e948b3a20ed2ba3bbbfa11c0d8095d1d2668ab7b84ab9c84ee141b4ffd858
-  data.tar.gz: 470d447468b40bb7f22ba97126702a7c99952cf9038005097b44651ce900a0c3
+  metadata.gz: 53ac1a0505551350a5f1374aa7bd3fb390c68047b8be65e87ec00f6f36e6394a
+  data.tar.gz: 050da3e0481a21c09aa00410dcaf19b514bf23d6dfc868261d8205120898cd2e
 SHA512:
-  metadata.gz: ce821ea5c0d68d23c1e57c5696013b4a3cdec84e4bd70e1ad484c2c394e1fa5699f7b685311732c4ed8d176406faeece9b78e722cb53fae7666c69e77cb9dfa5
-  data.tar.gz: fdb9094dd2861753b689f2a83b367116460b49f0a3817d2ba01b1c2fcf5ea705d2e4c7f903b6131c6d137c2785a8e5572ed9c80f74959447a37e9238a2eadecb
+  metadata.gz: c4ae1d7d6ce9deb7c39c7a4b82d3e3a2caf8fd9a05d9d4a089929e62a98081020699808c21745045461c30a70fa690a6706232126fa100137fe9e37a2bd183d5
+  data.tar.gz: e7761077fd40bb285b57136fa6b800c5f393746a9e02aab44969f81bd19a9eb5ca3fd4aaefe31718680e987999688e217ec7f36fc14d2dd7c9f839f374522b83

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hydra-keycloak-client (0.1.18)
+    hydra-keycloak-client (0.1.19)
       dry-auto_inject
       dry-container
       dry-monads

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.19'
   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.19
 platform: ruby
 authors:
 - Fedor Kosolapov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt