rails_base 0.54.0 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe27d75cdddcc15a030ab4fa65a259e47cf05f2213495291b29aca0b31ea1bbf
-  data.tar.gz: 88fa8e22d35ffaf1357341ce223873a86ea313f0a628fdc9b1710583df358126
+  metadata.gz: f0d56cf778690b03f6e04404f07f6b9c428406249adcf80f61dab8a0f16894b1
+  data.tar.gz: 553c0ebb31fa6f0cad2c715edd210fb9bfd71ef908ea25f9e8f753f7faa8bbf2
 SHA512:
-  metadata.gz: 9b0b2c4d3685e8030655c05d294b25bc27740e547354eeb69400fbcb2383a84b515b3275493cea85315ddda0bd4417891098afd5620f0d1934e24f54b8f3d831
-  data.tar.gz: 2d1dab3b919b1b0b3534aa613b2aa40b79f6b34bc8f594602856d2266ba524f833616fee4f3a7fd474a7f7814e4dc5667ed455feaa11029a6f2365cfda3119bc
+  metadata.gz: 867ba0f4c94b2e13ffe63bfff7ca8dd7f4414250c42a3a3ce31bf3599dbc7d53e39028e2a79ddd44990028b51065e8249d3da926a487eddf13a0a3855c1ac7a0
+  data.tar.gz: 35103b3f631bb8959892cda6cd6bbe15503e2e3b5c2381b372bc0e00e1525607efc43495d4b989a827158c783abb4daba216b218bc5343fe83c6d2219a8dfe4c

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/views/layouts/rails_base/application.html.erb

@@ -24,7 +24,7 @@
 
     <%=
     if RailsBase.config.app.favicon_path
-      favicon_link_tag 'rails_base/favicon.ico'
+      favicon_link_tag(RailsBase.config.app.favicon_path)
     end
     %>
   </head>

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/_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/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/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,6 +1,6 @@
 module RailsBase
   MAJOR = '0'
-  MINOR = '54'
+  MINOR = '58'
   PATCH = '0'
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_base
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.58.0
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -590,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