hydra-keycloak-client 0.1.10 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 516229617ccd659620dd11a197eadbb3d5f2085bd59afdc44371af351b013009
-  data.tar.gz: be901750b274b69fec1544e6268c0a0016d9b8ba254afec831215da440260de1
+  metadata.gz: 6b9fb72f474785e45fca86279c8a7877f73605bf3da22507a801ef7458f107b1
+  data.tar.gz: cc12951887ddd3f14aa662788b36c06d41095934707be9a4fe1ba685b8b1afa1
 SHA512:
-  metadata.gz: 01df11417b5231dc9651568b84c2c08f63580bfa1a7fcc951b169eddfeb4849ec833115416cb807f19ed6457445b7927e4d554cae6201811d4021d57616e2c19
-  data.tar.gz: 0f7af8f307e65ff7eae75bb5d9a5367c2af56a69f96b2d5723b6bb3e7ac54da5042ec499f84b2a741c55785a0cad2acef5c3e3b1d4d10939ccd0c48696d2ceea
+  metadata.gz: 5b026319391803ea1da1bee4bd47eb019a6c99ca48abd4a330353cdf55285378d1ef7d57f38d42520b59499962bbc393e6d17a1ed4b78e18087dc8e892d69ab5
+  data.tar.gz: 2bf4d76068843e4e82bb65c86653b04ed506d373f14990b77991f8c1064f1e193967c39a265536b364228bf1afa6bd4d2ad77f74201488f0d0d7e124c5c130b0

data/.github/workflows/main.yml

@@ -10,10 +10,23 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Build image
-      run: docker build -f Dockerfile.test -t hkc_test_image .
+      run: docker build -f Dockerfile.test -t hkc_image:testing .
 
-    - name: Run rubocop
-      run: docker run hkc_test_image rubocop
+    - name: "Run tests"
+      run: |
+          docker run --name hkc_image \
+                     -e SIMPLE_COV_ENABLED=true \
+                     hkc_image:testing \
+                     ./run_tests.sh
 
-    - name: Run tests
-      run: docker run hkc_test_image rspec
+    - name: "Save coverage report"
+      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"
+
+    - name: Clean up container
+      if: always()
+      run: |
+        docker kill hkc_image 2>/dev/null || true
+        docker rm hkc_image 2>/dev/null || true

data/.gitignore

@@ -0,0 +1 @@
+.rspec_status

data/.rspec

@@ -0,0 +1,2 @@
+--require spec_helper
+--color

data/Dockerfile.test

@@ -1,6 +1,9 @@
 FROM ruby:2.7.4
 
 COPY . /app
+
 WORKDIR /app
 
+RUN chmod +x ./run_tests.sh
+
 RUN bundle install

data/Gemfile

@@ -10,3 +10,6 @@ gem 'rspec', '~> 3.0'
 gem 'rubocop', '~> 1.26'
 
 gem 'pry'
+
+gem 'simplecov', require: false, group: :test
+gem 'simplecov-cobertura', require: false, group: :test

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hydra-keycloak-client (0.1.9)
+    hydra-keycloak-client (0.1.12)
       dry-auto_inject
       dry-container
       dry-monads
@@ -14,11 +14,12 @@ GEM
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
+    docile (1.4.0)
     dry-auto_inject (0.9.0)
       dry-container (>= 0.3.4)
-    dry-configurable (0.14.0)
+    dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
     dry-container (0.9.0)
@@ -34,7 +35,7 @@ GEM
     dry-monads (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.7)
-    dry-schema (1.9.1)
+    dry-schema (1.9.3)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.13, >= 0.13.0)
       dry-core (~> 0.5, >= 0.5)
@@ -52,7 +53,7 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     ice_nine (0.11.2)
-    jwt (2.3.0)
+    jwt (2.4.1)
     method_source (1.0.0)
     parallel (1.21.0)
     parser (3.1.1.0)
@@ -89,6 +90,15 @@ GEM
     rubocop-ast (1.16.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (2.1.0)
+      rexml
+      simplecov (~> 0.19)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     unicode-display_width (2.1.0)
 
 PLATFORMS
@@ -100,6 +110,8 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec (~> 3.0)
   rubocop (~> 1.26)
+  simplecov
+  simplecov-cobertura
 
 BUNDLED WITH
    2.2.25

data/README.md

@@ -32,7 +32,8 @@ keycloack_client = Hydra::Keycloak::ClientCreator.call(
     secret:               keycloak_config.fetch(:secret),
     logout_redirect:      keycloak_config.fetch(:logout_redirect),
     store_client:         'redis',
-    store_client_options: {redis_host: ENV['REDIS_HOST'], redis_port: ENV['REDIS_PORT']}
+    store_client_options: {redis_host: ENV['REDIS_HOST'], redis_port: ENV['REDIS_PORT']},
+    scope:                ['hoper_scope', 'homs_scope']
   })
 ```
 

data/hydra-keycloak-client.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Keycloak client for SSO'
   spec.description   = 'Keycloak client for SSO'
-  spec.homepage      = 'https://github.com/latera/hydra-keycloak-client'
+  spec.homepage      = 'https://github.com/hydra-billing/hydra-keycloak-client'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.5.8')
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'

data/lib/hydra/keycloak/client.rb

@@ -42,13 +42,14 @@ module Hydra
             required(:logout_redirect).filled(:string)
             required(:store_client).value(included_in?: %w[redis memcached])
             required(:store_client_options).hash(memcached_schema | redis_schema)
+            optional(:scope).array(:str?)
           end
         end
 
         def memcached_schema
           Dry::Schema.JSON do
             required(:memcached_host).filled(:string)
-            required(:memcached_port).filled(:string)
+            required(:memcached_port).filled(:integer)
             required(:memcached_namespace).filled(:string)
           end
         end
@@ -56,7 +57,7 @@ module Hydra
         def redis_schema
           Dry::Schema.JSON do
             required(:redis_host).filled(:string)
-            required(:redis_port).filled(:string)
+            required(:redis_port).filled(:integer)
           end
         end
 

data/lib/hydra/keycloak/urls.rb

@@ -3,6 +3,8 @@
 module Hydra
   module Keycloak
     class Urls
+      DEFAULT_SCOPE = ['openid'].freeze
+
       def initialize(config)
         @config = config
       end
@@ -14,7 +16,7 @@ module Hydra
           "client_id=#{@config[:client_id]}&" \
           "redirect_uri=#{@config[:redirect_uri]}&" \
           "nonce=#{@config[:secret]}&" \
-          'scope=openid&' \
+          "scope=#{scope}&" \
           "code_challenge=#{code_challenge}&" \
           'code_challenge_method=S256'
       end
@@ -59,9 +61,15 @@ module Hydra
           client_secret: @config[:secret],
           grant_type: 'refresh_token',
           refresh_token: refresh_token,
-          scope: 'openid'
+          scope: scope
         }
       end
+
+      private
+
+      def scope
+        (DEFAULT_SCOPE + @config[:scope]).join('%20')
+      end
     end
   end
 end

data/lib/hydra/keycloak/version.rb

@@ -2,6 +2,6 @@
 
 module Hydra
   module Keycloak
-    VERSION = '0.1.10'
+    VERSION = '0.1.13'
   end
 end

data/run_tests.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+bundle exec rubocop --display-only-failed
+
+bundle exec rspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-keycloak-client
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.13
 platform: ruby
 authors:
 - Fedor Kosolapov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -104,6 +104,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/main.yml"
+- ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - Dockerfile.test
 - Gemfile
@@ -126,13 +128,14 @@ files:
 - lib/hydra/keycloak/token.rb
 - lib/hydra/keycloak/urls.rb
 - lib/hydra/keycloak/version.rb
-homepage: https://github.com/latera/hydra-keycloak-client
+- run_tests.sh
+homepage: https://github.com/hydra-billing/hydra-keycloak-client
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/latera/hydra-keycloak-client
-  source_code_uri: https://github.com/latera/hydra-keycloak-client
-  changelog_uri: https://github.com/latera/hydra-keycloak-client
+  homepage_uri: https://github.com/hydra-billing/hydra-keycloak-client
+  source_code_uri: https://github.com/hydra-billing/hydra-keycloak-client
+  changelog_uri: https://github.com/hydra-billing/hydra-keycloak-client
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -148,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Keycloak client for SSO