Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

New logout system

Smaug673934520f2d92d2
diff --git a/backend/classes/SessionsManager.ts b/backend/classes/SessionsManager.ts
index 2ad697ca..4d3f2add 100644
--- a/backend/classes/SessionsManager.ts
+++ b/backend/classes/SessionsManager.ts
@@ -5,6 +5,7 @@ import type { Session, SessionDB } from '../types';
export class SessionsManager extends Base {
constructor(app: App) {
super(app);
+ this.deleteOldSessions();
setInterval(() => this.deleteOldSessions(), 1000 * 60 * 60); // 1 hour
}
@@ -76,6 +77,23 @@ export class SessionsManager extends Base {
});
});
}
+ markSessionInactive(refresh_token: string): Promise<boolean> {
+ return new Promise((resolve, reject) => {
+ this.app.db.query<SessionDB[]>('UPDATE sessions SET active = 0 WHERE refresh_token = ?', [refresh_token], async err => {
+ if (err) return reject('Internal database error.');
+ resolve(true);
+ });
+ });
+ }
+ markAllSessionsInactive(user_id: string): Promise<boolean> {
+ return new Promise((resolve, reject) => {
+ this.app.db.query<SessionDB[]>('UPDATE sessions SET active = 0 WHERE user_id = ?', [user_id], async err => {
+ if (err) return reject('Internal database error.');
+ resolve(true);
+ });
+ });
+ }
+
deleteOldSessions(): Promise<boolean> {
return new Promise((resolve, reject) => {
this.app.logger.info('[SESSIONS] Deleting old sessions...');
diff --git a/backend/controllers/auth.controller.ts b/backend/controllers/auth.controller.ts
index 99c4a1c2..d54d19cd 100644
--- a/backend/controllers/auth.controller.ts
+++ b/backend/controllers/auth.controller.ts
@@ -42,11 +42,35 @@ export default class Authentification extends BaseController<UsersManager> {
res.status(500).json(this.utils.error(e));
}
}
- public logout(_: Request, res: Response): void {
- res.clearCookie('user_auth', { domain: process.env.FRONT_DOMAIN });
- res.clearCookie('user_id', { domain: process.env.FRONT_DOMAIN });
- res.clearCookie('user_token', { domain: process.env.FRONT_DOMAIN });
- res.status(200).json(this.utils.success({ auth: false }));
+ public async logout(req: Request, res: Response) {
+ try {
+ res.clearCookie('user_auth', { domain: process.env.FRONT_DOMAIN });
+ res.clearCookie('user_id', { domain: process.env.FRONT_DOMAIN });
+ res.clearCookie('user_token', { domain: process.env.FRONT_DOMAIN });
+ res.clearCookie('user_refresh_token', { domain: process.env.FRONT_DOMAIN });
+
+ // Mark session as inactive
+ const refreshToken = req.cookies.user_refresh_token;
+ if (refreshToken) await this.sessions.markSessionInactive(refreshToken);
+
+ res.status(200).json(this.utils.success({ auth: false }));
+ } catch (e) {
+ res.status(500).json(this.utils.error(e));
+ }
+ }
+ public async logout_all(req: Request, res: Response) {
+ try {
+ const refreshToken = req.cookies.user_refresh_token;
+ if (!req.user_id) throw 'No user id provided';
+ if (refreshToken) await this.sessions.markAllSessionsInactive(req.user_id);
+ res.clearCookie('user_auth', { domain: process.env.FRONT_DOMAIN });
+ res.clearCookie('user_id', { domain: process.env.FRONT_DOMAIN });
+ res.clearCookie('user_token', { domain: process.env.FRONT_DOMAIN });
+ res.clearCookie('user_refresh_token', { domain: process.env.FRONT_DOMAIN });
+ res.status(200).json(this.utils.success({ auth: false }));
+ } catch (e) {
+ res.status(500).json(this.utils.error(e));
+ }
}
public async refresh_session(req: Request, res: Response) {
diff --git a/backend/routes/v1/auth.ts b/backend/routes/v1/auth.ts
index a1141f36..7687198e 100644
--- a/backend/routes/v1/auth.ts
+++ b/backend/routes/v1/auth.ts
@@ -1,5 +1,7 @@
import { Router } from 'express';
import AuthCtrl from '../../controllers/auth.controller';
+import authMid from '../../middlewares/auth';
+
const AuthRouter: Router = Router();
export default (client: App): Iroute => {
@@ -10,7 +12,8 @@ export default (client: App): Iroute => {
const controller = new AuthCtrl(client);
AuthRouter.post('/', (req, res) => controller.login(req, res));
AuthRouter.get('/refreshToken', (req, res) => controller.refresh_session(req, res));
- AuthRouter.get('/disconnection', (req, res) => controller.logout(req, res));
+ AuthRouter.post('/logout/all', authMid, (req, res) => controller.logout_all(req, res));
+ AuthRouter.post('/logout', authMid, (req, res) => controller.logout(req, res));
return AuthRouter;
},
};
diff --git a/frontend/composables/icons.ts b/frontend/composables/icons.ts
index 5355adfd..4eb28c1f 100644
--- a/frontend/composables/icons.ts
+++ b/frontend/composables/icons.ts
@@ -15,6 +15,7 @@ const icons = {
file: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path style="fill:var(--red);" d="M320-240h320v-80H320v80Zm0-160h320v-80H320v80ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520v-200H240v640h480v-440H520ZM240-800v200-200 640-640Z"/></svg>`,
file_parent: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path style="fill:var(--green);" d="M320-320h200v-200H320v200Zm0-280h480v-200H320v200Zm280 280h200v-200H600v200Zm-280 80q-33 0-56.5-23.5T240-320v-480q0-33 23.5-56.5T320-880h480q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H320ZM160-80q-33 0-56.5-23.5T80-160v-560h80v560h560v80H160Z"/></svg>`,
archive: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="none"><rect x="2.5" y="2.5" width="11" height="11" rx="1.5" fill="var(--grey-bg)" stroke="var(--grey)"/><rect x="6" y="4" width="2" height="2" rx="0.5" fill="var(--grey)"/><rect x="6" y="8" width="2" height="2" rx="0.5" fill="var(--grey)"/><rect x="8" y="10" width="2" height="2" rx="0.5" fill="var(--grey)"/><rect x="8" y="6" width="2" height="2" rx="0.5" fill="var(--grey)"/></svg>`,
+ logout: `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h280v80H200Zm440-160-55-58 102-102H360v-80h327L585-622l55-58 200 200-200 200Z"/></svg>`,
};
export type IconName = keyof typeof icons;
diff --git a/frontend/stores/user.store.ts b/frontend/stores/user.store.ts
index 594ad5cf..10c518a6 100644
--- a/frontend/stores/user.store.ts
+++ b/frontend/stores/user.store.ts
@@ -20,9 +20,7 @@ export const useUserStore = defineStore('user', {
return e;
}
},
- logout() {
- if (import.meta.client) localStorage.removeItem('isLoggedIn');
- },
+
register(user: Omit<User, 'id' | 'created_timestamp'>) {
return new Promise(async (resolve, reject) => {
const request = await makeRequest('users', 'POST', user);
@@ -77,5 +75,27 @@ export const useUserStore = defineStore('user', {
} else reject(request.message);
});
},
+ logout() {
+ return new Promise(async (resolve, reject) => {
+ if (!this.user) return;
+ const request = await makeRequest(`auth/logout`, 'POST', {});
+ if (request.status === 'success') {
+ return resolve(true);
+ } else reject(request.message);
+ });
+ },
+ logout_all() {
+ return new Promise(async (resolve, reject) => {
+ if (!this.user) return;
+ const request = await makeRequest(`auth/logout/all`, 'POST', {});
+ if (request.status === 'success') {
+ return resolve(true);
+ } else reject(request.message);
+ });
+ },
+ post_logout() {
+ this.user = undefined;
+ if (import.meta.client) localStorage.removeItem('isLoggedIn');
+ },
},
});