Merge pull request #2091 from basecamp/flavorjones/fix-redirect-from-active-storage-controllers

Explicitly use main_app for URL helpers

Author: flavorjones

app/controllers/concerns/authentication.rb

@@ -37,7 +37,7 @@ def authenticated?
 
     def require_account
       unless Current.account.present?
-        redirect_to session_menu_url(script_name: nil)
+        redirect_to main_app.session_menu_url(script_name: nil)
       end
     end
 
@@ -78,11 +78,11 @@ def after_authentication_url
     end
 
     def redirect_authenticated_user
-      redirect_to root_url if authenticated?
+      redirect_to main_app.root_url if authenticated?
     end
 
     def redirect_tenanted_request
-      redirect_to root_url if Current.account.present?
+      redirect_to main_app.root_url if Current.account.present?
     end
 
     def start_new_session_for(identity)
@@ -110,7 +110,7 @@ def ensure_development_magic_link_not_leaked
     def redirect_to_session_magic_link(magic_link, return_to: nil)
       serve_development_magic_link(magic_link)
       session[:return_to_after_authenticating] = return_to if return_to
-      redirect_to session_magic_link_url(script_name: nil)
+      redirect_to main_app.session_magic_link_url(script_name: nil)
     end
 
     def serve_development_magic_link(magic_link)

app/helpers/login_helper.rb

@@ -1,7 +1,5 @@
 module LoginHelper
   def login_url
-    # Use main_app because this helper may be invoked from an engine controller
-    # that inherits from AdminController.
     main_app.new_session_path(script_name: nil)
   end
 

test/controllers/sessions_controller_test.rb

@@ -9,6 +9,15 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
+  test "new redirects authenticated users" do
+    sign_in_as :kevin
+
+    untenanted do
+      get new_session_path
+      assert_redirected_to root_url
+    end
+  end
+
   test "create" do
     identity = identities(:kevin)