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

merge

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-09-21 17:04:17 -04:00
parent e6c9585ae6
commit 3675d343ef
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/controllers/authentication.js
View File

@@ -263,7 +263,7 @@ function continueLogin(strategy, req, res, next) {
passport.authenticate(strategy, async (err, userData, info) => {
if (err) {
plugins.hooks.fire('action:login.continue', { req, strategy, userData, error: err });
return helpers.noScriptErrors(req, res, err.message, 403);
return helpers.noScriptErrors(req, res, err.data || err.message, 403);
}
if (!userData) {
@@ -423,8 +423,7 @@ authenticationController.localLogin = async function (req, username, password, n
userData.isAdminOrGlobalMod = isAdminOrGlobalMod;
if (!canLoginIfBanned) {
const banMesage = await getBanInfo(uid);
return next(new Error(banMesage));
return next(await getBanError(uid));
}
// Doing this after the ban check, because user's privileges might change after a ban expires
@@ -483,19 +482,19 @@ authenticationController.logout = async function (req, res, next) {
}
};
async function getBanInfo(uid) {
async function getBanError(uid) {
try {
const banInfo = await user.getLatestBanInfo(uid);
if (!banInfo.reason) {
banInfo.reason = await translator.translate('[[user:info.banned-no-reason]]');
banInfo.reason = '[[user:info.banned-no-reason]]';
}
return banInfo.banned_until ?
`[[error:user-banned-reason-until, ${banInfo.banned_until_readable}, ${banInfo.reason}]]` :
`[[error:user-banned-reason, ${banInfo.reason}]]`;
const err = new Error(banInfo.reason);
err.data = banInfo;
return err;
} catch (err) {
if (err.message === 'no-ban-info') {
return '[[error:user-banned]]';
return new Error('[[error:user-banned]]');
}
throw err;
}