ucb_rails_user 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69d322a97e81f8ca73eeaf2ed27dda97091f9cb60adca63840880c40098cc835
-  data.tar.gz: 9ee6320543f525fe409fe221ab4462c118be3cd72ed08b248661057eae882767
+  metadata.gz: 7a1de8958c36cbeeb3541649d812e7288468672f9352ec84749810fccaf81005
+  data.tar.gz: e2262f788179205abf8dc7d4558a434f3826130f6d713448ef90a783e2341fe1
 SHA512:
-  metadata.gz: b4ee1dc80e260cedd5e5cfbcb7c7de1cb493a158225926ab586bd8dbfa33ac86ca9f1dbfc213da91b11128fa59a15663a68aedca5a4aa8a118f748484afd99db
-  data.tar.gz: 54a0492f88ea47ca8a6d09a72408e046bf945618a8ad2967fdf675ed52ff89ab49f4a884dcc91805785f30eb533ddc3d257beabe8eacb8c40c243d2ba89f4c54
+  metadata.gz: 27314e556fa6987b12779ea570dacbd3f5089a7cfdef91a316020f13754ceb147cd74de4e3e468a298109cc1336beef659708507bde98605743242e9cd4f6c91
+  data.tar.gz: dbb93ff5a2cde7347e2b5441155edafae6f18557cbaf584ac6f89fdb34adda7b67dc36b8f43a5c571e2fb0b6de8eefd71dacb6f3a3e6cd04458a56acd1d417fe

data/app/models/ucb_rails_user/user_uc_path_service.rb

@@ -4,20 +4,38 @@ class UcbRailsUser::UserUcPathService
 
   class << self
 
+    def create_or_update_user_from_employee_id(employee_id)
+      ucpath_entry = ucpath_client.fetch_employee_data_with_employee_id(employee_id)
+      return nil unless ucpath_entry.present?
+      user = User.find_or_initialize_by(employee_id: employee_id)
+      update_user_record_from_ucpath_entry!(user, ucpath_entry)
+    end
+
     def create_or_update_user_from_ldap_uid(ldap_uid)
-      ucpath_entry = ucpath_client.fetch_employee_data(ldap_uid)
+      ucpath_entry = ucpath_client.fetch_employee_data_with_ldap_uid(ldap_uid)
       return nil unless ucpath_entry.present?
+      user = User.find_or_initialize_by(ldap_uid: ldap_uid)
+      update_user_record_from_ucpath_entry!(user, ucpath_entry)
+    end
 
-      User.find_or_initialize_by(ldap_uid: ldap_uid).tap do |user|
+    def ucpath_client
+      UcPathClient.new
+    end
+
+    def update_user_record_from_ucpath_entry!(user, ucpath_entry)
+      user.tap do |u|
         name_entry = parse_name(ucpath_entry)
-        user.first_name = name_entry["givenName"]
-        user.last_name = name_entry["familyName"]
-        user.employee_id = ucpath_entry["identifiers"]&.detect do |id|
+        u.first_name = name_entry["givenName"]
+        u.last_name = name_entry["familyName"]
+        u.employee_id ||= ucpath_entry["identifiers"]&.detect do |id|
           id["type"] == "hr-employee-id"
         end&.fetch("id")
-        user.email = parse_email(ucpath_entry)
-        user.inactive_flag = false # any way to pull this from the API?
-        user.save!
+        u.ldap_uid ||= ucpath_entry["identifiers"]&.detect do |id|
+          id["type"] == "campus-uid"
+        end&.fetch("id")
+        u.email = parse_email(ucpath_entry)
+        u.inactive_flag = false # any way to pull this from the API?
+        u.save!
       end
     end
 
@@ -42,32 +60,38 @@ class UcbRailsUser::UserUcPathService
       email_entry&.fetch("emailAddress")
     end
 
-    def ucpath_client
-      UcPathClient.new
-    end
-
   end
 
   class UcPathClient
     attr_reader :app_id, :app_key, :endpoint
 
     def initialize
-      credentials =
-        Rails.application.credentials.ucpath || Rails.application.credentials.hcm
-      @app_id  = credentials&.fetch(:app_id)
-      @app_key = credentials&.fetch(:app_key)
-      @endpoint = credentials&.fetch(:endpoint)
+      base_credentials =
+        Rails.application.credentials.ucpath&.with_indifferent_access ||
+        Rails.application.credentials.hcm&.with_indifferent_access ||
+        Rails.application.credentials.fetch(:"ucb-hcm", {})&.with_indifferent_access
+      env_credentials = base_credentials&.fetch(Rails.env, {})
+      @app_id  = env_credentials&.fetch(:app_id, nil) || base_credentials&.fetch(:app_id, nil)
+      @app_key = env_credentials&.fetch(:app_key, nil) || base_credentials&.fetch(:app_key, nil)
+      @endpoint = env_credentials&.fetch(:endpoint, nil) || base_credentials&.fetch(:endpoint, nil)
     end
 
-    def fetch_employee_data(ldap_uid)
+    def fetch_employee_data_with_ldap_uid(ldap_uid)
+      fetch_employee_data(ldap_uid, "campus-uid")
+    end
+
+    def fetch_employee_data_with_employee_id(employee_id)
+      fetch_employee_data(employee_id, "hr-employee-id")
+    end
+
+    def fetch_employee_data(id, id_type)
       if [app_id, app_key, endpoint].any?(&:blank?)
         Rails.logger.warn missing_api_values_message
         return nil
       end
-
       response =
-        Faraday.get("#{endpoint}/employees/#{ldap_uid}") do |req|
-          req.params["id-type"] = "campus-uid"
+        Faraday.get("#{endpoint}/employees/#{id}") do |req|
+          req.params["id-type"] = id_type
           req.headers["Accept"] = "application/json"
           req.headers["app_id"] = app_id
           req.headers["app_key"] = app_key

data/lib/ucb_rails_user/version.rb

@@ -1,3 +1,3 @@
 module UcbRailsUser
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_user
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Steve Downey
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,16 +107,22 @@ dependencies:
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-cas
   requirement: !ruby/object:Gem::Requirement
@@ -386,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Rails engine for UCB user accounts