keycloak-admin 1.2.0 → 2.0.1

data/lib/keycloak-admin/client/token_client.rb

@@ -1,5 +1,3 @@
-require "rest-client"
-
 module KeycloakAdmin
   class TokenClient < Client
     def initialize(configuration, realm_client)
@@ -18,7 +16,7 @@ module KeycloakAdmin
 
     def get
       response = execute_http do
-        RestClient::Resource.new(token_url, @configuration.rest_client_options).post(
+        resource(token_url).post(
           @configuration.body_for_token_retrieval,
           @configuration.headers_for_token_retrieval
         )

data/lib/keycloak-admin/client/user_client.rb

@@ -13,7 +13,7 @@ module KeycloakAdmin
 
     def save(user_representation)
       execute_http do
-        RestClient::Resource.new(users_url, @configuration.rest_client_options).post(
+        resource(users_url).post(
           create_payload(user_representation), headers
         )
       end
@@ -23,40 +23,43 @@ module KeycloakAdmin
     # pay attention that, since Keycloak 24.0.4, partial updates of attributes are not authorized anymore
     def update(user_id, user_representation_body)
       raise ArgumentError.new("user_id must be defined") if user_id.nil?
-      RestClient::Request.execute(
-        @configuration.rest_client_options.merge(
+      Resource.execute(
+        @configuration.faraday_options.merge(
           method: :put,
           url: users_url(user_id),
           payload: create_payload(user_representation_body),
-          headers: headers
+          headers: headers,
+          logger: @configuration.logger
         )
       )
     end
 
     def add_group(user_id, group_id)
-      RestClient::Request.execute(
-        @configuration.rest_client_options.merge(
+      Resource.execute(
+        @configuration.faraday_options.merge(
           method: :put,
           url: "#{users_url(user_id)}/groups/#{group_id}",
           payload: create_payload({}),
-          headers: headers
+          headers: headers,
+          logger: @configuration.logger
         )
       )
     end
 
     def remove_group(user_id, group_id)
-      RestClient::Request.execute(
-        @configuration.rest_client_options.merge(
+      Resource.execute(
+        @configuration.faraday_options.merge(
           method: :delete,
           url: "#{users_url(user_id)}/groups/#{group_id}",
-          headers: headers
+          headers: headers,
+          logger: @configuration.logger
         )
       )
     end
 
     def add_client_roles_on_user(user_id, client_id, role_representations)
       execute_http do
-        RestClient::Resource.new(user_client_role_mappings_url(user_id, client_id), @configuration.rest_client_options).post(
+        resource(user_client_role_mappings_url(user_id, client_id)).post(
           create_payload(role_representations), headers
         )
       end
@@ -64,7 +67,7 @@ module KeycloakAdmin
 
     def get(user_id)
       response = execute_http do
-        RestClient::Resource.new(users_url(user_id), @configuration.rest_client_options).get(headers)
+        resource(users_url(user_id)).get(headers)
       end
       UserRepresentation.from_hash(JSON.parse(response))
     end
@@ -86,7 +89,7 @@ module KeycloakAdmin
                         end
 
       response = execute_http do
-        RestClient::Resource.new(users_url, @configuration.rest_client_options).get(derived_headers)
+        resource(users_url).get(derived_headers)
       end
       JSON.parse(response).map { |user_as_hash| UserRepresentation.from_hash(user_as_hash) }
     end
@@ -97,26 +100,27 @@ module KeycloakAdmin
 
     def delete(user_id)
       execute_http do
-        RestClient::Resource.new(users_url(user_id), @configuration.rest_client_options).delete(headers)
+        resource(users_url(user_id)).delete(headers)
       end
       true
     end
 
     def groups(user_id)
       response = execute_http do
-        RestClient::Resource.new(groups_url(user_id), @configuration.rest_client_options).get(headers)
+        resource(groups_url(user_id)).get(headers)
       end
       JSON.parse(response).map { |group_as_hash| GroupRepresentation.from_hash(group_as_hash) }
     end
 
     def update_password(user_id, new_password)
       execute_http do
-        RestClient::Request.execute(
-          @configuration.rest_client_options.merge(
+        Resource.execute(
+          @configuration.faraday_options.merge(
             method: :put,
             url: reset_password_url(user_id),
             payload: { type: "password", value: new_password, temporary: false }.to_json,
-            headers: headers
+            headers: headers,
+            logger: @configuration.logger
           )
         )
       end
@@ -125,7 +129,7 @@ module KeycloakAdmin
 
     def credentials(user_id)
       response = execute_http do
-        RestClient::Resource.new(credentials_url(user_id), @configuration.rest_client_options).get(headers)
+        resource(credentials_url(user_id)).get(headers)
       end
       JSON.parse(response).map { |group_as_hash| CredentialRepresentation.from_hash(group_as_hash) }
     end
@@ -140,7 +144,7 @@ module KeycloakAdmin
         lifespan_param = lifespan.nil? ? "" : "&lifespan=#{lifespan.seconds}"
         redirect_uri_param = redirect_uri.nil? ? "" : "&redirect_uri=#{redirect_uri}"
         client_id_param = client_id.nil? ? "" : "client_id=#{client_id}"
-        RestClient.put("#{execute_actions_email_url(user_id)}?#{client_id_param}#{redirect_uri_param}#{lifespan_param}", create_payload(actions), headers)
+        Resource.put("#{execute_actions_email_url(user_id)}?#{client_id_param}#{redirect_uri_param}#{lifespan_param}", create_payload(actions), headers, @configuration.logger)
       end
       user_id
     end
@@ -148,12 +152,13 @@ module KeycloakAdmin
     def impersonate(user_id)
       impersonation = get_redirect_impersonation(user_id)
       response = execute_http do
-        RestClient::Request.execute(
-          @configuration.rest_client_options.merge(
+        Resource.execute(
+          @configuration.faraday_options.merge(
             method: :post,
             url: impersonation.impersonation_url,
             payload: impersonation.body.to_json,
-            headers: impersonation.headers
+            headers: impersonation.headers,
+            logger: @configuration.logger
           )
         )
       end
@@ -164,7 +169,7 @@ module KeycloakAdmin
       raise ArgumentError.new("user_id must be defined") if user_id.nil?
 
       response = execute_http do
-        RestClient::Resource.new("#{users_url(user_id)}/sessions", @configuration.rest_client_options).get(headers)
+        resource("#{users_url(user_id)}/sessions").get(headers)
       end
       JSON.parse(response).map { |session_as_hash| SessionRepresentation.from_hash(session_as_hash) }
     end
@@ -173,11 +178,12 @@ module KeycloakAdmin
       raise ArgumentError.new("user_id must be defined") if user_id.nil?
 
       execute_http do
-        RestClient::Request.execute(
-          @configuration.rest_client_options.merge(
+        Resource.execute(
+          @configuration.faraday_options.merge(
             method: :post,
             url: logout_url(user_id),
-            headers: headers
+            headers: headers,
+            logger: @configuration.logger
           )
         )
       end
@@ -195,12 +201,13 @@ module KeycloakAdmin
       fed_id_rep.identity_provider = idp_id
 
       execute_http do
-        RestClient::Request.execute(
-          @configuration.rest_client_options.merge(
+        Resource.execute(
+          @configuration.faraday_options.merge(
             method: :post,
             url: federated_identity_url(user_id, idp_id),
             payload: fed_id_rep.to_json,
-            headers: headers
+            headers: headers,
+            logger: @configuration.logger
           )
         )
       end
@@ -208,7 +215,7 @@ module KeycloakAdmin
 
     def unlink_idp(user_id, idp_id)
       execute_http do
-        RestClient::Resource.new(federated_identity_url(user_id, idp_id), @configuration.rest_client_options).delete(headers)
+        resource(federated_identity_url(user_id, idp_id)).delete(headers)
       end
     end
 

data/lib/keycloak-admin/configuration.rb

@@ -2,7 +2,29 @@ require "base64"
 
 module KeycloakAdmin
   class Configuration
-    attr_accessor :server_url, :server_domain, :client_id, :client_secret, :client_realm_name, :use_service_account, :username, :password, :logger, :rest_client_options
+    attr_accessor :server_url, :server_domain, :client_id, :client_secret, :client_realm_name, :use_service_account, :username, :password, :logger, :faraday_options
+
+    # Treat a cached token as expired this many seconds before its real expiry, so it
+    # cannot go stale between the check below and the request that relies on it.
+    TOKEN_EXPIRY_SAFETY_MARGIN_SECONDS = 10
+
+    # Returns the cached TokenRepresentation, or nil if there is none or it is (about to be) expired.
+    def cached_token
+      return nil if @token_expires_at.nil? || Time.now >= @token_expires_at
+      @cached_token
+    end
+
+    def cache_token(token_representation)
+      return token_representation unless token_representation.expires_in.is_a?(Numeric)
+      @cached_token     = token_representation
+      @token_expires_at = Time.now + token_representation.expires_in - TOKEN_EXPIRY_SAFETY_MARGIN_SECONDS
+      token_representation
+    end
+
+    def clear_cached_token!
+      @cached_token     = nil
+      @token_expires_at = nil
+    end
 
     def body_for_token_retrieval
       if use_service_account

data/lib/keycloak-admin/version.rb

@@ -1,3 +1,3 @@
 module KeycloakAdmin
-  VERSION = "1.2.0"
+  VERSION = "2.0.1"
 end

data/lib/keycloak-admin.rb

@@ -1,6 +1,8 @@
 require "logger"
 
 require_relative "keycloak-admin/configuration"
+require_relative "keycloak-admin/client/response"
+require_relative "keycloak-admin/client/resource"
 require_relative "keycloak-admin/client/client"
 require_relative "keycloak-admin/client/client_client"
 require_relative "keycloak-admin/client/client_role_client"
@@ -83,7 +85,7 @@ module KeycloakAdmin
       config.use_service_account = true
       config.username            = nil
       config.password            = nil
-      config.rest_client_options = {}
+      config.faraday_options     = {}
     end
   end
 

data/spec/client/attack_detection_client_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe KeycloakAdmin::AttackDetectionClient do
     before(:each) do
       @attack_detections = KeycloakAdmin.realm(realm_name).attack_detections
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '{"numFailures":1,"disabled":true, "lastFailure":123456}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '{"numFailures":1,"disabled":true, "lastFailure":123456}'
     end
 
     context "when user_id is defined" do
@@ -49,7 +49,7 @@ RSpec.describe KeycloakAdmin::AttackDetectionClient do
     before(:each) do
       @attack_detections = KeycloakAdmin.realm(realm_name).attack_detections
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete)
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete)
     end
 
     context "when user_id is defined" do
@@ -72,7 +72,7 @@ RSpec.describe KeycloakAdmin::AttackDetectionClient do
     before(:each) do
       @attack_detections = KeycloakAdmin.realm(realm_name).attack_detections
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete)
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete)
     end
     it "returns true" do
       expect(@attack_detections.unlock_users).to be_truthy

data/spec/client/client_authz_permission_client_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzPermissionClient do
     let(:client_authz_permission) {  KeycloakAdmin.realm(realm_name).authz_permissions(client_id, "resource") }
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete).and_return 'true'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete).and_return 'true'
     end
 
     it "deletes a permission" do
@@ -56,7 +56,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzPermissionClient do
     let(:client_authz_permission) {  KeycloakAdmin.realm(realm_name).authz_permissions(client_id, "resource") }
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"245ce612-ccdc-4426-8ea7-e0e29a718033","name":"Default Permission","description":"A permission that applies to the default resource type","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"urn:dummy-client:resources:default"},{"id":"06a21e38-4e92-466d-8647-ffcd9c7b51c3","name":"delme policy","description":"delme polidy ","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"asdfasdf"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"245ce612-ccdc-4426-8ea7-e0e29a718033","name":"Default Permission","description":"A permission that applies to the default resource type","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"urn:dummy-client:resources:default"},{"id":"06a21e38-4e92-466d-8647-ffcd9c7b51c3","name":"delme policy","description":"delme polidy ","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"asdfasdf"}]'
     end
 
     it "finds permissions" do
@@ -72,7 +72,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzPermissionClient do
     let(:client_authz_permission) {  KeycloakAdmin.realm(realm_name).authz_permissions(client_id, "resource") }
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return '{"id":"245ce612-ccdc-4426-8ea7-e0e29a718033","name":"Default Permission","description":"A permission that applies to the default resource type","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"urn:dummy-client:resources:default"}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return '{"id":"245ce612-ccdc-4426-8ea7-e0e29a718033","name":"Default Permission","description":"A permission that applies to the default resource type","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"urn:dummy-client:resources:default"}'
     end
 
     it "creates a permission" do
@@ -92,7 +92,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzPermissionClient do
     before(:each) do
       @client_authz_permission = KeycloakAdmin.realm(realm_name).authz_permissions(client_id, "resource")
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"245ce612-ccdc-4426-8ea7-e0e29a718033","name":"Default Permission","description":"A permission that applies to the default resource type","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"urn:dummy-client:resources:default"},{"id":"06a21e38-4e92-466d-8647-ffcd9c7b51c3","name":"delme policy","description":"delme polidy ","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"asdfasdf"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"245ce612-ccdc-4426-8ea7-e0e29a718033","name":"Default Permission","description":"A permission that applies to the default resource type","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"urn:dummy-client:resources:default"},{"id":"06a21e38-4e92-466d-8647-ffcd9c7b51c3","name":"delme policy","description":"delme polidy ","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"asdfasdf"}]'
 
     end
 
@@ -114,7 +114,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzPermissionClient do
     let(:client_authz_permission) {  KeycloakAdmin.realm(realm_name).authz_permissions(client_id, "resource") }
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '{"id":"245ce612-ccdc-4426-8ea7-e0e29a718033","name":"Default Permission","description":"A permission that applies to the default resource type","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"urn:dummy-client:resources:default"}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '{"id":"245ce612-ccdc-4426-8ea7-e0e29a718033","name":"Default Permission","description":"A permission that applies to the default resource type","type":"resource","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","resourceType":"urn:dummy-client:resources:default"}'
     end
 
     it "gets a permission" do

data/spec/client/client_authz_policy_client_spec.rb

@@ -50,7 +50,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzPolicyClient do
 
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return '{"id":"234f6f33-ef03-4f3f-a8c0-ad7bca27b720","name":"policy name","description":"policy description","type":"role","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","config":{"roles":"[{\"id\":\"1d305dbe-6379-4900-8e63-96541006160a\",\"required\":false}]"}}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return '{"id":"234f6f33-ef03-4f3f-a8c0-ad7bca27b720","name":"policy name","description":"policy description","type":"role","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","config":{"roles":"[{\"id\":\"1d305dbe-6379-4900-8e63-96541006160a\",\"required\":false}]"}}'
     end
 
     it "creates a new authz policy" do
@@ -72,7 +72,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzPolicyClient do
     let(:client_authz_policy){ KeycloakAdmin.realm(realm_name).authz_policies(client_id, type) }
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '{"id":"234f6f33-ef03-4f3f-a8c0-ad7bca27b720","name":"policy name","description":"policy description","type":"role","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","config":{"roles":"[{\"id\":\"1d305dbe-6379-4900-8e63-96541006160a\",\"required\":false}]"}}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '{"id":"234f6f33-ef03-4f3f-a8c0-ad7bca27b720","name":"policy name","description":"policy description","type":"role","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","config":{"roles":"[{\"id\":\"1d305dbe-6379-4900-8e63-96541006160a\",\"required\":false}]"}}'
     end
 
     it "returns an authz policy" do
@@ -94,7 +94,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzPolicyClient do
     let(:client_authz_policy){ KeycloakAdmin.realm(realm_name).authz_policies(client_id, type) }
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"234f6f33-ef03-4f3f-a8c0-ad7bca27b720","name":"policy name","description":"policy description","type":"role","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","config":{"roles":"[{\"id\":\"1d305dbe-6379-4900-8e63-96541006160a\",\"required\":false}]"}}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"234f6f33-ef03-4f3f-a8c0-ad7bca27b720","name":"policy name","description":"policy description","type":"role","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","config":{"roles":"[{\"id\":\"1d305dbe-6379-4900-8e63-96541006160a\",\"required\":false}]"}}]'
     end
 
     it "returns list of authz policies" do
@@ -117,7 +117,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzPolicyClient do
     before(:each) do
       @client_authz_policy = KeycloakAdmin.realm(realm_name).authz_policies(client_id, type)
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete).and_return 'true'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete).and_return 'true'
     end
 
     it "deletes an authz policy" do
@@ -133,7 +133,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzPolicyClient do
     before(:each) do
       @client_authz_policy = KeycloakAdmin.realm(realm_name).authz_policies(client_id, type)
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"234f6f33-ef03-4f3f-a8c0-ad7bca27b720","name":"policy name","description":"policy description","type":"role","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","config":{"roles":"[{\"id\":\"1d305dbe-6379-4900-8e63-96541006160a\",\"required\":false}]"}}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"234f6f33-ef03-4f3f-a8c0-ad7bca27b720","name":"policy name","description":"policy description","type":"role","logic":"POSITIVE","decisionStrategy":"UNANIMOUS","config":{"roles":"[{\"id\":\"1d305dbe-6379-4900-8e63-96541006160a\",\"required\":false}]"}}]'
     end
 
     it "returns list of authz policies" do

data/spec/client/client_authz_resource_client_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzResourceClient do
     before(:each) do
       @client_authz_resource = KeycloakAdmin.realm(realm_name).authz_resources(client_id)
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]},{"name":"asdfasdf","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":true,"displayName":"asdfasdfasdfa","_id":"385966a2-14b9-4cc4-9539-5f2fe1008222","uris":["/*"],"icon_uri":"http://icon"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]},{"name":"asdfasdf","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":true,"displayName":"asdfasdfasdfa","_id":"385966a2-14b9-4cc4-9539-5f2fe1008222","uris":["/*"],"icon_uri":"http://icon"}]'
     end
 
     it "returns list of authz scopes" do
@@ -44,7 +44,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzResourceClient do
     let(:client_authz_resource) { KeycloakAdmin.realm(realm_name).authz_resources(client_id) }
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]}'
     end
 
     it "returns authz scope" do
@@ -63,8 +63,8 @@ RSpec.describe KeycloakAdmin::ClientAuthzResourceClient do
     let(:client_authz_resource) { KeycloakAdmin.realm(realm_name).authz_resources(client_id) }
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]}'
-      allow_any_instance_of(RestClient::Resource).to receive(:put).and_return '{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:put).and_return '{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]}'
     end
 
     it "returns updated authz scope" do
@@ -82,7 +82,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzResourceClient do
     before(:each) do
       @client_authz_resource = KeycloakAdmin.realm(realm_name).authz_resources(client_id)
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return '{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return '{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]}'
     end
 
     it "returns created authz scope" do
@@ -101,7 +101,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzResourceClient do
     let(:client_authz_resource) { KeycloakAdmin.realm(realm_name).authz_resources(client_id) }
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"name":"Default Resource","type":"urn:delme-client-id:resources:default","owner":{"id":"d259b451-371b-432a-a526-3508f3a36f3b","name":"delme-client-id"},"ownerManagedAccess":false,"_id":"94643fe2-1973-4a36-8e1f-830ade186398","uris":["/*"]}]'
     end
 
     it "returns list of authz scopes" do
@@ -139,7 +139,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzResourceClient do
     let(:client_authz_resource) { KeycloakAdmin.realm(realm_name).authz_resources(client_id) }
     before(:each) do
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete).and_return '{}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete).and_return '{}'
     end
 
     it "returns true" do

data/spec/client/client_authz_scope_client_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzScopeClient do
     before(:each) do
       @client_authz_scope = KeycloakAdmin.realm(realm_name).authz_scopes(client_id)
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:post).and_return '{"id":"c0779ce3-0900-4ea3-b1d6-b23e1f19c662","name":"GET","iconUri":"http://asdfasd1","displayName":"GET authz scope"}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:post).and_return '{"id":"c0779ce3-0900-4ea3-b1d6-b23e1f19c662","name":"GET","iconUri":"http://asdfasd1","displayName":"GET authz scope"}'
     end
 
     it "returns created authz scope" do
@@ -42,7 +42,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzScopeClient do
     before(:each) do
       @client_authz_scope = KeycloakAdmin.realm(realm_name).authz_scopes(client_id)
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"c0779ce3-0900-4ea3-b1d6-b23e1f19c662","name":"GET","iconUri":"http://asdfasd1","displayName":"GET authz scope"},{"id":"d0779ce3-0900-4ea3-b1d6-b23e1f19c662","name":"POST","iconUri":"http://asdfasd2","displayName":"POST authz scope"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"c0779ce3-0900-4ea3-b1d6-b23e1f19c662","name":"GET","iconUri":"http://asdfasd1","displayName":"GET authz scope"},{"id":"d0779ce3-0900-4ea3-b1d6-b23e1f19c662","name":"POST","iconUri":"http://asdfasd2","displayName":"POST authz scope"}]'
     end
 
     it "returns list of authz scopes" do
@@ -63,7 +63,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzScopeClient do
     before(:each) do
       @client_authz_scope = KeycloakAdmin.realm(realm_name).authz_scopes(client_id)
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete).and_return ""
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete).and_return ""
     end
 
     it "returns true" do
@@ -79,7 +79,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzScopeClient do
     before(:each) do
       @client_authz_scope = KeycloakAdmin.realm(realm_name).authz_scopes(client_id)
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '{"id":"c0779ce3-0900-4ea3-b1d6-b23e1f19c662","name":"GET","iconUri":"http://asdfasd1","displayName":"GET authz scope"}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '{"id":"c0779ce3-0900-4ea3-b1d6-b23e1f19c662","name":"GET","iconUri":"http://asdfasd1","displayName":"GET authz scope"}'
     end
 
     it "returns authz scope" do
@@ -98,7 +98,7 @@ RSpec.describe KeycloakAdmin::ClientAuthzScopeClient do
     before(:each) do
       @client_authz_scope = KeycloakAdmin.realm(realm_name).authz_scopes(client_id)
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"c0779ce3-0900-4ea3-b1d6-b23e1f19c662","name":"GET","iconUri":"http://asdfasd1","displayName":"GET authz scope"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"c0779ce3-0900-4ea3-b1d6-b23e1f19c662","name":"GET","iconUri":"http://asdfasd1","displayName":"GET authz scope"}]'
     end
 
     it "returns list of authz scopes" do

data/spec/client/client_client_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe KeycloakAdmin::ClientClient do
       @client_client = KeycloakAdmin.realm(realm_name).clients
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '{"id":"test_client_id","name":"test_client_name"}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '{"id":"test_client_id","name":"test_client_name"}'
     end
 
     it "finds a client" do
@@ -50,7 +50,7 @@ RSpec.describe KeycloakAdmin::ClientClient do
       @client_client = KeycloakAdmin.realm(realm_name).clients
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"test_client_id","clientId": "my_client_id","name":"test_client_name"},{"id":"test_client_id_2","clientId":"client_id_2","name":"test_client_name_2"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"test_client_id","clientId": "my_client_id","name":"test_client_name"},{"id":"test_client_id_2","clientId":"client_id_2","name":"test_client_name_2"}]'
     end
 
     it "finds a client it has" do
@@ -72,7 +72,7 @@ RSpec.describe KeycloakAdmin::ClientClient do
       @client_client = KeycloakAdmin.realm(realm_name).clients
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"test_client_id","name":"test_client_name"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"test_client_id","name":"test_client_name"}]'
     end
 
     it "lists clients" do
@@ -82,11 +82,11 @@ RSpec.describe KeycloakAdmin::ClientClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/clients", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/clients", faraday_options, anything).and_call_original
 
       clients = @client_client.list
       expect(clients.length).to eq 1
@@ -102,8 +102,8 @@ RSpec.describe KeycloakAdmin::ClientClient do
       @client_client = KeycloakAdmin.realm(realm_name).clients
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:put).and_return ''
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '{"id":"test_client_id", "clientId": "my-client","name":"new_name"}'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:put).and_return ''
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '{"id":"test_client_id", "clientId": "my-client","name":"new_name"}'
     end
 
     it "updates a client" do
@@ -119,14 +119,14 @@ RSpec.describe KeycloakAdmin::ClientClient do
     before(:each) do
       @client_client = KeycloakAdmin.realm(realm_name).clients
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:delete).and_return ''
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:delete).and_return ''
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/clients/95b45037-3980-404c-ba12-784fa1baf2c2", rest_client_options).and_call_original
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/clients/95b45037-3980-404c-ba12-784fa1baf2c2", faraday_options, anything).and_call_original
       @client_client.delete("95b45037-3980-404c-ba12-784fa1baf2c2")
     end
   end

data/spec/client/client_role_mappings_client_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe KeycloakAdmin::ClientRoleMappingsClient do
       @client_role_mappings_client = KeycloakAdmin.realm(realm_name).user(user_id).client_role_mappings(client_id)
 
       stub_token_client
-      allow_any_instance_of(RestClient::Resource).to receive(:get).and_return '[{"id":"test_role_id","name":"test_role_name"}]'
+      allow_any_instance_of(KeycloakAdmin::Resource).to receive(:get).and_return '[{"id":"test_role_id","name":"test_role_name"}]'
     end
 
     it "lists roles" do
@@ -32,12 +32,13 @@ RSpec.describe KeycloakAdmin::ClientRoleMappingsClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
         "http://auth.service.io/auth/admin/realms/valid-realm/users/test_user/role-mappings/clients/test_client/available",
-        rest_client_options
+        faraday_options,
+        anything
       ).and_call_original
 
       roles = @client_role_mappings_client.list_available
@@ -62,7 +63,7 @@ RSpec.describe KeycloakAdmin::ClientRoleMappingsClient do
       @client_role_mappings_client = KeycloakAdmin.realm(realm_name).user(user_id).client_role_mappings(client_id)
 
       stub_token_client
-      expect_any_instance_of(RestClient::Resource).to receive(:post).with(role_list.to_json, anything)
+      expect_any_instance_of(KeycloakAdmin::Resource).to receive(:post).with(role_list.to_json, anything)
     end
 
     it "saves client role mappings" do
@@ -70,11 +71,11 @@ RSpec.describe KeycloakAdmin::ClientRoleMappingsClient do
     end
 
     it "passes rest client options" do
-      rest_client_options = {timeout: 10}
-      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:rest_client_options).and_return rest_client_options
+      faraday_options = {timeout: 10}
+      allow_any_instance_of(KeycloakAdmin::Configuration).to receive(:faraday_options).and_return faraday_options
 
-      expect(RestClient::Resource).to receive(:new).with(
-        "http://auth.service.io/auth/admin/realms/valid-realm/users/test_user/role-mappings/clients/test_client", rest_client_options).and_call_original
+      expect(KeycloakAdmin::Resource).to receive(:new).with(
+        "http://auth.service.io/auth/admin/realms/valid-realm/users/test_user/role-mappings/clients/test_client", faraday_options, anything).and_call_original
 
       @client_role_mappings_client.save(role_list)
     end