fix: login with session

Author: masb0ymas

docs/swagger/routes/auth.js

@@ -110,6 +110,40 @@ module.exports = {
       },
     },
   },
+  '/auth/verify-session': {
+    get: {
+      tags: ['Auth'],
+      summary: 'Verify Session',
+      produces: ['application/json'],
+      security: [
+        {
+          auth_token: [],
+        },
+      ],
+      responses: {
+        200: {
+          description: 'Verify Session',
+        },
+      },
+    },
+  },
+  '/profile': {
+    get: {
+      tags: ['Auth'],
+      summary: 'Get Profile',
+      produces: ['application/json'],
+      security: [
+        {
+          auth_token: [],
+        },
+      ],
+      responses: {
+        200: {
+          description: 'Get Profile',
+        },
+      },
+    },
+  },
   '/logout': {
     post: {
       tags: ['Auth'],
@@ -143,21 +177,4 @@ module.exports = {
       },
     },
   },
-  '/profile': {
-    get: {
-      tags: ['Auth'],
-      summary: 'Get Profile',
-      produces: ['application/json'],
-      security: [
-        {
-          auth_token: [],
-        },
-      ],
-      responses: {
-        200: {
-          description: 'Get Profile',
-        },
-      },
-    },
-  },
 }

src/controllers/Auth/controller.ts

@@ -5,12 +5,12 @@ import Authorization from 'middlewares/Authorization'
 import BuildResponse from 'modules/Response/BuildResponse'
 import RefreshTokenService from 'controllers/RefreshToken/service'
 import AuthService from 'controllers/Auth/service'
+import { currentToken } from 'helpers/Token'
 
 routes.post(
   '/auth/sign-up',
   asyncHandler(async function signUp(req: Request, res: Response) {
     const formData = req.getBody()
-
     const data = await AuthService.signUp(formData)
     const buildResponse = BuildResponse.get(data)
 
@@ -22,7 +22,7 @@ routes.post(
   '/auth/sign-in',
   asyncHandler(async function signIn(req: Request, res: Response) {
     const formData = req.getBody()
-    const data = await AuthService.signIn(formData)
+    const data = await AuthService.signIn(req, formData)
     const buildResponse = BuildResponse.get(data)
 
     return res
@@ -55,22 +55,36 @@ routes.get(
   asyncHandler(async function getProfile(req: Request, res: Response) {
     const userData = req.getState('userLogin')
 
-    // @ts-ignore
     const data = await AuthService.profile(userData)
     const buildResponse = BuildResponse.get({ data })
 
     return res.status(200).json(buildResponse)
   })
 )
 
+routes.get(
+  '/auth/verify-session',
+  Authorization,
+  asyncHandler(async function getProfile(req: Request, res: Response) {
+    const userData = req.getState('userLogin')
+    const getToken = currentToken(req)
+
+    const data = await AuthService.verifySession(userData.id, getToken)
+    const buildResponse = BuildResponse.get({ data })
+
+    return res.status(200).json(buildResponse)
+  })
+)
+
 routes.post(
   '/logout',
   Authorization,
   asyncHandler(async function logout(req: Request, res: Response) {
     const { UserId } = req.getBody()
     const userData = req.getState('userLogin')
+    const getToken = currentToken(req)
 
-    const message = await AuthService.logout(UserId, userData)
+    const message = await AuthService.logout(UserId, userData, getToken)
     const buildResponse = BuildResponse.deleted({ message })
 
     return res.clearCookie('token', { path: '/v1' }).json(buildResponse)

src/controllers/Auth/service.ts

@@ -10,8 +10,14 @@ import { UserAttributes, LoginAttributes } from 'models/user'
 import SendMail from 'helpers/SendEmail'
 import RefreshTokenService from 'controllers/RefreshToken/service'
 import UserService from 'controllers/User/service'
+import SessionService from 'controllers/Session/service'
+import { Request } from 'express'
+import userAgentHelper from 'helpers/userAgent'
+import { verifyAccessToken } from 'helpers/Token'
+import { isEmpty } from 'lodash'
 
 const { User, Role } = models
+const including = [{ model: Role }]
 
 const { JWT_SECRET_ACCESS_TOKEN, JWT_SECRET_REFRESH_TOKEN }: any = process.env
 
@@ -42,6 +48,9 @@ class AuthService {
    * @param formData
    */
   public static async signUp(formData: UserAttributes) {
+    // check duplicate email
+    await UserService.validateUserEmail(formData.email)
+
     const generateToken = {
       code: getUniqueCodev2(),
     }
@@ -72,7 +81,9 @@ class AuthService {
    *
    * @param formData
    */
-  public static async signIn(formData: LoginAttributes) {
+  public static async signIn(req: Request, formData: LoginAttributes) {
+    const { clientIp, useragent } = req
+
     const value = useValidation(schemaAuth.login, formData)
 
     const userData = await User.scope('withPassword').findOne({
@@ -115,12 +126,20 @@ class AuthService {
           }
         )
 
-        const formDataRefreshToken = {
+        // create refresh token
+        await RefreshTokenService.create({
           UserId: userData.id,
           token: refreshToken,
-        }
+        })
 
-        await RefreshTokenService.create(formDataRefreshToken)
+        // create session
+        await SessionService.create({
+          UserId: userData.id,
+          token: accessToken,
+          ipAddress: clientIp?.replace('::ffff:', ''),
+          device: userAgentHelper.currentDevice(req),
+          platform: useragent?.platform,
+        })
 
         // create directory
         await createDirectory(userData.id)
@@ -144,13 +163,26 @@ class AuthService {
     )
   }
 
+  public static async verifySession(UserId: string, token: string) {
+    const sessionUser = await SessionService.findByTokenUser(UserId, token)
+    const verifyToken = verifyAccessToken(sessionUser.token)
+
+    if (!isEmpty(verifyToken?.data)) {
+      // @ts-ignore
+      const data = await User.findByPk(verifyToken?.data?.id, {
+        include: including,
+      })
+      return data
+    }
+
+    return null
+  }
+
   /**
    *
    * @param token
    */
   public static async profile(userData: UserAttributes) {
-    const including = [{ model: Role }]
-
     const data = await User.findByPk(userData.id, { include: including })
     return data
   }
@@ -159,15 +191,17 @@ class AuthService {
    *
    * @param UserId
    */
-  public static async logout(UserId: string, userData: any) {
+  public static async logout(UserId: string, userData: any, token: string) {
     if (userData?.id !== UserId) {
       throw new ResponseError.Unauthorized('Invalid user login!')
     }
 
     const data = await UserService.getOne(UserId)
 
-    // remove refresh token by user id
+    // clean refresh token & session
     await RefreshTokenService.delete(data.id)
+    await SessionService.deleteByTokenUser(data.id, token)
+
     const message = 'You have logged out of the application'
 
     return message