Move UserAccount interface in dedicated file

e-adrien · Dec 4, 2024 · faf6587 · faf6587
1 parent 4dabe4e
commit faf6587
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/server/@types/express/index.d.ts b/server/@types/express/index.d.ts
@@ -1,4 +1,4 @@
-import { UserAccount } from "../../middlewares/authentication";
+import { UserAccount } from "../../interfaces/index.js";
 
 export {};
 
@@ -21,7 +21,7 @@ declare module "express-session" {
   interface SessionData {
     passport:
       | {
-          user: string | UserAccount | undefined;
+          user: UserAccount | string | undefined;
         }
       | undefined;
   }

diff --git a/server/interfaces/index.ts b/server/interfaces/index.ts
@@ -0,0 +1,3 @@
+export type UserAccount = {
+  username: string;
+};
diff --git a/server/middlewares/authentication.ts b/server/middlewares/authentication.ts
@@ -3,6 +3,7 @@ import { NextFunction, Request, Response, Router } from "express";
 import nconf from "nconf";
 import passport from "passport";
 import { Strategy as LocalStrategy } from "passport-local";
+import { UserAccount } from "../interfaces/index.js";
 
 export const kUrlLoginPage = "/auth/login";
 export const kUrlLogoutPage = "/auth/logout";
@@ -18,10 +19,6 @@ type AuthenticateCallback = (
   info: { message: string } | undefined
 ) => void;
 
-export type UserAccount = {
-  username: string;
-};
-
 function checkCredential(username: string, password: string, credential: Credential): boolean {
   return (
     credential.username === username &&
@@ -55,7 +52,7 @@ export function authentication() {
   );
 
   // Add serializers
-  passport.serializeUser(function (user: UserAccount, done) {
+  passport.serializeUser(function (user: UserAccount, done: (err?: Error | null, id?: unknown) => void) {
     done(null, user.username);
   });
   passport.deserializeUser(async function (username: string, done) {