fix: user serialize

Author: froggagul

Diff for: .eslintrc.json

@@ -49,7 +49,7 @@
     "jest/no-identical-title": "error",
     "jest/prefer-to-have-length": "warn",
     "jest/valid-expect": "error",
-    "no-underscore-dangle": ["error", { "allow": ["_id"] }],
+    "no-underscore-dangle": ["error", { "allow": ["_id", "_json"] }],
     "@typescript-eslint/no-misused-promises": [
       "error",
       {

Diff for: package.json

@@ -16,36 +16,40 @@
   "dependencies": {
     "argon2": "^0.28.5",
     "bson": "^4.6.4",
+    "connect-mongo": "^4.6.0",
     "cookie-parser": "^1.4.6",
+    "cors": "^2.8.5",
     "cross-env": "^7.0.3",
     "dotenv": "^16.0.1",
     "express": "^4.18.1",
     "express-session": "^1.17.3",
     "helmet": "^5.1.0",
+    "lodash": "^4.17.21",
+    "mongodb": "^4.7.0",
+    "mongoose": "^6.4.0",
     "passport": "^0.6.0",
     "passport-github": "^1.1.0",
     "passport-google-oauth20": "^2.0.0",
     "passport-kakao": "^1.0.1",
-    "passport-local": "^1.0.0",
-    "lodash": "^4.17.21",
-    "mongodb": "^4.7.0",
-    "mongoose": "^6.4.0"
+    "passport-local": "^1.0.0"
   },
   "devDependencies": {
-    "@types/express-session": "^1.17.4",
     "@shelf/jest-mongodb": "^3.0.2",
+    "@types/connect-mongo": "^3.1.3",
     "@types/cookie-parser": "^1.4.3",
+    "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
+    "@types/express-session": "^1.17.4",
     "@types/jest": "^28.1.4",
     "@types/lodash": "^4.14.182",
     "@types/mongodb": "^4.0.7",
     "@types/mongoose": "^5.11.97",
     "@types/node": "^18.0.0",
     "@types/passport": "^1.0.9",
-    "@types/passport-local": "^1.0.34",
     "@types/passport-github": "^1.1.7",
     "@types/passport-google-oauth20": "^2.0.11",
     "@types/passport-kakao": "^1.0.0",
+    "@types/passport-local": "^1.0.34",
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "@typescript-eslint/parser": "^5.29.0",
     "eslint": "^7.32.0 || ^8.2.0",
@@ -61,11 +65,7 @@
     "ts-node-dev": "^2.0.0",
     "tsc-alias": "^1.6.11",
     "tsconfig-paths": "^4.0.0",
-    "typescript": "^4.7.4",
-    "helmet": "^5.1.0",
-    "lodash": "^4.17.21",
-    "mongodb": "^4.7.0",
-    "mongoose": "^6.4.0"
+    "typescript": "^4.7.4"
   },
   "lint-staged": {
     "src/**/*.ts": "eslint --fix",

Diff for: src/controllers/auth.ts

@@ -1,36 +1,34 @@
+/* eslint-disable consistent-return */
 import { NextFunction, Request, Response } from 'express';
 import passport from 'passport';
 import * as CONSTS from '@/utils/consts';
+import { isCompany, UserModel } from '@/interfaces/auth';
 
-export const signup = async (req: Request, res: Response) => {
+export const logout = (req: Request, res: Response) => {
   try {
-    if (req.isAuthenticated()) {
-      res.sendStatus(403);
-      return;
-    }
-    // TODO
-    const result = undefined;
-    res.json(result);
+    req.logout((err) => {
+      if (err) { return console.log(err); }
+      res.redirect('/');
+    });
   } catch (err) {
     console.log(err);
   }
 };
-
 export const localLogin = [
   (req: Request, res: Response, next: NextFunction) => {
     if (req.isAuthenticated()) {
-      res.sendStatus(403);
+      res.status(403).json({ reason: 'ALREADY LOGIN' });
     } else {
       next();
     }
   },
-  passport.authenticate('local', { failureRedirect: CONSTS.LOGIN_FAILURE_REDIRECT }),
+  passport.authenticate('local', { successRedirect: CONSTS.LOGIN_SUCCESS_REDIRECT, failureRedirect: CONSTS.LOGIN_FAILURE_REDIRECT }),
 ];
 
 export const googleLogin = [
   (req: Request, res: Response, next: NextFunction) => {
     if (req.isAuthenticated()) {
-      res.sendStatus(403);
+      res.status(403).json({ reason: 'ALREADY LOGIN' });
     } else {
       next();
     }
@@ -46,23 +44,20 @@ export const googleLogin = [
 export const kakaoLogin = [
   (req: Request, res: Response, next: NextFunction) => {
     if (req.isAuthenticated()) {
-      res.sendStatus(403);
+      res.status(403).json({ reason: 'ALREADY LOGIN' });
     } else {
       next();
     }
   },
   passport.authenticate('kakao', {
     successRedirect: CONSTS.LOGIN_SUCCESS_REDIRECT, failureRedirect: CONSTS.LOGIN_FAILURE_REDIRECT, scope: ['profile_nickname', 'account_email'],
   }),
-  (req: Request, res: Response) => {
-    res.json({ success: true });
-  },
 ];
 
 export const githubLogin = [
   (req: Request, res: Response, next: NextFunction) => {
     if (req.isAuthenticated()) {
-      res.sendStatus(403);
+      res.status(403).json({ reason: 'ALREADY LOGIN' });
     } else {
       next();
     }
@@ -74,3 +69,12 @@ export const githubLogin = [
     res.json({ success: true });
   },
 ];
+
+export const getSessionUser = (req: Request, res: Response) => {
+  if (req.user) {
+    res.send({
+      type: req.user?.type,
+      ...req.user?.userData,
+    });
+  }
+};

Diff for: src/controllers/company.ts

@@ -0,0 +1,30 @@
+import { Request, Response, NextFunction } from 'express';
+import * as CompanyService from '@/services/auth/company';
+import { CompanySignup } from '@/interfaces/auth';
+
+export async function get(req: Request<{ id: string }>, res: Response, next: NextFunction) {
+  try {
+    const result = await CompanyService.get(req.params.id);
+    res.json(result);
+  } catch (err) {
+    next(err);
+  }
+}
+
+export async function create(
+  req: Request<Record<string, never>, Record<string, never>, { data: CompanySignup }>,
+  res: Response,
+  next: NextFunction,
+) {
+  try {
+    const result = await CompanyService.create({
+      name: req.body.data.username,
+      username: req.body.data.username,
+      password: req.body.data.password,
+      level: req.body.data.level,
+    });
+    res.json(result);
+  } catch (err) {
+    next(err);
+  }
+}

Diff for: src/controllers/team.ts

@@ -65,7 +65,10 @@ export async function addUser(
 ) {
   try {
     if (req.isAuthenticated()) {
-      const result = await TeamService.addUser(req.params.id, req.user.id); // todo - user id type
+      const result = await TeamService.addUser(
+        req.params.id,
+        req.user.userData.id,
+      ); // todo - user id type
       res.json(result);
     } else {
       throw new Error('Unauthenticated User');

Diff for: src/index.ts

@@ -1,14 +1,22 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import express from 'express';
 import helmet from 'helmet';
 import http from 'http';
-import cookieParser from 'cookie-parser';
 import mongoose from 'mongoose';
+import MongoStore from 'connect-mongo';
 import dotenv from 'dotenv';
-import router from '@/routes';
 import session from 'express-session';
 import passport from 'passport';
-import * as Passport from './utils/passport';
 
+import router from '@/routes';
+import * as Passport from '@/utils/passport';
+
+declare module 'express-session' {
+  interface SessionData {
+    passport: any;
+  }
+}
 if (process.env.NODE_ENV === 'development') {
   dotenv.config({
     path: '.env',
@@ -46,15 +54,20 @@ async function expressLoader() {
   // parsers
   app.use(express.json());
   app.use(express.urlencoded({ extended: true }));
-  app.use(cookieParser());
 
-  app.use(router);
   // app.use(errorHandler); // todo - error handler
-
+  app.enable('trust proxy');
   app.use(session({
+    cookie: {
+      secure: false,
+      httpOnly: false,
+      maxAge: 3 * 24 * 60 * 60 * 1000, // 3 day
+      // sameSite: 'none',
+    },
     secret: process.env.SESSION_SECRET_KEY!,
-    resave: true,
-    saveUninitialized: true,
+    resave: false,
+    saveUninitialized: false,
+    store: MongoStore.create({ mongoUrl: process.env.MONGO_HOST }),
   }));
 
   app.use(passport.initialize());
@@ -66,6 +79,7 @@ async function expressLoader() {
   passport.serializeUser(Passport.serialize);
   passport.deserializeUser(Passport.deserialize);
 
+  app.use(router);
   app.all('*', (_, res) => {
     res.status(404).json({ error: { message: 'URL Not Found' } });
   });

Diff for: src/interfaces/auth.ts

@@ -31,13 +31,13 @@ export interface User {
 export interface Company {
   name: string;
   profile?: Profile;
+  level: number;
 }
 
 // fields that not be shown
 export interface CompanySignup extends Company {
   username: string;
   password: string;
-  level: number;
 }
 
 export interface UserModel extends User {

Diff for: src/interfaces/passport.d.ts

@@ -1,15 +1,13 @@
-import { UserModel as UserType, CompanyModel as CompanyType } from '@/interfaces/auth';
-import { Request } from 'express';
+import { GeneralUser } from '@/interfaces/auth';
 
 declare global {
-    namespace Express {
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  interface AuthInfo {}
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  interface User extends UserType, CompanyType {}
-//   type User = UserType | CompanyType
+  namespace Express {
+    // eslint-disable-next-line @typescript-eslint/no-empty-interface
+    interface AuthInfo {}
+    // eslint-disable-next-line @typescript-eslint/no-empty-interface
+    interface User extends GeneralUser {}
 
-  interface Request {
+    interface Request {
       authInfo?: AuthInfo | undefined;
       user?: User | undefined;
 
@@ -28,14 +26,14 @@ declare global {
       isAuthenticated(): this is AuthenticatedRequest;
       // eslint-disable-next-line no-use-before-define
       isUnauthenticated(): this is UnauthenticatedRequest;
-  }
+    }
 
-  interface AuthenticatedRequest extends Request {
+    interface AuthenticatedRequest extends Request {
       user: User;
-  }
+    }
 
-  interface UnauthenticatedRequest extends Request {
+    interface UnauthenticatedRequest extends Request {
       user?: undefined;
-  }
+    }
   }
 }