hydra-keycloak-client 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18c487395b0610c378e53e63bd831b32c74f599f4fcd7fad8827698bd645dcfc
-  data.tar.gz: 0b31711516d5f351b1c82bca9164462f124595eb40d7dc790316e6d43c7c08b0
+  metadata.gz: 291ce7dea090b7d863e9fd3d29c92bf035c64f940ef1b3c8d0fce955a54bf8fb
+  data.tar.gz: 94f719f340181a2cd5c12bd2d5eb070d53c6c1d55dbd1161f49249d6fd66b895
 SHA512:
-  metadata.gz: 0ed1cb5e7793a4ab45473551345d1ee6eca95d8ad349e3fd9023cd5f7282edf4cdcc87598bb9bc86de2797cc3ff0198d6f458817f0ded485745ef4d4dc3229da
-  data.tar.gz: 925857eea90aa7a6008f66febe1dadfa02820f72c0ca5ae2ec7cd24c20890c417a5268f2ad033084782d141706d47449f27d6c0797ef6b77e6899922f2ccc1d3
+  metadata.gz: 3198cc3b6df1e02af1686bdbdaa8f12dae01e47da07d20635ba843c5df4ac2de833c56c9c1629c0603856360345439bc2aeb34596f383a2853e1386d29ca672a
+  data.tar.gz: b7f96f9134234bd3c337f8727409a9d1a984ab8d375a484b29b7c32e9721e4e6d82509cc0162490e5451599c98a895d84a17d9ab390a83559ec520b3276e74f3

data/.github/workflows/main.yml

@@ -0,0 +1,16 @@
+name: CI
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: self-hosted
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build image
+      run: docker build -f Dockerfile.test -t hkc_test_image .
+
+    - name: Run tests
+      run: docker run hkc_test_image rspec

data/Dockerfile.test

@@ -0,0 +1,7 @@
+FROM ruby:2.7.4
+
+COPY . /app
+WORKDIR /app
+
+RUN bundle install
+CMD bundle exec rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hydra-keycloak-client (0.1.5)
+    hydra-keycloak-client (0.1.7)
       dalli
       dry-auto_inject
       dry-container
@@ -16,11 +16,11 @@ GEM
   specs:
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
-    dalli (3.1.1)
+    dalli (3.2.1)
     diff-lcs (1.4.4)
-    dry-auto_inject (0.8.0)
+    dry-auto_inject (0.9.0)
       dry-container (>= 0.3.4)
-    dry-configurable (0.13.0)
+    dry-configurable (0.14.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
     dry-container (0.9.0)
@@ -29,14 +29,14 @@ GEM
     dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
     dry-inflector (0.2.1)
-    dry-initializer (3.0.4)
+    dry-initializer (3.1.1)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
     dry-monads (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.7)
-    dry-schema (1.8.0)
+    dry-schema (1.9.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.13, >= 0.13.0)
       dry-core (~> 0.5, >= 0.5)

data/lib/hydra/keycloak/client.rb

@@ -5,7 +5,6 @@ require 'dry/container'
 require 'dry/schema'
 
 require 'hydra/keycloak/container'
-require 'hydra/keycloak/user_data'
 require 'hydra/keycloak/code_verifier'
 
 module Hydra
@@ -131,22 +130,6 @@ module Hydra
         fetch_token(session_state, 'access_token').success?
       end
 
-      def user_data(session_state)
-        unless authenticated?(session_state)
-          return Failure(status: 400, code: :not_authenticated)
-        end
-
-        fetch_token(session_state, 'access_token').fmap do |access_token|
-          UserData.new(
-            username:                access_token[:login],
-            base_subject_id:         access_token[:base_subject_id],
-            subj_group_id:           access_token[:subj_group_id],
-            firm_id:                 access_token[:firm_id],
-            base_subject_first_name: access_token[:base_subject_first_name],
-            jti:                     access_token[:jti])
-        end
-      end
-
       def access_token(session_state)
         unless authenticated?(session_state)
           return Failure(status: 400, code: :not_authenticated)

data/lib/hydra/keycloak/token.rb

@@ -26,7 +26,7 @@ module Hydra
       end
 
       def [](key)
-        @data.fetch(key)
+        @data[key]
       end
     end
   end

data/lib/hydra/keycloak/version.rb

@@ -2,6 +2,6 @@
 
 module Hydra
   module Keycloak
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-keycloak-client
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Fedor Kosolapov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -131,6 +131,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
+- Dockerfile.test
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -148,7 +150,6 @@ files:
 - lib/hydra/keycloak/store/redis_client.rb
 - lib/hydra/keycloak/token.rb
 - lib/hydra/keycloak/urls.rb
-- lib/hydra/keycloak/user_data.rb
 - lib/hydra/keycloak/version.rb
 homepage: https://github.com/latera/hydra-keycloak-client
 licenses: []
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Keycloak client for SSO

data/lib/hydra/keycloak/user_data.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'dry/struct'
-
-module Hydra
-  module Keycloak
-    module Types
-      include Dry.Types()
-    end
-
-    class UserData < Dry::Struct
-      attribute :username, Types::String
-      attribute :base_subject_id, Types::Coercible::Integer
-      attribute :subj_group_id, Types::Coercible::Integer
-      attribute :firm_id, Types::Coercible::Integer
-      attribute :base_subject_first_name, Types::String
-      attribute :jti, Types::String
-    end
-  end
-end