auto commit

.gitignore

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

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,