@mondart/nestjs-common-module 2.6.5 → 2.6.7

package/dist/decorators/iam-context.decorator.js

@@ -9,18 +9,23 @@ exports.IamContext = (0, common_1.createParamDecorator)((data, ctx) => {
     return (0, exports.getIamContext)(request);
 });
 const getIamContext = (request) => {
-    const injectedPayload = request?.headers?.['injectedpayload'];
-    const ip = request?.headers['x-forwarded-for'] ||
+    const headers = typeof request?.headers === 'string'
+        ? JSON.parse(request?.headers)
+        : request?.headers;
+    const injectedPayload = headers?.['injectedpayload'];
+    const ip = headers?.['x-forwarded-for'] ||
+        headers?.['host'] ||
+        headers?.address ||
         request?.socket?.remoteAddress ||
         null;
-    const requestId = request?.headers['request-id'] ?? (0, crypto_1.randomUUID)();
-    const timestamp = new Date(request?.headers?.['timestamp']);
+    const requestId = headers?.['request-id'] ?? (0, crypto_1.randomUUID)();
+    const timestamp = new Date(headers?.['timestamp'] || headers?.['time'] || Date.now());
     let isAgent = false;
     let user;
     let agent;
     if (injectedPayload) {
         const data = JSON.parse(injectedPayload);
-        const token = request?.headers?.['authorization'];
+        const token = headers?.['authorization'];
         if (data) {
             if (!data?.is_agent && (data?.contact_id || data?.store_id)) {
                 user = {
@@ -40,7 +45,7 @@ const getIamContext = (request) => {
                 };
             }
         }
-        delete request?.headers?.['authorization'];
+        delete headers?.['authorization'];
     }
     return new iam_context_dto_1.IamContextDto({
         ip,

package/dist/dto/response/iam-context.dto.js

@@ -16,6 +16,7 @@ const crypto_1 = require("crypto");
 class IamContextDto {
     constructor(init) {
         this.ip = init?.ip;
+        this.isAgent = init?.isAgent;
         this.agentId = init?.agent ? init?.agent?.agentId : undefined;
         this.agent = init?.agent;
         this.userId = init?.user ? init?.user?.userId : undefined;

package/dist/filters/global-exception.filter.js

@@ -29,9 +29,18 @@ let GlobalExceptionFilter = class GlobalExceptionFilter {
             Sentry.captureException(exception, exception?.response);
         const context = host.switchToHttp();
         const type = host?.getType();
-        this.logger.error(`exceptionName: ${exception?.name}`, JSON.stringify(exception) ??
-            exception?.message ??
-            'Unknown exception occurred.');
+        const message = typeof exception?.message === 'string'
+            ? exception?.message !== ''
+                ? exception?.message
+                : 'Unknown exception occurred.'
+            : (typeof exception?.message === 'object' &&
+                Object.keys(exception?.message)?.length !== 0) ||
+                (Array.isArray(exception?.message) &&
+                    exception?.message?.length !== 0)
+                ? JSON.stringify(exception?.message)
+                : 'Unknown exception occurred.';
+        this.logger.error(`exceptionName: ${exception?.name} - ${message}`);
+        this.logger.debug(exception?.stack);
         if (type === 'rpc') {
             const exceptionsName = Object.values(exceptions).map((exception) => exception.name);
             if (exceptionsName.includes(exception.name)) {

package/dist/lib/captcha/captcha.guard.js

@@ -33,15 +33,18 @@ let CaptchaGuard = class CaptchaGuard {
         const captchaSettings = this.getCaptchaDetails(context);
         const request = context.switchToHttp().getRequest();
         const iamContext = (0, decorators_1.getIamContext)(request);
-        if (iamContext?.agentId || iamContext?.userId)
+        if (iamContext?.agentId || iamContext?.userId || !captchaSettings)
             return true;
         if (captchaSettings && captchaSettings.executeAfter) {
-            const ip = request.headers['x-forwarded-for'] || request.socket.remoteAddress;
+            const ip = iamContext?.ip || null;
             const result = await this.incExecutionTimes(ip, captchaSettings.executeAfter);
             if (result)
                 return true;
         }
-        const text = request.headers['captcha-token'];
+        const headers = typeof request?.headers === 'string'
+            ? JSON.parse(request?.headers)
+            : request?.headers;
+        const text = headers?.['captcha-token'];
         if (!text)
             throw new captcha_exception_1.InvalidCaptcha();
         await this.isCaptchaValid(text);