ucb_rails_user 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a006bac12edd8a40970366888880a897fe1e93a0c05a3c00eb749cc6059305f1
-  data.tar.gz: 9c64c70d6ed4c4c8d107b981db50c5a93333624e226b4905c798ea402c2e9058
+  metadata.gz: fd76a5b19aa06b93d571891fc4151dfbcf513801ccd575a45a3765734b9ba5f5
+  data.tar.gz: de7650bed13196b8531dc092203e4dcb6149d94b5367024104ae235439f909bf
 SHA512:
-  metadata.gz: d7b0b2239c2b26223a1c129392d78173133c88754bfff7d3d30505dcf22edce4e4e360a7a2328d9fbe2c3843b271f3a9e0e3881ceff1d5a6654b4d4c5925d032
-  data.tar.gz: a703d4ff5e5242dc5aada67526da8c544743e74c612354fc443cb2eafcb71f9433a51e17e2b2a0ce597fdbf794022650580937627b5583cf0bca12e54333c2b9
+  metadata.gz: 648c9f48aaf4098ad18537a292340ad97579bfe39573b83a11dc72351c4d90f1ea6503112329e8f218ea3efd62c0640cf400eefbe57bf5dba683fa808c819163
+  data.tar.gz: 526aad45c5d1a944245c8b0a0767c27f77a08da8f677e69b010c3bc8fce2e15b2f2f73c27aad3ec81e278718da0b39a081c9fdb673ed13f00b9e0975015a030b

data/README.md

@@ -2,13 +2,13 @@
 
 A [Rails engine](http://guides.rubyonrails.org/engines.html) that provides authentication and user management for UCB Rails apps. By adding this engine to your app, you get:
 
-  * a full [User model](https://github.com/ucb-ist-eas/ucb_rails_user/blob/master/app/models/user.rb) which can be customized by host apps
   * login and logout via [CAS](https://calnetweb.berkeley.edu/calnet-technologists/cas)
   * automatic creation of user records following CAS authentication
   * controller filters that block access to resources unless user is logged in
   * a default home page that reflects user's login status
   * admin screens for updating and deleting user records
   * ability for admins to impersonate other users
+  * optional generator to create a users table that's compatible with this gem
 
 This engine also includes the [Datatables](https://datatables.net/) JQuery plug-in, which is used in the user management screens, and [typeahead.js](https://github.com/twitter/typeahead.js) for autocomplete. Host apps can make use of these libraries as well.
 
@@ -16,14 +16,18 @@ This engine also includes the [Datatables](https://datatables.net/) JQuery plug-
 
 Version 2.0 and greater of this gem sets a user's `employee_id` to the new UCPath employee id, rather than the legacy HCM employee id. If you need to use the older ID, use version 1.1.3 of this gem, or lower.
 
+## Upgrading to version 6.0+
+
+See [this wiki page](https://github.com/ucb-ist-eas/ucb_rails_user/wiki/Upgrading-to-version-6.0) for details.
+
 ## Upgrading to version 3.0+ from version 2.x
 
 See [this wiki page](https://github.com/ucb-ist-eas/ucb_rails_user/wiki/Upgrading-to-version-3.0) for details.
 
 ## Prerequisites
 
-  * Ruby >= 2.3
-  * Rails >= 5.1
+  * Ruby >= 3.0
+  * Rails >= 6.0
 
 Older versions may work as well, but they haven't been tested.
 
@@ -51,7 +55,7 @@ bundle install
 3. Add this line to your host app's `ApplicationController:`
 
 ```ruby
-include UcbRailsUser::Concerns::ControllerMethods
+include UcbRailsUser::AuthConcerns
 ```
 
 4. Copy [this initializer file](https://github.com/ucb-ist-eas/ucb_rails_cli/blob/master/lib/ucb_rails_cli/templates/config/initializers/ucb_rails_user.rb) into your host app's `config/initializer` directory.
@@ -62,13 +66,15 @@ include UcbRailsUser::Concerns::ControllerMethods
 root to: UcbRailsUser::HomeController.action(:index)
 ```
 
-6. Copy the migrations for the `User` and `Impersonation` models from the engine into your host app, and run them:
+6. Copy the migrations for the `Impersonation` models from the engine into your host app, and run them:
 
 ```
 bin/rails railties:install:migrations
 bin/rake db:migrate
 ```
 
+7. (optional) If you don't already have a `users` table, you can generate one with a Rails task (see next section below)
+
 8. Update your assets files
 
 In `application.css` add this line:
@@ -83,7 +89,7 @@ And in `application.js` add this line:
 //= require ucb_rails_user/scripts
 ```
 
-8. Restart your host app as usual
+9. Restart your host app as usual
 
 You should be able to access the following routes:
 
@@ -95,6 +101,24 @@ You should be able to access the following routes:
   * `/admin/stop_impersonation`: this stops an active impersonation
   * `/admin/users/toggle_superuser`: in dev mode, you can use this url to turn the superuser flag of your account on and off
 
+## User model
+
+This gem does not define a model representing a user - that is left to the host app. However, if you don't have such a model yet, you can generate a migration for one by running:
+
+```bash
+bin/rails ucb_rails_user:create_users_table
+```
+
+This will create a migration for a `users` table containing the fields this gem expects to see.
+
+### Alternate naming
+
+By default, this gem expects the user model to be named `User`, but if you're using a different class name, you can specify that name in an initializer (e.g. `config/initializers/ucb_rails_user.rb`):
+
+```ruby
+UcbRailsUser.user_class = "Entity"
+```
+
 ## Routing
 
 The [config/routes.rb file](https://github.com/ucb-ist-eas/ucb_rails_user/blob/master/config/routes.rb) will show you the routes that this engine provides out of the box. But if necessary, you can override these routes in your host app.
@@ -149,9 +173,9 @@ Alice stops impersonating Bob:
    * `logged_in_user` returns Alice
    * `current_user` returns Alice
 
-## Controller Methods
+## Auth Helpers
 
-If you followed the setup instructions above, your `ApplicationController` should be including `UcbRails::Concerns::ControllerMethods.` This provides a number of utility methods you can use in your controllers:
+If you followed the setup instructions above, your `ApplicationController` should be including `UcbRails::AuthConcerns.` This provides a number of utility methods you can use in your controllers:
 
   * `current_user`: returns the `User` instance for the currently logged-in user, or `nil` if user is not logged in. If the logged-in user is impersonating another user, this will return the impersonated user
   * `logged_in_user`: this returns the user who logged in with their Calnet credentials, even if that user is impersonating another user
@@ -232,7 +256,7 @@ Similarly, to override `UserController,` add `app/controllers/ucb_rails/user_con
 
 ```ruby
 class UcbRailsUser::UsersController < ApplicationController
-  include UcbRailsUser::Concerns::UsersController
+  include UcbRailsUser::UsersControllerConcerns
 
   # add your code here
 

data/app/controllers/{ucb_rails_user/concerns/controller_methods.rb → concerns/ucb_rails_user/auth_concerns.rb}

@@ -1,4 +1,4 @@
-module UcbRailsUser::Concerns::ControllerMethods
+module UcbRailsUser::AuthConcerns
   extend ActiveSupport::Concern
 
   included do

data/app/controllers/{ucb_rails_user/concerns/home_controller.rb → concerns/ucb_rails_user/home_controller_concerns.rb}

@@ -1,4 +1,4 @@
-module UcbRailsUser::Concerns::HomeController
+module UcbRailsUser::HomeControllerConcerns
   extend ActiveSupport::Concern
 
   included do
@@ -14,4 +14,3 @@ module UcbRailsUser::Concerns::HomeController
   end
 
 end
-

data/app/controllers/{ucb_rails_user/concerns/impersonations_controller.rb → concerns/ucb_rails_user/impersonations_controller_concerns.rb}

@@ -1,4 +1,4 @@
-module UcbRailsUser::Concerns::ImpersonationsController
+module UcbRailsUser::ImpersonationsControllerConcerns
   extend ActiveSupport::Concern
 
   included do
@@ -10,7 +10,7 @@ module UcbRailsUser::Concerns::ImpersonationsController
   end
 
   def create
-    target = UcbRailsUser::User.find_by(id: params[:ucb_rails_user_impersonation][:target_id])
+    target = UcbRailsUser.user_class.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 "/"
@@ -40,4 +40,3 @@ module UcbRailsUser::Concerns::ImpersonationsController
   end
 
 end
-

data/app/controllers/{ucb_rails_user/concerns/sessions_controller.rb → concerns/ucb_rails_user/sessions_controller_concerns.rb}

@@ -1,4 +1,4 @@
-module UcbRailsUser::Concerns::SessionsController
+module UcbRailsUser::SessionsControllerConcerns
   extend ActiveSupport::Concern
 
   included do
@@ -35,7 +35,7 @@ module UcbRailsUser::Concerns::SessionsController
     user_session_manager.logout(current_user)
     provider = session[:omniauth_provider]
     reset_session
-    redirect_to redirect_url(provider)
+    redirect_to redirect_url(provider), allow_other_host: true
   end
 
   # Action called when unauthorized access attempted

data/app/controllers/{ucb_rails_user/concerns/users_controller.rb → concerns/ucb_rails_user/users_controller_concerns.rb}

@@ -1,4 +1,4 @@
-module UcbRailsUser::Concerns::UsersController
+module UcbRailsUser::UsersControllerConcerns
   extend ActiveSupport::Concern
 
   included do
@@ -8,9 +8,9 @@ module UcbRailsUser::Concerns::UsersController
   end
 
   def index
-    @users = UcbRailsUser::User.all
+    @users = UcbRailsUser.user_class.all
     respond_to do |format|
-      format.html { @users = UcbRailsUser::User.all }
+      format.html { @users = UcbRailsUser.user_class.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 = UcbRailsUser::User.find_by_ldap_uid(uid)
+    if user = UcbRailsUser.user_class.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 = UcbRailsUser::User.where(ldap_uid: uid_strings).pluck(:uid)
+      @lps_existing_uids = UcbRailsUser.user_class.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(:ucb_rails_user_user).permit([
+    params.require(:user).permit([
       :superuser_flag,
       :inactive_flag,
       :first_name,
@@ -131,8 +131,7 @@ module UcbRailsUser::Concerns::UsersController
   end
 
   def find_user
-    @user ||= UcbRailsUser::User.find(params.fetch(:id))
+    @user ||= UcbRailsUser.user_class.find(params.fetch(:id))
   end
 
 end
-

data/app/controllers/ucb_rails_user/home_controller.rb

@@ -1,10 +1,9 @@
 class UcbRailsUser::HomeController < ApplicationController
-  include UcbRailsUser::Concerns::ControllerMethods
-  include UcbRailsUser::Concerns::HomeController
+  include UcbRailsUser::AuthConcerns
+  include UcbRailsUser::HomeControllerConcerns
 
   # Don't add anything more here - any logic for this class should go into
-  # Concerns::HomeController. This will make it much easier for host
+  # UcbRailsUser::HomeControllerConcerns. This will make it much easier for host
   # apps to customize behavior if they need to
   # http://guides.rubyonrails.org/engines.html#implementing-decorator-pattern-using-activesupport-concern
 end
-

data/app/controllers/ucb_rails_user/impersonations_controller.rb

@@ -1,8 +1,8 @@
 class UcbRailsUser::ImpersonationsController < ApplicationController
-  include UcbRailsUser::Concerns::ImpersonationsController
+  include UcbRailsUser::ImpersonationsControllerConcerns
 
   # Don't add anything more here - any logic for this controller should go into
-  # Concerns::ImpersonationsController. This will make it much easier for host apps to customize
+  # UcbRiailsUser::ImpersonationsControllerConcerns. This will make it much easier for host apps to customize
   # behavior if they need to
   # http://guides.rubyonrails.org/engines.html#implementing-decorator-pattern-using-activesupport-concern
 end

data/app/controllers/ucb_rails_user/sessions_controller.rb

@@ -1,9 +1,9 @@
 # Manages starting and ending of sessions, i.e., logging in and out.
 class UcbRailsUser::SessionsController < ApplicationController
-  include UcbRailsUser::Concerns::SessionsController
+  include UcbRailsUser::SessionsControllerConcerns
 
   # Don't add anything more here - any logic for this class should go into
-  # Concerns::SessionsController. This will make it much easier for host
+  # UcbRailsUser::SessionsControllerConcerns. This will make it much easier for host
   # apps to customize behavior if they need to
   # http://guides.rubyonrails.org/engines.html#implementing-decorator-pattern-using-activesupport-concern
 end

data/app/controllers/ucb_rails_user/users_controller.rb

@@ -1,8 +1,8 @@
 class UcbRailsUser::UsersController < ApplicationController
-  include UcbRailsUser::Concerns::UsersController
+  include UcbRailsUser::UsersControllerConcerns
 
   # Don't add anything more here - any logic for this controller should go into
-  # Concerns::UserController. This will make it much easier for host apps to customize
+  # UcbRailsUser::UserControllerConcerns. This will make it much easier for host apps to customize
   # behavior if they need to
   # http://guides.rubyonrails.org/engines.html#implementing-decorator-pattern-using-activesupport-concern
 end

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

@@ -1,4 +1,4 @@
-module UcbRailsUser::Concerns::ImpersonationConcerns
+module UcbRailsUser::ImpersonationConcerns
   extend ActiveSupport::Concern
 
   included do

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

@@ -1,4 +1,4 @@
-module UcbRailsUser::Concerns::UserConcerns
+module UcbRailsUser::UserConcerns
   extend ActiveSupport::Concern
 
   included do
@@ -46,7 +46,7 @@ module UcbRailsUser::Concerns::UserConcerns
       if target.respond_to?(:id)
         target.id
       else
-        UcbRailsUser::User.find_by(id: target)&.id
+        UcbRailsUser.user_class.find_by(id: target)&.id
       end
     return false unless impersonation_is_valid?(target_id)
     @current_impersonation = create_impersonation(target_id)
@@ -114,4 +114,3 @@ module UcbRailsUser::Concerns::UserConcerns
   end
 
 end
-

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

@@ -1,4 +1,4 @@
-module UcbRailsUser::Concerns::UserRolesConcerns
+module UcbRailsUser::UserRolesConcerns
   extend ActiveSupport::Concern
 
   # Overridden by application

data/app/models/ucb_rails_user/configuration/configuration.rb

@@ -60,7 +60,7 @@ module UcbRailsUser
     end
 
     def load_file
-      if File.exists?(config_filename)
+      if File.exist?(config_filename)
         self.config_yaml = YAML.load_file(config_filename)
       else
         raise(FileNotFound, config_filename)

data/app/models/ucb_rails_user/impersonation.rb

@@ -1,5 +1,5 @@
 class UcbRailsUser::Impersonation < ApplicationRecord
-  include UcbRailsUser::Concerns::ImpersonationConcerns
+  include UcbRailsUser::ImpersonationConcerns
 
   # Don't add anything more here - any logic for the Impersonation class should go into
   # ImpersonationConcerns. 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}"
 
-      UcbRailsUser::User.create! do |u|
+      UcbRailsUser.user_class.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}"
 
-      UcbRailsUser::User.find_by_ldap_uid!(ldap_entry.uid).tap do |user|
+      UcbRailsUser.user_class.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 = UcbRailsUser::User.find_by_ldap_uid(uid)
+      if user = UcbRailsUser.user_class.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 = UcbRailsUser::User.find_by_ldap_uid(entry.uid.to_s)
+      if user = UcbRailsUser.user_class.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?
-        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))
+        UcbRailsUser.user_class.where("LOWER(first_name) LIKE ? AND LOWER(last_name) LIKE ?", name1, name2)
+          .or(UcbRailsUser.user_class.where("LOWER(last_name) LIKE ? AND LOWER(first_name) LIKE ?", name1, name2))
       else
-        UcbRailsUser::User.where("LOWER(first_name) LIKE ? OR LOWER(last_name) LIKE ?", name1, name1)
+        UcbRailsUser.user_class.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 ||= UcbRailsUser::User.active.find_by_ldap_uid(uid)
+    @active_user ||= UcbRailsUser.user_class.active.find_by_ldap_uid(uid)
   end
 
   def active_admin_user
-    @active_user ||= UcbRailsUser::User.active.superuser.find_by_ldap_uid(uid)
+    @active_user ||= UcbRailsUser.user_class.active.superuser.find_by_ldap_uid(uid)
   end
 
   def ldap_person_user_wrapper(ldap_person_entry)

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 = UcbRailsUser::User.find_or_initialize_by(employee_id: employee_id)
+      user = UcbRailsUser.user_class.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 = UcbRailsUser::User.find_or_initialize_by(ldap_uid: ldap_uid)
+      user = UcbRailsUser.user_class.find_or_initialize_by(ldap_uid: ldap_uid)
       update_user_record_from_ucpath_entry!(user, ucpath_entry)
     end
 
@@ -118,4 +118,3 @@ class UcbRailsUser::UserUcPathService
   end
 
 end
-

data/app/views/ucb_rails_user/users/_user.html.haml

@@ -8,5 +8,4 @@
   %td.min= user.ldap_uid
   %td.min= user.employee_id
   %td= link_to('edit', edit_admin_user_path(user), :class => 'btn btn-info btn-xs', :id => dom_id(user, 'edit'))
-  %td= link_to('delete', admin_user_path(user), :data => {confirm: 'Are you sure?'}, :method => :delete, :class => 'btn btn-xs btn-danger')
-
+  %td= button_to 'delete', admin_user_path(user), method: :delete, data: {confirm: "Are you sure?"}, class: "btn btn-danger btn-xs"

data/lib/tasks/ucb_rails_user_tasks.rake

@@ -1,4 +1,8 @@
-# desc "Explaining what the task does"
-# task :ucb_rails_user do
-#   # Task goes here
-# end
+namespace :ucb_rails_user do
+  desc "Create a migration for a users table that is compatible with this gem"
+  task create_users_table: :environment do
+    sh "bin/rails g migration CreateUsersToo"
+    new_migration_file = Dir.glob("db/migrate/*_create_users_too.rb").last
+    sh "cat #{File.expand_path('../..', __FILE__)}/templates/db/create_users.rb > #{new_migration_file}"
+  end
+end

data/lib/ucb_rails_user/version.rb

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

data/lib/ucb_rails_user.rb

@@ -9,9 +9,14 @@ require "active_attr"
 
 module UcbRailsUser
 
+  mattr_accessor :user_class
+
   def self.logger
     Rails.logger
   end
 
-end
+  def self.user_class
+    @@user_class&.constantize || ::User
+  end
 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_user
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Steve Downey
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,14 +171,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '6.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '6.4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -278,7 +278,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -313,20 +313,20 @@ files:
 - app/assets/stylesheets/ucb_rails_user/main.sass
 - app/assets/stylesheets/ucb_rails_user/styles.css
 - app/assets/stylesheets/ucb_rails_user/typeahead_tweaks.sass
-- app/controllers/ucb_rails_user/concerns/controller_methods.rb
-- app/controllers/ucb_rails_user/concerns/home_controller.rb
-- app/controllers/ucb_rails_user/concerns/impersonations_controller.rb
-- app/controllers/ucb_rails_user/concerns/sessions_controller.rb
-- app/controllers/ucb_rails_user/concerns/users_controller.rb
+- app/controllers/concerns/ucb_rails_user/auth_concerns.rb
+- app/controllers/concerns/ucb_rails_user/home_controller_concerns.rb
+- app/controllers/concerns/ucb_rails_user/impersonations_controller_concerns.rb
+- app/controllers/concerns/ucb_rails_user/sessions_controller_concerns.rb
+- app/controllers/concerns/ucb_rails_user/users_controller_concerns.rb
 - app/controllers/ucb_rails_user/home_controller.rb
 - app/controllers/ucb_rails_user/impersonations_controller.rb
 - app/controllers/ucb_rails_user/sessions_controller.rb
 - 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/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/concerns/ucb_rails_user/impersonation_concerns.rb
+- app/models/concerns/ucb_rails_user/user_concerns.rb
+- app/models/concerns/ucb_rails_user/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
@@ -336,7 +336,6 @@ 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
@@ -366,9 +365,9 @@ files:
 - config/initializers/simple_form_bootstrap.rb
 - config/locales/simple_form.en.yml
 - config/routes.rb
-- db/migrate/20170324221936_create_users.rb
 - db/migrate/20190807231505_create_impersonations.rb
 - lib/tasks/ucb_rails_user_tasks.rake
+- lib/templates/db/create_users.rb
 - lib/templates/erb/scaffold/_form.html.erb
 - lib/ucb_rails_user.rb
 - lib/ucb_rails_user/engine.rb
@@ -393,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Rails engine for UCB user accounts

data/app/models/ucb_rails_user/user.rb

@@ -1,8 +0,0 @@
-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
-  # behavior if they need to
-  # http://guides.rubyonrails.org/engines.html#implementing-decorator-pattern-using-activesupport-concern
-end