discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-05 18:59:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: redirect to original URL when logging in via OAuth

Browse Source
This commit is contained in:
Arpit Jalan 2015-09-18 18:29:57 +05:30
parent f37f6f7673
commit 7abd4687e2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/controllers/login.js.es6
View File

@ -184,7 +184,12 @@ export default Ember.Controller.extend(ModalFunctionality, {
// Reload the page if we're authenticated
if (options.authenticated) {
if (window.location.pathname === Discourse.getURL('/login')) {
const destinationUrl = $.cookie('destination_url');
if (self.get('loginRequired') && destinationUrl) {
// redirect client to the original URL
$.cookie('destination_url', null);
window.location.href = destinationUrl;
} else if (window.location.pathname === Discourse.getURL('/login')) {
window.location.pathname = Discourse.getURL('/');
} else {
window.location.reload();