From b90d98c0b2d7f7dff1d082ccfd2408ee5caea8a9 Mon Sep 17 00:00:00 2001 From: bangdk Date: Thu, 21 Nov 2024 15:09:39 +0900 Subject: [PATCH] auto commit --- .gitignore | 3 +- fems-api/src/services/auth.service.js | 58 +- fems-mqtt/data/mosquitto.db | Bin 157 -> 156 bytes fems-mqtt/log/mosquitto.log | 2687 +++++++++++++++++++++++++ 4 files changed, 2734 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 5571389..65afc6c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ config/ backups/ init-scripts/ logs/ -shared/ \ No newline at end of file +shared/ +fems-mqtt/log/mosquitto.log \ No newline at end of file diff --git a/fems-api/src/services/auth.service.js b/fems-api/src/services/auth.service.js index 168235e..5fb046f 100644 --- a/fems-api/src/services/auth.service.js +++ b/fems-api/src/services/auth.service.js @@ -68,11 +68,21 @@ class AuthService { const companyData = userData.Company || {}; delete userData.Roles; + // const userInfo = { + // ...userData, + // companyName: companyData.name, + // businessNumber: companyData.businessNumber, + // contractEndDate: companyData.contractEndDate, + // permissions, + // }; const userInfo = { ...userData, + companyId: companyData.id, companyName: companyData.name, businessNumber: companyData.businessNumber, contractEndDate: companyData.contractEndDate, + branchId: userData.Branch?.id, + branchName: userData.Branch?.name, permissions, }; @@ -274,28 +284,50 @@ class AuthService { // { 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) { const payload = { id: user.id, role: user.role, + // 회사 정보 companyId: user.companyId, + companyName: user.Company?.name || user.companyName, + businessNumber: user.Company?.businessNumber || user.businessNumber, + contractEndDate: user.Company?.contractEndDate || user.contractEndDate, + // 지점 정보 branchId: user.branchId, + branchName: user.Branch?.name || user.branchName, + // 권한 정보 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); // 디버깅을 위한 로그 추가 + logger.debug("Token payload:", payload); return jwt.sign(payload, config.jwt.secret, { expiresIn: config.jwt.expiresIn, diff --git a/fems-mqtt/data/mosquitto.db b/fems-mqtt/data/mosquitto.db index fd237415818083c2283cd5c75ee876b212863842..74357f140701368be0d38c311e21335858785546 100644 GIT binary patch delta 78 zcmbQsIEQh9yk5C9BLf(4Kqw%|1jM0|0#I?dFaz7%!xMe2MDubo^HPDLEI`ZwQw9J_ C>