hydra-keycloak-client 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e44c13e82949716bb5f91393dab600335b8c5d201065edff00b286084f15399d
-  data.tar.gz: 23662cc9f3ffdd48f77c1d05baeff95ea72af6681a5813cd46f22d155c532b1d
+  metadata.gz: 61046cc3cd3ab5bc987ab0769799054193795ad82fca2ca46450b3cd6a1d1c44
+  data.tar.gz: 408a84fdaa9a9d769e54a6bfb57fba5bcfdc9c74fe158e3062128b53a29e9a37
 SHA512:
-  metadata.gz: b9fb3fe92fc2c065ff622a5dcbea04541a94c2f9bb0bac1a3d0b7f34af058f1801869a068d8720937fbd38cb349fc3b4a707a72c7a9a43f0763aa74c3fe5fd33
-  data.tar.gz: 0e5ec4ae6acfd1f9ca880f24741077cff808cd9a3d1ffdb1bc27c6db801f6b3d5c36864729401827d7918d341d5d3033e2ed2fe37e226cdc5f1a6522687aebf5
+  metadata.gz: bd7d6888768745cc897b554ec7f8342e12ec879258eafe967a947a2c902af32ba0e7ba4b46b3dc1c7b826b2f99962f8112698fbb50484951100ab6ff4ed64f0c
+  data.tar.gz: e82f992be649e2d1923df2fdff0292a5b906e82c61082671f5fecb038c4dd3cd40d567e6f05b413d35b5ab8df99bf0d031c3e56b32ae2c0b8f435822a8734d86

data/.gitignore

@@ -1,3 +1,6 @@
 .rspec_status
 coverage
 .bundle
+.DS_Store
+.idea
+.ruby-version

data/Dockerfile.release

@@ -1,4 +1,4 @@
-FROM ruby:2.7.4
+FROM ruby:3.2.0
 
 COPY . /app
 

data/Dockerfile.test

@@ -1,4 +1,4 @@
-FROM ruby:2.7.4
+FROM ruby:3.2.0
 
 COPY . /app
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hydra-keycloak-client (0.1.15)
+    hydra-keycloak-client (0.1.17)
       dry-auto_inject
       dry-container
       dry-monads
@@ -14,31 +14,34 @@ GEM
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     connection_pool (2.3.0)
-    dalli (3.2.3)
-    diff-lcs (1.4.4)
+    dalli (3.2.0)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    dry-auto_inject (0.9.0)
+    dry-auto_inject (0.7.0)
       dry-container (>= 0.3.4)
-    dry-configurable (0.15.0)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.10.1)
+      dry-core (~> 0.5, >= 0.5.0)
+    dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
-    dry-core (0.8.1)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.6.0)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.3.0)
-    dry-initializer (3.1.1)
+    dry-equalizer (0.3.0)
+    dry-inflector (0.2.0)
+    dry-initializer (3.0.4)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
-    dry-monads (1.4.0)
+    dry-monads (1.3.5)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.7)
-    dry-schema (1.9.3)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer
+    dry-schema (1.6.2)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
+      dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
@@ -54,17 +57,17 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     ice_nine (0.11.2)
-    jwt (2.4.1)
+    jwt (2.7.0)
     method_source (1.0.0)
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.1.1)
     rake (12.3.3)
-    redis (5.0.5)
+    redis (5.0.6)
       redis-client (>= 0.9.0)
     redis-client (0.11.2)
       connection_pool
@@ -74,16 +77,16 @@ GEM
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.26.0)
+    rubocop (1.27.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -95,7 +98,7 @@ GEM
     rubocop-ast (1.16.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -104,7 +107,7 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -121,4 +124,4 @@ DEPENDENCIES
   simplecov-cobertura
 
 BUNDLED WITH
-   2.3.5
+   2.3.26

data/lib/hydra/keycloak/client.rb

@@ -73,9 +73,9 @@ module Hydra
         def register_store_client(config)
           case config.fetch(:store_client)
           when 'redis'
-            register_redis_store(config.fetch(:store_client_options))
+            register_redis_store(**config.fetch(:store_client_options))
           when 'memcached'
-            register_memcached_store(config.fetch(:store_client_options))
+            register_memcached_store(**config.fetch(:store_client_options))
           end
         end
 
@@ -127,7 +127,12 @@ module Hydra
     class Client
       extend ::Hydra::Keycloak::Mixin
       include ::Dry::Monads[:result, :do]
-      inject['urls', 'tokens_repo', 'store', 'code_verifier']
+      inject[
+        'urls',
+        'tokens_repo',
+        'store',
+        'code_verifier'
+      ]
 
       def auth_url
         code_verifier.generate
@@ -196,11 +201,11 @@ module Hydra
       end
 
       def logout!(session_state)
-        fetch_token(session_state, 'id_token').bind do |id_token|
-          clear_tokens(session_state)
+        id_token = yield fetch_token(session_state, 'id_token')
 
-          urls.end_session_url(id_token.source)
-        end
+        yield clear_tokens(session_state)
+
+        Success(urls.end_session_url(id_token.source))
       end
 
       def introspect_token(token)
@@ -224,9 +229,14 @@ module Hydra
       end
 
       def clear_tokens(session_state)
-        store.delete("#{session_state}_access_token")
-        store.delete("#{session_state}_id_token")
-        store.delete("#{session_state}_refresh_token")
+        Dry::Monads::List[
+          "#{session_state}_access_token",
+          "#{session_state}_id_token",
+          "#{session_state}_refresh_token"
+        ]
+          .fmap { |x| store.delete(x) }
+          .typed(Dry::Monads::Result)
+          .traverse
       end
 
       def token_expired?(token)

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

@@ -25,7 +25,7 @@ module Hydra
                           Net::ProtocolError].freeze
 
         def post(path, body)
-          response = http.post_form(URI(path), **body)
+          response = http.post_form(URI(path), body)
 
           if response.code == '200'
             json = JSON.parse(response.body)

data/lib/hydra/keycloak/version.rb

@@ -2,6 +2,6 @@
 
 module Hydra
   module Keycloak
-    VERSION = '0.1.15'
+    VERSION = '0.1.17'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-keycloak-client
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Fedor Kosolapov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-22 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Keycloak client for SSO