fix: review

src/localeDetector.ts

@@ -1,24 +1,18 @@
-// https://i18n.nuxtjs.org/docs/guide/server-side-translations
-// Detect based on query, cookie, header
 export default defineI18nLocaleDetector((event, config) => {
-  // try to get locale from query
+  const query = tryQueryLocale(event, { lang: '' });
-  const query = tryQueryLocale(event, { lang: '' }); // disable locale default value with `lang` option
   if (query) {
     return query.toString();
   }
 
-  // try to get locale from cookie
+  const cookie = tryCookieLocale(event, { lang: '', name: 'i18n_locale' });
-  const cookie = tryCookieLocale(event, { lang: '', name: 'i18n_locale' }); // disable locale default value with `lang` option
   if (cookie) {
     return cookie.toString();
   }
 
-  // try to get locale from header (`accept-header`)
+  const header = tryHeaderLocale(event, { lang: '' });
-  const header = tryHeaderLocale(event, { lang: '' }); // disable locale default value with `lang` option
   if (header) {
     return header.toString();
   }
 
-  // If the locale cannot be resolved up to this point, it is resolved with the value `defaultLocale` of the locale config passed to the function
   return config.defaultLocale;
 });

src/server/api/account/new.post.ts

@@ -1,4 +1,4 @@
-import { DatabaseError } from '~/repositories/database';
+import { DatabaseError } from '~/services/database/repositories/database';
 
 export default defineEventHandler(async (event) => {
   setHeader(event, 'Content-Type', 'application/json');

src/server/api/lang.get.ts

@@ -1,4 +1,4 @@
-export default defineEventHandler(async (event) => {
+export default defineEventHandler((event) => {
   setHeader(event, 'Content-Type', 'application/json');
   return Database.getLang();
 });

src/server/api/session.post.ts

@@ -24,16 +24,23 @@ export default defineEventHandler(async (event) => {
 
   // TODO: timing againts timing attack
 
-  const conf: SessionConfig = SESSION_CONFIG;
+  const system = await Database.getSystem();
+  if (!system)
+    throw createError({
+      statusCode: 500,
+      statusMessage: 'Invalid',
+    });
+
+  const conf: SessionConfig = system.sessionConfig;
   if (MAX_AGE && remember) {
     conf.cookie = {
-      ...(SESSION_CONFIG.cookie ?? {}),
+      ...(system.sessionConfig.cookie ?? {}),
       maxAge: MAX_AGE,
     };
   }
 
   const session = await useSession(event, {
-    ...SESSION_CONFIG,
+    ...system.sessionConfig,
   });
 
   const data = await session.update({

src/server/middleware/session.ts

@@ -11,7 +11,14 @@ export default defineEventHandler(async (event) => {
   ) {
     return;
   }
-  const session = await getSession(event, SESSION_CONFIG);
+  const system = await Database.getSystem();
+  if (!system)
+    throw createError({
+      statusCode: 500,
+      statusMessage: 'Invalid',
+    });
+
+  const session = await getSession(event, system.sessionConfig);
   if (session.id && session.data.authenticated) {
     return;
   }

src/server/utils/session.ts

@@ -4,6 +4,8 @@ export type WGSession = {
   authenticated: boolean;
 };
 
-export function useWGSession(event: H3Event) {
+export async function useWGSession(event: H3Event) {
-  return useSession<Partial<WGSession>>(event, SESSION_CONFIG);
+  const system = await Database.getSystem();
+  if (!system) throw new Error('Invalid');
+  return useSession<Partial<WGSession>>(event, system.sessionConfig);
 }

src/services/database/inmemory.ts

@@ -2,26 +2,25 @@ import debug from 'debug';
 import packageJson from '@/package.json';
 import crypto from 'node:crypto';
 
-import DatabaseProvider, { DatabaseError } from '~/repositories/database';
+import DatabaseProvider, { DatabaseError } from './repositories/database';
-import { ChartType, Lang } from '~/repositories/types';
+import { ChartType, Lang } from './repositories/types';
 
-import type { SessionConfig } from 'h3';
+import type { ID } from './repositories/types';
-import type { ID } from '~/repositories/types';
+import type { System } from './repositories/system/model';
-import type { System } from '~/repositories/system/model';
+import type { User } from './repositories/user/model';
-import type { User } from '~/repositories/user/model';
 import { hashPassword, isPasswordStrong } from '~/server/utils/password';
 
 const DEBUG = debug('InMemoryDB');
 
 // Represent in-memory data structure
 type InMemoryData = {
-  system?: System;
+  system: System | null;
-  users: Array<User>;
+  users: User[];
 };
 
 // In-Memory Database Provider
 export default class InMemory extends DatabaseProvider {
-  protected data: InMemoryData = { users: [] };
+  protected data: InMemoryData = { system: null, users: [] };
 
   async connect() {
     DEBUG('Connection...');
@@ -69,7 +68,7 @@ export default class InMemory extends DatabaseProvider {
         password: '',
         name: 'wg-easy',
         cookie: undefined,
-      } satisfies SessionConfig,
+      },
     };
 
     this.data.system = system;
@@ -77,7 +76,7 @@ export default class InMemory extends DatabaseProvider {
   }
 
   async disconnect() {
-    this.data = { users: [] };
+    this.data = { system: null, users: [] };
   }
 
   async getSystem() {

src/repositories/database.ts → src/services/database/repositories/database.ts

@@ -1,6 +1,6 @@
 import type SystemRepository from './system/repository';
 import type UserRepository from './user/repository.ts';
-import type { Undefined, Lang, ID } from './types';
+import type { Lang, ID } from './types';
 import type { User } from './user/model';
 import type { System } from './system/model';
 
@@ -24,11 +24,11 @@ export default abstract class DatabaseProvider
    */
   abstract disconnect(): Promise<void>;
 
-  abstract getSystem(): Promise<System | Undefined>;
+  abstract getSystem(): Promise<System | null>;
   abstract getLang(): Promise<Lang>;
 
   abstract getUsers(): Promise<Array<User>>;
-  abstract getUser(id: ID): Promise<User | Undefined>;
+  abstract getUser(id: ID): Promise<User | undefined>;
   abstract newUserWithPassword(
     username: string,
     password: string

src/repositories/system/repository.ts → src/services/database/repositories/system/repository.ts

@@ -1,4 +1,4 @@
-import type { Lang, Undefined } from '../types';
+import type { Lang } from '../types';
 import type { System } from './model';
 
 /**
@@ -9,10 +9,10 @@ import type { System } from './model';
 export default interface SystemRepository {
   /**
    * Retrieves the system configuration data from the database.
-   * @returns {Promise<System | Undefined>} A promise that resolves to the system data
+   * @returns {Promise<System | null>} A promise that resolves to the system data
    * if found, or `undefined` if the system data is not available.
    */
-  getSystem(): Promise<System | Undefined>;
+  getSystem(): Promise<System | null>;
 
   /**
    * Retrieves the system's language setting.

src/repositories/types.ts → src/services/database/repositories/types.ts

@@ -1,6 +1,5 @@
 import type * as crypto from 'node:crypto';
 
-export type Undefined = null | undefined | 0 | '';
 export enum Lang {
   /* english */
   EN = 'en',
@@ -46,5 +45,5 @@ export type TrafficStats = {
 };
 export type Prometheus = {
   enabled: boolean;
-  password?: HashPassword | Undefined;
+  password: HashPassword | null;
 };

src/repositories/user/repository.ts.ts → src/services/database/repositories/user/repository.ts.ts

@@ -1,4 +1,4 @@
-import type { ID, Undefined } from '../types';
+import type { ID } from '../types';
 import type { User } from './model';
 
 /**
@@ -15,10 +15,10 @@ export default interface UserRepository {
   /**
    * Retrieves a user by their ID or User object from the database.
    * @param {ID} id - The ID of the user or a User object.
-   * @returns {Promise<User | Undefined>} A promise that resolves to the user data
+   * @returns {Promise<User | undefined>} A promise that resolves to the user data
    * if found, or `undefined` if the user is not available.
    */
-  getUser(id: ID): Promise<User | Undefined>;
+  getUser(id: ID): Promise<User | undefined>;
 
   newUserWithPassword(username: string, password: string): Promise<void>;