rails_base 0.60.0 → 0.70.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2382233d63801820a6f6b4b68f03f6eea0b3e79915edbf6d9da3c03500c91f98
-  data.tar.gz: 90b9db35b59889f0efc3ba402d852731f1c071667d9a24a87f5583d57b292372
+  metadata.gz: 0ba156b2df503b9c1facc7fdf879ab25dd301c608ff36e5ab63b142d4cbb7ce1
+  data.tar.gz: 76b8bd2e24c9f45521f9f8fabc4e4fb4fdecaa97b6f42d242f222e04d9ae31f2
 SHA512:
-  metadata.gz: e0fbebe271f5e0ff50dc7255a22c27d8b2fdff93272298d9026019d37bd4362e6883c4c653eb440aeb89dc3ab32aa87084a53a950a1ca213bbdea1297ec8b78f
-  data.tar.gz: 25f855f707777734d74b33f682484adcbb8958dfbb6fa7ad12aa965619c2d7610f48f3cb348772469a5231a5e52c95f57360a6cb8dd486a396f9f7241f6ba07f
+  metadata.gz: cfc56c7a9f8144d317b9c8fa6ab1ba63a8cc86bd6b9c6d9a537c2752152a18a464c48c2adbf7be986cdc6d68ce61477aff49f126b2c51a830bcbfbec1eb2d55d
+  data.tar.gz: 6060c33bcd4eb4153a4e3caf4f5ca4d5dcb60ff27e8e22eb213f448141dc8a0801602866408f320c9440baf5448f1b6a8d057080f077dcd9d11b014120bdc794

data/app/controllers/rails_base/admin_controller.rb

@@ -1,9 +1,9 @@
 module RailsBase
-  class AdminController < ApplicationController
+  class AdminController < RailsBaseApplicationController
     before_action :authenticate_user!, except: [:sso_retrieve]
     before_action :admin_user?, only: [:index, :config, :sso_send]
     before_action :validate_token!, only: [:update_email, :update_phone]
-    skip_before_action :admin_reset_impersonation_session!
+    skip_before_action :admin_reset_impersonation_session!, raise: false
 
     include AdminHelper
 

data/app/controllers/rails_base/errors_controller.rb

@@ -1,5 +1,5 @@
 module RailsBase
-  class ErrorsController < ApplicationController
+  class ErrorsController < RailsBaseApplicationController
     before_action :set_variable
 
     def not_found

data/app/controllers/rails_base/mfa_auth_controller.rb

@@ -1,5 +1,5 @@
 module RailsBase
-  class MfaAuthController < ApplicationController
+  class MfaAuthController < RailsBaseApplicationController
     before_action :validate_token, only: [:mfa_code, :mfa_code_verify, :resend_mfa]
 
     # GET /mfa_verify

data/app/controllers/rails_base/secondary_authentication_controller.rb

@@ -1,5 +1,5 @@
 module RailsBase
-  class SecondaryAuthenticationController < ApplicationController
+  class SecondaryAuthenticationController < RailsBaseApplicationController
     before_action :authenticate_user!, only: [:remove_phone_mfa, :confirm_phone_registration]
 
     before_action :validate_token!, only: [:resend_email, :wait, :confirm_phone_registration]

data/app/controllers/rails_base/switch_user_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module RailsBase
   class SwitchUserController < ::SwitchUserController
     before_action :admin_user?

data/app/controllers/rails_base/user_settings_controller.rb

@@ -1,5 +1,5 @@
 module RailsBase
-  class UserSettingsController < ApplicationController
+  class UserSettingsController < RailsBaseApplicationController
     before_action :authenticate_user!
     before_action :confirm_password_flow, only: :confirm_password
 

data/app/controllers/rails_base_application_controller.rb

@@ -0,0 +1,157 @@
+class RailsBaseApplicationController < ActionController::Base
+  layout 'rails_base/application'
+
+  before_action :configure_permitted_parameters, if: :devise_controller?
+  before_action :set_time_zone
+  before_action :is_timeout_error?
+  before_action :admin_reset_impersonation_session!
+  before_action :footer_mode_case
+
+  before_action :populate_admin_actions, if: -> { RailsBase.config.admin.enable_actions? }
+  after_action :capture_admin_action
+
+  include RailsBase::ApplicationHelper
+  helper_method :mfa_fallback?, :is_safari?, :is_mobile?
+
+  include RailsBase::AppearanceHelper
+  helper_method :appearance_text_class, :footer_mode_case, :appearance_mode_drop_down, :appearance_text_class
+
+  include RailsBase::CaptureReferenceHelper
+
+  def set_time_zone
+    return unless RailsBase.config.user.tz_user_defined?
+    return if current_user.nil?
+
+    # esape this since this is not signed
+    offset = cookies[TIMEZONE_OFFSET_COOKIE].to_i
+
+    cookie_tz = ActiveSupport::TimeZone[((offset * -1) / 60.0)]
+
+    if session_tz = session[TIMEZONE_SESSION_NAME]
+      # if session exists
+      if cookie_tz && session_tz != cookie_tz.name
+        # if cookie exists and cookie_tz does not match, update db and session
+        current_user.update_tz(tz_name: cookie_tz.name)
+        session[TIMEZONE_SESSION_NAME] = cookie_tz.name
+      end
+    else
+      # if session timezone does not exist, attempt to push to DB and set to session
+      current_user.update_tz(tz_name: cookie_tz.name)
+      session[TIMEZONE_SESSION_NAME] = cookie_tz.name
+    end
+    Thread.current[TIMEZONE_THREAD_NAME] = session[TIMEZONE_SESSION_NAME]
+  end
+
+  def is_timeout_error?
+    return if current_user || !params.keys.include?('timeout')
+
+    flash[:notice] = nil
+    flash[:alert] = 'Your session expired. Please sign in again to continue.'
+  end
+
+  def admin_impersonation_session?
+    return false if current_user.nil?
+    return false unless encrypted_val = session[RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON].presence
+
+    token = admin_get_token(encrypted_val: encrypted_val)
+    if token.failure?
+      logger.warn "Failed to parse encrypted token. Either expired or was not present"
+      flash[:alert] = 'Failed to retrieve Session token. Retry action'
+      redirect_to RailsBase.url_routes.admin_base_path
+      return false
+    else
+      logger.info "Found original_admin_user_id"
+      @original_admin_user_id = token.user_id
+    end
+    true
+  end
+
+  def admin_reset_impersonation_session!
+    return unless admin_impersonation_session?
+
+    # at this point we know there is an impersonation
+    admin_user = User.find @original_admin_user_id
+    admin_set_token_on_session(admin_user: admin_user, other_user: current_user)
+  end
+
+  def admin_user?
+    return if RailsBase.config.admin.view_admin_page?(current_user)
+
+    session.clear
+    sign_out(current_user)
+
+    flash[:alert] = 'Unauthorized action. You have been signed out'
+    redirect_to RailsBase.url_routes.unauthenticated_root_path
+  end
+
+  def populate_admin_actions
+    return if session[RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON].present?
+    return if current_user.nil?
+    return unless request.fullpath == RailsBase.url_routes.authenticated_root_path
+
+    @__admin_actions_array = AdminAction.get_cache_items(user: current_user, alltime: true)
+  end
+
+  def capture_admin_action
+    # ToDo: Turn this into a service
+    # ToDo: All admin actions come there here: Allow this to be confirugable on or off
+    _controller = ActiveSupport::Inflector.camelize("#{params[:controller]}_controller")
+    admin_user =
+      if _controller == RailsBase::AdminController.to_s
+        current_user
+      else
+        @original_admin_user_id ? User.find(@original_admin_user_id) : nil
+      end
+
+    # Means we are not in the admin controller or we are not impersonating
+    return if admin_user.nil? || @_admin_action_struct == false
+
+    # Admin action for all routes
+    (RailsBase::Admin::ActionHelper.actions.dig(RailsBase::Admin::ActionHelper::ACTIONS_KEY) || []).each do |helper|
+      Rails.logger.warn("Admin Action for every action")
+      helper.call(req: request, params: params, admin_user: admin_user, user: current_user, struct: @_admin_action_struct)
+    end
+
+    # Admin action for all controller routes
+    object = RailsBase::Admin::ActionHelper.actions.dig(_controller, RailsBase::Admin::ActionHelper::CONTROLLER_ACTIONS_KEY) || []
+    object.each do |helper|
+      Rails.logger.warn("Admin Action for #{_controller}")
+      helper.call(req: request, params: params, admin_user: admin_user, user: current_user, struct: @_admin_action_struct)
+    end
+
+    # Admin action for all controller action specific routes
+    (RailsBase::Admin::ActionHelper.actions.dig(_controller, params[:action].to_s) || []).each do |helper|
+      Rails.logger.warn("Admin Action for #{_controller}##{params[:action]}")
+      helper.call(req: request, params: params, admin_user: admin_user, user: current_user, struct: @_admin_action_struct)
+    end
+  end
+
+  protected
+
+  def admin_get_token(encrypted_val:)
+    params = {
+      mfa_randomized_token: encrypted_val,
+      purpose: RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON,
+    }
+    RailsBase::Authentication::SessionTokenVerifier.call(params)
+  end
+
+  def admin_set_token_on_session(admin_user:, other_user:)
+    if admin_user.id !=  other_user.id #dont do this if you are yourself
+      logger.warn { "Admin user [#{admin_user.id}] is impersonating user #{other_user.id}" }
+      params = {
+        user: admin_user,
+        purpose: RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON,
+        expires_at: RailsBase::Authentication::Constants::ADMIN_MAX_IDLE_TIME.from_now
+      }
+      encrpytion = RailsBase::Authentication::MfaSetEncryptToken.call(params)
+      session[RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON] = encrpytion.encrypted_val
+    end
+  end
+
+  def configure_permitted_parameters
+    added_attrs = [:phone_number, :email, :password, :password_confirmation, :remember_me]
+    devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
+    devise_parameter_sanitizer.permit :account_update, keys: added_attrs
+  end
+end

data/app/helpers/rails_base/user_settings_helper.rb

@@ -17,6 +17,6 @@ module RailsBase::UserSettingsHelper
       ttl: DATUM_TTL,
       length: DATUM_LENGTH,
     }
-    ShortLivedData.create_data_key(params)
+    ShortLivedData.create_data_key(**params)
   end
 end

data/app/models/admin_action.rb

@@ -20,6 +20,7 @@ class AdminAction < RailsBase::ApplicationRecord
 
   class << self
     include ActionView::Helpers::DateHelper
+
     def action(admin_user:, action:, user: nil, original_attribute: nil, new_attribute: nil, long_action: nil)
       params = { admin_user_id: admin_user.id, action: action }
       params[:user_id] = user.id if user
@@ -27,7 +28,7 @@ class AdminAction < RailsBase::ApplicationRecord
       params[:change_to] = new_attribute.to_s unless new_attribute.nil?
       params[:long_action] = long_action unless long_action.nil?
       begin
-        instance = AdminAction.create!(params)
+        instance = AdminAction.create!(**params)
         ship_to_cache!(instance: instance, user: user, created_at: Time.zone.now) if user
         instance
       rescue StandardError => e

data/app/models/rails_base/application_record.rb

@@ -8,7 +8,7 @@ module RailsBase
 
         # This is actually pretty cool. If you set the thread corectly, you can
         define_method("#{column.name}") do
-          thread_tz = Thread.current[RailsBase::ApplicationController::TIMEZONE_THREAD_NAME]
+          thread_tz = Thread.current[RailsBaseApplicationController::TIMEZONE_THREAD_NAME]
           return super() if thread_tz.nil?
           time = self[column.name].in_time_zone(thread_tz) rescue self[column.name]
 

data/app/services/rails_base/admin_risky_mfa_send.rb

@@ -49,7 +49,7 @@ module RailsBase
         expires_at: EXPIRES_AT.from_now,
         length: Authentication::Constants::MFA_LENGTH,
       }
-      ShortLivedData.create_data_key(params)
+      ShortLivedData.create_data_key(**params)
     end
 
     def velocity_max_in_frame

data/app/services/rails_base/authentication/mfa_set_encrypt_token.rb

@@ -11,7 +11,7 @@ module RailsBase::Authentication
 				expires_at: expires_at
 			}
 
-			context.encrypted_val = RailsBase::Encryption.encode(params)
+			context.encrypted_val = RailsBase::Encryption.encode(**params)
 		end
 
 		def value

data/app/services/rails_base/authentication/send_login_mfa_to_user.rb

@@ -46,7 +46,7 @@ module RailsBase::Authentication
         expires_at: expires_at,
         length: Constants::MFA_LENGTH,
       }
-      ShortLivedData.create_data_key(params)
+      ShortLivedData.create_data_key(**params)
     end
 
     def velocity_max_in_frame

data/app/services/rails_base/authentication/send_verification_email.rb

@@ -74,7 +74,7 @@ module RailsBase::Authentication
 				ttl: Constants::SVE_TTL,
 				length: Constants::EMAIL_LENGTH,
 			}
-			ShortLivedData.create_data_key(params)
+			ShortLivedData.create_data_key(**params)
 		end
 
 		def velocity_max_in_frame

data/app/services/rails_base/authentication/single_sign_on_create.rb

@@ -25,7 +25,7 @@ module RailsBase::Authentication
         length: token_length,
         extra: url_redirect,
       }.compact
-      ShortLivedData.create_data_key(params)
+      ShortLivedData.create_data_key(**params)
     end
 
     def data_type

data/app/services/rails_base/authentication/single_sign_on_send.rb

@@ -32,7 +32,7 @@ module RailsBase::Authentication
         token_type: token_type,
         url_redirect: url_redirect
       }
-      datum = SingleSignOnCreate.call(params)
+      datum = SingleSignOnCreate.call(**params)
       context.fail!(message: 'Failed to create SSO token. Try again') if datum.failure?
 
       url = sso_url(data: datum.data.data)

data/app/services/rails_base/authentication/single_sign_on_verify.rb

@@ -31,7 +31,7 @@ module RailsBase::Authentication
         reason: reason,
         access_count: !(bypass || false)
       }
-      ShortLivedData.find_datum(params)
+      ShortLivedData.find_datum(**params)
     end
 
     def validate!

data/app/services/rails_base/encryption.rb

@@ -26,7 +26,7 @@ class RailsBase::Encryption
       raise "expires_at && expires_in are both nil" if expires_in.nil? && expires_at.nil?
 
       log(level: :info, msg: "Encoding [#{value}] with params #{params}")
-      token = verifier.generate(value, params)
+      token = verifier.generate(value, **params)
       token = CGI.escape(token) if url_safe
       token
     end
@@ -40,7 +40,7 @@ class RailsBase::Encryption
       # TODO: matt-taylor
       # Check if the message is valid and untampered with
       # https://api.rubyonrails.org/classes/ActiveSupport/MessageVerifier.html#method-i-valid_message-3F
-      decoded = verifier.verified(value, params)
+      decoded = verifier.verified(value, **params)
       if decoded.nil?
         log(level: :warn, msg: "Failed to decode value: value: #{value}, purpose: #{purpose}")
       end

data/app/views/layouts/rails_base/application.html.erb

@@ -50,20 +50,16 @@
         }
       }
 
-      <% RailsBase::ApplicationController::VIEWPORT_SIZES.each do |name, max_width| %>
+      <% RailsBaseApplicationController::VIEWPORT_SIZES.each do |name, max_width| %>
         function viewport_at_least_<%= name %>(){
           return getViewportWidth() >= <%= max_width || 99_999 %>
 
         }
-        <% if name == RailsBase::ApplicationController::VIEWPORT_MOBILE_MAX %>
-        <% puts "Rendering #{name} for viewport_probable_mobile" %>
-
-        <% end %>
       <% end %>
 
       <%
-        k = RailsBase::ApplicationController::VIEWPORT_MOBILE_MAX
-        size = RailsBase::ApplicationController::VIEWPORT_SIZES[k] || 99_999
+        k = RailsBaseApplicationController::VIEWPORT_MOBILE_MAX
+        size = RailsBaseApplicationController::VIEWPORT_SIZES[k] || 99_999
       %>
       function viewport_probable_mobile(){
         return getViewportWidth() <= <%= size  %>
@@ -192,6 +188,16 @@
         <% end %>
       }
 
+      function _rails_base_toggle_base_footer(status){
+        if(status=='show') {
+           $('#base-footer').show()
+        } else if(status=='hide') {
+           $('#base-footer').hide()
+        } else  {
+           $('#base-footer').toggle()
+        }
+      }
+
       _rails_base_reload_base_footer();
 
       <% unless defined?(@error_page) %>
@@ -202,7 +208,7 @@
         $('.tableFixHead').stickyTableHeaders();
 
         // Attempt to set timezone on every request
-        set_cookie('<%= RailsBase::ApplicationController::TIMEZONE_OFFSET_COOKIE %>', new Date().getTimezoneOffset())
+        set_cookie('<%= RailsBaseApplicationController::TIMEZONE_OFFSET_COOKIE %>', new Date().getTimezoneOffset())
         });
       <% end %>
       <% if Rails.env == 'production' %>

data/app/views/rails_base/shared/_appearance_mode_selector.html.erb

@@ -53,8 +53,8 @@
     <% light = RailsBase::Configuration::Appearance::LIGHT_MODE %>
     var type_mapping = JSON.parse('<%= raw RailsBase::Configuration::Appearance::APPEARANCE_TYPES.to_json %>')
 
-    var cookie_name = `<%= RailsBase::ApplicationController::APPEARANCE_MODE_COOKIE %>`;
-    var cookie_actual_name = `<%= RailsBase::ApplicationController::APPEARANCE_MODE_ACTUAL_COOKIE %>`;
+    var cookie_name = `<%= RailsBaseApplicationController::APPEARANCE_MODE_COOKIE %>`;
+    var cookie_actual_name = `<%= RailsBaseApplicationController::APPEARANCE_MODE_ACTUAL_COOKIE %>`;
     var dark_mode_changes = [
       {
         'descriptor': 'thead',
@@ -151,11 +151,11 @@
     })
     // This function MUST be called outside of document ready
     // to ensure dark mode does not activate after document is loaded
-    set_and_toggle_mode( `<%= cookies[RailsBase::ApplicationController::APPEARANCE_MODE_COOKIE] || RailsBase.appearance.default_mode %>`)
+    set_and_toggle_mode( `<%= cookies[RailsBaseApplicationController::APPEARANCE_MODE_COOKIE] || RailsBase.appearance.default_mode %>`)
     $('#appearance_mode_selector').appendTo('body');
     $(document).ready(function(){
       // differentiation of load order means we need to call this twice
-      set_and_toggle_mode( `<%= cookies[RailsBase::ApplicationController::APPEARANCE_MODE_COOKIE] || RailsBase.appearance.default_mode %>`)
+      set_and_toggle_mode( `<%= cookies[RailsBaseApplicationController::APPEARANCE_MODE_COOKIE] || RailsBase.appearance.default_mode %>`)
       $(document).ajaxComplete(function () {
         set_and_toggle_mode()
       });

data/app/views/rails_base/shared/_standardized_collapse.html.erb

@@ -0,0 +1,62 @@
+
+<%
+  id = options.fetch(:id)
+  title = options.fetch(:title_id)
+  body = options.fetch(:body_id)
+  use_fa_icon = options[:fa_icon] != false
+  if use_fa_icon
+    fa_icon_open = options.dig(:fa_icon, :open) || 'fa-caret-right'
+    fa_icon_closed = options.dig(:fa_icon, :closed) || 'fa-caret-down'
+    fa_icon_only = options.dig(:fa_icon, :collapse_only) || false
+    fa_icon_span_class = "fa-icon-span-class-#{rand(100..100_000)}_id-#{id}"
+    fa_icon_span_id = "id-#{fa_icon_span_class}"
+  end
+  start_open = !(options[:default_closed] || false)
+  close_display = start_open ? 'inline' : 'none'
+  open_display = !start_open ? 'inline' : 'none'
+  id_transposed = "id_transposed_#{rand(100_000..999_999)}"
+%>
+
+<% if use_fa_icon %>
+  <span id="<%= fa_icon_span_id %>" class="float-md-left fa-icon-span <%= fa_icon_span_class %> ">
+    <i class="fa <%= fa_icon_open %> open" aria-hidden="true" style="display:<%= open_display %>"></i>
+    <i class="fa <%= fa_icon_closed %> closed" aria-hidden="true" style="display:<%= close_display %>"></i>
+  </span>
+<% end %>
+
+<script type="text/javascript">
+  $(`#<%= body %>`).addClass('collapse')
+  <% if start_open %>
+    $(`#<%= body %>`).addClass('show')
+  <% end %>
+  <% if use_fa_icon %>
+    // Initialize fa <%= id %>
+    $(`#<%= fa_icon_span_id %>`).prependTo(`#<%= title %>`);
+  <% end %>
+
+  <% if use_fa_icon && fa_icon_only %>
+  var <%= id_transposed %> = `#<%= fa_icon_span_id %>`
+  <% else %>
+  var <%= id_transposed %> = `#<%= title %>`
+  <% end %>
+
+  $(<%= id_transposed %>).click(function(event){
+    _rails_base_toggle_base_footer('hide')
+    $(`#<%= body %>`).collapse('toggle')
+    <% if use_fa_icon %>
+      $(`#<%= fa_icon_span_id %> .open`).toggle()
+      $(`#<%= fa_icon_span_id %> .closed`).toggle()
+    <% end %>
+  });
+
+  $(`#<%= body %>`).on('shown.bs.collapse', function () {
+    _rails_base_reload_base_footer();
+    _rails_base_toggle_base_footer('show')
+  })
+
+  $(`#<%= body %>`).on('hidden.bs.collapse', function () {
+    _rails_base_reload_base_footer();
+    _rails_base_toggle_base_footer('show')
+  })
+
+</script>

data/db/seeds.rb

@@ -3,12 +3,14 @@ params = {
   email: "mattius.taylor@gmail.com",
   first_name: 'Some',
   last_name: 'Guy',
-  phone_number: '6508675309',
+  phone_number: ENV.fetch("PHONE_NUMBER", '6509410795'),
   password: "password1",
-  password_confirmation: "password1"
+  password_confirmation: "password1",
+  email_validated: true,
 }
 
-User.create!(params)
+user = User.create!(params)
+user.admin_owner!
 
 
 params = {
@@ -17,7 +19,8 @@ params = {
   last_name: 'Guy2',
   phone_number: '6508675309',
   password: "password2",
-  password_confirmation: "password2"
+  password_confirmation: "password2",
+  email_validated: true,
 }
 
 User.create!(params)

data/lib/rails_base/admin/action_helper.rb

@@ -1,8 +1,10 @@
+require 'switch_user'
+
 module RailsBase::Admin
   class ActionHelper
     ACTIONS_KEY = "___all_actions_#{(rand*10**10).to_i}___"
     CONTROLLER_ACTIONS_KEY = "___all_controller_actions__#{(rand*10**10).to_i}___"
-    DEFAULT_ALLOWED_KLASSES = [ApplicationController, RailsBase::ApplicationController, ::SwitchUserController]
+    DEFAULT_ALLOWED_KLASSES = [ApplicationController, RailsBaseApplicationController, ::SwitchUserController]
     class << self
       def allowed_inherited_klasses
         DEFAULT_ALLOWED_KLASSES + (@allowed_klasses || [])
@@ -60,7 +62,7 @@ module RailsBase::Admin
     class InvalidTitleError < StandardError; end;
 
     attr_accessor :controller, :action, :proc, :title, :default
-    # controller is the controller class inherited by RailsBase::ApplicationController
+    # controller is the controller class inherited by RailsBaseApplicationController
     # action is the method name on the controller
     # title should be the AdminAction.action
     # if proc available,
@@ -88,10 +90,11 @@ module RailsBase::Admin
         action_params = proc.call(req, params, admin_user, user, title, struct)
         return if action_params.nil?
 
-        AdminAction.action(action_params)
+        AdminAction.action(**action_params)
       else
         default_call(request: request, admin_user: admin_user, user: user, struct: struct)
       end
+
     rescue StandardError => e
       Rails.logger.error(e.message)
       Rails.logger.error(e.backtrace)
@@ -108,7 +111,7 @@ module RailsBase::Admin
         change_from: struct&.original_attribute,
         change_to: struct&.new_attribute,
       }
-      AdminAction.action(action_params)
+      AdminAction.action(**action_params)
     end
 
     def valid_controller!

data/lib/rails_base/configuration/active_job.rb

@@ -5,6 +5,7 @@ module RailsBase
         if val.is_a?(Symbol)
           begin
             ::ActiveJob::QueueAdapters.lookup(val)
+            RailsBase::ApplicationJob.queue_adapter = val.to_sym
             Rails.configuration.active_job.queue_adapter = val.to_sym
           rescue StandardError => e
             raise ArgumentError, "config.app.active_job_adapter=#{val} is not a defined active job"

data/lib/rails_base/configuration/admin.rb

@@ -192,12 +192,12 @@ module RailsBase
         },
         admin_impersonate_redirect:{
           type: :proc,
-          default: ->(_request, _params) { RailsBase.url_routes.authenticated_root_path },
-          description: 'Redirection to impersonation -- Landing page when having an identity cris',
+          default: ->(*) { RailsBase.url_routes.authenticated_root_path },
+          description: 'Redirection to impersonation -- Landing page when having an identity crisis',
         },
         admin_impersonate_return:{
           type: :proc,
-          default: ->(_request, _params) { RailsBase.url_routes.admin_base_path },
+          default: ->(*) { RailsBase.url_routes.admin_base_path },
           description: 'Redirection from impersonation -- Page to return from when you have found yourself',
         }
       }
@@ -230,6 +230,7 @@ module RailsBase
         # User.admin_owner
         # User.admin_owners
         # This is 100% dependent upon keeping `admin_types` in order of precedence
+        require RailsBase::Engine.root.join('app','models', 'user.rb')
         admin_types.each do |type|
           ::User._def_admin_convenience_method!(admin_method: type)
         end

data/lib/rails_base/configuration/app.rb

@@ -4,6 +4,11 @@ module RailsBase
   module Configuration
     class App < Base
       DEFAULT_VALUES = {
+        app_name: {
+          type: :string_proc,
+          default: ->(*) { RailsBase.default_app_name },
+          description: 'Name of the application when authenticated user is present. Name in the tab of the browser. Allows for dynamic tab names'
+        },
         base_url: {
           type: :string,
           default: ENV.fetch('BASE_URL', 'http://localhost'),
@@ -16,27 +21,27 @@ module RailsBase
         },
         web_name_logged_in: {
           type: :string_proc,
-          default: ->(user) { RailsBase.app_name },
+          default: ->(*) { RailsBase.config.app.app_name },
           description: 'Name of the application when authenticated user is present. Name in the tab of the browser. Allows for dynamic tab names'
         },
         web_name_logged_out: {
           type: :string_proc,
-          default: ->(*) { RailsBase.app_name },
+          default: ->(*) { RailsBase.config.app.app_name },
           description: 'Name of the application when no authenticated user. Name in the tab of the browser. Allows for dynamic tab names'
         },
         web_title_logged_in: {
           type: :string_proc,
-          default: ->(user) { RailsBase.app_name },
+          default: ->(user) { RailsBase.config.app.app_name },
           description: 'Title in nav for the web when logged in. String or proc accepted. When proc, current user will be passed in.'
         },
         web_title_logged_out: {
           type: :string_proc,
-          default: ->(*) { RailsBase.app_name },
+          default: ->(*) { RailsBase.config.app.app_name },
           description: 'Title in nav for the web when logged in. String or proc accepted. When proc, current user will be passed in.'
         },
         communication_name: {
           type: :string_proc,
-          default: ->(*) { RailsBase.app_name },
+          default: ->(*) { RailsBase.config.app.app_name },
           description: 'Name used when communicating with users.'
         },
         favicon_path: {

data/lib/rails_base/engine.rb

@@ -1,25 +1,29 @@
 module RailsBase
   class Engine < ::Rails::Engine
     isolate_namespace RailsBase
+
+    # config.autoload_paths << File.expand_path("app", __dir__)
+
     ActiveSupport::Reloader.to_prepare do
       if RailsBase.___execute_initializer___?
         RailsBase.config.admin.convenience_methods
 
+        Dir[RailsBase::Engine.root.join('app','models','**', '*.rb')].each {|f| require f }
         RailsBase::ApplicationRecord.descendants.each do |model|
           model._magically_defined_time_objects
         end
       end
     end
 
-    initializer 'instantiate RailsBase configs' do |_app|
+    initializer 'rails_base.config.intantiate' do |_app|
       RailsBase.config if RailsBase.___execute_initializer___?
     end
 
-    initializer 'remove write access to RailsBase config', after: 'after_initialize' do |app|
+    initializer 'rails_base.config.remove_write_acess', after: 'after_initialize' do |app|
       RailsBase::Configuration::Base._unset_allow_write! if RailsBase.___execute_initializer___?
     end
 
-    initializer 'define magic convenionce methods for converting team', after: 'active_record.initialize_database' do |app|
+    initializer 'rails_base.magic_convenience_methods.model', after: 'active_record.initialize_database' do |app|
       if RailsBase.___execute_initializer___?
         # need to eager load Models
         Rails.application.eager_load!
@@ -28,18 +32,17 @@ module RailsBase
         ActiveRecord::Base.retrieve_connection
 
         #explicitly load engine routes
-        Dir.entries(RailsBase::Engine.root.join('app','models')).select{|s| s.ends_with?('.rb')}.each {|f| require f}
         RailsBase::ApplicationRecord.descendants.each do |model|
           model._magically_defined_time_objects
         end
       end
     end
 
-    initializer 'remove switch_user routes', after: 'add_routing_paths' do |app|
+    initializer 'rails_base.switch_user.remove_routes', after: 'add_routing_paths' do |app|
       app.routes_reloader.paths.delete_if{ |path| path.include?('switch_user') }
     end
 
-    initializer 'append RailsBase engine migrations' do |app|
+    initializer 'rails_base.append_engine_migrations' do |app|
       unless app.root.to_s.match root.to_s
         config.paths["db/migrate"].expanded.each do |expanded_path|
           app.config.paths["db/migrate"] << expanded_path
@@ -47,6 +50,14 @@ module RailsBase
       end
     end
 
+    initializer 'rails_base.switch_user.view' do
+      config.to_prepare do
+        ActiveSupport.on_load(:action_view) do
+          require RailsBase::Engine.root.join('lib', 'rails_base', 'switch_user_helper.rb')
 
+          include RailsBase::SwitchUserHelper
+        end
+      end
+    end
   end
 end

data/lib/rails_base/switch_user_helper.rb

@@ -0,0 +1,36 @@
+require 'switch_user'
+
+module RailsBase
+  module SwitchUserHelper
+    def switch_user_custom(options = {})
+      return unless available?
+
+      selected_user = nil
+
+      grouped_options_container =
+        {}.tap do |h|
+          SwitchUser.all_users.each do |record|
+            scope = record.is_a?(SwitchUser::GuestRecord) ? :Guest : record.scope.to_s.capitalize
+            h[scope] ||= []
+            h[scope] << [record.label, record.scope_id]
+
+            next unless selected_user.nil?
+            next if record.is_a?(SwitchUser::GuestRecord)
+
+            selected_user = record.scope_id if provider.current_user?(record.user, record.scope)
+          end
+        end
+
+      option_tags = grouped_options_for_select(grouped_options_container.to_a, selected_user)
+
+      render partial: 'rails_base/switch_user/widget',
+             locals: { option_tags: option_tags, classes: options[:class], styles: options[:style] }
+    end
+
+    private
+
+    def available?
+      SwitchUser.guard_class.new(controller, provider).view_available?
+    end
+  end
+end

data/lib/rails_base/version.rb

@@ -1,8 +1,8 @@
 module RailsBase
   MAJOR = '0'
-  MINOR = '60'
-  PATCH = '0'
-  VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
+  MINOR = '70'
+  PATCH = '1'
+  VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}.pre"
 
   def self.print_version
     $stdout.puts VERSION

data/lib/rails_base.rb

@@ -18,8 +18,10 @@ require 'rails_base/config'
 
 module RailsBase
 
-  # Rails 6 does not play nice with this function -- Find a different work around
   def self.___execute_initializer___?
+    # Fixes rails 6 changes to ARGV's -- dont reun initializers during rake tasks
+    return false if Rake.application.top_level_tasks.any? { |task| task.include?(":") } rescue nil
+
     # Only execute when not doing DB actions
     boolean = defined?(ARGV) ? true : false  # for when no ARGVs are provided, we know its a railsc or rails s explicit
     boolean = false if boolean && ARGV[0]&.include?('db') # when its the DB rake tasks
@@ -35,6 +37,10 @@ module RailsBase
   end
 
   def self.app_name
+    config.app.app_name
+  end
+
+  def self.default_app_name
     if ::Rails::VERSION::MAJOR >= 6
       ::Rails.application.class.module_parent_name
     else

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rails_base
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.70.1.pre
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-02 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -420,7 +420,6 @@ files:
 - app/assets/stylesheets/rails_base/secondary_authentication.scss
 - app/assets/stylesheets/rails_base/user_settings.scss
 - app/controllers/rails_base/admin_controller.rb
-- app/controllers/rails_base/application_controller.rb
 - app/controllers/rails_base/errors_controller.rb
 - app/controllers/rails_base/mfa_auth_controller.rb
 - app/controllers/rails_base/secondary_authentication_controller.rb
@@ -429,6 +428,7 @@ files:
 - app/controllers/rails_base/users/passwords_controller.rb
 - app/controllers/rails_base/users/registrations_controller.rb
 - app/controllers/rails_base/users/sessions_controller.rb
+- app/controllers/rails_base_application_controller.rb
 - app/helpers/rails_base/admin_helper.rb
 - app/helpers/rails_base/appearance_helper.rb
 - app/helpers/rails_base/application_helper.rb
@@ -531,6 +531,7 @@ files:
 - app/views/rails_base/shared/_reset_password_form.html.erb
 - app/views/rails_base/shared/_session_create_form.html.erb
 - app/views/rails_base/shared/_session_timeout_modal.html.erb
+- app/views/rails_base/shared/_standardized_collapse.html.erb
 - app/views/rails_base/switch_user/_widget.html.erb
 - app/views/rails_base/user_settings/_confirm_destroy_user.html.erb
 - app/views/rails_base/user_settings/_destroy_user.html.erb
@@ -545,7 +546,6 @@ files:
 - config/initializers/devise.rb
 - config/initializers/encryption.rb
 - config/initializers/switch_user.rb
-- config/initializers/switch_user_helper.rb
 - config/locales/devise.en.yml
 - config/locales/en.yml
 - config/routes.rb
@@ -593,6 +593,7 @@ files:
 - lib/rails_base/configuration/templates.rb
 - lib/rails_base/configuration/user.rb
 - lib/rails_base/engine.rb
+- lib/rails_base/switch_user_helper.rb
 - lib/rails_base/version.rb
 - lib/tasks/rails_base_tasks.rake
 - lib/twilio_helper.rb
@@ -612,11 +613,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Rails engine that takes care of the stuff you dont want to!

data/app/controllers/rails_base/application_controller.rb

@@ -1,153 +0,0 @@
-module RailsBase
-  class ApplicationController < ActionController::Base
-    before_action :configure_permitted_parameters, if: :devise_controller?
-    before_action :set_time_zone
-    before_action :is_timeout_error?
-    before_action :admin_reset_impersonation_session!
-    before_action :footer_mode_case
-
-    before_action :populate_admin_actions, if: -> { RailsBase.config.admin.enable_actions? }
-    after_action :capture_admin_action
-
-    include ApplicationHelper
-    include AppearanceHelper
-    include CaptureReferenceHelper
-
-    def set_time_zone
-      return unless RailsBase.config.user.tz_user_defined?
-      return if current_user.nil?
-
-      # esape this since this is not signed
-      offset = cookies[TIMEZONE_OFFSET_COOKIE].to_i
-
-      cookie_tz = ActiveSupport::TimeZone[((offset * -1) / 60.0)]
-
-      if session_tz = session[TIMEZONE_SESSION_NAME]
-        # if session exists
-        if cookie_tz && session_tz != cookie_tz.name
-          # if cookie exists and cookie_tz does not match, update db and session
-          current_user.update_tz(tz_name: cookie_tz.name)
-          session[TIMEZONE_SESSION_NAME] = cookie_tz.name
-        end
-      else
-        # if session timezone does not exist, attempt to push to DB and set to session
-        current_user.update_tz(tz_name: cookie_tz.name)
-        session[TIMEZONE_SESSION_NAME] = cookie_tz.name
-      end
-      Thread.current[TIMEZONE_THREAD_NAME] = session[TIMEZONE_SESSION_NAME]
-    end
-
-    def is_timeout_error?
-      return if current_user || !params.keys.include?('timeout')
-
-      flash[:notice] = nil
-      flash[:alert] = 'Your session expired. Please sign in again to continue.'
-    end
-
-    def admin_impersonation_session?
-      return false if current_user.nil?
-      return false unless encrypted_val = session[RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON].presence
-
-      token = admin_get_token(encrypted_val: encrypted_val)
-      if token.failure?
-        logger.warn "Failed to parse encrypted token. Either expired or was not present"
-        flash[:alert] = 'Failed to retrieve Session token. Retry action'
-        redirect_to RailsBase.url_routes.admin_base_path
-        return false
-      else
-        logger.info "Found original_admin_user_id"
-        @original_admin_user_id = token.user_id
-      end
-      true
-    end
-
-    def admin_reset_impersonation_session!
-      return unless admin_impersonation_session?
-
-      # at this point we know there is an impersonation
-      admin_user = User.find @original_admin_user_id
-      admin_set_token_on_session(admin_user: admin_user, other_user: current_user)
-    end
-
-    def admin_user?
-      return if RailsBase.config.admin.view_admin_page?(current_user)
-
-      session.clear
-      sign_out(current_user)
-
-      flash[:alert] = 'Unauthorized action. You have been signed out'
-      redirect_to RailsBase.url_routes.unauthenticated_root_path
-    end
-
-    def populate_admin_actions
-      return if session[RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON].present?
-      return if current_user.nil?
-      return unless request.fullpath == RailsBase.url_routes.authenticated_root_path
-
-      @__admin_actions_array = AdminAction.get_cache_items(user: current_user, alltime: true)
-    end
-
-    def capture_admin_action
-      # ToDo: Turn this into a service
-      # ToDo: All admin actions come there here: Allow this to be confirugable on or off
-      _controller = ActiveSupport::Inflector.camelize("#{params[:controller]}_controller")
-      admin_user =
-        if _controller == RailsBase::AdminController.to_s
-          current_user
-        else
-          @original_admin_user_id ? User.find(@original_admin_user_id) : nil
-        end
-
-      # Means we are not in the admin controller or we are not impersonating
-      return if admin_user.nil? || @_admin_action_struct == false
-
-      # Admin action for all routes
-      (RailsBase::Admin::ActionHelper.actions.dig(RailsBase::Admin::ActionHelper::ACTIONS_KEY) || []).each do |helper|
-        Rails.logger.warn("Admin Action for every action")
-        helper.call(req: request, params: params, admin_user: admin_user, user: current_user, struct: @_admin_action_struct)
-      end
-
-      # Admin action for all controller routes
-      object = RailsBase::Admin::ActionHelper.actions.dig(_controller, RailsBase::Admin::ActionHelper::CONTROLLER_ACTIONS_KEY) || []
-      object.each do |helper|
-        Rails.logger.warn("Admin Action for #{_controller}")
-        helper.call(req: request, params: params, admin_user: admin_user, user: current_user, struct: @_admin_action_struct)
-      end
-
-      # Admin action for all controller action specific routes
-      (RailsBase::Admin::ActionHelper.actions.dig(_controller, params[:action].to_s) || []).each do |helper|
-        Rails.logger.warn("Admin Action for #{_controller}##{params[:action]}")
-        helper.call(req: request, params: params, admin_user: admin_user, user: current_user, struct: @_admin_action_struct)
-      end
-    end
-
-    protected
-
-    def admin_get_token(encrypted_val:)
-      params = {
-        mfa_randomized_token: encrypted_val,
-        purpose: RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON,
-      }
-      RailsBase::Authentication::SessionTokenVerifier.call(params)
-    end
-
-    def admin_set_token_on_session(admin_user:, other_user:)
-      if admin_user.id !=  other_user.id #dont do this if you are yourself
-        logger.warn { "Admin user [#{admin_user.id}] is impersonating user #{other_user.id}" }
-        params = {
-          user: admin_user,
-          purpose: RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON,
-          expires_at: RailsBase::Authentication::Constants::ADMIN_MAX_IDLE_TIME.from_now
-        }
-        encrpytion = RailsBase::Authentication::MfaSetEncryptToken.call(params)
-        session[RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON] = encrpytion.encrypted_val
-      end
-    end
-
-    def configure_permitted_parameters
-      added_attrs = [:phone_number, :email, :password, :password_confirmation, :remember_me]
-      devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
-      devise_parameter_sanitizer.permit :account_update, keys: added_attrs
-    end
-  end
-end

data/config/initializers/switch_user_helper.rb

@@ -1,29 +0,0 @@
-require 'switch_user'
-require SwitchUser::Engine.root.join('app', 'helpers', 'switch_user_helper.rb')
-
-module SwitchUserHelper
-  def switch_user_custom(options = {})
-    return unless available?
-
-    selected_user = nil
-
-    grouped_options_container =
-      {}.tap do |h|
-        SwitchUser.all_users.each do |record|
-          scope = record.is_a?(SwitchUser::GuestRecord) ? :Guest : record.scope.to_s.capitalize
-          h[scope] ||= []
-          h[scope] << [record.label, record.scope_id]
-
-          next unless selected_user.nil?
-          next if record.is_a?(SwitchUser::GuestRecord)
-
-          selected_user = record.scope_id if provider.current_user?(record.user, record.scope)
-        end
-      end
-
-    option_tags = grouped_options_for_select(grouped_options_container.to_a, selected_user)
-
-    render partial: 'rails_base/switch_user/widget',
-           locals: { option_tags: option_tags, classes: options[:class], styles: options[:style] }
-  end
-end