hydra-keycloak-client 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df63eb8a97b5a549f867fa0de5fe449c9791ca811195c1aba5610fb54a278e6
-  data.tar.gz: 05d90289f5a8dce6618664a44ba1e7f0b1cd4d901b09895d52b43ef7fac8666c
+  metadata.gz: e21882cde2f44b50a21259216097d6f101429189476d7c8e672a45376445639e
+  data.tar.gz: 109d00d611d0755b8a8ef9d1ddc564d0b05203bbf52fe09b2bf50d41c58cf62d
 SHA512:
-  metadata.gz: e00caef745d78165d825b25a69b7afcb578dda19e9bccd543a56c3640ad5be1f9d70e402d977d38594821c4d2a9a988f32dec05cdc5748dcdf58b834b090afbe
-  data.tar.gz: 919a92716cbf26f5e8f94b973fe5023d350c298bd541caa50e81d4ec824b59c789fd0fa52480d65e9c98e8405d92317b19090467102815725abbc62c42ba99cd
+  metadata.gz: 66ece7983e4ed5731233f41ad9d15e4bf6fcb1c55f8e2aa708b3317031ff89f201e9cdf3ec7bc94fc7e5855f9b95b78ed7c53ddfcac085108053893719072b27
+  data.tar.gz: a1edbad85e6397ae3ea3f1f6e66c3f0cecc16648e4b344d900ac16c71a2904ac450041615cc022319421380b39837a93abd4e5765ec3c6dcc1e196e70483785e

data/.github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: Create release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  deploy:
+    runs-on: self-hosted
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set env
+        run: echo "RELEASE_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
+
+      - name: Build releaser image
+        run: docker build -f Dockerfile.release -t hkc:release .
+
+      - name: Release gem
+        run: |
+          docker run --rm --name hkc_release \
+                     -e RUBYGEMS_TOKEN=${{ secrets.RUBYGEMS_TOKEN }} \
+                     -e RELEASE_VERSION=${{ env.RELEASE_VERSION }} \
+                     hkc:release

data/Dockerfile.release

@@ -0,0 +1,11 @@
+FROM ruby:3.2.0
+
+COPY . /app
+
+WORKDIR /app
+
+RUN chmod +x ./release.sh
+
+RUN bundle install
+
+ENTRYPOINT ["./release.sh"]

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.14)
+    hydra-keycloak-client (0.1.16)
       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
 

data/lib/hydra/keycloak/token.rb

@@ -5,21 +5,22 @@ require 'jwt'
 module Hydra
   module Keycloak
     class Token
+      REGISTERED_CLAIMS = %i[iss sub aud exp nbf iat jti].freeze
+      PUBLIC_CLAIMS     = %i[auth_time scope].freeze
+      PRIVATE_CLAIMS    = %i[session_state resource_access].freeze
+
       attr_reader :source,
-                  :exp,
-                  :iat,
-                  :auth_time,
-                  :iss,
-                  :session_state,
-                  :scope,
-                  :jti
+                  :data,
+                  *REGISTERED_CLAIMS,
+                  *PUBLIC_CLAIMS,
+                  *PRIVATE_CLAIMS
 
       def initialize(source)
         @source = source
         @data = ::JWT.decode(source, nil, false).first.transform_keys(&:to_sym)
       end
 
-      %i[exp iat auth_time iss session_state scope jti].each do |field|
+      [*REGISTERED_CLAIMS, *PUBLIC_CLAIMS, *PRIVATE_CLAIMS].each do |field|
         define_method(field) do
           @data.fetch(field)
         end

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.14'
+    VERSION = '0.1.16'
   end
 end

data/release.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+mkdir -p $HOME/.gem
+touch $HOME/.gem/credentials
+chmod 0600 $HOME/.gem/credentials
+printf -- "---\n:rubygems_api_key: $RUBYGEMS_TOKEN\n" > $HOME/.gem/credentials
+
+gem build hydra-keycloak-client.gemspec
+gem push hydra-keycloak-client-$RELEASE_VERSION.gem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-keycloak-client
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Fedor Kosolapov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -104,9 +104,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/main.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- Dockerfile.release
 - Dockerfile.test
 - Gemfile
 - Gemfile.lock
@@ -128,6 +130,7 @@ files:
 - lib/hydra/keycloak/tokens/repo.rb
 - lib/hydra/keycloak/urls.rb
 - lib/hydra/keycloak/version.rb
+- release.sh
 - run_tests.sh
 homepage: https://github.com/hydra-billing/hydra-keycloak-client
 licenses: []
@@ -151,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