Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

(fix)redirectBareDomain not working when MFA is on (#6961)

Browse Source
This commit is contained in:
Elian Doran
2025-09-14 11:18:20 +03:00
committed by GitHub
parent 3a02ad7836 c79c21e965
commit d8386bfbe8
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/server/src/services/auth.ts
View File

@@ -26,20 +26,8 @@ function checkAuth(req: Request, res: Response, next: NextFunction) {
if (isElectron || noAuthentication) { if (isElectron || noAuthentication) {
next(); next();
return; return;
} else if (currentTotpStatus !== lastAuthState.totpEnabled || currentSsoStatus !== lastAuthState.ssoEnabled) {
req.session.destroy((err) => {
if (err) console.error('Error destroying session:', err);
res.redirect('login');
});
return;
} else if (currentSsoStatus) {
if (req.oidc?.isAuthenticated() && req.session.loggedIn) {
next();
return;
}
res.redirect('login');
return;
} else if (!req.session.loggedIn && !noAuthentication) { } else if (!req.session.loggedIn && !noAuthentication) {
// check redirectBareDomain option first
// cannot use options.getOptionBool currently => it will throw an error on new installations // cannot use options.getOptionBool currently => it will throw an error on new installations
// TriliumNextTODO: look into potentially creating an getOptionBoolOrNull instead // TriliumNextTODO: look into potentially creating an getOptionBoolOrNull instead
@@ -54,6 +42,19 @@ function checkAuth(req: Request, res: Response, next: NextFunction) {
} }
} }
res.redirect(hasRedirectBareDomain ? "share" : "login"); res.redirect(hasRedirectBareDomain ? "share" : "login");
} else if (currentTotpStatus !== lastAuthState.totpEnabled || currentSsoStatus !== lastAuthState.ssoEnabled) {
req.session.destroy((err) => {
if (err) console.error('Error destroying session:', err);
res.redirect('login');
});
return;
} else if (currentSsoStatus) {
if (req.oidc?.isAuthenticated() && req.session.loggedIn) {
next();
return;
}
res.redirect('login');
return;
} else { } else {
next(); next();
} }