@axinom/mosaic-id-guard 0.26.0-rc.15 → 0.26.0-rc.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/message-bus/guarded-transactional-inbox-message-handler.d.ts +1 -1
- package/dist/message-bus/guarded-transactional-inbox-message-handler.d.ts.map +1 -1
- package/dist/message-bus/guarded-transactional-inbox-message-handler.js +4 -6
- package/dist/message-bus/guarded-transactional-inbox-message-handler.js.map +1 -1
- package/package.json +6 -6
- package/src/message-bus/guarded-transactional-inbox-message-handler.spec.ts +14 -14
- package/src/message-bus/guarded-transactional-inbox-message-handler.ts +6 -11
|
@@ -39,6 +39,6 @@ export declare abstract class GuardedTransactionalInboxMessageHandler<TMessage,
|
|
|
39
39
|
mapError(error: Error): Error;
|
|
40
40
|
protected updateErrorDetails(error: Error & {
|
|
41
41
|
details?: Record<string, unknown>;
|
|
42
|
-
}, message: InboxMessage, context?: GuardedContext):
|
|
42
|
+
}, message: InboxMessage, context?: GuardedContext): void;
|
|
43
43
|
}
|
|
44
44
|
//# sourceMappingURL=guarded-transactional-inbox-message-handler.d.ts.map
|
|
@@ -1 +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,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,
|
|
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,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,IAAI;CAcR"}
|
|
@@ -38,15 +38,13 @@ class GuardedTransactionalInboxMessageHandler extends mosaic_transactional_inbox
|
|
|
38
38
|
}
|
|
39
39
|
updateErrorDetails(error, message, context) {
|
|
40
40
|
var _a, _b, _c, _d, _e;
|
|
41
|
-
|
|
42
|
-
if (((_a =
|
|
43
|
-
|
|
44
|
-
return detailedError;
|
|
41
|
+
super.updateErrorDetails(error, message, context);
|
|
42
|
+
if (((_a = error.details) === null || _a === void 0 ? void 0 : _a.tenantId) && ((_b = error.details) === null || _b === void 0 ? void 0 : _b.environmentId)) {
|
|
43
|
+
return;
|
|
45
44
|
}
|
|
46
45
|
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)) {
|
|
47
|
-
|
|
46
|
+
error.details = Object.assign({ tenantId: context.subject.tenantId, environmentId: context.subject.environmentId }, ((_e = error.details) !== null && _e !== void 0 ? _e : {}));
|
|
48
47
|
}
|
|
49
|
-
return detailedError;
|
|
50
48
|
}
|
|
51
49
|
}
|
|
52
50
|
exports.GuardedTransactionalInboxMessageHandler = GuardedTransactionalInboxMessageHandler;
|
|
@@ -1 +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;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,
|
|
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;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,KAAK,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,QAAQ,MAAI,MAAA,KAAK,CAAC,OAAO,0CAAE,aAAa,CAAA,EAAE;YAC3D,OAAO;SACR;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,KAAK,CAAC,OAAO,mBACX,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAClC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,IACzC,CAAC,MAAA,KAAK,CAAC,OAAO,mCAAI,EAAE,CAAC,CACzB,CAAC;SACH;IACH,CAAC;CACF;AAnFD,0FAmFC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-id-guard",
|
|
3
|
-
"version": "0.26.0-rc.
|
|
3
|
+
"version": "0.26.0-rc.17",
|
|
4
4
|
"description": "Authentication and authorization helpers for Axinom Mosaic services",
|
|
5
5
|
"author": "Axinom",
|
|
6
6
|
"license": "PROPRIETARY",
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
"lint": "eslint . --ext .ts,.tsx,.js --color --cache"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@axinom/mosaic-id-utils": "^0.15.11-rc.
|
|
32
|
-
"@axinom/mosaic-message-bus": "^0.21.0-rc.
|
|
33
|
-
"@axinom/mosaic-service-common": "^0.43.0-rc.
|
|
34
|
-
"@axinom/mosaic-transactional-inbox-outbox": "^0.3.0-rc.
|
|
31
|
+
"@axinom/mosaic-id-utils": "^0.15.11-rc.17",
|
|
32
|
+
"@axinom/mosaic-message-bus": "^0.21.0-rc.17",
|
|
33
|
+
"@axinom/mosaic-service-common": "^0.43.0-rc.17",
|
|
34
|
+
"@axinom/mosaic-transactional-inbox-outbox": "^0.3.0-rc.17",
|
|
35
35
|
"amqplib": "^0.10.3",
|
|
36
36
|
"express": "^4.17.1",
|
|
37
37
|
"express-bearer-token": "^2.4.0",
|
|
@@ -64,5 +64,5 @@
|
|
|
64
64
|
"publishConfig": {
|
|
65
65
|
"access": "public"
|
|
66
66
|
},
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "50a903f5ce7cc64e40887ef8e54422fc4d330acd"
|
|
68
68
|
}
|
|
@@ -31,14 +31,14 @@ describe('GuardedTransactionalInboxMessageHandler', () => {
|
|
|
31
31
|
const message = {} as any;
|
|
32
32
|
|
|
33
33
|
// Act
|
|
34
|
-
|
|
34
|
+
handler.updateErrorDetails(originalError, message);
|
|
35
35
|
|
|
36
36
|
// Assert
|
|
37
|
-
expect(
|
|
37
|
+
expect(originalError).toMatchObject({
|
|
38
38
|
message: 'Test Message',
|
|
39
39
|
stack: expect.toStartWith('Error: Test Message'),
|
|
40
40
|
});
|
|
41
|
-
expect((
|
|
41
|
+
expect((originalError as any).details).toBeUndefined();
|
|
42
42
|
});
|
|
43
43
|
|
|
44
44
|
it.each([undefined, null])(
|
|
@@ -51,14 +51,14 @@ describe('GuardedTransactionalInboxMessageHandler', () => {
|
|
|
51
51
|
} as any;
|
|
52
52
|
|
|
53
53
|
// Act
|
|
54
|
-
|
|
54
|
+
handler.updateErrorDetails(originalError, message);
|
|
55
55
|
|
|
56
56
|
// Assert
|
|
57
|
-
expect(
|
|
57
|
+
expect(originalError).toMatchObject({
|
|
58
58
|
message: 'Test Message',
|
|
59
59
|
stack: expect.toStartWith('Error: Test Message'),
|
|
60
60
|
});
|
|
61
|
-
expect((
|
|
61
|
+
expect((originalError as any).details).toBeUndefined();
|
|
62
62
|
},
|
|
63
63
|
);
|
|
64
64
|
|
|
@@ -76,10 +76,10 @@ describe('GuardedTransactionalInboxMessageHandler', () => {
|
|
|
76
76
|
} as any;
|
|
77
77
|
|
|
78
78
|
// Act
|
|
79
|
-
|
|
79
|
+
handler.updateErrorDetails(originalError, message);
|
|
80
80
|
|
|
81
81
|
// Assert
|
|
82
|
-
expect(
|
|
82
|
+
expect(originalError).toMatchObject({
|
|
83
83
|
message: 'Test Message',
|
|
84
84
|
stack: expect.toStartWith('Error: Test Message'),
|
|
85
85
|
details: {
|
|
@@ -106,10 +106,10 @@ describe('GuardedTransactionalInboxMessageHandler', () => {
|
|
|
106
106
|
} as any;
|
|
107
107
|
|
|
108
108
|
// Act
|
|
109
|
-
|
|
109
|
+
handler.updateErrorDetails(originalError, message);
|
|
110
110
|
|
|
111
111
|
// Assert
|
|
112
|
-
expect(
|
|
112
|
+
expect(originalError).toMatchObject({
|
|
113
113
|
message: 'Test Message',
|
|
114
114
|
stack: expect.toStartWith('Error: Test Message'),
|
|
115
115
|
details: {
|
|
@@ -129,10 +129,10 @@ describe('GuardedTransactionalInboxMessageHandler', () => {
|
|
|
129
129
|
const message = { metadata: { fields: {} } } as any;
|
|
130
130
|
|
|
131
131
|
// Act
|
|
132
|
-
|
|
132
|
+
handler.updateErrorDetails(originalError, message);
|
|
133
133
|
|
|
134
134
|
// Assert
|
|
135
|
-
expect(
|
|
135
|
+
expect(originalError).toMatchObject({
|
|
136
136
|
message: 'Test Message',
|
|
137
137
|
stack: expect.toStartWith('Error: Test Message'),
|
|
138
138
|
details: {
|
|
@@ -153,10 +153,10 @@ describe('GuardedTransactionalInboxMessageHandler', () => {
|
|
|
153
153
|
const context = { subject: { tenantId, environmentId } } as any;
|
|
154
154
|
|
|
155
155
|
// Act
|
|
156
|
-
|
|
156
|
+
handler.updateErrorDetails(originalError, message, context);
|
|
157
157
|
|
|
158
158
|
// Assert
|
|
159
|
-
expect(
|
|
159
|
+
expect(originalError).toMatchObject({
|
|
160
160
|
message: 'Test Message',
|
|
161
161
|
stack: expect.toStartWith('Error: Test Message'),
|
|
162
162
|
details: {
|
|
@@ -95,23 +95,18 @@ export abstract class GuardedTransactionalInboxMessageHandler<
|
|
|
95
95
|
error: Error & { details?: Record<string, unknown> },
|
|
96
96
|
message: InboxMessage,
|
|
97
97
|
context?: GuardedContext,
|
|
98
|
-
):
|
|
99
|
-
|
|
100
|
-
if (
|
|
101
|
-
|
|
102
|
-
detailedError.details?.environmentId
|
|
103
|
-
) {
|
|
104
|
-
return detailedError;
|
|
98
|
+
): void {
|
|
99
|
+
super.updateErrorDetails(error, message, context);
|
|
100
|
+
if (error.details?.tenantId && error.details?.environmentId) {
|
|
101
|
+
return;
|
|
105
102
|
}
|
|
106
103
|
|
|
107
104
|
if (context?.subject?.tenantId && context?.subject?.environmentId) {
|
|
108
|
-
|
|
105
|
+
error.details = {
|
|
109
106
|
tenantId: context.subject.tenantId,
|
|
110
107
|
environmentId: context.subject.environmentId,
|
|
111
|
-
...(
|
|
108
|
+
...(error.details ?? {}),
|
|
112
109
|
};
|
|
113
110
|
}
|
|
114
|
-
|
|
115
|
-
return detailedError;
|
|
116
111
|
}
|
|
117
112
|
}
|