psu_identity 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ede6bfacb5202361d54d13fa9e8aed416ecffe1030f6c5194f9c1049a0222199
-  data.tar.gz: 94da5cb3a5ad4deb0931959d31458e210374d62421d8d4cef25efde920962039
+  metadata.gz: 51ee8619629274ba4e705f67c851420a9a3e773ab3d5bbd1e08587ebe64f3ecb
+  data.tar.gz: 4bf4eacbc97b634d13bae26652362343e1c3c8780d3dfb455371b10ab85fa6e8
 SHA512:
-  metadata.gz: 4e5ed78f69e1773cf90274c23138a0f6b05ad0f645437379a2b77471ece8232ab767f280d87e251fc04a3967815fc06a0f93cc9f5db8fc6600f5f17c34bf3421
-  data.tar.gz: 7a74f77fd41e38db06b86de7885c403a0e4a0fe88cbf7192d05687898cc5b560a976a7587eb14e1ce85e3bb74450293daf5e34023982fb8b2ff4784601606235
+  metadata.gz: 3781788fd2253c99aa1113952502473e1ebd1d58fabf4d1771d56e7831db33085a4433f3bb256f890e06ca51271a73354443c999ced1202446cb421e45c5417f
+  data.tar.gz: 92a6c28a1eb7ba9e8f3169fdb4ae116f45334b5b62f2e992ce3b9272298a467b01430242cb34a7b1fe4890caf9abf174682d814649b2fefe5b93cc4f0341bf8a

data/.rubocop.yml

@@ -25,3 +25,7 @@ Style/OpenStructUse:
   Exclude:
     - 'lib/psu_identity/search_service/atomic_link.rb'
     - 'spec/lib/psu_identity/search_service/atomic_link_spec.rb'
+
+Rspec/NestedGroups:
+  Exclude:
+    - 'spec/lib/psu_identity/search_service/person_spec.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    psu_identity (0.5.1)
+    psu_identity (0.6.1)
       faraday (~> 1.0)
       json
       oauth2

data/lib/psu_identity/directory_service/client.rb

@@ -20,6 +20,8 @@ module PsuIdentity::DirectoryService
     # @param [Hash] args of options to pass to the endpoint
     # @option args [String] :userid of the person
     def userid(userid)
+      raise NotFound if /\A[[:space:]]*\z/.match?(userid.to_s)
+
       process_userid_response connection.get("#{base_url}/people/#{userid}")
     end
 
@@ -49,12 +51,17 @@ module PsuIdentity::DirectoryService
       def token
         oauth_client = OAuth2::Client.new(client_id,
                                           client_secret, site: oauth_endpoint,
+                                                         auth_scheme:,
                                                          authorize_url: '/oauth/api/authz',
                                                          token_url: '/oauth/api/token')
         oauth_token = oauth_client.client_credentials.get_token
         oauth_token.token
       end
 
+      def auth_scheme
+        @auth_scheme ||= ENV.fetch('PSU_ID_AUTH_SCHEME', 'request_body').to_sym
+      end
+
       def client_id
         @client_id ||= ENV.fetch('PSU_ID_OAUTH_CLIENT_ID')
       end

data/lib/psu_identity/search_service/person.rb

@@ -39,19 +39,19 @@ module PsuIdentity::SearchService
     end
 
     def preferred_given_name
-      data.fetch('preferredGivenName', given_name)
+      presence(data['preferredGivenName']) || given_name
     end
 
     def preferred_middle_name
-      data.fetch('preferredMiddleName', middle_name)
+      presence(data['preferredMiddleName']) || middle_name
     end
 
     def preferred_family_name
-      data.fetch('preferredFamilyName', family_name)
+      presence(data['preferredFamilyName']) || family_name
     end
 
     def preferred_honorific_suffix
-      data.fetch('preferredHonorificSuffix', honorific_suffix)
+      presence(data['preferredHonorificSuffix']) || honorific_suffix
     end
 
     def active?
@@ -81,5 +81,15 @@ module PsuIdentity::SearchService
     def link
       AtomicLink.new(data['link'])
     end
+
+    private
+
+      def presence(string)
+        return nil if string == nil
+
+        return nil if string == ''
+
+        string
+      end
   end
 end

data/lib/psu_identity/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PsuIdentity
-  VERSION = '0.5.1'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psu_identity
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Alex Kiessling
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday