ucb_rails_user 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1de8958c36cbeeb3541649d812e7288468672f9352ec84749810fccaf81005
-  data.tar.gz: e2262f788179205abf8dc7d4558a434f3826130f6d713448ef90a783e2341fe1
+  metadata.gz: a2d32568b7c7c44c29b420b560c94db14a5cef2150e40e69b535cc9fad3b6714
+  data.tar.gz: 7325bbb7ee1f6cd3ea3a04c7f38411d5e75551c31022260ba454d22769c60d2d
 SHA512:
-  metadata.gz: 27314e556fa6987b12779ea570dacbd3f5089a7cfdef91a316020f13754ceb147cd74de4e3e468a298109cc1336beef659708507bde98605743242e9cd4f6c91
-  data.tar.gz: dbb93ff5a2cde7347e2b5441155edafae6f18557cbaf584ac6f89fdb34adda7b67dc36b8f43a5c571e2fb0b6de8eefd71dacb6f3a3e6cd04458a56acd1d417fe
+  metadata.gz: efb9dd7b036a5de8251cab4068172cea5fdcce1db57be780d0e70111d90b634dc591a09fadc8b81206a6005f6d2b4a59cc63b31d729716abfc3a396492567b82
+  data.tar.gz: 7f0beaa12b968857a56c1c6a8966c51a77447f975c88494c5e6c4022d5ad712b7be085c91c6a0ab267d3d454de9cfd38b5f979c61becc2c3812d2853dfb224d7

data/app/models/ucb_rails_user/ldap_person/entry.rb

@@ -14,6 +14,7 @@ module UcbRailsUser::LdapPerson
     attribute :first_name
     attribute :last_name
     attribute :email
+    attribute :alternate_email
     attribute :phone
     attribute :departments
     attribute :affiliations
@@ -40,19 +41,23 @@ module UcbRailsUser::LdapPerson
     class << self
 
       def new_from_ldap_entry(ldap_entry)
+        # the to_s calls are because the underlying LDAP library sometimes returns strings as instances
+        # of Net::BER::BerIdentifiedString rather than String, and the Oracle DB library doesn't play
+        # nicely with those (postgres and sqlite work fine)
         new(
-          :uid => ldap_entry.uid,
-          :calnet_id => ldap_entry.berkeleyedukerberosprincipalstring.first,
-          :employee_id => ldap_entry.attributes[:berkeleyeduucpathid]&.first,
-          :student_id => ldap_entry.berkeleyedustuid,
-          :first_name => ldap_entry.givenname.first,
-          :last_name => ldap_entry.sn.first,
-          :email => ldap_entry.mail.first,
-          :phone => ldap_entry.phone,
-          :departments => ldap_entry.berkeleyeduunithrdeptname,
-          :affiliations => ldap_entry.berkeleyeduaffiliations,
-          :affiliate_id => ldap_entry.berkeleyeduaffid.first,
-          :inactive => ldap_entry.expired? || false
+          uid: ldap_entry.uid&.to_s,
+          calnet_id: ldap_entry.berkeleyedukerberosprincipalstring.first&.to_s,
+          employee_id: ldap_entry.attributes[:berkeleyeduucpathid]&.first&.to_s,
+          student_id: ldap_entry.berkeleyedustuid&.to_s,
+          first_name: ldap_entry.givenname.first&.to_s,
+          last_name: ldap_entry.sn.first&.to_s,
+          email: ldap_entry.mail.first&.to_s,
+          alternate_email: ldap_entry.attributes[:berkeleyeduofficialemail]&.first&.to_s,
+          phone: ldap_entry.phone&.to_s,
+          departments: ldap_entry.berkeleyeduunithrdeptname&.to_s,
+          affiliations: ldap_entry.berkeleyeduaffiliations&.map(&:to_s),
+          affiliate_id: ldap_entry.berkeleyeduaffid.first&.to_s,
+          inactive: ldap_entry.expired? || false
         )
       end
 

data/app/models/ucb_rails_user/user_session_manager/in_people_ou_add_to_users_table.rb

@@ -8,6 +8,9 @@ module UcbRailsUser
 
         if people_ou_entry.present?
           UcbRailsUser::UserLdapService.create_or_update_user_from_entry(people_ou_entry).tap do |user|
+            if missing_or_invalid_email?(user)
+              user.update(email: people_ou_entry.alternate_email) if people_ou_entry.alternate_email.present?
+            end
             user.touch(:last_login_at)
           end
         else
@@ -15,6 +18,12 @@ module UcbRailsUser
         end
       end
 
+      private
+
+      def missing_or_invalid_email?(user)
+        user&.email.blank? || (user.email =~ URI::MailTo::EMAIL_REGEXP).nil?
+      end
+
     end
 
   end

data/lib/ucb_rails_user/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_user
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Steve Downey
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails