updtae

src/controllers/auth.ts

@@ -46,19 +46,11 @@ export class AuthController {
 			const userRepository = OrmHelper.DB.getRepository(User)
 			const userRefreshTokenRepository = OrmHelper.DB.getRepository(UserRefreshToken)
 
-<<<<<<< HEAD
-		const user = await userRepository.findOne({
-			relations: ["roles", "roles.application", "employee"],
-			select: ["id", "email", "name", "password", "username", "roles"],
-			where: { username: param.username },
-		})
-=======
 			const user = await userRepository.findOne({
 				relations: ["roles", "roles.application"],
 				select: ["id", "email", "name", "password", "username", "roles"],
 				where: { username: param.username },
 			})
->>>>>>> f562ccf38baffaa1cb6caf8a196127fe2512c7e4
 
 			if (user != null && user.roles != null && user.roles.length > 0 && user.checkIfPasswordMatch(param.password)) {
 				const { browser, device, os } = UAParser(req.get("User-Agent"))
@@ -108,19 +100,6 @@ export class AuthController {
 
 					var privateKey = fs.readFileSync("src/helpers/key/private.key")
 
-<<<<<<< HEAD
-				var token = jwt.sign(
-					{
-						exp: Math.floor(Date.now() / 1000) + Number(config.get("auth.access_token_lifetime")),
-						data: {
-							id: user.id,
-							username: user.username,
-							name: user.name,
-							id_role: role_id,
-							roles: roles.roles,
-							employee_id: user.employee?.id || null,
-							hrms: hrms,
-=======
 					var token = jwt.sign(
 						{
 							exp: Math.floor(Date.now() / 1000) + Number(config.get("auth.access_token_lifetime")),
@@ -132,7 +111,6 @@ export class AuthController {
 								roles: roles.roles,
 								hrms: hrms,
 							},
->>>>>>> f562ccf38baffaa1cb6caf8a196127fe2512c7e4
 						},
 						privateKey,
 						{ algorithm: "RS256" }

src/controllers/user.ts

@@ -1,10 +1,6 @@
 import axios from "axios"
 import config from "config"
-<<<<<<< HEAD
-import { Paging, User, UserRefreshToken, UserRole, HrmsEmployee } from "entity"
-=======
 import { HrmsEmployee, Paging, User, UserRefreshToken, UserRole } from "entity"
->>>>>>> f562ccf38baffaa1cb6caf8a196127fe2512c7e4
 import exceljs from "exceljs"
 import { NextFunction, Response } from "express"
 import { Request } from "express-jwt"