self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2026-06-18 20:16:34 +02:00
Code Issues Releases Activity

Server: Fixes #13368: Cannot login with SAML when already logged in on the browser

Browse Source
This commit is contained in:
Laurent Cozic
2025-10-28 16:59:42 +01:00
parent a4556bf598
commit 7b95ef72a0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/routes/index/login.ts
+3 -3
View File
@@ -44,12 +44,12 @@ router.get('login', async (_path: SubPath, ctx: AppContext) => {
router.get('login/:id', async (path: SubPath, ctx: AppContext) => {
if (!config().saml.enabled) throw new ErrorForbidden('SAML not enabled');
if (ctx.joplin.owner) { // Already logged-in
return redirect(ctx, homeUrl());
} else if (config().saml.enabled && path.id === 'sso-saml') { // Server page, SAML
if (config().saml.enabled && path.id === 'sso-saml') { // Server page, SAML
return await generateRedirectHtml('web-login');
} else if (config().saml.enabled && path.id === 'sso-saml-app') { // Client, SAML
return await generateRedirectHtml('app-login');
} else if (ctx.joplin.owner) { // Already logged-in
return redirect(ctx, homeUrl());
} else {
return makeView();
}