diff --git a/src/services/auth.ts b/src/services/auth.ts index 7d55c3d32..d1d951fc0 100644 --- a/src/services/auth.ts +++ b/src/services/auth.ts @@ -39,8 +39,12 @@ function checkAuth(req: Request, res: Response, next: NextFunction) { res.redirect('login'); return; } else if (!req.session.loggedIn && !noAuthentication) { - const redirectToShare = options.getOptionBool("redirectBareDomain"); - if (redirectToShare) { + + // cannot use options.getOptionBool currently => it will throw an error on new installations + // TriliumNextTODO: look into potentially creating an getOptionBoolOrNull instead + const hasRedirectBareDomain = options.getOptionOrNull("redirectBareDomain") === "true"; + + if (hasRedirectBareDomain) { // Check if any note has the #shareRoot label const shareRootNotes = attributes.getNotesWithLabel("shareRoot"); if (shareRootNotes.length === 0) { @@ -48,12 +52,14 @@ function checkAuth(req: Request, res: Response, next: NextFunction) { return; } } - res.redirect(redirectToShare ? "share" : "login"); + res.redirect(hasRedirectBareDomain ? "share" : "login"); } else { next(); } } + + // for electron things which need network stuff // currently, we're doing that for file upload because handling form data seems to be difficult function checkApiAuthOrElectron(req: Request, res: Response, next: NextFunction) {