@axinom/mosaic-id-guard 0.26.0-rc.12 → 0.26.0-rc.13

package/dist/message-bus/guarded-transactional-inbox-message-handler.d.ts

@@ -2,6 +2,7 @@ import { MessagingSettings } from '@axinom/mosaic-message-bus-abstractions';
 import { Logger } from '@axinom/mosaic-service-common';
 import { DbConfig, TransactionalInboxMessage, TransactionalInboxMessageHandler } from '@axinom/mosaic-transactional-inbox-outbox';
 import { ClientBase } from 'pg';
+import { InboxMessage } from 'pg-transactional-outbox';
 import { AuthenticatedManagementSubject, AuthenticationConfig } from '../common';
 export interface GuardedContext {
     subject: AuthenticatedManagementSubject;
@@ -36,5 +37,8 @@ export declare abstract class GuardedTransactionalInboxMessageHandler<TMessage,
      */
     protected abstract setPgSettings(envOwnerClient: ClientBase, subject: AuthenticatedManagementSubject): Promise<void>;
     mapError(error: Error): Error;
+    protected updateErrorDetails(error: Error & {
+        details?: Record<string, unknown>;
+    }, message: InboxMessage, context?: GuardedContext): Error;
 }
 //# sourceMappingURL=guarded-transactional-inbox-message-handler.d.ts.map

package/dist/message-bus/guarded-transactional-inbox-message-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guarded-transactional-inbox-message-handler.d.ts","sourceRoot":"","sources":["../../src/message-bus/guarded-transactional-inbox-message-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EACL,MAAM,EAGP,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,QAAQ,EACR,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EACL,8BAA8B,EAC9B,oBAAoB,EAGrB,MAAM,WAAW,CAAC;AAGnB,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,8BAA8B,CAAC;IACxC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG;IAAE,oBAAoB,EAAE,MAAM,CAAA;CAAE,CAAC;AAExE,8BAAsB,uCAAuC,CAC3D,QAAQ,EACR,OAAO,SAAS,aAAa,CAC7B,SAAQ,gCAAgC,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC;IAYzE,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE;IAG/B,OAAO,CAAC,UAAU;IAdpB;;;;;;;;OAQG;gBAED,iBAAiB,EAAE,iBAAiB,EAC1B,WAAW,EAAE,MAAM,EAAE,EAC/B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACP,UAAU,EAAE,MAAM,GAAG,oBAAoB;IAWnD,SAAS,CAAC,wBAAwB,+EAEhB,UAAU,KACzB,QAAQ,cAAc,CAAC,CAYxB;IAEF;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,CAC9B,cAAc,EAAE,UAAU,EAC1B,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,IAAI,CAAC;IAEP,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAGvC"}
+{"version":3,"file":"guarded-transactional-inbox-message-handler.d.ts","sourceRoot":"","sources":["../../src/message-bus/guarded-transactional-inbox-message-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EACL,MAAM,EAGP,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,QAAQ,EACR,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACL,8BAA8B,EAC9B,oBAAoB,EAGrB,MAAM,WAAW,CAAC;AAGnB,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,8BAA8B,CAAC;IACxC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG;IAAE,oBAAoB,EAAE,MAAM,CAAA;CAAE,CAAC;AAExE,8BAAsB,uCAAuC,CAC3D,QAAQ,EACR,OAAO,SAAS,aAAa,CAC7B,SAAQ,gCAAgC,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC;IAYzE,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE;IAG/B,OAAO,CAAC,UAAU;IAdpB;;;;;;;;OAQG;gBAED,iBAAiB,EAAE,iBAAiB,EAC1B,WAAW,EAAE,MAAM,EAAE,EAC/B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACP,UAAU,EAAE,MAAM,GAAG,oBAAoB;IAWnD,SAAS,CAAC,wBAAwB,+EAEhB,UAAU,KACzB,QAAQ,cAAc,CAAC,CAYxB;IAEF;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,aAAa,CAC9B,cAAc,EAAE,UAAU,EAC1B,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,IAAI,CAAC;IAEP,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;cAInB,kBAAkB,CACnC,KAAK,EAAE,KAAK,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,EACpD,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE,cAAc,GACvB,KAAK;CAmBT"}

package/dist/message-bus/guarded-transactional-inbox-message-handler.js

@@ -36,6 +36,18 @@ class GuardedTransactionalInboxMessageHandler extends mosaic_transactional_inbox
     mapError(error) {
         return (0, mosaic_service_common_1.getMappedError)(error);
     }
+    updateErrorDetails(error, message, context) {
+        var _a, _b, _c, _d, _e;
+        const detailedError = super.updateErrorDetails(error, message, context);
+        if (((_a = detailedError.details) === null || _a === void 0 ? void 0 : _a.tenantId) &&
+            ((_b = detailedError.details) === null || _b === void 0 ? void 0 : _b.environmentId)) {
+            return detailedError;
+        }
+        if (((_c = context === null || context === void 0 ? void 0 : context.subject) === null || _c === void 0 ? void 0 : _c.tenantId) && ((_d = context === null || context === void 0 ? void 0 : context.subject) === null || _d === void 0 ? void 0 : _d.environmentId)) {
+            detailedError.details = Object.assign({ tenantId: context.subject.tenantId, environmentId: context.subject.environmentId }, ((_e = detailedError.details) !== null && _e !== void 0 ? _e : {}));
+        }
+        return detailedError;
+    }
 }
 exports.GuardedTransactionalInboxMessageHandler = GuardedTransactionalInboxMessageHandler;
 //# sourceMappingURL=guarded-transactional-inbox-message-handler.js.map

package/dist/message-bus/guarded-transactional-inbox-message-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"guarded-transactional-inbox-message-handler.js","sourceRoot":"","sources":["../../src/message-bus/guarded-transactional-inbox-message-handler.ts"],"names":[],"mappings":";;;AACA,yEAIuC;AACvC,iGAImD;AAEnD,sCAKmB;AACnB,+EAAiE;AASjE,MAAsB,uCAGpB,SAAQ,oEAAmE;IAC3E;;;;;;;;OAQG;IACH,YACE,iBAAoC,EAC1B,WAAqB,EAC/B,MAAc,EACd,MAAe,EACP,UAAyC;QAEjD,MAAM,OAAO,GAAG,KAAK,EACnB,OAA4C,EAC5C,cAA0B,EACD,EAAE;YAC3B,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAChE,CAAC,CAAC;QACF,KAAK,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAXxC,gBAAW,GAAX,WAAW,CAAU;QAGvB,eAAU,GAAV,UAAU,CAA+B;QAWzC,6BAAwB,GAAG,KAAK,EACxC,OAA4C,EAC5C,cAA0B,EACD,EAAE;YAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;YACzC,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,MAAM,IAAI,mCAAW,CAAC,sBAAa,CAAC,mBAAmB,CAAC,CAAC;aAC1D;YACD,MAAM,OAAO,GAAG,MAAM,IAAA,0CAAiC,EACrD,KAAK,EACL,IAAI,CAAC,UAAU,CAChB,CAAC;YACF,MAAM,IAAA,8CAAgB,EAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACzE,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC5C,OAAO,EAAE,OAAO,EAAE,CAAC;QACrB,CAAC,CAAC;IAjBF,CAAC;IAkCQ,QAAQ,CAAC,KAAY;QAC5B,OAAO,IAAA,sCAAc,EAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;CACF;AAhED,0FAgEC"}
+{"version":3,"file":"guarded-transactional-inbox-message-handler.js","sourceRoot":"","sources":["../../src/message-bus/guarded-transactional-inbox-message-handler.ts"],"names":[],"mappings":";;;AACA,yEAIuC;AACvC,iGAImD;AAGnD,sCAKmB;AACnB,+EAAiE;AASjE,MAAsB,uCAGpB,SAAQ,oEAAmE;IAC3E;;;;;;;;OAQG;IACH,YACE,iBAAoC,EAC1B,WAAqB,EAC/B,MAAc,EACd,MAAe,EACP,UAAyC;QAEjD,MAAM,OAAO,GAAG,KAAK,EACnB,OAA4C,EAC5C,cAA0B,EACD,EAAE;YAC3B,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAChE,CAAC,CAAC;QACF,KAAK,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAXxC,gBAAW,GAAX,WAAW,CAAU;QAGvB,eAAU,GAAV,UAAU,CAA+B;QAWzC,6BAAwB,GAAG,KAAK,EACxC,OAA4C,EAC5C,cAA0B,EACD,EAAE;YAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;YACzC,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,MAAM,IAAI,mCAAW,CAAC,sBAAa,CAAC,mBAAmB,CAAC,CAAC;aAC1D;YACD,MAAM,OAAO,GAAG,MAAM,IAAA,0CAAiC,EACrD,KAAK,EACL,IAAI,CAAC,UAAU,CAChB,CAAC;YACF,MAAM,IAAA,8CAAgB,EAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACzE,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC5C,OAAO,EAAE,OAAO,EAAE,CAAC;QACrB,CAAC,CAAC;IAjBF,CAAC;IAkCQ,QAAQ,CAAC,KAAY;QAC5B,OAAO,IAAA,sCAAc,EAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEkB,kBAAkB,CACnC,KAAoD,EACpD,OAAqB,EACrB,OAAwB;;QAExB,MAAM,aAAa,GAAG,KAAK,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACxE,IACE,CAAA,MAAA,aAAa,CAAC,OAAO,0CAAE,QAAQ;aAC/B,MAAA,aAAa,CAAC,OAAO,0CAAE,aAAa,CAAA,EACpC;YACA,OAAO,aAAa,CAAC;SACtB;QAED,IAAI,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,QAAQ,MAAI,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,aAAa,CAAA,EAAE;YACjE,aAAa,CAAC,OAAO,mBACnB,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAClC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,IACzC,CAAC,MAAA,aAAa,CAAC,OAAO,mCAAI,EAAE,CAAC,CACjC,CAAC;SACH;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAxFD,0FAwFC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axinom/mosaic-id-guard",
-  "version": "0.26.0-rc.12",
+  "version": "0.26.0-rc.13",
   "description": "Authentication and authorization helpers for Axinom Mosaic services",
   "author": "Axinom",
   "license": "PROPRIETARY",
@@ -22,16 +22,16 @@
     "dev": "tsc -w",
     "test": "jest --silent",
     "test:watch": "jest --watch --silent",
-    "test:cov": "jest --coverage --silent",
-    "posttest:cov": "ts-node ../../scripts/open-test-coverage.ts -- libs/ax-guard",
+    "test:cov": "jest --coverage --silent && yarn posttest:cov",
+    "posttest:cov": "ts-node ../../../scripts/open-test-coverage.ts -- services/id/lib-id-guard",
     "test:ci": "jest --reporters=default --reporters=jest-junit --coverage --coverageReporters=cobertura --coverageReporters=html",
     "lint": "eslint . --ext .ts,.tsx,.js --color --cache"
   },
   "dependencies": {
-    "@axinom/mosaic-id-utils": "^0.15.11-rc.12",
-    "@axinom/mosaic-message-bus": "^0.21.0-rc.12",
-    "@axinom/mosaic-service-common": "^0.43.0-rc.12",
-    "@axinom/mosaic-transactional-inbox-outbox": "^0.3.0-rc.12",
+    "@axinom/mosaic-id-utils": "^0.15.11-rc.13",
+    "@axinom/mosaic-message-bus": "^0.21.0-rc.13",
+    "@axinom/mosaic-service-common": "^0.43.0-rc.13",
+    "@axinom/mosaic-transactional-inbox-outbox": "^0.3.0-rc.13",
     "amqplib": "^0.10.3",
     "express": "^4.17.1",
     "express-bearer-token": "^2.4.0",
@@ -44,6 +44,7 @@
     "jwks-rsa": "^1.8.1",
     "lru-cache": "^7.18.3",
     "pg": "^8.11.3",
+    "pg-transactional-outbox": "^0.4.0-beta.11",
     "postgraphile": "^4.13.0",
     "rascal": "^14.0.1",
     "subscriptions-transport-ws": "^0.9.19"
@@ -63,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5d20a36fa1a52587822b9c57b69bab16ad3d6b03"
+  "gitHead": "e8739d927ba6360e38368c41a119491931d965db"
 }

package/src/message-bus/guarded-transactional-inbox-message-handler.spec.ts

@@ -0,0 +1,170 @@
+/* eslint-disable no-console */
+import 'jest-extended';
+import { GuardedTransactionalInboxMessageHandler } from './guarded-transactional-inbox-message-handler';
+
+class TestTransactionalInboxMessageHandler extends GuardedTransactionalInboxMessageHandler<
+  any,
+  any
+> {
+  override handleMessage(): Promise<void> {
+    throw new Error('Method not implemented.');
+  }
+
+  override setPgSettings(): Promise<void> {
+    throw new Error('Method not implemented.');
+  }
+}
+
+describe('GuardedTransactionalInboxMessageHandler', () => {
+  const handler = new TestTransactionalInboxMessageHandler(
+    {} as any,
+    [],
+    {} as any,
+    {} as any,
+    {} as any,
+  ) as any; // To access protected method for testing
+
+  describe('updateErrorDetails', () => {
+    it('Update error details with empty message object -> returns original error', () => {
+      // Arrange
+      const originalError = new Error('Test Message');
+      const message = {} as any;
+
+      // Act
+      const error = handler.updateErrorDetails(originalError, message);
+
+      // Assert
+      expect(error).toMatchObject({
+        message: 'Test Message',
+        stack: expect.toStartWith('Error: Test Message'),
+      });
+      expect((error as any).details).toBeUndefined();
+    });
+
+    it.each([undefined, null])(
+      'Update error details with %p routingKey -> returns original error',
+      (falsyKey) => {
+        // Arrange
+        const originalError = new Error('Test Message');
+        const message = {
+          metadata: { fields: { routingKey: falsyKey } },
+        } as any;
+
+        // Act
+        const error = handler.updateErrorDetails(originalError, message);
+
+        // Assert
+        expect(error).toMatchObject({
+          message: 'Test Message',
+          stack: expect.toStartWith('Error: Test Message'),
+        });
+        expect((error as any).details).toBeUndefined();
+      },
+    );
+
+    it('Update error details with valid routingKey -> returns extended error', () => {
+      // Arrange
+      const tenantId = '00000000-0000-0000-0000-000000000001';
+      const environmentId = '00000000-0000-0000-0000-000000000002';
+      const originalError = new Error('Test Message');
+      const message = {
+        metadata: {
+          fields: {
+            routingKey: `ax-image-service.${tenantId}.${environmentId}.image_types.declare`,
+          },
+        },
+      } as any;
+
+      // Act
+      const error = handler.updateErrorDetails(originalError, message);
+
+      // Assert
+      expect(error).toMatchObject({
+        message: 'Test Message',
+        stack: expect.toStartWith('Error: Test Message'),
+        details: {
+          tenantId,
+          environmentId,
+        },
+      });
+    });
+
+    it('Update error details with valid routingKey and existing details -> returns extended error preserving details', () => {
+      // Arrange
+      const tenantId = '00000000-0000-0000-0000-000000000001';
+      const environmentId = '00000000-0000-0000-0000-000000000002';
+      const originalError = new Error('Test Message') as Error & {
+        details?: Record<string, string>;
+      };
+      originalError.details = { custom: 'custom details property' };
+      const message = {
+        metadata: {
+          fields: {
+            routingKey: `ax-image-service.${tenantId}.${environmentId}.image_types.declare`,
+          },
+        },
+      } as any;
+
+      // Act
+      const error = handler.updateErrorDetails(originalError, message);
+
+      // Assert
+      expect(error).toMatchObject({
+        message: 'Test Message',
+        stack: expect.toStartWith('Error: Test Message'),
+        details: {
+          tenantId,
+          environmentId,
+          custom: 'custom details property',
+        },
+      });
+    });
+
+    it('Update error details with empty routingKey and existing details -> returns original error preserving details', () => {
+      // Arrange
+      const originalError = new Error('Test Message') as Error & {
+        details?: Record<string, string>;
+      };
+      originalError.details = { custom: 'custom details property' };
+      const message = { metadata: { fields: {} } } as any;
+
+      // Act
+      const error = handler.updateErrorDetails(originalError, message);
+
+      // Assert
+      expect(error).toMatchObject({
+        message: 'Test Message',
+        stack: expect.toStartWith('Error: Test Message'),
+        details: {
+          custom: 'custom details property',
+        },
+      });
+    });
+
+    it('Update error details with empty routingKey, existing details, and context having subject -> returns extended error preserving details', () => {
+      // Arrange
+      const tenantId = '00000000-0000-0000-0000-000000000001';
+      const environmentId = '00000000-0000-0000-0000-000000000002';
+      const originalError = new Error('Test Message') as Error & {
+        details?: Record<string, string>;
+      };
+      originalError.details = { custom: 'custom details property' };
+      const message = { metadata: { fields: {} } } as any;
+      const context = { subject: { tenantId, environmentId } } as any;
+
+      // Act
+      const error = handler.updateErrorDetails(originalError, message, context);
+
+      // Assert
+      expect(error).toMatchObject({
+        message: 'Test Message',
+        stack: expect.toStartWith('Error: Test Message'),
+        details: {
+          tenantId,
+          environmentId,
+          custom: 'custom details property',
+        },
+      });
+    });
+  });
+});

package/src/message-bus/guarded-transactional-inbox-message-handler.ts

@@ -10,6 +10,7 @@ import {
   TransactionalInboxMessageHandler,
 } from '@axinom/mosaic-transactional-inbox-outbox';
 import { ClientBase } from 'pg';
+import { InboxMessage } from 'pg-transactional-outbox';
 import {
   AuthenticatedManagementSubject,
   AuthenticationConfig,
@@ -89,4 +90,28 @@ export abstract class GuardedTransactionalInboxMessageHandler<
   override mapError(error: Error): Error {
     return getMappedError(error);
   }
+
+  protected override updateErrorDetails(
+    error: Error & { details?: Record<string, unknown> },
+    message: InboxMessage,
+    context?: GuardedContext,
+  ): Error {
+    const detailedError = super.updateErrorDetails(error, message, context);
+    if (
+      detailedError.details?.tenantId &&
+      detailedError.details?.environmentId
+    ) {
+      return detailedError;
+    }
+
+    if (context?.subject?.tenantId && context?.subject?.environmentId) {
+      detailedError.details = {
+        tenantId: context.subject.tenantId,
+        environmentId: context.subject.environmentId,
+        ...(detailedError.details ?? {}),
+      };
+    }
+
+    return detailedError;
+  }
 }