update
This commit is contained in:
@ -46,11 +46,19 @@ 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"))
|
||||
@ -85,21 +93,22 @@ export class AuthController {
|
||||
return ReturnHelper.errorResponse(res, 403, 403, Language.lang.failed_access + ", you don't have any roles in this application")
|
||||
} else {
|
||||
// const userRole = await userRoleRepository.findOneBy({ id: role_id })
|
||||
var hrms = {
|
||||
uuid: null,
|
||||
idx: null,
|
||||
employee_id: null,
|
||||
employeename: null,
|
||||
title: null,
|
||||
department_id: null,
|
||||
departement_uuid: null,
|
||||
department_name: null,
|
||||
level_id: null,
|
||||
level_name: null,
|
||||
}
|
||||
var hrms = {
|
||||
uuid: null,
|
||||
idx: null,
|
||||
employee_id: null,
|
||||
employeename: null,
|
||||
title: null,
|
||||
department_id: null,
|
||||
departement_uuid: null,
|
||||
department_name: null,
|
||||
level_id: null,
|
||||
level_name: null,
|
||||
}
|
||||
|
||||
var privateKey = fs.readFileSync("src/helpers/key/private.key")
|
||||
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")),
|
||||
@ -111,11 +120,23 @@ export class AuthController {
|
||||
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")),
|
||||
data: {
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
name: user.name,
|
||||
id_role: role_id,
|
||||
roles: roles.roles,
|
||||
hrms: hrms,
|
||||
},
|
||||
>>>>>>> f562ccf38baffaa1cb6caf8a196127fe2512c7e4
|
||||
},
|
||||
},
|
||||
privateKey,
|
||||
{ algorithm: "RS256" }
|
||||
)
|
||||
privateKey,
|
||||
{ algorithm: "RS256" }
|
||||
)
|
||||
|
||||
delete user.password
|
||||
|
||||
|
||||
Reference in New Issue
Block a user