rails_base 0.53.1 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d20109ef6d422bfe9f2d9ea381e0bae71bfd9cb9a3585554f97fb378baf00d50
-  data.tar.gz: '08666f477b07d62d5fffd6505785b12b643bc9164ccd1c038585f7d895fa78c7'
+  metadata.gz: 64ddb52ebfed26fcec5bd3ea7e44feab2d2308591958c7e90a4cc476811332ba
+  data.tar.gz: d89ad080614e89f901d7d51ad22cfb1c77e32b67e0712fae1d31fa2a9b2aa746
 SHA512:
-  metadata.gz: b67025f0a012ed6c7024671a048f74026f30b9870115f13f5c2ff047f1a5fed7e5b31e61c2074a8f193d5cdd8392465deaa816c6a651d9cfb6f2788de4bcfeb0
-  data.tar.gz: 3b44a97ffc9ebd160941fe29b517d1ab114b61250562a6a51d4cf72cb29702233b31b39c6aa550664527b1e78a787600549dba4c06e96c9b9c2feb2b838b30e3
+  metadata.gz: b1110d8afad68484b6a28f00c8fcbe41253984b6e3a820c2d13c6d9125c6000e2b53d114b78426b81ea73ddf12767a2e710a495bca820001c0a5f197e4c5185c
+  data.tar.gz: 60116d2b2d6d99f1736ef44702999ac55598085d22fc6c0cd29df9b06cd9aef2e60b0a02d17fb0201590ef4f85f6ecd95b21d6c78ca938e730cdc8ba2dbaefdb

data/app/controllers/rails_base/admin_controller.rb

@@ -298,7 +298,8 @@ module RailsBase
       session.delete(RailsBase::Authentication::Constants::ADMIN_REMEMBER_REASON)
 
       flash[:notice] = 'You no longer have an identity crisis. You are back to normal.'
-      redirect_to RailsBase.url_routes.admin_base_path
+      redirect_url = RailsBase.config.admin.admin_impersonate_return.call(request, params)
+      redirect_to redirect_url
     end
 
     private

data/app/helpers/rails_base/admin_helper.rb

@@ -19,6 +19,9 @@ module RailsBase
       User.all.select do |user|
         proc.call(user)
       end.map(&:inspect_name)
+    rescue StandardError => e
+      Rails.logger.warn("Error -> #{e}")
+      nil
     end
 
     def array_for_proc(proc, array)

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

@@ -8,15 +8,22 @@ module RailsBase::Authentication
 		delegate :user, to: :context
 		delegate :reason, to: :context
 
-		MAX_USE_COUNT = 1.freeze
 		DATA_USE = :alphanumeric
 		VELOCITY_MAX = 5
 		VELOCITY_MAX_IN_FRAME = 10.minutes
 		VELOCITY_FRAME = 1.hour
 
 		REASON_MAPPER = {
-			Constants::SVE_LOGIN_REASON => { method: :email_verification, url_method: :email_verification_url },
-			Constants::SVE_FORGOT_REASON => { method: :forgot_password, url_method: :forgot_password_auth_url }
+			Constants::SVE_LOGIN_REASON => {
+				method: :email_verification,
+				url_method: :email_verification_url,
+				max_use: RailsBase.config.login_behavior.email_max_use_verification
+			},
+			Constants::SVE_FORGOT_REASON => {
+				method: :forgot_password,
+				url_method: :forgot_password_auth_url,
+				max_use: RailsBase.config.login_behavior.email_max_use_forgot
+			}
 		}
 
 		def call
@@ -61,7 +68,7 @@ module RailsBase::Authentication
 		def create_short_lived_data
 			params = {
 				user: user,
-				max_use: MAX_USE_COUNT,
+				max_use: REASON_MAPPER[reason][:max_use],
 				reason: reason,
 				data_use: DATA_USE,
 				ttl: Constants::SVE_TTL,

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

@@ -9,6 +9,7 @@ module RailsBase::Authentication
     delegate :reason, to: :context
     delegate :token_type, to: :context
     delegate :url_redirect, to: :context
+    delegate :msg_proc, to: :context
 
     SSO_DECISION_TWILIO = :twilio
     SSO_DECISION_EMAIL = :email
@@ -38,17 +39,19 @@ module RailsBase::Authentication
       case sso_decision_type
       when SSO_DECISION_TWILIO
         context.sso_destination = :sms
-        send_to_twilio!(message: message(url: url))
+        send_to_twilio!(message: message(url: url, full_name: user.full_name))
       when SSO_DECISION_EMAIL
         context.sso_destination = :email
-        send_to_email!(message: message(url: url))
+        send_to_email!(message: message(url: url, full_name: user.full_name))
       end
     end
 
     # This method is expected to be overridden by the main app
     # This is the default message
     # Might consider shipping this to a locales that can be easily overridden in downstream app
-    def message(url:)
+    def message(url:, full_name:)
+      return msg_proc.call(url, full_name) if msg_proc.is_a?(Proc)
+
       "Hello #{user.full_name}. This is your SSO link to your favorite site.\n#{url}"
     end
 

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

@@ -32,7 +32,7 @@
   <body>
     <script type="text/javascript">
       // Load at top so available for rest of body oddy
-      function set_cookie(name, value, path ) {
+      function set_cookie(name, value, path) {
         path ||= '/'
         document.cookie = `${name}=${value}; path=${path}`
       }
@@ -126,7 +126,7 @@
       </footer>
     <% end %>
     </div>
-    
+
     <% if RailsBase.appearance.back_to_top.enable? %>
       <a id="rails-base-back-to-top" class="btn btn-light btn-lg back-to-top" role="button"><i class="fas fa-chevron-up"></i></a>
       <script type="text/javascript">

data/app/views/rails_base/email_verification_mailer/email_verification.html.erb

@@ -1,7 +1,9 @@
 <p>Hello <%= @user.full_name %>!</p>
 
 <p>
-  Welcome to <%= RailsBase.config.app.communication_name %>. Where you have the ability to keep track of all of your optiosn accross different companies and life events
+  Welcome to <%= RailsBase.config.app.communication_name %>.
+  </br>
+  <%= RailsBase.config.mailer.verification_content(@user) %>
   </br>
   Please finish your registration by following this <a href="<%=@sso_url_for_user%>" target="_blank"> Registration Link </a>
   </br>

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

@@ -14,7 +14,7 @@
           <% case object[:type] %>
           <% when :proc %>
             <td>
-              <% users = users_for_proc(instance.public_send(name)) %>
+              <% users = users_for_proc(instance.public_send(name)) || ['Yikes! Probably a proc with different values'] %>
               <a tabindex="0" class="btn btn_secondary" role="button" data-toggle="popover" data-trigger="focus" title="Users with ability" data-html=true data-content="<%=users.join('</br>')%>">View Users</a>
             </td>
           <% when :string_proc %>

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

@@ -111,6 +111,11 @@
         '<%= dark %>': '<%= RailsBase.appearance.text.dark_mode %>',
         '<%= light %>': '<%= RailsBase.appearance.text.light_mode %>'
       },
+      {
+        'descriptor': '.card',
+        '<%= dark %>': '<%= RailsBase.appearance.card.dark_mode %>',
+        '<%= light %>': '<%= RailsBase.appearance.card.light_mode %>'
+      },
       // buttons
       <% RailsBase.appearance.class::BUTTONS.each do |klass| %>
       {
@@ -119,7 +124,6 @@
         '<%= light %>': '<%= RailsBase.appearance.dig(klass, :light_mode) %>'
       },
       <% end %>
-
     ]
 
     function toggle_dark_mode(set_key){
@@ -146,7 +150,7 @@
       set_and_toggle_mode(value)
     })
     // This function MUST be called outside of document ready
-    // to ensure dark mode does not activate after docuemnt is loaded
+    // 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 %>`)
     $('#appearance_mode_selector').appendTo('body');
     $(document).ready(function(){
@@ -180,4 +184,4 @@
       set_and_toggle_mode(get_cookie(cookie_name))
     });
   </script>
-<% end %>
+<% end %>

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

@@ -59,7 +59,7 @@
         </br>
         <div class='row'>
           <div class='col'>
-            <a class="btn btn_info btn-block" href="<%=RailsBase.url_routes.user_settings_path%>" role="button">Modify User</a>
+            <a class="btn btn_info btn-block" href="<%=RailsBase.url_routes.user_settings_path %>" role="button">Modify User</a>
           </div>
         </div>
         </br>
@@ -69,6 +69,14 @@
           </div>
         </div>
         </br>
+        <% if RailsBase.config.templates.logged_in_header_modal %>
+          <div class='row'>
+            <div class='col'>
+            <%= render partial: RailsBase.config.templates.logged_in_header_modal, locals: { current_user: current_user } %>
+            </div>
+          </div>
+          </br>
+        <% end %>
           <div class="dropdown-divider"></div>
         <div class='row'>
           <div class='col'>

data/config/initializers/switch_user.rb

@@ -41,7 +41,7 @@ SwitchUser.setup do |config|
 
   # redirect_path is a block, it returns which page will be redirected
   # after switching a user.
-  config.redirect_path = ->(_request, _params) { RailsBase.url_routes.authenticated_root_path }
+  config.redirect_path = ->(request, params) { RailsBase.config.admin.admin_impersonate_redirect.call(request, params) }
 
   # helper_with_guest is a boolean value, if it set to false
   # the guest item in the helper won't be shown

data/lib/rails_base/admin/default_index_tile.rb

@@ -144,7 +144,6 @@ params = {
 instance = RailsBase::Admin::IndexTile.new(**params)
 RailsBase::Admin::IndexTile.add(instance)
 
-
 # Impersonation Tile
 params = {
   type: :button,

data/lib/rails_base/config.rb

@@ -11,6 +11,7 @@ require 'rails_base/configuration/appearance'
 require 'rails_base/configuration/user'
 require 'rails_base/configuration/login_behavior'
 require 'rails_base/configuration/active_job'
+require 'rails_base/configuration/templates'
 
 module RailsBase
   class Config
@@ -28,7 +29,8 @@ module RailsBase
       appearance: nil,
       user: nil,
       active_job: nil,
-      login_behavior: nil
+      login_behavior: nil,
+      templates: nil,
     }
     attr_reader *VARIABLES.keys
 

data/lib/rails_base/configuration/admin.rb

@@ -190,6 +190,16 @@ module RailsBase
           default: ENV.fetch('ADMIN_VELOCITY_FRAME', 5).to_i.hours,
           description: 'Debug purposes. How long to keep admin_velocity_max attempts',
         },
+        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',
+        },
+        admin_impersonate_return:{
+          type: :proc,
+          default: ->(_request, _params) { RailsBase.url_routes.admin_base_path },
+          description: 'Redirection from impersonation -- Page to return from when you have found yourself',
+        }
       }
 
       attr_accessor *DEFAULT_VALUES.keys

data/lib/rails_base/configuration/appearance.rb

@@ -14,6 +14,9 @@ require 'rails_base/configuration/display/navbar'
 require 'rails_base/configuration/display/table_body'
 require 'rails_base/configuration/display/table_header'
 require 'rails_base/configuration/display/text'
+require 'rails_base/configuration/display/card'
+require 'rails_base/configuration/display/card'
+require 'rails_base/configuration/display/bg_light'
 
 module RailsBase
   module Configuration
@@ -27,6 +30,8 @@ module RailsBase
         :btn_info,
         :btn_light,
         :btn_dark,
+        :bg_light,
+
       ]
 
       DOWNSTREAM_CLASSES = [
@@ -35,9 +40,9 @@ module RailsBase
         :bg_color,
         :navbar,
         :text,
+        :card,
         :footer,
         :back_to_top,
-
       ] + BUTTONS
 
       SKIP_DOWNSTREAM_CLASSES = [:footer, :back_to_top]
@@ -85,9 +90,10 @@ module RailsBase
         @bg_color = Configuration::Display::BackgroundColor.new
         @navbar = Configuration::Display::Navbar.new
         @text = Configuration::Display::Text.new
-
+        @card = Configuration::Display::Card.new
         @footer = Configuration::Display::Footer.new
         @back_to_top = Configuration::Display::BackTotop.new
+        @bg_light = Configuration::Display::BgLight.new
 
         @btn_primary = Configuration::Display::BtnPrimary.new
         @btn_secondary = Configuration::Display::BtnSecondary.new

data/lib/rails_base/configuration/display/bg_light.rb

@@ -0,0 +1,25 @@
+require 'rails_base/configuration/base'
+
+module RailsBase
+  module Configuration
+    module Display
+      class BgLight < Base
+
+        DEFAULT_VALUES = {
+          dark_mode: {
+            type: :string_nil,
+            default: 'bg-secondary',
+            description: 'Background to use in Dark mode'
+          },
+          light_mode: {
+            type: :string_nil,
+            default: 'bg-light',
+            description: 'Background to use in light mode'
+          },
+        }
+
+        attr_accessor *DEFAULT_VALUES.keys
+      end
+    end
+  end
+end

data/lib/rails_base/configuration/display/card.rb

@@ -0,0 +1,24 @@
+require 'rails_base/configuration/base'
+
+module RailsBase
+  module Configuration
+    module Display
+      class Card < Base
+        DEFAULT_VALUES = {
+          dark_mode: {
+            type: :string_nil,
+            default: 'bg-dark',
+            description: 'Color of card for dark mode: https://getbootstrap.com/docs/4.0/utilities/colors/'
+          },
+          light_mode: {
+            type: :string_nil,
+            default: '',
+            description: 'Color of card for light mode : https://getbootstrap.com/docs/4.0/utilities/colors/'
+          },
+        }
+
+        attr_accessor *DEFAULT_VALUES.keys
+      end
+    end
+  end
+end

data/lib/rails_base/configuration/display/text.rb

@@ -15,7 +15,6 @@ module RailsBase
             type: :string_nil,
             default: 'text-dark',
             description: 'Color of text for light mode. Text that is outside of standard elems (tables, navbars): https://getbootstrap.com/docs/4.0/utilities/colors/'
-
           },
         }
 

data/lib/rails_base/configuration/login_behavior.rb

@@ -9,7 +9,17 @@ module RailsBase
           type: :boolean,
           default: true,
           description: 'Enable capturing requests context when login fails. Upon login, redirect user to page they tried to go to.',
-        }
+        },
+        email_max_use_verification:{
+          type: :integer,
+          default: 2,
+          description: 'Maximum number of times User can click link for verifiaction',
+        },
+        email_max_use_forgot:{
+          type: :integer,
+          default: 2,
+          description: 'Maximum number of times User can click link for forgot password flow',
+        },
       }
       attr_accessor *DEFAULT_VALUES.keys
     end

data/lib/rails_base/configuration/mailer.rb

@@ -107,7 +107,12 @@ module RailsBase
           default: 'mailers',
           on_assignment: ->(val, _instance) { ACTION_MAILER_PROC.call(:deliver_later_queue_name, val) },
           description: 'The active job queue to send twilio messages from. Ensure that adapter is bound to the queue',
-        }
+        },
+        verification_content: {
+          type: :string_proc,
+          default: ->(user) { "We are pleased to have you here" },
+          description: 'Description of app for verification mailer. User is passed in.',
+        },
       }
 
       attr_accessor *DEFAULT_VALUES.keys

data/lib/rails_base/configuration/templates.rb

@@ -0,0 +1,18 @@
+require 'rails_base/configuration/base'
+
+module RailsBase
+  module Configuration
+    class Templates < Base
+
+      DEFAULT_VALUES = {
+        logged_in_header_modal: {
+          type: :string_nil,
+          default: nil,
+          description: 'The template to render in the logged in header modal. `current_user` is passed in',
+        },
+      }
+
+      attr_accessor *DEFAULT_VALUES.keys
+    end
+  end
+end

data/lib/rails_base/version.rb

@@ -1,7 +1,7 @@
 module RailsBase
   MAJOR = '0'
-  MINOR = '53'
-  PATCH = '1'
+  MINOR = '57'
+  PATCH = '0'
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 
   def self.print_version

data/lib/velocity_limiter.rb

@@ -9,7 +9,7 @@ module VelocityLimiter
 		if metadata[:velocity_reached]
 			log(level: :warn, msg: "#{cache_key} has been velocity limited. #{metadata[:within_attempts_count]} attempts since #{metadata[:threshold]}. MAX allowed is #{velocity_max}")
 			log(level: :warn, msg: "#{cache_key} may try again in #{metadata[:to_words]} :: #{metadata[:attempt_again_at]}. Will fully reset at #{metadata[:fully_reset_time]}")
-			msg = "Velocity limit reached for SMS verification. You may try again in #{metadata[:to_words]}"
+			msg = velocity_limit_message(metadata: metadata)
 			return {reached: true, msg: msg}
 		end
 
@@ -35,6 +35,10 @@ module VelocityLimiter
 	def velocity_frame
 	end
 
+	def velocity_limit_message(metadata:)
+		"Velocity limit reached for SMS verification. You may try again in #{metadata[:to_words]}"
+	end
+
 	def cache_delineator
 		','
 	end
@@ -57,6 +61,7 @@ module VelocityLimiter
 		obj[:velocity_reached] = within_attempts.count >= velocity_max
 		obj[:within_attempts_arr] = within_attempts
 		obj[:within_attempts_count] = within_attempts.count
+		obj[:attempts_remaining] = velocity_max - obj[:vl_write].count
 		obj[:threshold] = threshold
 		obj[:velocity_max] = velocity_max
 		obj[:velocity_frame] = velocity_frame

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_base
 version: !ruby/object:Gem::Version
-  version: 0.53.1
+  version: 0.57.0
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -569,6 +569,7 @@ files:
 - lib/rails_base/configuration/base.rb
 - lib/rails_base/configuration/display/back_to_top.rb
 - lib/rails_base/configuration/display/background_color.rb
+- lib/rails_base/configuration/display/bg_light.rb
 - lib/rails_base/configuration/display/btn_danger.rb
 - lib/rails_base/configuration/display/btn_dark.rb
 - lib/rails_base/configuration/display/btn_info.rb
@@ -577,6 +578,7 @@ files:
 - lib/rails_base/configuration/display/btn_secondary.rb
 - lib/rails_base/configuration/display/btn_success.rb
 - lib/rails_base/configuration/display/btn_warning.rb
+- lib/rails_base/configuration/display/card.rb
 - lib/rails_base/configuration/display/footer.rb
 - lib/rails_base/configuration/display/navbar.rb
 - lib/rails_base/configuration/display/table_body.rb
@@ -588,6 +590,7 @@ files:
 - lib/rails_base/configuration/mfa.rb
 - lib/rails_base/configuration/owner.rb
 - lib/rails_base/configuration/redis.rb
+- lib/rails_base/configuration/templates.rb
 - lib/rails_base/configuration/user.rb
 - lib/rails_base/engine.rb
 - lib/rails_base/version.rb