keycloak-ruby-client 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea96c6ce0461b03f3044cef0525da847469201b4
-  data.tar.gz: 6eb43a59c72b12bf0e54aa87b35475a2101203f0
+  metadata.gz: a5fb941053a36de82d660a51be6d041b432c9342
+  data.tar.gz: 5c9ffc4b484fed6cdbff04f937b0a96f603e457e
 SHA512:
-  metadata.gz: 1905046d47ebcd9572a4edfe05e7eb79b9aa12b197c1c41b97f7eea1341d600de99c5fa873ad6c04c834888fca95145d3d3c3e62bc9afc6cbad92497030bc221
-  data.tar.gz: 88b9cd6fa32a4bf3d978ba8fddb880fa1f59d2c71eebdf24750ac6bea65bde323e2c703e4aaa101ef7df994744c8ff25f0e58ade079dce587759c978e3080735
+  metadata.gz: bb526460464780a4be8667ce19e576d3ff790b169d22edf0502f20d9684bab8ca22a65c71c9aeecd7a9e6534729739420d40917208a93c4f791062062adbaf5f
+  data.tar.gz: 50e74f7a50372209f4b011076ecb9ceeda1b4898ed718b6e4fdf01b4a54ab8ca5415ae28cc4b92d73f16a1880bdabc85343de35bf7dbac05e1a784b9337c3acc

data/Rakefile

@@ -1,5 +1,12 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 task :default => :spec
 
 gem 'rails'
-gem 'rest-client'
+gem 'rest-client'
+
+desc "Run the specs."
+RSpec::Core::RakeTask.new do |task|
+  task.pattern = "spec/**/*_spec.rb"
+  task.verbose = false
+end

data/lib/keycloak/api/protection_resources.rb

@@ -17,18 +17,23 @@ module Keycloak
       #   for more details.
       # @param access_token [Keycloak::AccessToken] access token
       # @return [Boolean] true if the permissions granted or false when forbidden
-      def granted_by_server(permissions, access_token)
+      def granted_by_server(permissions, access_token, extra_claims: {})
         url = admin_realm_url + "/protocol/openid-connect/token"
-        res = JSON.parse post(url, {
-            grant_type: "urn:ietf:params:oauth:grant-type:uma-ticket",
-            audience: @realm,
-            permission: permissions,
-            response_mode: "decision"
-          },
+        params = {
+          grant_type: "urn:ietf:params:oauth:grant-type:uma-ticket",
+          audience: @realm,
+          permission: permissions,
+          response_mode: "decision"
+        }
+        if !extra_claims.empty?
+          params[:claim_token] = Base64.strict_decode64(extra_claims.to_json)
+          params[:claim_token_format] = "urn:ietf:params:oauth:token-type:jwt"
+        end
+        res = JSON.parse post(url, params,
           headers: {content_type: :json, authorization: access_token.authorization},
           try_refresh_token: false
         )
-        res['result']
+        res["result"]
       rescue RestClient::Forbidden, RestClient::Unauthorized
         false
       end

data/lib/keycloak/client.rb

@@ -64,18 +64,18 @@ module Keycloak
       @expires_in = now + res["expires_in"].seconds
     end
 
-    def access_token_expired?
-      @expires_in && @expires_in < DateTime.now
+    def access_token_valid?
+      @expires_in && @expires_in > DateTime.now
     end
 
-    def refresh_token_expired?
-      @refresh_expires_in && @refresh_expires_in < DateTime.now
+    def refresh_token_valid?
+      @refresh_expires_in && @refresh_expires_in > DateTime.now
     end
 
     def try_refresh_token!
-      return unless access_token_expired?
+      return if access_token_valid?
 
-      if !refresh_token_expired?
+      if refresh_token_valid?
         refresh_token!
       elsif @authenticate_username && @authenticate_password
         authenticate(@authenticate_username, @authenticate_password, @authenticate_grant_type, @authenticate_client_id, @authenticate_realm, auto: false)

data/lib/keycloak/model/base_representation.rb

@@ -74,11 +74,11 @@ module Keycloak
           v = instance_variable_get("@#{attr}")
           h[attr] = v unless v.nil?
         end
-        h
+        h.as_json(*options)
       end
 
-      def to_json
-        as_json.to_json
+      def to_json(*options)
+        as_json(*options).to_json
       end
     end
   end

data/lib/keycloak/version.rb

@@ -1,3 +1,3 @@
 module Keycloak
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keycloak-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Fuxin Hao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails