@autofleet/shtinker 1.2.4-beta.16 → 1.2.4-beta.17

package/dist/audit-logger.js

@@ -110,6 +110,7 @@ class AuditLogger {
     }
     sendAuditLogContext(context) {
         return __awaiter(this, void 0, void 0, function* () {
+            logger_1.default.error('OMRYYY - sendAuditLogContext', { context });
             try {
                 yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_CONTEXT_QUEUE, context);
             }
@@ -120,6 +121,7 @@ class AuditLogger {
     }
     sendAuditLogRows(payload) {
         return __awaiter(this, void 0, void 0, function* () {
+            logger_1.default.error('OMRYYY - sendAuditLogRows', { payload });
             try {
                 yield this.rabbit.sendToQueue(const_1.AUDIT_LOG_ROWS_QUEUE, payload);
             }

package/dist/index.js

@@ -56,11 +56,24 @@ exports.enableAuditing = enableAuditing;
 const setAuditContext = (entityType, action) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     try {
+        logger_1.default.error('OMRYYY - setAuditContext - Start', { entityType, action });
         const currentTrace = (0, zehut_1.getCurrentPayload)();
         if (process.env.DISABLE_AUDIT_LOGS === 'true' || !((_a = currentTrace === null || currentTrace === void 0 ? void 0 : currentTrace.context) === null || _a === void 0 ? void 0 : _a.get)) {
+            logger_1.default.error('OMRYYY - setAuditContext - in first if: returning', {
+                entityType,
+                action,
+                DISABLE_AUDIT_LOGS: process.env.DISABLE_AUDIT_LOGS,
+            });
             return next();
         }
+        logger_1.default.error('OMRYYY - setAuditContext - after first if', {
+            context: currentTrace.context,
+        });
         const user = currentTrace.context.get(const_1.USER_CONTEXT_KEY);
+        logger_1.default.error('OMRYYY - setAuditContext - user = ', {
+            user,
+        });
+        // This is where we can fix the System, user/driver/client, and API-empty-user bug
         const { performedBy, actionOrigin } = (user === null || user === void 0 ? void 0 : user.id)
             ? { performedBy: user.id, actionOrigin: "user" /* ActionOrigin.USER */ }
             : { performedBy: (_b = req.headers[const_1.AUTOMATION_ID_HEADER]) !== null && _b !== void 0 ? _b : null, actionOrigin: req.headers[const_1.AUTOMATION_ID_HEADER] ? "automation" /* ActionOrigin.AUTOMATION */ : null };
@@ -74,6 +87,7 @@ const setAuditContext = (entityType, action) => (req, res, next) => __awaiter(vo
         };
         currentTrace.context.set(const_1.AUDIT_LOG_CONTEXT_KEY, auditLogContext);
         const sendAuditLogContextEvent = () => __awaiter(void 0, void 0, void 0, function* () {
+            logger_1.default.error('OMRYYY - sendAuditLogContextEvent - Start', { entityType, action, auditLogContext });
             res.off('finish', sendAuditLogContextEvent);
             res.off('close', sendAuditLogContextEvent);
             res.off('error', sendAuditLogContextEvent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/shtinker",
-  "version": "1.2.4-beta.16",
+  "version": "1.2.4-beta.17",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -15,14 +15,12 @@
     "@autofleet/errors": "^1.2.2",
     "@autofleet/logger": "^4.0.6",
     "@autofleet/network": "^1.4.7",
+    "@autofleet/rabbit": "^3.2.25",
     "lodash": "^4.17.21",
     "sequelize-typescript": "^2.1.5"
   },
-  "peerDependencies": {
-    "@autofleet/zehut": "*",
-    "@autofleet/rabbit": "*"
-  },
   "devDependencies": {
+    "@autofleet/zehut": "^3.1.2",
     "@types/express": "^4.17.17",
     "@types/jest": "^27.0.9",
     "@types/node": "^18.11.19",
@@ -36,6 +34,9 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
   },
+  "peerDependencies": {
+    "@autofleet/zehut": "^3.x"
+  },
   "author": "Autofleet",
   "license": "ISC"
 }

package/src/audit-logger.ts

@@ -112,6 +112,7 @@ class AuditLogger {
   }
 
   async sendAuditLogContext(context: AuditLogContext): Promise<void> {
+    logger.error('OMRYYY - sendAuditLogContext', { context });
     try {
       await this.rabbit.sendToQueue(AUDIT_LOG_CONTEXT_QUEUE, context);
     } catch (err) {
@@ -120,6 +121,7 @@ class AuditLogger {
   }
 
   async sendAuditLogRows(payload: AuditLogPayload): Promise<void> {
+    logger.error('OMRYYY - sendAuditLogRows', { payload });
     try {
       await this.rabbit.sendToQueue(AUDIT_LOG_ROWS_QUEUE, payload);
     } catch (err) {

package/src/index.ts

@@ -21,11 +21,24 @@ export const setAuditContext = (
   action: string,
 ) => async (req: Request, res: Response, next: NextFunction): Promise<any> => {
   try {
+    logger.error('OMRYYY - setAuditContext - Start', { entityType, action });
     const currentTrace = getCurrentTrace();
     if (process.env.DISABLE_AUDIT_LOGS === 'true' || !currentTrace?.context?.get) {
+      logger.error('OMRYYY - setAuditContext - in first if: returning', {
+        entityType,
+        action,
+        DISABLE_AUDIT_LOGS: process.env.DISABLE_AUDIT_LOGS,
+      });
       return next();
     }
+    logger.error('OMRYYY - setAuditContext - after first if', {
+      context: currentTrace.context,
+    });
     const user = currentTrace.context.get(USER_CONTEXT_KEY);
+    logger.error('OMRYYY - setAuditContext - user = ', {
+      user,
+    });
+    // This is where we can fix the System, user/driver/client, and API-empty-user bug
     const { performedBy, actionOrigin } = user?.id
       ? { performedBy: user.id, actionOrigin: ActionOrigin.USER }
       : { performedBy: req.headers[AUTOMATION_ID_HEADER] ?? null, actionOrigin: req.headers[AUTOMATION_ID_HEADER] ? ActionOrigin.AUTOMATION : null };
@@ -41,6 +54,7 @@ export const setAuditContext = (
     currentTrace.context.set(AUDIT_LOG_CONTEXT_KEY, auditLogContext);
 
     const sendAuditLogContextEvent = async () => {
+      logger.error('OMRYYY - sendAuditLogContextEvent - Start', { entityType, action, auditLogContext });
       res.off('finish', sendAuditLogContextEvent);
       res.off('close', sendAuditLogContextEvent);
       res.off('error', sendAuditLogContextEvent);