oauth_im 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98d097fc63cfed0036ed0d71348d46641b870d78be7f13cdca990cc00793f4c9
-  data.tar.gz: 8308890358478cfd66420278d8739fe718fcde66d6d12aa81588ccdc2bd8b54e
+  metadata.gz: 261d1ea644c2e1b82d42840d636d8f30e1ffe9dfb719a85c690440e192eec6a6
+  data.tar.gz: 1310fdeb14e9182818d4905c8c82a98e5d7c89e6033c448d58f013eaf3d1851d
 SHA512:
-  metadata.gz: c089a1599692d321d4361d03d92f6ca79c65b11072230de43cc7225727a6bbfc633e242fe68209a4f60034e2127f1a2b350282f7c2331a6b0d1193c01068e381
-  data.tar.gz: 23eca7c41af07bc4a72d47159f1e7c8834af7b4cfe2bcf9c8092face5f6e9c0a28d8135880a692e590a7f19e50edfbb6374c3345c453f9ac678982a0e269dca0
+  metadata.gz: f670809fb571009b1281e7a896ae0a6d733eff593974243d2982cd8f8b06ea5958ab9501e05e2bb5f313d0999e7dbfdd97e7f20e2e8ccc71f89f1569e080d404
+  data.tar.gz: 5a63f7ff9a3b0e9a7f7ddc9c2375c64c3be0536bac627c550d1da29b10be61a4ab301e107873b689bf1883ecb8494b87e003526c5ab1cd0dd2e5174b34972f46

data/README.md

@@ -139,6 +139,9 @@ After many false starts, this repo includes two (seemingly functional) github wo
 
 ## Version History
 
+### 0.9.3
+* added specs for AppContext initializer
+
 ### 0.9.2
 * Fix redirect url
   * No longer does it take user back to page they were on

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,41 @@
+# 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 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
+  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

@@ -1,36 +1,57 @@
 # frozen_string_literal: true
 
 module AppContext
-  def self.provide_authentication?
+  module_function
+
+  TEST_ENV_ERROR_MESSAGE = 'Use only in test environment!'
+
+  def override_for_specs?
+    Rails.env.test? && provide_authentication?
+  end
+
+  def provide_authentication?
     true
   end
 
-  def self.spec_user
+  def provide_auth_routes?
+    provide_authentication?
+  end
+
+  def spec_user
     @spec_user if override_for_specs?
   end
 
-  def self.authenticated_for_specs?
-    @authenticated_for_specs if override_for_specs?
+  def spec_user_is_sponsor?
+    @spec_user_is_sponsor && override_for_specs?
   end
 
-  def self.spec_user_data
-    override_for_specs? ? (@spec_user_data.presence || {}) : {}
+  def authenticated_for_specs?
+    @authenticated_for_specs && override_for_specs?
   end
 
-  def self.override_for_specs?
-    Rails.env.test? && provide_authentication?
+  def authenticate_for_specs?
+    raise TEST_ENV_ERROR_MESSAGE unless Rails.env.test?
+
+    provide_authentication?
   end
 
-  def self.authenticate_for_specs(spec_user: nil, spec_user_data: {})
-    return unless provide_authentication?
-    raise 'Use only in test environment!!' unless Rails.env.test?
+  def authenticate_for_specs(spec_user: nil, sponsor: false)
+    return unless authenticate_for_specs?
 
-    @authenticated_for_specs = true
-    @spec_user               = spec_user
-    @spec_user_data          = spec_user_data
+    initialize_spec_user spec_user: spec_user, sponsor: sponsor
     yield
-    @privileged_for_specs    = false
-    @spec_user_data          = {}
+    reset_spec_user
+  end
+
+  def initialize_spec_user(spec_user:, sponsor:)
+    @spec_user               = spec_user
+    @spec_user_is_sponsor    = sponsor
+    @authenticated_for_specs = true
+  end
+
+  def reset_spec_user
     @authenticated_for_specs = false
+    @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.2'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Eric Connally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 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