From 4d6fa318b7efab43a38d891c9c880784b6cbf089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 6 Mar 2024 22:00:15 +0100 Subject: [PATCH] Fix login redirect for existing RS auth fixes #178 --- app/views/devise/sessions/new.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index ddb0a44..a334230 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,6 +1,7 @@ <% # TODO remove when https://github.com/hotwired/turbo/issues/203 is fixed - enable_turbo = !session[:user_return_to] || !session[:user_return_to].match?('/discourse/connect') + enable_turbo = session[:user_return_to].blank? || + ['/discourse/connect', '/rs/oauth'].none? { |s| session[:user_return_to].match(s) } %> <%= render HeaderCompactComponent.new(title: "Log in") %>