rails_base 0.72.1 → 0.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c96ef922f5d84008526225d5a218a10800cd8afb6141e978f3b6f440525da39b
-  data.tar.gz: bd5ddc3de729b5145cb7120406b42f19ce23f9fd2ac45371f73591425ced48b2
+  metadata.gz: 417d36c66840f75a28fca2998dce4862a4d7997cf6e13d374872a25e397a8bae
+  data.tar.gz: 24c761421d3cfdb881ca30a658934ac4cf47fe1f6deb5ca41434b0a95222122d
 SHA512:
-  metadata.gz: 43e770e791e132c8c08889b2ebed4a853fc8f277cba8d95f41323ff35bc8e9a51bc4600f14cafd4c83b75edf33ab9b7d87fd6703b573b900ac975541627c4f2b
-  data.tar.gz: aa0b6b20a68300ecd74a800402c50d0cb23ab056a620513de7b1dc483754e3c746871797a269f8165f561743bdc20fe62a315080eb60195138b0ab68013bbd66
+  metadata.gz: 6a913f6bbed29e62177ce3bf3a5ee19026803486378a8a07402b9d87c60fa90204af60fa1e2ba9a8a902c7f13ed74beac2ec6995ebd79aa5b4ee351174e412d5
+  data.tar.gz: 4545f9d272a1bcde9d4c349f7801e37f24a0994f5390b09356a7a6b78ef5c7992df0abb1ed0e0164f4b944a3229040d41f2f0edea8cbbfb941ee522d5e63fd8d

data/app/helpers/rails_base/user_field_validators.rb

@@ -86,7 +86,7 @@ module RailsBase::UserFieldValidators
 
 		number_count = password.scan(/\d/).join('').length
 		char_count = password.scan(/[a-zA-Z]/).join('').length
-		unacceptable_chars = password.scan(/\W/).join('')
+		non_standard_chars = password.scan(/\W/)
 
 		if char_count < RailsBase::Authentication::Constants::MP_MIN_ALPHA
 			log(level: :warn, msg: "User password does not have enough numbers. Req: #{RailsBase::Authentication::Constants::MP_MIN_ALPHA}. Given: #{char_count}")
@@ -98,9 +98,10 @@ module RailsBase::UserFieldValidators
 			return { status: false, msg: "Password must contain at least #{RailsBase::Authentication::Constants::MP_MIN_NUMS} numbers [0-9]" }
 		end
 
+    unacceptable_chars = non_standard_chars - RailsBase.config.auth.password_allowed_special_chars.split("")
 		if unacceptable_chars.length > 0
-			log(level: :warn, msg: "User password contains unacceptable_chars. Received: #{unacceptable_chars}")
-			return { status: false, msg: "Unaccepted characters received. Characters must be in [0-9a-zA-Z] exclusively. Received #{unacceptable_chars}" }
+			log(level: :warn, msg: "User password contains unacceptable_chars special chars. Received: #{unacceptable_chars}")
+			return { status: false, msg: "Unaccepted characters received. Characters must be in [0-9a-zA-Z] and [#{RailsBase.config.auth.password_allowed_special_chars}] exclusively. Received #{unacceptable_chars}" }
 		end
 
 		{ status: true }

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

@@ -35,13 +35,10 @@ module RailsBase::Authentication
 		SSOVE_PURPOSE = :verify_email
 
 		# modify password
-		MP_MIN_LENGTH = 7
-		MP_MIN_NUMS = 1
-		MP_MIN_ALPHA = 6
-		var = []
-		var << "contain at least #{MP_MIN_NUMS} numerics [0-9]" if MP_MIN_NUMS > 0
-		var << "contain at least #{MP_MIN_ALPHA} letters [a-z,A-Z]" if MP_MIN_NUMS > 0
-		MP_REQ_MESSAGE = "Password must #{var.join(' and ')}. Minimum length is #{MP_MIN_LENGTH} and contain [1-9a-zA-Z] only"
+		MP_MIN_LENGTH = RailsBase.config.auth.password_min_length
+		MP_MIN_NUMS = RailsBase.config.auth.password_min_numeric
+		MP_MIN_ALPHA = RailsBase.config.auth.password_min_alpha
+		MP_REQ_MESSAGE = RailsBase.config.auth.password_message
 
 		STATIC_WAIT_FLASH = '"Check email inbox for verification email. Follow instructions to gain access"'
 

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

@@ -109,6 +109,12 @@
         <button type="button" class="close" data-dismiss="alert" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
+      </div>
+        <% if partial = RailsBase.config.appearance.header.partial %>
+          <%= render partial: partial %>
+        <% end %>
+      <div >
+
       </div>
       <div class="p-1">
         <%= yield %>

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

@@ -9,7 +9,7 @@
         </button>
       </div>
       <div class="modal-body">
-        <h5> Admins have made actions recently on your account. Aknowledge to clear alert. </h5>
+        <h5> Admins have made actions recently on your account. Acknowledge to clear alert. </h5>
         </br>
         <% @__admin_actions_array.reverse.each do |action, time| %>
           <div class="alert alert-danger alert-dismissible fade show" role="alert">

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

@@ -15,8 +15,21 @@
       return false
     }
 
-    var unknown = value.replace(/[0-9a-zA-Z]/g,'')
-    if(unknown.length > 0) {
+    var special_chars = value.replace(/[0-9a-zA-Z]/g,'')
+
+    if (special_chars.length == 0) {
+      return true
+    }
+    password_allowed_special_chars = <%= raw (RailsBase.config.auth.password_allowed_special_chars || "").split("") %>
+
+    special_chars_array = special_chars.split("")
+    unknown_chars = []
+    for (let i = 0; i < special_chars_array.length; i++) {
+      if(!password_allowed_special_chars.includes(special_chars_array[i])){
+        unknown_chars.push(special_chars_array[i])
+      }
+    }
+    if(unknown_chars.length > 0) {
       return false
     }
     true

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

@@ -59,8 +59,21 @@
       return false
     }
 
-    var unknown = value.replace(/[0-9a-zA-Z]/g,'')
-    if(unknown.length > 0) {
+    var special_chars = value.replace(/[0-9a-zA-Z]/g,'')
+
+    if (special_chars.length == 0) {
+      return true
+    }
+    password_allowed_special_chars = <%= raw (RailsBase.config.auth.password_allowed_special_chars || "").split("") %>
+
+    special_chars_array = special_chars.split("")
+    unknown_chars = []
+    for (let i = 0; i < special_chars_array.length; i++) {
+      if(!password_allowed_special_chars.includes(special_chars_array[i])){
+        unknown_chars.push(special_chars_array[i])
+      }
+    }
+    if(unknown_chars.length > 0) {
       return false
     }
     true

data/lib/rails_base/config.rb

@@ -1,17 +1,17 @@
 require 'singleton'
+require 'rails_base/configuration/active_job'
 require 'rails_base/configuration/admin'
-require 'rails_base/configuration/mfa'
-require 'rails_base/configuration/authentication'
-require 'rails_base/configuration/redis'
-require 'rails_base/configuration/owner'
-require 'rails_base/configuration/mailer'
-require 'rails_base/configuration/exceptions_app'
 require 'rails_base/configuration/app'
 require 'rails_base/configuration/appearance'
-require 'rails_base/configuration/user'
+require 'rails_base/configuration/authentication'
+require 'rails_base/configuration/exceptions_app'
 require 'rails_base/configuration/login_behavior'
-require 'rails_base/configuration/active_job'
+require 'rails_base/configuration/mailer'
+require 'rails_base/configuration/mfa'
+require 'rails_base/configuration/owner'
+require 'rails_base/configuration/redis'
 require 'rails_base/configuration/templates'
+require 'rails_base/configuration/user'
 
 module RailsBase
   class Config

data/lib/rails_base/configuration/active_job.rb

@@ -1,3 +1,5 @@
+require 'rails_base/configuration/base'
+
 module RailsBase
   module Configuration
     class ActiveJob < Base

data/lib/rails_base/configuration/appearance.rb

@@ -10,6 +10,7 @@ require 'rails_base/configuration/display/btn_secondary'
 require 'rails_base/configuration/display/btn_success'
 require 'rails_base/configuration/display/btn_warning'
 require 'rails_base/configuration/display/footer'
+require 'rails_base/configuration/display/header'
 require 'rails_base/configuration/display/navbar'
 require 'rails_base/configuration/display/table_body'
 require 'rails_base/configuration/display/table_header'
@@ -42,10 +43,11 @@ module RailsBase
         :text,
         :card,
         :footer,
+        :header,
         :back_to_top,
       ] + BUTTONS
 
-      SKIP_DOWNSTREAM_CLASSES = [:footer, :back_to_top]
+      SKIP_DOWNSTREAM_CLASSES = [:footer, :header, :back_to_top]
       DARK_MODE = :dark
       LIGHT_MODE = :light
       MATCH_OS = :match_os
@@ -92,6 +94,7 @@ module RailsBase
         @text = Configuration::Display::Text.new
         @card = Configuration::Display::Card.new
         @footer = Configuration::Display::Footer.new
+        @header = Configuration::Display::Header.new
         @back_to_top = Configuration::Display::BackTotop.new
         @bg_light = Configuration::Display::BgLight.new
 

data/lib/rails_base/configuration/authentication.rb

@@ -8,6 +8,25 @@ module RailsBase
 
       DEFAULT_MFA_TIME = 7.day
       MIN_MFA_TIME = 1.day
+      PASSWORD_MIN_LENGTH = 8
+      PASSWORD_MIN_NUMERIC = 2
+      PASSWORD_MIN_ALPHANUMERIC = 6
+      PASSWORD_ALLOWED_SPECIAL_CHARS = "(),.\"'{}[]!@\#$%^&*_-+="
+
+      PASSWORD_MESSAGE_ON_ASSIGNMENT = Proc.new do |value, current|
+        if value.nil?
+          special_chars_str =
+            if current.password_allowed_special_chars.nil?
+              "No Special characters are allowed"
+            else
+              "Only the following special characters are allowed #{current.password_allowed_special_chars}"
+            end
+
+          current.password_message = "Password must be at least #{current.password_min_length} characters long. " \
+            "With #{current.password_min_numeric} numbers [0-9] and #{current.password_min_alpha} letters [a-zA-Z]. " \
+            "#{special_chars_str}."
+        end
+      end
 
       DEFAULT_VALUES = {
         session_timeout: {
@@ -29,9 +48,52 @@ module RailsBase
           custom: ->(val) { val.to_i > MIN_MFA_TIME },
           msg: "mfa_time_duration must be a duration. Greater than #{MIN_MFA_TIME}",
           description: 'Max time between when MFA will be required',
+        },
+        password_min_length: {
+          type: :integer,
+          default: PASSWORD_MIN_LENGTH,
+          custom: ->(val) { val >= PASSWORD_MIN_LENGTH },
+          msg: "password_min_length must be a integer greater than #{PASSWORD_MIN_LENGTH}.",
+          description: 'Min length the password can be.',
+        },
+        password_min_numeric: {
+          type: :integer,
+          default: PASSWORD_MIN_NUMERIC,
+          custom: ->(val) { val >= PASSWORD_MIN_NUMERIC },
+          msg: "password_min_numeric must be a integer greater or equal to #{PASSWORD_MIN_NUMERIC}.",
+          description: 'Min count of numerics in password.',
+        },
+        password_min_alpha: {
+          type: :integer,
+          default: PASSWORD_MIN_ALPHANUMERIC,
+          custom: ->(val) { val >= PASSWORD_MIN_ALPHANUMERIC },
+          msg: "password_min_alpha must be a integer greater or equal to #{PASSWORD_MIN_ALPHANUMERIC}.",
+          description: 'Min count of letters in password.',
+        },
+        password_allowed_special_chars: {
+          type: :string_nil,
+          default: PASSWORD_ALLOWED_SPECIAL_CHARS,
+          description: 'Allowed special characters in password.',
+        },
+        password_message: {
+          type: :string_nil,
+          default: nil,
+          description: 'Password message for users.',
+          on_assignment: PASSWORD_MESSAGE_ON_ASSIGNMENT,
         }
       }
       attr_accessor *DEFAULT_VALUES.keys
+
+      private
+
+      def custom_validations
+        enforce_password_config!
+      end
+
+      def enforce_password_config!
+        incorrectness = []
+        incorrectness << "`password_min_numeric` is not less than or equal to `password_min_length`" if password_min_numeric <= password_min_length
+      end
     end
   end
 end

data/lib/rails_base/configuration/base.rb

@@ -16,19 +16,20 @@ module RailsBase
       end
 
       ALLOWED_TYPES = {
+        array: -> (val) { [Array].include?(val.class) },
+        array_nil: -> (val) { [Array, NilClass].include?(val.class) },
         boolean: -> (val) { [TrueClass, FalseClass].include?(val.class) },
-        proc: -> (val) { [Proc].include?(val.class) },
+        duration: -> (val) { [ActiveSupport::Duration].include?(val.class) },
+        hash: -> (val) { [Hash].include?(val.class) },
         integer: -> (val) { [Integer].include?(val.class) },
+        klass: -> (_val) { true },
+        path: -> (val) { [Pathname].include?(val.class) },
+        proc: -> (val) { [Proc].include?(val.class) },
         string: -> (val) { [String].include?(val.class) },
-        symbol: -> (val) { [Symbol].include?(val.class) },
-        symbol_class: -> (val) { [Symbol].include?(val.class) || val.superclass === ActiveJob::QueueAdapters },
-        duration: -> (val) { [ActiveSupport::Duration].include?(val.class) },
         string_nil: -> (val) { [String, NilClass].include?(val.class) },
         string_proc: -> (val) { [String, Proc].include?(val.class) },
-        array: -> (val) { [Array].include?(val.class) },
-        hash: -> (val) { [Hash].include?(val.class) },
-        path: -> (val) { [Pathname].include?(val.class) },
-        klass: -> (_val) { true },
+        symbol: -> (val) { [Symbol].include?(val.class) },
+        symbol_class: -> (val) { [Symbol].include?(val.class) || val.superclass === ActiveJob::QueueAdapters },
         values: -> (_val) { true },
       }
 
@@ -116,8 +117,7 @@ module RailsBase
 
       private
 
-      def custom_validations
-      end
+      def custom_validations; end
 
       def def_convenience_methods
         self.class::DEFAULT_VALUES.each do |key, object|

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

@@ -44,7 +44,6 @@ module RailsBase
             dependents: [ -> (i) { i.enable? } ],
             description: 'When enabled, footer will stick to bottom or stick to bottom of content -- whichever is greater. Takes precendence over `sticky`',
           },
-
         }
 
         attr_accessor *DEFAULT_VALUES.keys

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

@@ -0,0 +1,20 @@
+require 'rails_base/configuration/base'
+
+module RailsBase
+  module Configuration
+    module Display
+      class Header < Base
+
+        DEFAULT_VALUES = {
+          partial: {
+            type: :string_nil,
+            default: nil,
+            description: "Rails partial to render at the header."
+          },
+        }
+
+        attr_accessor *DEFAULT_VALUES.keys
+      end
+    end
+  end
+end

data/lib/rails_base/configuration/mfa.rb

@@ -69,9 +69,9 @@ module RailsBase
       def enforce_twilio!
         return unless enable == true
 
-      return if twilio_sid.present? &&
-        twilio_auth_token.present? &&
-        twilio_from_number.present?
+        return if twilio_sid.present? &&
+          twilio_auth_token.present? &&
+          twilio_from_number.present?
 
         raise InvalidConfiguration, "twilio_sid twilio_auth_token twilio_from_number need to be present when `mfa.enabled`"
       end

data/lib/rails_base/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_base
 version: !ruby/object:Gem::Version
-  version: 0.72.1
+  version: 0.74.0
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-30 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -580,6 +580,7 @@ files:
 - 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/header.rb
 - lib/rails_base/configuration/display/navbar.rb
 - lib/rails_base/configuration/display/table_body.rb
 - lib/rails_base/configuration/display/table_header.rb