Fix login page linking to other pages within OAuth authorization flow (#36115)

app/helpers/application_helper.rb

@@ -260,6 +260,10 @@ module ApplicationHelper
     'https://play.google.com/store/apps/details?id=org.joinmastodon.android'
   end
 
+  def within_authorization_flow?
+    session[:user_return_to].present? && Rails.application.routes.recognize_path(session[:user_return_to])[:controller] == 'oauth/authorizations'
+  end
+
   private
 
   def storage_host_var

app/views/auth/sessions/new.html.haml

@@ -41,4 +41,5 @@
       - resource_class.omniauth_providers.each do |provider|
         = provider_sign_in_link(provider)
 
-.form-footer= render 'auth/shared/links'
+- unless within_authorization_flow?
+  .form-footer= render 'auth/shared/links'

app/views/layouts/auth.html.haml

@@ -5,6 +5,9 @@
   .container-alt
     .logo-container
       %h1
+        - if within_authorization_flow?
+          = logo_as_symbol(:wordmark)
+        - else
           = link_to root_path do
             = logo_as_symbol(:wordmark)