oauth_im 0.9.3 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59850b2078fcdc211be2d3a43ca7f7d3e0aaf4a433e1a703e48e3ac0942e8bdc
-  data.tar.gz: 228df263b5f216a455ea5cd0365ae97d77ff48e1e0bd527850977e1a7d0fa262
+  metadata.gz: 6e0f366f5c38cc82da877d02f34ca778bcee19235b9b286fbf449e8cd1c5e2cf
+  data.tar.gz: 52c299ea3e29fb97c74643cbdbcbf90ff06a0104cb8e3b1eb2a35a8418432810
 SHA512:
-  metadata.gz: 37e2f602d2de4058a194d01af1074c6bc2f5231f0fb5a13efe8c77b8b80dc7344cf35f6c7e139310352bef8e07b93796d3088b966245c3db0bb6f15bf5ab87a9
-  data.tar.gz: 48e15c481324112a37afb2400938f3d2dc13e8e173adeb86505ab079d5d3b77e2fb66e64fad211057f89e5e5ab31bbbf111de3ee3ad791ce951f0d2b3b250c69
+  metadata.gz: df9b7b1c12bcfc6fe06b3c48c0c337a1dfc24060c0812f575d29b6f972cf6b1ff15bb4c92513f03f87701e0a266f4773fd78ad4954535be8156a0322782155df
+  data.tar.gz: 2fdca9e46d141266cecb01b2cdaea5ffb00182cdb24f2db87a8624c9a641aa5f7bd8edf49b5e23988d962f1ea6e1f2e18a9bd00c9dc938a2b71909a4eba75558

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

@@ -5,17 +5,19 @@ module OauthIm
     extend ActiveSupport::Concern
 
     included do
-      helper_method :authenticated?
-      helper_method :email
+      helper_method :admin?, :authenticated?, :email
     end
 
     private
 
     delegate :email, :email_verified?,
-             :user_privileges,
+             :user_is_sponsor?,
+             :admin?,
              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/admin_client.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'fusionauth/fusionauth_client'
+
+module OauthIm
+  class AdminClient < IdpClient
+    def search_for(term: '', email: '')
+      if email.present?
+        proxy_users_for client.retrieve_user_by_email(email)
+      elsif term.present?
+        proxy_users_for client.search_users_by_query({ search: { queryString: term } })
+      else
+        []
+      end
+    end
+
+    def proxy_user_for(user_id:)
+      response = client.retrieve_user(user_id).success_response
+      raise "No user for id #{user_id}" if response.blank?
+
+      ProxyUser.new response.user
+    end
+
+    private
+
+    def user_attrs_for(response)
+      response.success_response.then do |results|
+        results&.users.presence ||
+          [results&.user.presence].compact
+      end
+    end
+
+    def proxy_users_for(response)
+      user_attrs_for(response).map { |attrs| ProxyUser.new(attrs) }
+    end
+  end
+end

data/app/services/oauth_im/has_registration_data.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'fusionauth/fusionauth_client'
+
+module OauthIm
+  module HasRegistrationData
+    delegate :email, to: :attrs
+    delegate :role, :grade_level, :school, :district, :state,
+             to: :registration_data
+    delegate :name, :id,
+             to: :role, prefix: true
+    delegate :name, :id,
+             to: :grade_level, prefix: true
+    delegate :name, :id,
+             to: :school, prefix: true
+    delegate :name, :id,
+             to: :district, prefix: true
+    delegate :name, :id,
+             to: :state, prefix: true
+
+    def registration_data
+      @registration_data ||= attrs[:registrations]&.first&.data || {}
+    end
+
+    def active?
+      attrs.active
+    end
+
+    def sponsor?
+      registration_data[:sponsor].eql? 'true'
+    end
+
+    def user_is_sponsor?
+      sponsor?
+    end
+
+    def first_name
+      attrs.firstName
+    end
+
+    def last_name
+      attrs.lastName
+    end
+
+    def full_name
+      @full_name ||= "#{first_name} #{last_name}"
+    end
+  end
+end

data/app/services/oauth_im/proxy_user.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module OauthIm
+  class ProxyUser < IdpClient
+    include HasRegistrationData
+
+    attr_reader :attrs
+
+    delegate :to_h, to: :attrs
+
+    def self.for(user_id:)
+      AdminClient.new.proxy_user_for user_id: user_id
+    end
+
+    def initialize(attrs)
+      @attrs = attrs
+      super()
+    end
+
+    def user_id
+      @user_id ||= attrs[:id]
+    end
+
+    def send_reset_password_email
+      client.forgot_password loginId: user_id
+    end
+
+    def deactivate_user
+      client.deactivate_user user_id
+    end
+  end
+end

data/app/services/oauth_im/user_client.rb

@@ -4,6 +4,8 @@ require 'fusionauth/fusionauth_client'
 
 module OauthIm
   class UserClient < IdpClient
+    include HasRegistrationData
+
     attr_reader :user_jwt
 
     def initialize(user_jwt:)
@@ -19,29 +21,20 @@ module OauthIm
       email.present?
     end
 
-    def user_privileges
-      @user_privileges ||= data[:privileges] || []
+    def admin?
+      jwt_token[:roles].include? 'admin'
     end
 
     private
 
-    def user_data
-      @user_data ||= user[:registrations]&.first || {}
-    end
-
-    def data
-      @data ||= user_data[:data] || {}
+    def attrs
+      @attrs ||= success_response[:user] || {}
     end
 
     def success_response
       @success_response ||= client_response&.success_response || {}
     end
 
-    def user
-      @user ||= success_response[:user] || {}
-    end
-
-    # https://www.rubydoc.info/gems/fusionauth_client/1.32.1/FusionAuth/FusionAuthClient#retrieve_user-instance_method
     def client_response
       @client_response ||= client.retrieve_user user_id
     end

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.10.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.1
 platform: ruby
 authors:
 - Eric Connally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusionauth_client
@@ -139,8 +139,11 @@ files:
 - app/controllers/oauth_im/application_controller.rb
 - app/controllers/oauth_im/client_controller.rb
 - app/helpers/oauth_im/application_helper.rb
+- app/services/oauth_im/admin_client.rb
 - app/services/oauth_im/client.rb
+- app/services/oauth_im/has_registration_data.rb
 - app/services/oauth_im/idp_client.rb
+- app/services/oauth_im/proxy_user.rb
 - app/services/oauth_im/registration_client.rb
 - app/services/oauth_im/request_client.rb
 - app/services/oauth_im/token_decoder.rb