oauth_im 0.14.1 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1ff274fe0d63b2497c11f24be1e022aa087922838cc41f653fbf2f47f3b6696
-  data.tar.gz: 69b1a55b21d3f59a927fb2989c3475f59ab7469a92495a1d046b7f699c2bf407
+  metadata.gz: 43d9ae7d853f98f0cafe43420959218c2a85cf7b87a76c719db8ec6dba3fc274
+  data.tar.gz: e997dc7ee11af0976eb451c8b025286b2b988e7d4a749fd4668b5e481a00a2ea
 SHA512:
-  metadata.gz: d9facffb072ec3a07c9caf36f1b366bd2bd9112575d145a1275f365fc94e153a428855be9d6a059c79225919cf88de0fc9c755152f18dac43041709da2cd7527
-  data.tar.gz: 9e49eac286d026051127845aad1006070b35fa2bcd0c6d24e48637b78eef223f75cf3b017a4b3e1d1b3919894120ba71503a9a8f06377b34999089b587303e06
+  metadata.gz: eb676b5995e44372dec671b97bf903a7c68b4e082eb76763161b6f6cdea533daca7502689701f5255b23f835325ef40a6f14e21fa8bd99976cb7c95a1edba69c
+  data.tar.gz: 517966a4743b43427647e09c58039b8dfd53bdbaebd992cdc06181146b242f28083067c08979b11509b59b8e1bc5d09234edd3b97a6372f405570596914ece85

data/app/services/oauth_im/client.rb

@@ -2,16 +2,30 @@
 
 module OauthIm
   class Client
-    def self.for(request: nil, user_jwt: nil, secure_id: nil)
+    # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
+    def self.for(request: nil,
+                 user_jwt: nil,
+                 secure_id: nil,
+                 client_id: nil,
+                 api_key: nil,
+                 idp_url: nil)
       if request.present?
-        RequestClient.new request: request
+        RequestClient.new request: request,
+                          client_id: client_id,
+                          idp_url: idp_url
       elsif user_jwt.present?
-        UserClient.new user_jwt: user_jwt
+        UserClient.new user_jwt: user_jwt,
+                       api_key: api_key,
+                       idp_url: idp_url
       elsif secure_id.present?
-        RegistrationClient.new secure_id: secure_id
+        RegistrationClient.new secure_id: secure_id,
+                               api_key: api_key,
+                               idp_url: idp_url
       else
-        raise ArgumentError
+        AdminClient.new api_key: api_key,
+                        idp_url: idp_url
       end
     end
+    # rubocop:enable Metrics/ParameterLists, Metrics/MethodLength
   end
 end

data/app/services/oauth_im/idp_client.rb

@@ -4,10 +4,23 @@ require 'fusionauth/fusionauth_client'
 
 module OauthIm
   class IdpClient
-    private
+    attr_reader :api_key, :idp_url
+
+    def self.default_api_key
+      @default_api_key ||= OauthIm.configuration.api_key
+    end
+
+    def self.default_idp_url
+      @default_idp_url ||= OauthIm.configuration.idp_url
+    end
+
+    def initialize(api_key: nil,
+                   idp_url: nil)
+      @api_key = api_key || self.class.default_api_key
+      @idp_url = idp_url || self.class.default_idp_url
+    end
 
-    delegate :configuration, to: OauthIm
-    delegate :api_key, :idp_url, to: :configuration
+    private
 
     def client
       @client ||= ::FusionAuth::FusionAuthClient.new api_key, idp_url

data/app/services/oauth_im/proxy_user.rb

@@ -18,8 +18,9 @@ module OauthIm
     attr_reader :attrs
 
     def initialize(attrs)
-      @attrs = attrs
-      super()
+      @attrs = (attrs || {}).with_indifferent_access
+      super api_key: @attrs[:api_key],
+            idp_url: @attrs[:idp_url]
     end
 
     def grant_sponsorship

data/app/services/oauth_im/registration_client.rb

@@ -4,9 +4,11 @@ module OauthIm
   class RegistrationClient < IdpClient
     attr_reader :secure_id
 
-    def initialize(secure_id:)
+    def initialize(secure_id:,
+                   api_key: nil,
+                   idp_url: nil)
       @secure_id = secure_id
-      super()
+      super api_key: api_key, idp_url: idp_url
     end
 
     def register(submission_params:)

data/app/services/oauth_im/request_client.rb

@@ -2,10 +2,22 @@
 
 module OauthIm
   class RequestClient
-    attr_reader :request
+    attr_reader :request, :idp_url, :client_id
 
-    def initialize(request:)
-      @request = request
+    def self.default_idp_url
+      @default_idp_url ||= OauthIm.configuration.idp_url
+    end
+
+    def self.default_client_id
+      @default_client_id ||= OauthIm.configuration.client_id
+    end
+
+    def initialize(request:,
+                   client_id: nil,
+                   idp_url:   nil)
+      @request   = request
+      @idp_url   = idp_url   || self.class.default_idp_url
+      @client_id = client_id || self.class.default_client_id
     end
 
     def login_url
@@ -24,7 +36,7 @@ module OauthIm
 
     delegate :host_with_port, :params, to: :request
     delegate :configuration, to: OauthIm
-    delegate :authorize_url, :token_url, :idp_url, :client_id, :client_secret,
+    delegate :authorize_url, :token_url, :client_secret,
              to: :configuration
     delegate :auth_code, to: :oauth_client
 

data/app/services/oauth_im/user_client.rb

@@ -8,9 +8,11 @@ module OauthIm
 
     attr_reader :user_jwt
 
-    def initialize(user_jwt:)
+    def initialize(user_jwt:,
+                   api_key: nil,
+                   idp_url: nil)
       @user_jwt = user_jwt&.with_indifferent_access
-      super()
+      super api_key: api_key, idp_url: idp_url
     end
 
     def email

data/lib/oauth_im/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OauthIm
-  VERSION = '0.14.1'
+  VERSION = '0.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.1
 platform: ruby
 authors:
 - Eric Connally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusionauth_client