oauth_im 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc27c0f6156c8c268aa642b7bb93ec558df3242ba4935bf6108d25b943e22a7
-  data.tar.gz: bd9bcc76ee46fef4b1d592bf6ad1f27d847aac830195e82d13c878009858fb0c
+  metadata.gz: 96a52f6e8d59737439a315eb6b64a883dc8c8a8680d4b1a136b98fdd042eb4f7
+  data.tar.gz: 04cbae317291c2a9f16b20f41bd8e394ef52ebbfbdd132eb474b768110de9bca
 SHA512:
-  metadata.gz: b00319d1bf052c6bcfbceac00337ee736d029f797be234dbe96e90c0d02a266dff7382a7075779947aec7b5f3dd448fbd366b84baff2ffa41b8803885cdc32fe
-  data.tar.gz: eb03efb12c05c9f5785ce4cb5d852a940f082c269decc536ffe2bcb98698931a742c885f92db1b666c0bed51d88d5c214a3f9295dab76f537aced0cd0b965de4
+  metadata.gz: 125503e2251bcab4b98933f45f8533798cc8ebb808207c3df9ffaeba40b3640db8888638b2a319b9edf3f0a71a4f281600ffbf0c899d380ed42f70c754a5b1f9
+  data.tar.gz: aa3935aa8ec9b3a974931813a15f484d52e24204ba8bf71a70d042152e003a66ec1b5d5e427842b8c7901ff1d53866460950607f823a78eb77108c323a60c64c

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: self.class.default_api_key,
+                   idp_url: self.class.default_idp_url)
+      @api_key = api_key
+      @idp_url = 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.fetch(:api_key, self.class.default_api_key),
+            idp_url: attrs.fetch(:idp_url, self.class.default_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: self.class.default_api_key,
+                   idp_url: self.class.default_idp_url)
       @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:,
+                   idp_url:   self.class.default_idp_url,
+                   client_id: self.class.default_client_id)
+      @request   = request
+      @idp_url   = idp_url
+      @client_id = 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: self.class.default_api_key,
+                   idp_url: self.class.default_idp_url)
       @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.0'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Eric Connally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusionauth_client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.42.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.42.1
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement