rails_base 0.80.0 → 0.81.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac8c98816130bae4d552e2b82ecf75c5a3b8f6441936bb70d9663f07a1ee4c2f
-  data.tar.gz: f9df9901477573b0e827019a141996cec8c2192e940d334d91da624a8c69dc07
+  metadata.gz: 2e6dfb9b0dfa087ba1c2378c08703360360da41dfc5f676feb29c94a3542cfaf
+  data.tar.gz: 0bae19f4b8e3b06b42b3b7d91fd407028676034f5cb4c102898848747238d205
 SHA512:
-  metadata.gz: f868b2bb553e9e1f4fcd4e14abda131b153e38f6b43f1bfdfef2f34b5a3d0b2d75d31a8eec7720d3a8339db74782706f9e0d39e7284256416130601233bb54d7
-  data.tar.gz: bf26e5f0ae48f7674ee614d7a159d352c990ddced01a7ca28ccb3215dae5a6b6f0b9c3e218b05ec4eb34d917da4c6296bdcd825a511ae8b8a7ab037317f854c8
+  metadata.gz: e4c16fdf660ed93e2672208de8b86c0b766f374defb44cd3259ee96441071b8e1821246a766d6b2237c95250c6e3c21c1858eeeeb714079f1993aa13016676fd
+  data.tar.gz: fe5cd28864e828717ddf81a3fbfc3c0af190e4ca888154ad3af177fc8ca67e2bc9c908e29e6215e7e675533fdc005082a30de09bd27f25f25ad997adede714c5

data/app/controllers/rails_base/users/sessions_controller.rb

@@ -44,7 +44,10 @@ class RailsBase::Users::SessionsController < Devise::SessionsController
 
     if mfa_decision.sign_in_user
       sign_in(authenticate.user)
-      session.merge!(mfa_decision.session || {})
+      if mfa_decision.add_mfa_button
+        RailsBase::RequestLink.add(link: RailsBase.url_routes.user_settings_path(openmfa: true), text: "Enable MFA")
+      end
+
       # only referentially redirect when we know the user should sign in
       redirect_to(redirect_from_reference || RailsBase.url_routes.authenticated_root_path, mfa_decision.flash)
       return

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

@@ -36,7 +36,9 @@ module RailsBase::Authentication
 				# no MFA type enabled on account
 				sign_in_user_context!
 				context.flash = { notice: "Welcome. You have succesfully signed in." }
-				context.session = { add_mfa_button: true }
+				if RailsBase.config.mfa.enable?
+					context.add_mfa_button = true
+				end
 			else
 				raise "Unknown MFA type provided"
 			end
@@ -80,7 +82,7 @@ module RailsBase::Authentication
 				context.token_ttl = 2.minutes.from_now
 			else
 				sign_in_user_context!
-				context.flash = { notice: "Welcome. You have succesfully signed in via #{decision.mfa_type.to_s.upcase} MFA." }
+				context.flash = { notice: "Welcome. You have succesfully signed in" }
 				nil
 			end
 		end
@@ -95,7 +97,7 @@ module RailsBase::Authentication
 				result
 			else
 				sign_in_user_context!
-				context.flash = { notice: "Welcome. You have succesfully signed in via #{decision.mfa_type.to_s.upcase} MFA." }
+				context.flash = { notice: "Welcome. You have succesfully signed in" }
 				nil
 			end
 		end

data/app/services/rails_base/mfa/decision.rb

@@ -38,7 +38,7 @@ module RailsBase::Mfa
     end
 
     def execute_sms
-      log(level: :info, msg: "MFA type SMS is enabled on user. Executing OTP workflow")
+      log(level: :info, msg: "MFA type SMS is enabled on user. Executing SMS workflow")
       result = reauth_strategy_class.(user: user, force: force_mfa, mfa_type: SMS, mfa_last_used: user.last_mfa_sms_login)
       require_mfa = result.request_mfa
 

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

@@ -83,20 +83,8 @@
         <%= render partial: 'rails_base/shared/logged_out_header'%>
       <% end %>
       <% if notice %>
-        <% if session.delete(:add_mfa_button) %>
-          <div class="alert alert-success alert-dismissible fade show" role="alert">
-            <div class="row">
-              <div class="col-md-6">
-                <%= notice %>
-              </div>
-              <div class="col-md-6">
-                <%= link_to "Enable MFA", RailsBase.url_routes.user_settings_path(openmfa: true), method: :get, class: "btn btn-light float-right" %>
-              </div>
-              <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-            </div>
-          </div>
+        <% if user_signed_in? && RailsBase::RequestLink.any? %>
+          <%= render partial: "rails_base/shared/request_link_alert", locals: { text: notice } %>
         <% else %>
           <div class="alert alert-success alert-dismissible fade show" role="alert">
             <%= notice %>

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

@@ -0,0 +1,48 @@
+<div class="regularAlert alert alert-success alert-dismissible fade show" role="alert">
+  <div class="row">
+    <div class="col-md-6">
+      <%= text %>
+    </div>
+    <div class="col-md-6">
+      <% dupped = RailsBase::RequestLink.items.dup %>
+      <% while(link = dupped.shift) do %>
+        <%= link_to link.text, link.link, method: :get, class: "btn btn-light float-right" %>
+      <% end %>
+    </div>
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+</div>
+
+<br>
+
+<div class="mobileAlert alert alert-success alert-dismissible fade show" role="alert">
+  <div class="row">
+    <div class="col-md-12 text-center">
+      <%= text %>
+    </div>
+  </div>
+  <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <span aria-hidden="true">&times;</span>
+  </button>
+  <% while(link = RailsBase::RequestLink.items.shift) do %>
+    <div class="row">
+      <div class="col-12">
+        <%= link_to link.text, link.link, method: :get, class: "btn btn-light btn-block" %>
+      </div>
+    </div>
+  <% end %>
+</div>
+
+<script type="text/javascript">
+  $(document).ready(function(){
+    if(viewport_probable_mobile()){
+      $(`.regularAlert`).hide()
+      $(`.mobileAlert`).show()
+    } else {
+      $(`.regularAlert`).show()
+      $(`.mobileAlert`).hide()
+    }
+  });
+</script>

data/app/views/rails_base/user_settings/index.html.erb

@@ -19,13 +19,24 @@
           </tr>
           <tr>
             <th scope="col" class='text-right' style="width: 40%">
-             MFA enabled?
+             SMS MFA enabled?
             </th>
             <td style="width: 40%">
               <%= current_user.mfa_sms_enabled %>
             </td>
             <td style="width: 20%">
-              <button class="btn btn_primary btn-block show-create-modal" type="button">Modify</button>
+              <button onclick="advancedSecurityCollapse_collapse_open()" class="btn btn_primary btn-block" type="button">Modify</button>
+            </td>
+          </tr>
+          <tr>
+            <th scope="col" class='text-right' style="width: 40%">
+             TOTP MFA enabled?
+            </th>
+            <td style="width: 40%">
+              <%= current_user.mfa_otp_enabled %>
+            </td>
+            <td style="width: 20%">
+              <button onclick="advancedSecurityCollapse_collapse_open()" class="btn btn_primary btn-block" type="button">Modify</button>
             </td>
           </tr>
           <tr>
@@ -92,7 +103,12 @@
                         <br>
                         <div class="row">
                           <div class="col-12">
-                            <button type="button" class="btn btn-block btn_info close-me" data-toggle="modal" data-target="#totpEnableModal">
+                            <button type="button" class="btn btn-block btn_info close-me" data-toggle="modal" data-target="#totpEnableModal" style="display: none;">
+                              <!--
+                              This is currently disabled.
+                              Steps to re-enabld
+                              - Enforce TOTP code is entered before showing totp secret
+                              -->
                               Add One Time Password Auth
                             </button>
                           </div>
@@ -101,8 +117,8 @@
                         <button type="button" class="btn btn-block btn_info close-me" data-toggle="modal" data-target="#totpEnableModal">
                             Enable One Time Password Auth
                         </button>
+                        <%= render partial: 'rails_base/shared/totp/add_authenticator_modal', locals: { type: @type, endpoint: @endpoint } %>
                       <% end %>
-                      <%= render partial: 'rails_base/shared/totp/add_authenticator_modal', locals: { type: @type, endpoint: @endpoint } %>
                     <% end %>
                   </div>
                 </div>

data/lib/rails_base/request_link.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module RailsBase
+  class RequestLink
+    attr_accessor :link, :text
+
+    def self.add(link:, text:)
+      return false if items.any? { _1.text == text }
+
+      items << new(link:, text:)
+      true
+    end
+
+    def self.items
+      @array ||= []
+    end
+
+    def self.any?
+      items.length > 0
+    end
+
+    def initialize(link:, text:)
+      @link = link
+      @text = text
+    end
+  end
+end

data/lib/rails_base/version.rb

@@ -1,6 +1,6 @@
 module RailsBase
   MAJOR = "0"
-  MINOR = "80"
+  MINOR = "81"
   PATCH = "0"
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 

data/lib/rails_base.rb

@@ -16,6 +16,7 @@ require 'switch_user'
 require 'rails_base/admin/action_cache'
 require 'rails_base/config'
 require 'rails_base/mfa_event'
+require 'rails_base/request_link'
 
 module RailsBase
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_base
 version: !ruby/object:Gem::Version
-  version: 0.80.0
+  version: 0.81.0
 platform: ruby
 authors:
 - Matt Taylor
@@ -608,6 +608,7 @@ files:
 - app/views/rails_base/shared/_mfa_input_layout_fallback.html.erb
 - app/views/rails_base/shared/_modify_mfa_auth_modal.html.erb
 - app/views/rails_base/shared/_password_confirm_javascript.html.erb
+- app/views/rails_base/shared/_request_link_alert.html.erb
 - 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
@@ -687,6 +688,7 @@ files:
 - lib/rails_base/configuration/user.rb
 - lib/rails_base/engine.rb
 - lib/rails_base/mfa_event.rb
+- lib/rails_base/request_link.rb
 - lib/rails_base/switch_user_helper.rb
 - lib/rails_base/version.rb
 - lib/tasks/rails_base_tasks.rake