Commit cd0d12b

mo <mo.khan@gmail.com>
2018-12-15 04:52:50
extract mfa_completed? helper
main
1 parent 23f8549
Changed files (3)
app
controllers
concerns
authenticatable.rb
views
layouts
application.html.erb
sessions
show.html.erb
app/controllers/concerns/authenticatable.rb
@@ -6,7 +6,7 @@ module Authenticatable
     before_action :apply_current_request_details
     before_action :authenticate!
     before_action :authenticate_mfa!
-    helper_method :current_user, :current_user?
+    helper_method :current_user, :current_user?, :mfa_completed?
   end
 
   def current_user
@@ -17,6 +17,10 @@ module Authenticatable
     Current.user?
   end
 
+  def mfa_completed?
+    Current.user.mfa.valid_session?(session[:mfa])
+  end
+
   private
 
   def authenticate!
@@ -25,9 +29,7 @@ module Authenticatable
 
   def authenticate_mfa!
     return unless Current.user?
-
-    mfa = Current.user.mfa
-    redirect_to new_mfa_path unless mfa.valid_session?(session[:mfa])
+    redirect_to new_mfa_path unless mfa_completed?
   end
 
   def apply_current_request_details
app/views/layouts/application.html.erb
@@ -9,7 +9,7 @@
     <%= stylesheet_pack_tag 'application' %>
   </head>
   <body>
-    <% if current_user %>
+    <% if current_user? && mfa_completed? %>
       <div class="container" data-controller="content-loader" data-content-loader-url="<%= session_path %>"></div>
     <% end %>
     <%= render partial: 'flash' %>
app/views/sessions/show.html.erb
@@ -9,7 +9,7 @@
       <span aria-hidden="true"></span>
     </a>
   </div>
-  <div id="navbarBasicExample" class="navbar-menu">
+  <div class="navbar-menu">
     <div class="navbar-start">
       <%= link_to t(".home"), my_dashboard_path, class: 'navbar-item' %>
       <%= link_to t(".documentation"), '/doc/', class: 'navbar-item' %>