oauth_im 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59850b2078fcdc211be2d3a43ca7f7d3e0aaf4a433e1a703e48e3ac0942e8bdc
-  data.tar.gz: 228df263b5f216a455ea5cd0365ae97d77ff48e1e0bd527850977e1a7d0fa262
+  metadata.gz: 3de11fe5ca4fd11cd2d762e7cde0501b1d2f05310991efe187d20b9f035834e1
+  data.tar.gz: c80dd50d7c7c7f0c1b32f0aab6f9fad43f4a42e0d841d7efd3523786b7710cb9
 SHA512:
-  metadata.gz: 37e2f602d2de4058a194d01af1074c6bc2f5231f0fb5a13efe8c77b8b80dc7344cf35f6c7e139310352bef8e07b93796d3088b966245c3db0bb6f15bf5ab87a9
-  data.tar.gz: 48e15c481324112a37afb2400938f3d2dc13e8e173adeb86505ab079d5d3b77e2fb66e64fad211057f89e5e5ab31bbbf111de3ee3ad791ce951f0d2b3b250c69
+  metadata.gz: b9a6298a624e5c4cc51dfda4bd79920d8d729c8cbbdd9f8a7723e95f2e3aac5c69f36fa4d733e18b9b503e65ba9185a37d88362705d8663572f3e5fb60bf02ad
+  data.tar.gz: 05b8f611dc5f111eca6865d2115b26b44abc0ccab2b582b7f9ed9fbf3e3f70b8f5e0a1930fb557c70772f128394fd057ca90983f2b7f8c4acaac4ce8de9508d7

data/app/controllers/concerns/oauth_im/authenticable.rb

@@ -12,10 +12,12 @@ module OauthIm
     private
 
     delegate :email, :email_verified?,
-             :user_privileges,
+             :user_is_sponsor?,
              to: :user_client,
              allow_nil: true
 
+    delegate :spec_user, :spec_user_is_sponsor?, to: AppContext
+
     def authenticated?
       AppContext.authenticated_for_specs? ||
         (AppContext.provide_authentication? && logged_in?)
@@ -32,10 +34,10 @@ module OauthIm
 
     def current_user
       @current_user ||=
-        if user_jwt.present?
+        if Rails.env.test?
+          spec_user
+        elsif user_jwt.present?
           email if email_verified?
-        elsif Rails.env.test?
-          AppContext.spec_user
         end
     end
 

data/app/services/oauth_im/user_client.rb

@@ -19,8 +19,8 @@ module OauthIm
       email.present?
     end
 
-    def user_privileges
-      @user_privileges ||= data[:privileges] || []
+    def user_is_sponsor?
+      data[:sponsor].eql?('true')
     end
 
     private

data/config/initializers/app_context.rb

@@ -3,8 +3,11 @@
 module AppContext
   module_function
 
-  TEST_ENV_ERROR_MESSGE  = 'Use only in test environment!'
-  DEFAULT_SPEC_USER_DATA = {}.freeze
+  TEST_ENV_ERROR_MESSAGE = 'Use only in test environment!'
+
+  def override_for_specs?
+    Rails.env.test? && provide_authentication?
+  end
 
   def provide_authentication?
     true
@@ -18,46 +21,37 @@ module AppContext
     @spec_user if override_for_specs?
   end
 
-  def authenticated_for_specs?
-    @authenticated_for_specs if override_for_specs?
-  end
-
-  def spec_user_data
-    if override_for_specs?
-      @spec_user_data.presence || DEFAULT_SPEC_USER_DATA
-    else
-      DEFAULT_SPEC_USER_DATA
-    end
+  def spec_user_is_sponsor?
+    @spec_user_is_sponsor && override_for_specs?
   end
 
-  def override_for_specs?
-    Rails.env.test? && provide_authentication?
+  def authenticated_for_specs?
+    @authenticated_for_specs && override_for_specs?
   end
 
   def authenticate_for_specs?
-    raise TEST_ENV_ERROR_MESSGE unless Rails.env.test?
+    raise TEST_ENV_ERROR_MESSAGE unless Rails.env.test?
 
     provide_authentication?
   end
 
-  def authenticate_for_specs(spec_user: nil, spec_user_data: {})
+  def authenticate_for_specs(spec_user: nil, sponsor: false)
     return unless authenticate_for_specs?
 
-    set_spec_user spec_user, spec_user_data
+    initialize_spec_user spec_user: spec_user, sponsor: sponsor
     yield
     reset_spec_user
   end
 
-  def set_spec_user(spec_user, spec_user_data)
-    @authenticated_for_specs = true
+  def initialize_spec_user(spec_user:, sponsor:)
     @spec_user               = spec_user
-    @spec_user_data          = spec_user_data
+    @spec_user_is_sponsor    = sponsor
+    @authenticated_for_specs = true
   end
 
   def reset_spec_user
-    @spec_user_data          = DEFAULT_SPEC_USER_DATA
-    @spec_user               = nil
     @authenticated_for_specs = false
-    nil
+    @spec_user               = nil
+    @spec_user_is_sponsor    = false
   end
 end

data/lib/oauth_im/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Eric Connally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusionauth_client