github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-08 01:37:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: use the destination_url cookie as return_path if present (#23594)

Browse Source
This commit is contained in:
Renato Atilio 2023-09-15 12:11:03 -03:00 committed by GitHub
parent 8823b5e504
commit aa9510a731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/app/routes/application.js
View File

@ -1,3 +1,4 @@
import cookie from "discourse/lib/cookie";
import DiscourseURL, { userPath } from "discourse/lib/url"; import DiscourseURL, { userPath } from "discourse/lib/url";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
import Composer from "discourse/models/composer"; import Composer from "discourse/models/composer";
@ -230,7 +231,9 @@ const ApplicationRoute = DiscourseRoute.extend({
handleShowLogin() { handleShowLogin() {
if (this.siteSettings.enable_discourse_connect) { if (this.siteSettings.enable_discourse_connect) {
const returnPath = encodeURIComponent(window.location.pathname); const returnPath = cookie("destination_url")
? getURL("/")
: encodeURIComponent(window.location.pathname);
window.location = getURL("/session/sso?return_path=" + returnPath); window.location = getURL("/session/sso?return_path=" + returnPath);
} else { } else {
this.modal.show(LoginModal, { this.modal.show(LoginModal, {