Merge pull request #225 from debtcollective/od/fix

fix: prevent Drawer from breaking when changing between admin and user backends
debtcollective · Apr 1, 2020 · 97ae326 · 97ae326
2 parents c39ed6e + c8d3dc3
commit 97ae326
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -18,8 +18,13 @@ def logged_in?
   end
 
   def authenticate_user!
-    # TODO: redirect to login instead
-    head :unauthorized unless logged_in?
+    unless logged_in?
+      if request.format.json?
+        head :unauthorized
+      else
+        redirect_to root_path
+      end
+    end
   end
 
   private

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -2,8 +2,8 @@
 
 class UsersController < ApplicationController
   layout 'backoffice'
+  before_action :authenticate_user!
   before_action :set_user
-  before_action :verify_current_user
 
   # GET /users/1
   # GET /users/1.json

diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -21,7 +21,9 @@
     </ul>
     <ul>
       <% if @current_user %>
-        <li><a href="<%= user_path(@current_user) %>" class="button primary" rel="nofollow">My Profile</a></li>
+        <li>
+          <%= link_to "My Account", user_path(@current_user), class: "button primary", data: { turbolinks: false } %>
+        </li>
       <% else %>
         <li><a href="<%= login_path %>" class="button secondary" rel="nofollow">Log In</a></li>
         <li><a href="<%= signup_path %>" class="button primary" rel="nofollow">Sign Up</a></li>