ucb_rails_user 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f97d4eaed1cb2f5c9ae47c6938e06759a824c6547bbe99a0a89e7b449e6ffef
-  data.tar.gz: 561f091975109dc34b87ec421c9b158c61f405b57cf67b172c4570d365d499d5
+  metadata.gz: 3a52f47b67f3941ef82192caf5fd352e71e9d85074d366da8a6a44897fbafd82
+  data.tar.gz: 64fa7bda12ce85ba806ebc4000131d700a8317ef5d95e2f49079f099d1f33ea9
 SHA512:
-  metadata.gz: b466215e44a1ba26631b8538a6905d497139c86125d8b153b8fcc30c739cfd5b2d2074ab0250140e8bc9a817296b264cbe346133f275c5c7d3cd12b03631b8bc
-  data.tar.gz: 6107b7bc878e2a4ea6789c1090ac70ba9ebc90b86128427a83386876682bba8788e80daa54e5468479a3aaff5a4983a6fc90e9c13efa81d8cab38b10c14f343f
+  metadata.gz: 4c0288fd05fee9438c59fd518bbb143721b43c8109aec25248ba162f8a8e3ce2abd70ab96b228caa37dbdc111288d9be1c3ccb804deb191afce17e683bb07de3
+  data.tar.gz: ee2fb735c92576d9cd596721ed3c6f3d4f30e2899725ce522c99121c3c05d3e77385d4b32b1c2aef80a13d27a5901ec3192de3b6990e751c4f7d77d4f09ed5c3

data/README.md

@@ -27,7 +27,7 @@ See [this wiki page](https://github.com/ucb-ist-eas/ucb_rails_user/wiki/Upgradin
 ## Prerequisites
 
   * Ruby >= 3.0
-  * Rails >= 6.0
+  * Rails >= 8.0
 
 Older versions may work as well, but they haven't been tested.
 
@@ -273,3 +273,20 @@ If you're using the `HomeController` provided by this engine for your home page,
       * `not_logged_in.html.haml`
 
 One of those two views will render when the user hits the home page, depending on whether or not they're currently logged in.
+
+## Session Timeouts
+
+While we would want to have session timeouts be the same across apps, we have noticed that some apps use cookies for sessions, some ActiveRecord and some not explicitly stated at all (Cookies). This is the general pattern that we are trying to follow. The major part is the `expire_after` and trying to keep that as close to the `30.miutees` as we can with the apps that we support. Obviously, some apps may need to have a different timeout.
+
+```ruby
+# cookie_key generates the session key in the form _app_name_session.
+cookie_key = '_' + Rails.application.class.module_parent.name.underscore + '_session'
+
+# Set user sessions to expire after 30 minutes of inactivity.
+Rails.application.config.session_store :cookie_store, key: cookie_key, expire_after: 30.minutes
+
+There is a new session timeout gem that can be used as well. It has a nice Javascript popup to let the user know that their session has expired. It can be found at: https://gitlab.com/ucb-bit/cad/aa/ucb_rails_session_timeout
+
+## Version 8+
+
+This version removes both the emailing setup functionality as well as the error reporting functionality. Those are both in the [UcbRailsDefaults] (https://gitlab.com/ucb-bit/cad/aa/ucb_rails_defaults) gem. This gem's dependencies have been slimmed down so that only the basics to run the gem are required. This makes it easier to upgrade the including apps.

data/app/assets/config/ucb_rails_user_manifest.js

@@ -0,0 +1 @@
+//= link_tree ../javascripts/ucb_rails_user .js

data/app/assets/stylesheets/ucb_rails_user/components/impersonations.css

@@ -0,0 +1,12 @@
+@media screen and (min-width: 768px) {
+  .impersonation-form {
+    width: 300px; } }
+
+.recent-impersonations {
+  margin-top: 24px;
+  padding-bottom: 200px; }
+  .recent-impersonations ul {
+    padding-left: 0px; }
+  .recent-impersonations li {
+    list-style-type: none;
+    font-size: 110%; }

data/app/assets/stylesheets/ucb_rails_user/components/loader.css

@@ -0,0 +1,41 @@
+.ucb-rails-user-loader,
+.ucb-rails-user-loader:after {
+  border-radius: 50%;
+  width: 6em;
+  height: 6em; }
+
+.ucb-rails-user-loader {
+  display: none;
+  margin: 60px auto;
+  font-size: 10px;
+  position: relative;
+  text-indent: -9999em;
+  border-top: 0.8em solid rgba(0, 50, 97, 0.2);
+  border-right: 0.8em solid rgba(0, 50, 97, 0.2);
+  border-bottom: 0.8em solid rgba(0, 50, 97, 0.2);
+  border-left: .8em solid #003261;
+  -webkit-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  transform: translateZ(0);
+  -webkit-animation: load8 1.1s infinite linear;
+  animation: load8 1.1s infinite linear; }
+
+@-webkit-keyframes load8 {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg); } }
+
+@keyframes load8 {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg); } }
+
+.ucb-rails-user-loader-small {
+  margin: 16px;
+  font-size: 6px; }

data/app/assets/stylesheets/ucb_rails_user/components/users_table.css

@@ -0,0 +1,54 @@
+.ucb-rails-users-table-header {
+  margin-top: 16px;
+margin-bottom: 16px; }
+
+.ucb-rails-users-table-header a {
+margin-top: 16px; }
+
+table.ucb-rails-users-table {
+  border-spacing: 0px;
+  margin-top: 16px; 
+}
+
+table.ucb-rails-users-table th {
+  border: 1px solid #dee2e6;
+  padding: 10px;
+  margin: 0px;
+}
+
+table.ucb-rails-users-table td {
+  text-align: center;
+  padding: 10px;
+}
+
+table.ucb-rails-users-table tr:nth-child(even) {
+  background-color: #00000011;
+}
+
+
+h1 {
+  font-size: 2.5rem;
+}
+
+.btn {
+  @apply font-bold py-2 px-4 rounded;
+}
+.btn-blue {
+  @apply bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 border border-blue-700 rounded text-white;
+}
+
+.btn-danger {
+  @apply bg-blue-500 text-white;
+}
+
+.ucb-rails-user > nav.pagy {
+  margin-top: 10px;
+  padding: 5px;
+}
+
+.ucb-rails-user > nav.pagy a {
+  padding: 5px;
+  border: 1px solid #99b;
+  padding-left: 10px;
+  padding-right: 10px;
+}

data/app/assets/stylesheets/ucb_rails_user/main.css

@@ -0,0 +1 @@
+@import "/user.css"

data/app/assets/stylesheets/ucb_rails_user/pagy_tailwind.css

@@ -0,0 +1,21 @@
+.pagy {
+  @apply flex space-x-1 font-semibold text-sm text-gray-500;
+  a:not(.gap) {
+    @apply block rounded-lg px-3 py-1 bg-gray-200;
+    &:hover {
+      @apply bg-gray-300;
+    }
+    &:not([href]) { /* disabled links */
+      @apply text-gray-300 bg-gray-100 cursor-default;
+    }
+    &.current {
+      @apply text-white bg-gray-400;
+    }
+  }
+  label {
+    @apply inline-block whitespace-nowrap bg-gray-200 rounded-lg px-3 py-0.5;
+    input {
+      @apply bg-gray-100 border-none rounded-md;
+    }
+  }
+}

data/app/assets/stylesheets/ucb_rails_user/user.css

@@ -0,0 +1,29 @@
+.table {
+  display: table;
+  width: 100%;
+}
+.table-header {
+  display: table-header-group;
+  width: auto;
+}
+
+.cell {
+  display: table-cell;
+  width: auto;
+  clear: both;
+  padding: 10px;
+  padding-right: 10px;
+  font-weight: bold;
+}
+
+.table-header > .cell {
+  border: 1px solid #aaa;
+}
+
+.cell:nth-of-type(even) {
+  background-color: #00000080;
+}
+
+.cell:nth-of-type(od) {
+  background-color: #fff;
+}

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

@@ -77,6 +77,7 @@ module UcbRailsUser::AuthConcerns
     @user_session_manager ||= begin
       logger.debug "creating new user_session_manager"
       klass = UcbRailsUser[:user_session_manager] || UcbRailsUser::UserSessionManager::ActiveInUserTable
+      logger.debug klass.inspect
       klass.to_s.classify.constantize.new
     end
   rescue NameError

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

@@ -1,5 +1,6 @@
 module UcbRailsUser::UsersControllerConcerns
   extend ActiveSupport::Concern
+  include Pagy::Backend
 
   included do
     before_action :find_user, :only => [:edit, :update, :destroy]
@@ -8,11 +9,7 @@ module UcbRailsUser::UsersControllerConcerns
   end
 
   def index
-    @users = UcbRailsUser.user_class.all
-    respond_to do |format|
-      format.html { @users = UcbRailsUser.user_class.all }
-      format.json { render json: UcbRails::UsersDatatable.new(view_context).as_json }
-    end
+    @pagy, @users = pagy(UcbRailsUser.user_class.all, limit: params[:count])
   end
 
   def search

data/app/helpers/ucb_rails_user/users_helper.rb

@@ -1,5 +1,6 @@
 module UcbRailsUser
   module UsersHelper
+    include Pagy::Frontend
 
     def link_to_new_user
       text = 'New User'

data/app/helpers/ucb_rails_user_helper.rb

@@ -1,17 +1,2 @@
-# These methods should be extracted into own gem.
 module UcbRailsUserHelper
-
-  def ucbr_table_tag(*args)
-    options = canonicalize_options(args.extract_options!)
-
-    ar_class = args.first
-    if ar_class.respond_to?(:haml_attributes)
-      options[:id] ||= ar_class.haml_attributes["id"]
-      options = ensure_class(options, ar_class.haml_attributes["class"])
-    end
-
-    bs_table_tag(options) do
-      yield
-    end
-  end
 end

data/app/views/ucb_rails_user/home/logged_in.html.erb

@@ -0,0 +1,6 @@
+<h1>Home</h1>
+
+<p>You are logged in as <%= current_user.full_name %></p>
+
+<p><%= link_to "Logout", logout_path %></p>
+

data/app/views/ucb_rails_user/home/not_logged_in.html.erb

@@ -0,0 +1,5 @@
+<h1>Home</h1>
+
+<p>You are not logged in</p>
+
+<p><%= link_to "Login", login_path() %></p>

data/app/views/ucb_rails_user/impersonations/index.html.erb

@@ -0,0 +1,32 @@
+<h1>Impersonate user</h1>
+
+<% if current_user.impersonating? %>
+  <div class="clear-impersonation">
+    <%= link_to "Stop impersonating #{current_user.impersonation_target.full_name}", admin_stop_impersonation_path, class: "btn btn-primary" %>
+  </div>
+<% else %>
+  <div class="impersonation-form">
+    <%= simple_form_for UcbRailsUser::Impersonation.new, url: admin_impersonations_path, method: :post do |f| %>
+      <%= f.input :target, label: "User", input_html: { class: "typeahead" } %>
+      <%= f.input :target_id, as: :hidden %>
+      <%= f.button :submit, value: "Impersonate", class: "btn btn-primary", disabled: true, data: { impersonate_button: true } %>
+    <% end %>
+  </div>
+<% end %>
+
+<div class="recent-impersonations">
+  <% if current_user.recent_impersonations.present? %>
+    <h3>Recent impersonations</h3>
+    <ul>
+      <% current_user.recent_impersonations.each do |imp| %>
+        <li>
+          <%= link_to full_name_with_uid(imp.target), "#{admin_impersonations_path}?ucb_rails_user_impersonation[target_id]=#{imp.target.id}", method: :post %>
+        </li>
+      <% end %>
+    </ul>
+  <% else %>
+    <h4>No recent impersonations</h4>
+  <% end %>
+</div>
+
+

data/app/views/ucb_rails_user/lps/_form.html.erb

@@ -0,0 +1,20 @@
+<%= form_tag('/ucb_rails/ldap_person_search', class: "well form-inline", id: 'lps-form', method: :get, remote: true) do %>
+  <%= hidden_field_tag 'search-field-name' %>
+  <%= hidden_field_tag 'result-link-http-method' %>
+  <%= hidden_field_tag 'result-link-text' %>
+  <%= hidden_field_tag 'result-link-class' %>
+  <%= hidden_field_tag 'result-link-url' %>
+
+  <div class="form-group">
+    <%= label_tag 'first_name', 'First Name' %>
+    <%= text_field_tag 'first_name', nil, class: "form-control" %>
+  </div>
+
+  <div class="form-group">
+    <%= label_tag 'last_name', 'Last Name' %>
+    <%= text_field_tag 'last_name', nil, class: "form-control" %>
+  </div>
+
+  <%= submit_tag 'Search', id: 'lps-search' %>
+  <%= button_to "Clear", "#", id: 'lps-clear', method: :get %>
+<% end %>

data/app/views/ucb_rails_user/lps/_modal.html.erb

@@ -0,0 +1,15 @@
+<%= modal(id: "lps-modal") do %>
+  <%= modal_header do %>
+    <h3 class="title">Search For Person</h3>
+    <%= render partial: "ucb_rails_user/lps/form" %>
+  <% end %>
+
+  <%= modal_body do %>
+    <div id="lps-results"></div>
+  <% end %>
+
+  <%= modal_footer do %>
+    <div id="matches" class="pull-left"></div>
+    <%= modal_footer_close_button %>
+  <% end %>
+<% end %>

data/app/views/ucb_rails_user/lps/_results.html.erb

@@ -0,0 +1,44 @@
+<div class="table-responsive ucb-rails-users-table-wrapper">
+  <table class="table table-striped table-bordered table-hover ucb-rails-users-table">
+    <thead>
+      <tr>
+        <th style="width:1%"></th>
+        <th>First Name</th>
+        <th>Last Name</th>
+        <th>Email</th>
+        <th>Department</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @lps_entries.each do |entry| %>
+        <% entry_id = "ldap_uid_#{entry.uid}" %>
+        <tr id="<%= entry_id %>" class="<%= ldap_entry_class(entry) %>">
+          <td><%= link_to_ldap_person_entry(entry) %></td>
+          <td><%= entry.first_name %></td>
+          <td><%= entry.last_name %></td>
+          <td><%= entry.email %></td>
+          <td><%= entry.departments %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </<table>
+</div>
+<% end %>
+
+<script>
+  $('#lps-modal table').dataTable({
+    "bPaginate": false,
+    "bFilter": false,
+    "bInfo": false,
+    "oLanguage": {
+      "sEmptyTable": "No matches for your search."
+    },
+    "aaSorting": [ [1, "asc"], [2, "asc"] ],
+    "aoColumnDefs": [
+      { "bSortable": false, "aTargets": [ 0 ] },   // selection link
+      { "aDataSort": [ 1, 2 ], "aTargets": [ 1 ] }, // first name
+      { "aDataSort": [ 2, 1 ], "aTargets": [ 2 ] }, // last name
+      { "aDataSort": [ 3, 1, 2 ], "aTargets": [ 3 ] }, // department
+    ]
+  });
+</script>

data/app/views/ucb_rails_user/lps/search.js.erb

@@ -0,0 +1,5 @@
+<% results = render partial: 'ucb_rails_user/lps/results' %>
+<script>
+  $('#lps-results').html('<%= j results %>');
+  $('#matches').html('<%= lps_matches %>');
+</script>

data/app/views/ucb_rails_user/users/_form.html.erb

@@ -0,0 +1,15 @@
+<%= simple_form_for(@user, url: url, method: method, html: { class: 'form-horizontal' }, wrapper: :horizontal_form) do |f| %>
+  <%= f.input :ldap_uid, input_html: { disabled: 'disabled' } %>
+  <%= f.input :first_name, input_html: { disabled: 'disabled' } %>
+  <%= f.input :last_name, input_html: { disabled: 'disabled' } %>
+  <%= f.input :email, input_html: { disabled: 'disabled' } %>
+  <%= f.input :alternate_email %>
+  <%= f.input :last_login_at, as: :string, input_html: { disabled: 'disabled', value: @user.last_login_at&.strftime("%m/%d/%Y %H:%M:%S") } %>
+  <%= f.input :superuser_flag, as: :boolean, label: "Superuser?", wrapper: :horizontal_boolean %>
+  <%= f.input :inactive_flag, as: :boolean, label: "Inactive User?", wrapper: :horizontal_boolean %>
+
+  <div class="form-actions">
+    <button type="submit" class="btn btn-primary">Submit</button>
+    <%= link_to "Cancel", admin_users_path %>
+  </div>
+<% end %>

data/app/views/ucb_rails_user/users/_search_results.html.erb

@@ -0,0 +1,33 @@
+<h3>Search Results</h3>
+<% if @results.empty? %>
+  <p>No results matched your search</p>
+<% else %>
+  <table class="table table-striped add-user-search-results-table">
+    <thead>
+      <tr>
+        <th>UID</th>
+        <th>Employee ID</th>
+        <th>First Name</th>
+        <th>Last Name</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @results.each do |person| %>
+        <tr>
+          <td><%= person.uid %></td>
+          <td><%= person.employee_id %></td>
+          <td><%= person.first_name %></td>
+          <td><%= person.last_name %></td>
+          <td>
+            <%= form_tag admin_users_path, method: :post do %>
+              <%= hidden_field_tag :ldap_uid, person.uid %>
+              <%= submit_tag "Add", class: "btn btn-primary" %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
+

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

@@ -0,0 +1,18 @@
+<%= turbo_frame_tag "users" do %>
+  <tr id="user_<%=user.id%>" class="user">
+    <td><%= checkmark(user.superuser?) %></td>
+    <td><%= checkmark(user.inactive?) %></td>
+    <td><%= user.first_name %></td>
+    <td><%= user.last_name %></td>
+    <td><%= mail_to(user.email) %></td>
+    <td class="dt"><%= user.last_login_at&.strftime("%m/%d/%Y %H:%M:%S") %></td>
+    <td class="min"><%= user.ldap_uid %></td>
+    <td class="min"><%= user.employee_id %></td>
+    <td>
+      <%= link_to 'edit', edit_admin_user_path(user), class: 'btn btn-blue', id: dom_id(user, 'edit') %>
+    </td>
+    <td>
+      <%= button_to 'delete', admin_user_path(user), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-danger" %>
+    </td>
+  </tr>
+<% end %>

data/app/views/ucb_rails_user/users/edit.html.erb

@@ -0,0 +1,3 @@
+<h1>Edit User</h1>
+
+<%= render partial: 'form', locals: { url: admin_user_path(@user), method: :put } %>

data/app/views/ucb_rails_user/users/index.html.erb

@@ -0,0 +1,34 @@
+<div class="ucb-rails-users-table-header clearfix">
+  <h1>Users</h1>
+</div>
+
+<%= form_with url: "", method: :get, data: { turbo_frame: "users", turbo_action: "advance" } do |form| %>
+  Show <%= form.select :count, options_for_select([10, 25, 50, 100], selected: params[:count]), {}, { onchange: "this.form.requestSubmit()" } %>
+
+  Search <%= form.search_field :query, value: params[:query], oninput: "this.form.requestSubmit()" %>
+<% end %>
+
+<div class="table-responsive ucb-rails-users-table-wrapper">
+  <table class="table table-striped table-bordered table-hover ucb-rails-users-table">
+    <thead>
+      <tr>
+        <th class="min">Superuser?</th>
+        <th class="min">Inactive?</th>
+        <th>First Name</th>
+        <th>Last Name</th>
+        <th>Email</th>
+        <th class="dt">Last Login</th>
+        <th>UID</th>
+        <th>Employee ID</th>
+        <th class="min unsorted">Edit</th>
+        <th class="min unsorted">Delete</th>
+      </tr>
+    </thead>
+    <tbody class="highlight">
+      <%= render partial: "ucb_rails_user/users/user", collection: @users %>
+    </tbody>
+  </table>
+  <div class="ucb-rails-user">
+    <%= pagy_nav(@pagy).html_safe %>
+  </div>
+</div>

data/app/views/ucb_rails_user/users/new.html.erb

@@ -0,0 +1,19 @@
+<h2>Add New User</h2>
+
+<%= form_tag admin_user_search_path, method: :get, remote: true, class: "form-inline user-search-form" do %>
+  <%= text_field_tag :first_name, "", placeholder: "First name", class: "form-control" %>
+  <%= text_field_tag :last_name, "", placeholder: "Last name", class: "form-control" %>
+  <%= text_field_tag :employee_id, "", placeholder: "Employee ID", class: "form-control" %>
+  <%= submit_tag "Search", class: "btn btn-primary" %>
+  <%= link_to "Cancel", admin_users_path, class: "btn btn-default" %>
+<% end %>
+
+<div class="ucb-rails-user-loader">
+  Loading...
+</div>
+
+<div class="search-results">
+  <% if @results %>
+    <%= render "results" %>
+  <% end %>
+</div>

data/app/views/ucb_rails_user/users/search.js.erb

@@ -0,0 +1,4 @@
+  $('.ucb-rails-user-loader').hide();
+  $('.search-results').html("<%= j render(partial: 'search_results') %>");
+  addDatatablesToNewUserSearchResults();
+  $('.search-results').show();

data/lib/ucb_rails_user/configuration/email.rb

@@ -9,65 +9,9 @@ module UcbRailsUser
         new(config)
       end
 
-      def initialize(configuration_hash)
-        return if configuration_hash.nil?
-        raise(ArgumentError, "expected a Hash, got: #{configuration_hash.inspect}") unless configuration_hash.is_a?(Hash)
-
-        self.hash = configuration_hash
-        process_configuration
-      end
-
-      private
-
-      def process_configuration
-        process_default
-        process_delivery_method
-        process_default_url_options
-        process_raise_delivery_errors
-        process_sendmail_settings
-        process_smtp_settings
-        process_subject_prefix
-      end
-
-      # This merges values with existing values
-      def process_default
-        if hash.has_key?('default')
-          ActionMailer::Base.default hash['default']
-        end
-      end
-
-      def process_delivery_method
-        ActionMailer::Base.delivery_method = hash.fetch('delivery_method', :smtp).to_sym
-      end
-
-      def process_default_url_options
-        if hash.has_key?('default_url_options')
-          ActionMailer::Base.default_url_options = hash.fetch('default_url_options').symbolize_keys
-        end
-      end
-
-      def process_raise_delivery_errors
-        ActionMailer::Base.raise_delivery_errors = hash.fetch('raise_delivery_errors', true)
-      end
-
-      def process_sendmail_settings
-        if hash.has_key?('sendmail_settings')
-          ActionMailer::Base.sendmail_settings = hash.fetch('sendmail_settings').symbolize_keys
-        end
-      end
-
-      def process_smtp_settings
-        if hash.has_key?('smtp_settings')
-          ActionMailer::Base.smtp_settings = hash.fetch('smtp_settings').symbolize_keys
-        end
-      end
-
-      def process_subject_prefix
-        prefix = hash.fetch('subject_prefix', '')
-        prefix = prefix.gsub("{env}", Rails.env)
-        UcbRailsUser.config.email_subject_prefix = prefix
+      def initialize(_configuration_hash)
+        puts '***** This is not used anymore. Please use UcbRailsDefaults::Configuration::Email. Configuration will be ignored *****'
       end
     end
-
   end
 end

data/lib/ucb_rails_user/engine.rb

@@ -1,3 +1,8 @@
+require 'propshaft'
+require 'pagy'
+require 'importmap-rails'
+require 'turbo-rails'
+
 module UcbRailsUser
   class Engine < ::Rails::Engine
     config.generators do |g|
@@ -6,6 +11,15 @@ module UcbRailsUser
       g.fixture_replacement :factory_bot
       g.factory_bot dir: "spec/factories"
     end
+    initializer "ucb_rails_user.importmap", before: "importmap" do |app|
+      # NOTE: this will add pins from this engine to the main app
+      # https://github.com/rails/importmap-rails#composing-import-maps
+      app.config.importmap.paths << root.join("config/importmap.rb")
+
+      # NOTE: something about cache; I did not look into it.
+      # https://github.com/rails/importmap-rails#sweeping-the-cache-in-development-and-test
+      app.config.importmap.cache_sweepers << root.join("app/assets/javascripts")
+    end
   end
 
   def self.config(&block)

data/lib/ucb_rails_user/version.rb

@@ -1,3 +1,3 @@
 module UcbRailsUser
-  VERSION = '7.0.0'
+  VERSION = '8.0.0'
 end

data/lib/ucb_rails_user.rb

@@ -1,7 +1,5 @@
 require "ucb_rails_user/engine"
 
-require "haml"
-require "haml-rails"
 require "omniauth"
 require "omniauth-cas"
 require "ucb_ldap"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails_user
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Steve Downey
@@ -9,10 +9,11 @@ authors:
 - Tyler Minard
 - Darin Wilson
 - Brandon Zylstra
+- Chris Chernesky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-22 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,7 +21,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
@@ -30,44 +31,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: propshaft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: importmap-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +123,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pagy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 9.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 9.3.3
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -150,14 +191,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -228,20 +269,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -317,15 +344,16 @@ files:
 - app/assets/javascripts/ucb_rails_user/scripts.js
 - app/assets/javascripts/ucb_rails_user/typeahead.bundle.js
 - app/assets/javascripts/ucb_rails_user/ucb_rails_user.js
-- app/assets/stylesheets/ucb_rails_user/components/_impersonations.sass
-- app/assets/stylesheets/ucb_rails_user/components/_loader.sass
-- app/assets/stylesheets/ucb_rails_user/components/_users_table.sass
-- app/assets/stylesheets/ucb_rails_user/components/index.sass
+- app/assets/stylesheets/ucb_rails_user/components/impersonations.css
+- app/assets/stylesheets/ucb_rails_user/components/loader.css
+- app/assets/stylesheets/ucb_rails_user/components/users_table.css
 - app/assets/stylesheets/ucb_rails_user/datatables.css
 - app/assets/stylesheets/ucb_rails_user/index.sass
-- app/assets/stylesheets/ucb_rails_user/main.sass
+- app/assets/stylesheets/ucb_rails_user/main.css
+- app/assets/stylesheets/ucb_rails_user/pagy_tailwind.css
 - app/assets/stylesheets/ucb_rails_user/styles.css
 - app/assets/stylesheets/ucb_rails_user/typeahead_tweaks.sass
+- app/assets/stylesheets/ucb_rails_user/user.css
 - 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
@@ -355,20 +383,20 @@ 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/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
-- app/views/ucb_rails_user/lps/_form.html.haml
-- app/views/ucb_rails_user/lps/_modal.html.haml
-- app/views/ucb_rails_user/lps/_results.html.haml
-- app/views/ucb_rails_user/lps/search.js.haml
-- app/views/ucb_rails_user/users/_form.html.haml
-- app/views/ucb_rails_user/users/_search_results.html.haml
-- app/views/ucb_rails_user/users/_user.html.haml
-- app/views/ucb_rails_user/users/edit.html.haml
-- app/views/ucb_rails_user/users/index.html.haml
-- app/views/ucb_rails_user/users/new.html.haml
-- app/views/ucb_rails_user/users/search.js.haml
+- app/views/ucb_rails_user/home/logged_in.html.erb
+- app/views/ucb_rails_user/home/not_logged_in.html.erb
+- app/views/ucb_rails_user/impersonations/index.html.erb
+- app/views/ucb_rails_user/lps/_form.html.erb
+- app/views/ucb_rails_user/lps/_modal.html.erb
+- app/views/ucb_rails_user/lps/_results.html.erb
+- app/views/ucb_rails_user/lps/search.js.erb
+- app/views/ucb_rails_user/users/_form.html.erb
+- app/views/ucb_rails_user/users/_search_results.html.erb
+- app/views/ucb_rails_user/users/_user.html.erb
+- app/views/ucb_rails_user/users/edit.html.erb
+- app/views/ucb_rails_user/users/index.html.erb
+- app/views/ucb_rails_user/users/new.html.erb
+- app/views/ucb_rails_user/users/search.js.erb
 - config/initializers/simple_form.rb
 - config/initializers/simple_form_bootstrap.rb
 - config/locales/simple_form.en.yml
@@ -381,7 +409,6 @@ files:
 - lib/ucb_rails_user/configuration/cas.rb
 - lib/ucb_rails_user/configuration/configuration.rb
 - lib/ucb_rails_user/configuration/email.rb
-- lib/ucb_rails_user/configuration/exception_notification.rb
 - lib/ucb_rails_user/configuration/ldap.rb
 - lib/ucb_rails_user/engine.rb
 - lib/ucb_rails_user/spec_helpers.rb

data/app/assets/stylesheets/ucb_rails_user/components/_impersonations.sass

@@ -1,13 +0,0 @@
-@media screen and (min-width: 768px)
-  .impersonation-form
-    width: 300px
-
-.recent-impersonations
-  margin-top: 24px
-  padding-bottom: 200px
-
-  ul
-    padding-left: 0px
-  li
-    list-style-type: none
-    font-size: 110%

data/app/assets/stylesheets/ucb_rails_user/components/_loader.sass

@@ -1,46 +0,0 @@
-.ucb-rails-user-loader,
-.ucb-rails-user-loader:after
-  border-radius: 50%
-  width: 6em
-  height: 6em
-
-.ucb-rails-user-loader
-  display: none
-  margin: 60px auto
-  font-size: 10px
-  position: relative
-  text-indent: -9999em
-  border-top: .8em solid rgba(0,50,97, 0.2)
-  border-right: .8em solid rgba(0,50,97, 0.2)
-  border-bottom: .8em solid rgba(0,50,97, 0.2)
-  border-left: .8em solid #003261
-  -webkit-transform: translateZ(0)
-  -ms-transform: translateZ(0)
-  transform: translateZ(0)
-  -webkit-animation: load8 1.1s infinite linear
-  animation: load8 1.1s infinite linear
-
-@-webkit-keyframes load8
-  0%
-    -webkit-transform: rotate(0deg)
-    transform: rotate(0deg)
-
-  100%
-    -webkit-transform: rotate(360deg)
-    transform: rotate(360deg)
-
-
-@keyframes load8
-  0%
-    -webkit-transform: rotate(0deg)
-    transform: rotate(0deg)
-
-  100%
-    -webkit-transform: rotate(360deg)
-    transform: rotate(360deg)
-
-.ucb-rails-user-loader-small
-  margin: 16px
-  font-size: 6px
-
-

data/app/assets/stylesheets/ucb_rails_user/components/_users_table.sass

@@ -1,10 +0,0 @@
-.ucb-rails-users-table-header
-  margin-top: 16px
-  margin-bottom: 16px
-
-  a
-    margin-top: 16px
-
-table.ucb-rails-users-table
-  margin-top: 16px
-

data/app/assets/stylesheets/ucb_rails_user/components/index.sass

@@ -1,3 +0,0 @@
-@use "impersonations"
-@use "loader"
-@use "users_table"

data/app/assets/stylesheets/ucb_rails_user/main.sass

@@ -1,6 +0,0 @@
-/* this is here for backwards compatibility - it should be removed in the future */
-@import "datatables"
-@import "typeahead_tweaks"
-@import "components/impersonations"
-@import "components/loader"
-@import "components/users_table"

data/app/views/ucb_rails_user/home/logged_in.html.haml

@@ -1,5 +0,0 @@
-%h1 Home
-
-%p You are logged in as #{current_user.full_name}
-
-%p= link_to "Logout", logout_path()

data/app/views/ucb_rails_user/home/not_logged_in.html.haml

@@ -1,5 +0,0 @@
-%h1 Home
-
-%p You are not logged in.
-
-%p= link_to "Login", login_path()

data/app/views/ucb_rails_user/impersonations/index.html.haml

@@ -1,20 +0,0 @@
-%h1 Impersonate user
-
-- if current_user.impersonating?
-  .clear-impersonation
-    = link_to "Stop impersonating #{current_user.impersonation_target.full_name}", admin_stop_impersonation_path(), class: "btn btn-primary"
-- else
-  .impersonation-form
-    = simple_form_for UcbRailsUser::Impersonation.new, url: admin_impersonations_path(), method: :post do |f|
-      = f.input :target, label: "User", input_html: { class: "typeahead" }
-      = f.input :target_id, as: :hidden
-      = f.button :submit, value: "Impersonate", class: "btn btn-primary", disabled: true, data: { impersonate_button: true }
-
-.recent-impersonations
-  - if current_user.recent_impersonations.present?
-    %h3 Recent impersonations
-    %ul
-      - current_user.recent_impersonations.each do |imp|
-        %li= link_to full_name_with_uid(imp.target), admin_impersonations_path() + "?ucb_rails_user_impersonation[target_id]=#{imp.target.id}", method: :post
-  - else
-    %h4 No recent impersonations

data/app/views/ucb_rails_user/lps/_form.html.haml

@@ -1,19 +0,0 @@
-= form_tag('/ucb_rails/ldap_person_search', :class => "well form-inline", :id => 'lps-form', :method => :get, :remote => true) do
-
-  = hidden_field_tag('search-field-name')
-  = hidden_field_tag('result-link-http-method')
-  = hidden_field_tag('result-link-text')
-  = hidden_field_tag('result-link-class')
-  = hidden_field_tag('result-link-url')
-  
-  .form-group
-    = label_tag 'first_name', 'First Name'
-    = text_field_tag("first_name", nil, class: "form-control")
-
-  .form-group
-  = label_tag 'last_name', 'Last Name'
-  = text_field_tag("last_name", nil, class: "form-control")
-
-  = submit_button_tag('Search', id: 'lps-search')
-  = button("Clear", url: "#", :id => 'lps-clear')
-  

data/app/views/ucb_rails_user/lps/_modal.html.haml

@@ -1,9 +0,0 @@
-= modal(id: "lps-modal") do
-  = modal_header do
-    %h3.title Search For Person
-    = render partial: "ucb_rails_user/lps/form"
-  = modal_body do
-    #lps-results
-  = modal_footer do
-    #matches.pull-left
-    = modal_footer_close_button

data/app/views/ucb_rails_user/lps/_results.html.haml

@@ -1,34 +0,0 @@
-= ucbr_table_tag(class: 'table-condensed') do
-  %thead
-    %tr
-      %th{style: 'width="1%"'}
-      %th First Name
-      %th Last Name
-      %th Email
-      %th Department
-  %tbody
-    - @lps_entries.each do |entry|
-    -   entry_id = "ldap_uid_#{entry.uid}" 
-      %tr{id: entry_id, class: ldap_entry_class(entry)}
-        %td= link_to_ldap_person_entry(entry) 
-        %td= entry.first_name 
-        %td= entry.last_name 
-        %td= entry.email 
-        %td= entry.departments 
-
-:javascript
-  $('#lps-modal table').dataTable({
-    "bPaginate": false,
-    "bFilter": false,
-    "bInfo": false,
-    "oLanguage": {
-      "sEmptyTable": "No matches for your search."
-    },
-    "aaSorting": [ [1, "asc"], [2, "asc"] ],
-    "aoColumnDefs": [
-      { "bSortable": false, "aTargets": [ 0 ] },   // selection link
-      { "aDataSort": [ 1, 2 ], "aTargets": [ 1 ] }, // first name
-      { "aDataSort": [ 2, 1 ], "aTargets": [ 2 ] }, // last name
-      { "aDataSort": [ 3, 1, 2 ], "aTargets": [ 3 ] }, // department
-    ]
-  });

data/app/views/ucb_rails_user/lps/search.js.haml

@@ -1,3 +0,0 @@
-- results = render :partial => 'ucb_rails_user/lps/results'
-$('#lps-results').html('#{j results}');
-$('#matches').html('#{lps_matches}');

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

@@ -1,14 +0,0 @@
-= simple_form_for(@user, url: url, method: method, :html => {:class => 'form-horizontal'}, wrapper: :horizontal_form) do |f|
-  = f.input :ldap_uid, :input_html => {disabled: 'disabled'}
-  = f.input :first_name, :input_html => {disabled: 'disabled'}
-  = f.input :last_name, :input_html => {disabled: 'disabled'}
-  = f.input :email, :input_html => {disabled: 'disabled'}
-  = f.input :alternate_email
-  = f.input :last_login_at, as: :string, :input_html => {disabled: 'disabled', value: @user.last_login_at&.strftime("%m/%d/%Y %H:%M:%S")}
-  = f.input :superuser_flag, :as => :boolean, label: "Superuser?", wrapper: :horizontal_boolean
-  = f.input :inactive_flag, :as => :boolean, :label => "Inactive User?", wrapper: :horizontal_boolean
-
-  .form-actions
-    %button{type: "submit", class: "btn btn-primary"} Submit
-    = link_to "Cancel", admin_users_path
-

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

@@ -1,24 +0,0 @@
-%h3 Search Results
-- if @results.empty?
-  %p No results matched your search
-- else
-  %table.table.table-striped.add-user-search-results-table
-    %thead
-      %tr
-        %th UID
-        %th Employee ID
-        %th First Name
-        %th Last Name
-        %th
-    %tbody
-      - @results.each do |person|
-        %tr
-          %td= person.uid
-          %td= person.employee_id
-          %td= person.first_name
-          %td= person.last_name
-          %td
-            = form_tag admin_users_path(), method: :post do
-              = hidden_field_tag :ldap_uid, person.uid
-              = submit_tag "Add", class: "btn btn-primary"
-

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

@@ -1,11 +0,0 @@
-%tr[user]
-  %td= checkmark(user.superuser?)
-  %td= checkmark(user.inactive?)
-  %td= user.first_name
-  %td= user.last_name
-  %td= mail_to(user.email)
-  %td.dt= user.last_login_at&.strftime("%m/%d/%Y %H:%M:%S")
-  %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= button_to 'delete', admin_user_path(user), method: :delete, data: {confirm: "Are you sure?"}, class: "btn btn-danger btn-xs"

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

@@ -1,3 +0,0 @@
-%h1 Edit User
-
-= render partial: 'form', locals: { url: admin_user_path(@user), method: :put }

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

@@ -1,22 +0,0 @@
-.ucb-rails-users-table-header.clearfix
-  %h1
-    Users
-
-.table-responsive.ucb-rails-users-table-wrapper
-  %table.table.table-striped.table-bordered.table-hover.ucb-rails-users-table
-    %thead
-      %tr
-        %th.min Superuser?
-        %th.min Inactive?
-        %th First Name
-        %th Last Name
-        %th Email
-        %th.dt Last Login
-        %th UID
-        %th Employee ID
-        %th.min.unsorted Edit
-        %th.min.unsorted Delete
-    %tbody.highlight
-      = render partial: "ucb_rails_user/users/user", collection: @users
-
-

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

@@ -1,16 +0,0 @@
-%h2 Add New User
-
-= form_tag admin_user_search_path(), method: :get, remote: true, class: "form-inline user-search-form" do
-  = text_field_tag :first_name, "", placeholder: "First name", class: "form-control"
-  = text_field_tag :last_name, "", placeholder: "Last name", class: "form-control"
-  = text_field_tag :employee_id, "", placeholder: "Employee ID", class: "form-control"
-  = submit_tag "Search", class: "btn btn-primary"
-  = link_to "Cancel", admin_users_path(), class: "btn btn-default"
-
-.ucb-rails-user-loader
-  Loading...
-
-.search-results
-  - if @results
-    = render "results"
-

data/app/views/ucb_rails_user/users/search.js.haml

@@ -1,4 +0,0 @@
-$('.ucb-rails-user-loader').hide()
-$('.search-results').html("#{ j render(partial: "search_results") }")
-addDatatablesToNewUserSearchResults()
-$('.search-results').show()

data/lib/ucb_rails_user/configuration/exception_notification.rb

@@ -1,21 +0,0 @@
-module UcbRailsUser
-  module Configuration
-
-    class ExceptionNotification
-
-      class << self
-
-        def configure(config)
-          return if config.blank?
-
-          config = config.symbolize_keys
-          config[:email].symbolize_keys!
-          config[:email][:email_prefix] = config[:email][:email_prefix].gsub("{env}", RailsEnvironment.short)
-
-          Rails.application.config.middleware.use ::ExceptionNotification::Rack, config
-        end
-      end
-    end
-
-  end
-end