Merge pull request 'Fix login redirect for existing RS auth' (#180 ) from bugfix/178-rs_login_redirect into master

Reviewed-on: #180
Fix login redirect for existing RS auth
2024-03-06 21:06:27 +00:00 · 2024-03-06 22:00:15 +01:00
1 changed files with 2 additions and 1 deletions
--- 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") %>
Author	SHA1	Message	Date
Râu Cao	e322867d79	Merge pull request 'Fix login redirect for existing RS auth' (#180 ) from bugfix/178-rs_login_redirect into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #180	2024-03-06 21:06:27 +00:00
Râu Cao	4d6fa318b7	Fix login redirect for existing RS auth All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details Release Drafter / Update release notes draft (pull_request) Successful in 3s Details fixes #178	2024-03-06 22:00:15 +01:00