auto commit

This commit is contained in:
bangdk 2024-11-21 15:09:39 +09:00
parent 5a3b1c845d
commit b90d98c0b2
4 changed files with 2734 additions and 14 deletions

3
.gitignore vendored
View File

@ -8,4 +8,5 @@ config/
backups/ backups/
init-scripts/ init-scripts/
logs/ logs/
shared/ shared/
fems-mqtt/log/mosquitto.log

View File

@ -68,11 +68,21 @@ class AuthService {
const companyData = userData.Company || {}; const companyData = userData.Company || {};
delete userData.Roles; delete userData.Roles;
// const userInfo = {
// ...userData,
// companyName: companyData.name,
// businessNumber: companyData.businessNumber,
// contractEndDate: companyData.contractEndDate,
// permissions,
// };
const userInfo = { const userInfo = {
...userData, ...userData,
companyId: companyData.id,
companyName: companyData.name, companyName: companyData.name,
businessNumber: companyData.businessNumber, businessNumber: companyData.businessNumber,
contractEndDate: companyData.contractEndDate, contractEndDate: companyData.contractEndDate,
branchId: userData.Branch?.id,
branchName: userData.Branch?.name,
permissions, permissions,
}; };
@ -274,28 +284,50 @@ class AuthService {
// { expiresIn: config.jwt.expiresIn } // { expiresIn: config.jwt.expiresIn }
// ); // );
// } // }
// _generateToken(user) {
// const payload = {
// id: user.id,
// role: user.role,
// companyId: user.companyId,
// branchId: user.branchId,
// permissions: user.permissions,
// };
// // 회사 관련 정보 추가 (Company 객체 또는 평탄화된 속성에서 가져옴)
// if (user.Company) {
// payload.companyName = user.Company.name;
// payload.businessNumber = user.Company.businessNumber;
// payload.contractEndDate = user.Company.contractEndDate;
// } else {
// // 평탄화된 데이터에서 가져옴
// payload.companyName = user.companyName;
// payload.businessNumber = user.businessNumber;
// payload.contractEndDate = user.contractEndDate;
// }
// logger.debug("Token payload:", payload); // 디버깅을 위한 로그 추가
// return jwt.sign(payload, config.jwt.secret, {
// expiresIn: config.jwt.expiresIn,
// });
// }
_generateToken(user) { _generateToken(user) {
const payload = { const payload = {
id: user.id, id: user.id,
role: user.role, role: user.role,
// 회사 정보
companyId: user.companyId, companyId: user.companyId,
companyName: user.Company?.name || user.companyName,
businessNumber: user.Company?.businessNumber || user.businessNumber,
contractEndDate: user.Company?.contractEndDate || user.contractEndDate,
// 지점 정보
branchId: user.branchId, branchId: user.branchId,
branchName: user.Branch?.name || user.branchName,
// 권한 정보
permissions: user.permissions, permissions: user.permissions,
}; };
// 회사 관련 정보 추가 (Company 객체 또는 평탄화된 속성에서 가져옴) logger.debug("Token payload:", payload);
if (user.Company) {
payload.companyName = user.Company.name;
payload.businessNumber = user.Company.businessNumber;
payload.contractEndDate = user.Company.contractEndDate;
} else {
// 평탄화된 데이터에서 가져옴
payload.companyName = user.companyName;
payload.businessNumber = user.businessNumber;
payload.contractEndDate = user.contractEndDate;
}
logger.debug("Token payload:", payload); // 디버깅을 위한 로그 추가
return jwt.sign(payload, config.jwt.secret, { return jwt.sign(payload, config.jwt.secret, {
expiresIn: config.jwt.expiresIn, expiresIn: config.jwt.expiresIn,

Binary file not shown.

File diff suppressed because it is too large Load Diff