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

2025-11-27 18:10:58 +00:00 · 2025-09-16 16:25:21 +02:00 · 2025-09-16 16:25:21 +02:00 · d9b70bbde1
commit d9b70bbde1
parent d1402af0b2
3 changed files with 10 additions and 2 deletions
--- a/app/helpers/application_helper.rb
+++ b/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
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@ -41,4 +41,5 @@
      - resource_class.omniauth_providers.each do |provider|
        = provider_sign_in_link(provider)

+- unless within_authorization_flow?
  .form-footer= render 'auth/shared/links'
--- a/app/views/layouts/auth.html.haml
+++ b/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)