ucb_rails_user 4.1.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1de8958c36cbeeb3541649d812e7288468672f9352ec84749810fccaf81005
-  data.tar.gz: e2262f788179205abf8dc7d4558a434f3826130f6d713448ef90a783e2341fe1
+  metadata.gz: a006bac12edd8a40970366888880a897fe1e93a0c05a3c00eb749cc6059305f1
+  data.tar.gz: 9c64c70d6ed4c4c8d107b981db50c5a93333624e226b4905c798ea402c2e9058
 SHA512:
-  metadata.gz: 27314e556fa6987b12779ea570dacbd3f5089a7cfdef91a316020f13754ceb147cd74de4e3e468a298109cc1336beef659708507bde98605743242e9cd4f6c91
-  data.tar.gz: dbb93ff5a2cde7347e2b5441155edafae6f18557cbaf584ac6f89fdb34adda7b67dc36b8f43a5c571e2fb0b6de8eefd71dacb6f3a3e6cd04458a56acd1d417fe
+  metadata.gz: d7b0b2239c2b26223a1c129392d78173133c88754bfff7d3d30505dcf22edce4e4e360a7a2328d9fbe2c3843b271f3a9e0e3881ceff1d5a6654b4d4c5925d032
+  data.tar.gz: a703d4ff5e5242dc5aada67526da8c544743e74c612354fc443cb2eafcb71f9433a51e17e2b2a0ce597fdbf794022650580937627b5583cf0bca12e54333c2b9

data/app/controllers/ucb_rails_user/concerns/impersonations_controller.rb

@@ -10,7 +10,7 @@ module UcbRailsUser::Concerns::ImpersonationsController
   end
 
   def create
-    target = User.find_by(id: params[:ucb_rails_user_impersonation][:target_id])
+    target = UcbRailsUser::User.find_by(id: params[:ucb_rails_user_impersonation][:target_id])
     if logged_in_user.impersonate!(target)
       flash[:info] = "You are now impersonating #{target.full_name}"
       return redirect_to "/"

data/app/controllers/ucb_rails_user/concerns/users_controller.rb

@@ -8,9 +8,9 @@ module UcbRailsUser::Concerns::UsersController
   end
 
   def index
-    @users = User.all
+    @users = UcbRailsUser::User.all
     respond_to do |format|
-      format.html { @users = User.all }
+      format.html { @users = UcbRailsUser::User.all }
       format.json { render json: UcbRails::UsersDatatable.new(view_context).as_json }
     end
   end
@@ -40,7 +40,7 @@ module UcbRailsUser::Concerns::UsersController
   def create
     uid = params.fetch(:ldap_uid)
     user = nil
-    if user = User.find_by_ldap_uid(uid)
+    if user = UcbRailsUser::User.find_by_ldap_uid(uid)
       flash[:warning] = "User already exists"
     else
       begin
@@ -91,7 +91,7 @@ module UcbRailsUser::Concerns::UsersController
         :sort => :last_first_downcase
       )
       uid_strings = @lps_entries.map { |entry| entry.uid&.to_s }.compact
-      @lps_existing_uids = User.where(ldap_uid: uid_strings).pluck(:uid)
+      @lps_existing_uids = UcbRailsUser::User.where(ldap_uid: uid_strings).pluck(:uid)
       render 'ucb_rails_user/lps/search'
     end
 
@@ -115,7 +115,7 @@ module UcbRailsUser::Concerns::UsersController
   private
 
   def user_params(extra_params = [])
-    params.require(:user).permit([
+    params.require(:ucb_rails_user_user).permit([
       :superuser_flag,
       :inactive_flag,
       :first_name,
@@ -131,7 +131,7 @@ module UcbRailsUser::Concerns::UsersController
   end
 
   def find_user
-    @user ||= User.find(params.fetch(:id))
+    @user ||= UcbRailsUser::User.find(params.fetch(:id))
   end
 
 end

data/app/models/{concerns → ucb_rails_user/concerns}/user_concerns.rb

@@ -1,4 +1,4 @@
-module UserConcerns
+module UcbRailsUser::Concerns::UserConcerns
   extend ActiveSupport::Concern
 
   included do
@@ -6,15 +6,6 @@ module UserConcerns
     has_many :targets, class_name: "::UcbRailsUser::Impersonation", dependent: :delete_all
   end
 
-  # Overridden by application
-  def roles
-    []
-  end
-
-  def has_role?(role)
-    superuser? || roles.include?(role)
-  end
-
   def active?
     !inactive?
   end
@@ -55,7 +46,7 @@ module UserConcerns
       if target.respond_to?(:id)
         target.id
       else
-        User.find_by(id: target)&.id
+        UcbRailsUser::User.find_by(id: target)&.id
       end
     return false unless impersonation_is_valid?(target_id)
     @current_impersonation = create_impersonation(target_id)
@@ -64,7 +55,7 @@ module UserConcerns
 
   def current_impersonation
     return @current_impersonation if defined?(@current_impersonation)
-    @current_impersonation = UcbRailsUser::Impersonation.find_by(user_id: self.id, active: true)
+    @current_impersonation = UcbRailsUser::Impersonation.where(user_id: self.id, active: true).includes([:target]).take
   end
 
   def impersonation_target

data/app/models/ucb_rails_user/concerns/user_roles_concerns.rb

@@ -0,0 +1,12 @@
+module UcbRailsUser::Concerns::UserRolesConcerns
+  extend ActiveSupport::Concern
+
+  # Overridden by application
+  def roles
+    []
+  end
+
+  def has_role?(role)
+    superuser? || roles.include?(role)
+  end
+end

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/{user.rb → ucb_rails_user/user.rb}

@@ -1,5 +1,5 @@
-class User < ActiveRecord::Base
-  include UserConcerns
+class UcbRailsUser::User < ActiveRecord::Base
+  include UcbRailsUser::Concerns::UserConcerns
 
   # Don't add anything more here - any logic for the User class should go into
   # UserConcerns. This will make it much easier for host apps to customize

data/app/models/ucb_rails_user/user_ldap_service.rb

@@ -12,7 +12,7 @@ class UcbRailsUser::UserLdapService
     def create_user_from_ldap_entry(ldap_entry)
       UcbRailsUser.logger.debug "create_user_from_ldap_entry #{ldap_entry.uid}"
 
-      User.create! do |u|
+      UcbRailsUser::User.create! do |u|
         u.ldap_uid = ldap_entry.uid
         u.employee_id = ldap_entry.employee_id
         u.affiliate_id = ldap_entry.affiliate_id
@@ -34,7 +34,7 @@ class UcbRailsUser::UserLdapService
     def update_user_from_ldap_entry(ldap_entry)
       UcbRailsUser.logger.debug "update_user_from_ldap_entry #{ldap_entry.uid}"
 
-      User.find_by_ldap_uid!(ldap_entry.uid).tap do |user|
+      UcbRailsUser::User.find_by_ldap_uid!(ldap_entry.uid).tap do |user|
         user.employee_id = ldap_entry.employee_id if user.respond_to?(:employee_id=)
         user.affiliate_id = ldap_entry.affiliate_id
         user.student_id = ldap_entry.student_id
@@ -47,7 +47,7 @@ class UcbRailsUser::UserLdapService
     end
 
     def create_or_update_user(uid)
-      if user = User.find_by_ldap_uid(uid)
+      if user = UcbRailsUser::User.find_by_ldap_uid(uid)
         update_user_from_uid(uid)
       else
         create_user_from_uid(uid)
@@ -58,7 +58,7 @@ class UcbRailsUser::UserLdapService
       # LDAP returns some values as Net::BER::BerIdentifiedString instances, and not
       # all DBs seem to handle that well (e.g. Oracle) - we might want to fix LDAP library
       # to smooth this over?
-      if user = User.find_by_ldap_uid(entry.uid.to_s)
+      if user = UcbRailsUser::User.find_by_ldap_uid(entry.uid.to_s)
         update_user_from_ldap_entry(entry)
       else
         create_user_from_ldap_entry(entry)

data/app/models/ucb_rails_user/user_search.rb

@@ -10,10 +10,10 @@ module UcbRailsUser::UserSearch
       .map { |n| "#{n}%" }
     query =
       if name1.present? && name2.present?
-        User.where("LOWER(first_name) LIKE ? AND LOWER(last_name) LIKE ?", name1, name2)
-          .or(User.where("LOWER(last_name) LIKE ? AND LOWER(first_name) LIKE ?", name1, name2))
+        UcbRailsUser::User.where("LOWER(first_name) LIKE ? AND LOWER(last_name) LIKE ?", name1, name2)
+          .or(UcbRailsUser::User.where("LOWER(last_name) LIKE ? AND LOWER(first_name) LIKE ?", name1, name2))
       else
-        User.where("LOWER(first_name) LIKE ? OR LOWER(last_name) LIKE ?", name1, name1)
+        UcbRailsUser::User.where("LOWER(first_name) LIKE ? OR LOWER(last_name) LIKE ?", name1, name1)
       end
     query.order(:last_name, :first_name)
   end

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

@@ -31,11 +31,11 @@ class UcbRailsUser::UserSessionManager::Base
   private
 
   def active_user
-    @active_user ||= User.active.find_by_ldap_uid(uid)
+    @active_user ||= UcbRailsUser::User.active.find_by_ldap_uid(uid)
   end
 
   def active_admin_user
-    @active_user ||= User.active.superuser.find_by_ldap_uid(uid)
+    @active_user ||= UcbRailsUser::User.active.superuser.find_by_ldap_uid(uid)
   end
 
   def ldap_person_user_wrapper(ldap_person_entry)

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/app/models/ucb_rails_user/user_uc_path_service.rb

@@ -7,14 +7,14 @@ class UcbRailsUser::UserUcPathService
     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)
+      user = UcbRailsUser::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_with_ldap_uid(ldap_uid)
       return nil unless ucpath_entry.present?
-      user = User.find_or_initialize_by(ldap_uid: ldap_uid)
+      user = UcbRailsUser::User.find_or_initialize_by(ldap_uid: ldap_uid)
       update_user_record_from_ucpath_entry!(user, ucpath_entry)
     end
 

data/lib/ucb_rails_user/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_user
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
 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: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -324,8 +324,9 @@ files:
 - app/controllers/ucb_rails_user/users_controller.rb
 - app/helpers/ucb_rails_user/users_helper.rb
 - app/helpers/ucb_rails_user_helper.rb
-- app/models/concerns/user_concerns.rb
 - app/models/ucb_rails_user/concerns/impersonation_concerns.rb
+- app/models/ucb_rails_user/concerns/user_concerns.rb
+- app/models/ucb_rails_user/concerns/user_roles_concerns.rb
 - app/models/ucb_rails_user/configuration/cas.rb
 - app/models/ucb_rails_user/configuration/configuration.rb
 - app/models/ucb_rails_user/configuration/email.rb
@@ -335,6 +336,7 @@ files:
 - app/models/ucb_rails_user/ldap_person/entry.rb
 - app/models/ucb_rails_user/ldap_person/finder.rb
 - app/models/ucb_rails_user/ldap_person/test_finder.rb
+- app/models/ucb_rails_user/user.rb
 - app/models/ucb_rails_user/user_ldap_service.rb
 - app/models/ucb_rails_user/user_search.rb
 - app/models/ucb_rails_user/user_session_manager/active_in_user_table.rb
@@ -346,7 +348,6 @@ files:
 - app/models/ucb_rails_user/user_session_manager/ldap_person_user_wrapper.rb
 - app/models/ucb_rails_user/user_session_manager/test_session_manager.rb
 - app/models/ucb_rails_user/user_uc_path_service.rb
-- app/models/user.rb
 - app/views/ucb_rails_user/home/logged_in.html.haml
 - app/views/ucb_rails_user/home/not_logged_in.html.haml
 - app/views/ucb_rails_user/impersonations/index.html.haml