diff --git a/api/src/middlewares/authenticateToken.ts b/api/src/middlewares/authenticateToken.ts index 1cc8dd5..9543080 100644 --- a/api/src/middlewares/authenticateToken.ts +++ b/api/src/middlewares/authenticateToken.ts @@ -29,7 +29,7 @@ const authenticateToken = ( tokenType: 'accessToken' | 'refreshToken' = 'accessToken' ) => { const { MODE } = process.env - if (MODE === 'desktop') return next() + if (MODE?.trim() === 'desktop') return next() const authHeader = req.headers['authorization'] const token = authHeader?.split(' ')[1] diff --git a/api/src/middlewares/desktopRestrict.ts b/api/src/middlewares/desktopRestrict.ts index 7c744b0..0f45aa7 100644 --- a/api/src/middlewares/desktopRestrict.ts +++ b/api/src/middlewares/desktopRestrict.ts @@ -1,6 +1,6 @@ export const desktopRestrict = (req: any, res: any, next: any) => { const { MODE } = process.env - if (MODE === 'desktop') + if (MODE?.trim() === 'desktop') return res.status(403).send('Not Allowed while in Desktop Mode.') next() diff --git a/api/src/middlewares/verifyAdmin.ts b/api/src/middlewares/verifyAdmin.ts index 69d5010..2d94a7e 100644 --- a/api/src/middlewares/verifyAdmin.ts +++ b/api/src/middlewares/verifyAdmin.ts @@ -1,6 +1,6 @@ export const verifyAdmin = (req: any, res: any, next: any) => { const { MODE } = process.env - if (MODE === 'desktop') return next() + if (MODE?.trim() === 'desktop') return next() const { user } = req if (!user?.isAdmin) return res.status(401).send('Admin account required') diff --git a/api/src/routes/api/auth.ts b/api/src/routes/api/auth.ts index 42b0599..db7e91c 100644 --- a/api/src/routes/api/auth.ts +++ b/api/src/routes/api/auth.ts @@ -26,7 +26,7 @@ export const populateClients = async () => { export const connectDB = () => { const { MODE } = process.env - if (MODE === 'desktop') { + if (MODE?.trim() === 'desktop') { console.log('Running in Destop Mode, no DB to connect.') return } diff --git a/api/src/routes/web/web.ts b/api/src/routes/web/web.ts index d247736..3006d01 100644 --- a/api/src/routes/web/web.ts +++ b/api/src/routes/web/web.ts @@ -9,7 +9,7 @@ webRouter.get('/', async (_, res) => { const indexHtmlPath = path.join(getWebBuildFolderPath(), 'index.html') const { MODE } = process.env - if (MODE === 'desktop') { + if (MODE?.trim() === 'desktop') { const content = await readFile(indexHtmlPath) const codeToInject = `