Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #9032, fix login redirect for sso plugins

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-12-02 12:42:21 -05:00
parent b771a5733b
commit 6f68f4d20a
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/src/ajaxify.js
View File

@@ -155,16 +155,12 @@ ajaxify = window.ajaxify || {};
app.alertError('[[global:please_log_in]]'); app.alertError('[[global:please_log_in]]');
app.previousUrl = url; app.previousUrl = url;
window.location.href = config.relative_path + '/login'; window.location.href = config.relative_path + '/login';
} else if (status === 302 || status === 308) { } else if ((status === 302 || status === 308) && typeof data.responseJSON === 'string') {
if (data.responseJSON && data.responseJSON.external) { ajaxifyTimer = undefined;
window.location.href = data.responseJSON.external; if (data.responseJSON.startsWith('http://') || data.responseJSON.startsWith('https://')) {
} else if (typeof data.responseJSON === 'string') { window.location.href = data.responseJSON;
ajaxifyTimer = undefined; } else {
if (data.responseJSON.startsWith('http://') || data.responseJSON.startsWith('https://')) { ajaxify.go(data.responseJSON.slice(1), callback, quiet);
window.location.href = data.responseJSON;
} else {
ajaxify.go(data.responseJSON.slice(1), callback, quiet);
}
} }
} }
} else if (textStatus !== 'abort') { } else if (textStatus !== 'abort') {

7
src/controllers/index.js
View File

@@ -125,12 +125,7 @@ Controllers.login = async function (req, res) {
data.allowLocalLogin = hasLoginPrivilege || parseInt(req.query.local, 10) === 1; data.allowLocalLogin = hasLoginPrivilege || parseInt(req.query.local, 10) === 1;
if (!data.allowLocalLogin && !data.allowRegistration && data.alternate_logins && data.authentication.length === 1) { if (!data.allowLocalLogin && !data.allowRegistration && data.alternate_logins && data.authentication.length === 1) {
if (res.locals.isAPI) { return helpers.redirect(res, data.authentication[0].url);
return helpers.redirect(res, {
external: nconf.get('relative_path') + data.authentication[0].url,
});
}
return res.redirect(nconf.get('relative_path') + data.authentication[0].url);
} }
if (req.loggedIn) { if (req.loggedIn) {