@axinom/mosaic-id-guard 0.29.0-rc.5 → 0.29.0-rc.7
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/common/helpers/parse-jwt-token-error-handler.d.ts.map +1 -1
- package/dist/common/helpers/parse-jwt-token-error-handler.js +4 -2
- package/dist/common/helpers/parse-jwt-token-error-handler.js.map +1 -1
- package/dist/common/id-guard-error.d.ts +0 -1
- package/dist/common/id-guard-error.d.ts.map +1 -1
- package/dist/common/id-guard-error.js +1 -7
- package/dist/common/id-guard-error.js.map +1 -1
- package/dist/graphql/subscription-guard-plugin.d.ts.map +1 -1
- package/dist/graphql/subscription-guard-plugin.js +2 -2
- package/dist/graphql/subscription-guard-plugin.js.map +1 -1
- package/dist/message-bus/message-handler-authentication.d.ts.map +1 -1
- package/dist/message-bus/message-handler-authentication.js +1 -2
- package/dist/message-bus/message-handler-authentication.js.map +1 -1
- package/package.json +6 -6
- package/src/common/helpers/parse-jwt-token-error-handler.ts +5 -3
- package/src/common/id-guard-error.ts +0 -13
- package/src/common/parse-jwt-token.spec.ts +1 -1
- package/src/graphql/subscription-guard-plugin.ts +3 -4
- package/src/message-bus/message-handler-authentication.ts +2 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-jwt-token-error-handler.d.ts","sourceRoot":"","sources":["../../../src/common/helpers/parse-jwt-token-error-handler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAGL,oBAAoB,EACrB,MAAM,UAAU,CAAC;AAGlB,KAAK,SAAS,GACV,OAAO,aAAa,CAAC,cAAc,CAAC,IAAI,GACxC,OAAO,aAAa,CAAC,kBAAkB,CAAC,IAAI,GAC5C,OAAO,aAAa,CAAC,kBAAkB,CAAC,IAAI,GAC5C,OAAO,aAAa,CAAC,SAAS,CAAC,IAAI,GACnC,OAAO,aAAa,CAAC,6BAA6B,CAAC,IAAI,GACvD,OAAO,aAAa,CAAC,iBAAiB,CAAC,IAAI,GAC3C,OAAO,aAAa,CAAC,mBAAmB,CAAC,IAAI,GAC7C,OAAO,aAAa,CAAC,4BAA4B,CAAC,IAAI,GACtD,OAAO,aAAa,CAAC,wBAAwB,CAAC,IAAI,CAAC;AAiFvD;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,QACzB,OAAO,YACF,YAAY,GAAG,UAAU,GAAG,SAAS,SACxC,MAAM,cACD,MAAM,GAAG,oBAAoB,
|
|
1
|
+
{"version":3,"file":"parse-jwt-token-error-handler.d.ts","sourceRoot":"","sources":["../../../src/common/helpers/parse-jwt-token-error-handler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAGL,oBAAoB,EACrB,MAAM,UAAU,CAAC;AAGlB,KAAK,SAAS,GACV,OAAO,aAAa,CAAC,cAAc,CAAC,IAAI,GACxC,OAAO,aAAa,CAAC,kBAAkB,CAAC,IAAI,GAC5C,OAAO,aAAa,CAAC,kBAAkB,CAAC,IAAI,GAC5C,OAAO,aAAa,CAAC,SAAS,CAAC,IAAI,GACnC,OAAO,aAAa,CAAC,6BAA6B,CAAC,IAAI,GACvD,OAAO,aAAa,CAAC,iBAAiB,CAAC,IAAI,GAC3C,OAAO,aAAa,CAAC,mBAAmB,CAAC,IAAI,GAC7C,OAAO,aAAa,CAAC,4BAA4B,CAAC,IAAI,GACtD,OAAO,aAAa,CAAC,wBAAwB,CAAC,IAAI,CAAC;AAiFvD;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,QACzB,OAAO,YACF,YAAY,GAAG,UAAU,GAAG,SAAS,SACxC,MAAM,cACD,MAAM,GAAG,oBAAoB,gIAuE1C,CAAC"}
|
|
@@ -161,12 +161,14 @@ const handleJwtParseError = (err, authType, token, authConfig) => {
|
|
|
161
161
|
code = id_guard_errors_1.IdGuardErrors.AccessTokenVerificationFailed.code;
|
|
162
162
|
message = buildJwtErrorMessage(code, authType, token, authConfig);
|
|
163
163
|
}
|
|
164
|
-
// If thrown error is an instance of Error, take that as the original error.
|
|
164
|
+
// If thrown error is an instance of Error, take that as the original error.
|
|
165
|
+
// If not, create a new Unhandled MosaicError and encapsulate the unknown
|
|
166
|
+
// error in it
|
|
165
167
|
if (err instanceof Error) {
|
|
166
168
|
originalError = err;
|
|
167
169
|
}
|
|
168
170
|
else {
|
|
169
|
-
originalError = new mosaic_service_common_1.
|
|
171
|
+
originalError = new mosaic_service_common_1.MosaicError(err);
|
|
170
172
|
}
|
|
171
173
|
return [code, message, originalError, details];
|
|
172
174
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-jwt-token-error-handler.js","sourceRoot":"","sources":["../../../src/common/helpers/parse-jwt-token-error-handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"parse-jwt-token-error-handler.js","sourceRoot":"","sources":["../../../src/common/helpers/parse-jwt-token-error-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAGuC;AACvC,gEAA+B;AAC/B,+CAAiC;AACjC,wDAAmD;AAmBnD;;;;;;;;;GASG;AACH,MAAM,oBAAoB,GAAG,CAC3B,SAAoB,EACpB,QAA+C,EAC/C,KAAa,EACb,UAAyC,EACjC,EAAE;IACV,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,QAAQ,SAAS,EAAE;QACjB,KAAK,+BAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,YAAY,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAEvC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,GAAG,qKAAqK,CAAC;aACjL;iBAAM;gBACL,IACG,YAA+C,CAAC,QAAQ;oBACvD,UAAU,CAAC,QAAQ;oBACpB,YAA+C,CAAC,aAAa;wBAC5D,UAAU,CAAC,aAAa,EAC1B;oBACA,OAAO,GAAG,sGAAsG,CAAC;iBAClH;qBAAM;oBACL,OAAO,GAAG,kKAAkK,CAAC;iBAC9K;aACF;YACD,MAAM;SACP;QACD,KAAK,+BAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,YAAY,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvC,OAAO,GAAG,2FACP,YAA+C,CAAC,QACnD,iBACG,YAA+C,CAAC,aACnD,IACE,QAAQ,KAAK,UAAU;gBACrB,CAAC,CAAC,gBACG,YAAqC,CAAC,aACzC,IAAI;gBACN,CAAC,CAAC,GACN,EAAE,CAAC;YACH,MAAM;SACP;QACD,KAAK,+BAAa,CAAC,wBAAwB,CAAC,IAAI;YAC9C,OAAO,GAAG,+BAAa,CAAC,wBAAwB,CAAC,OAAO,CAAC;YACzD,MAAM;QACR,KAAK,+BAAa,CAAC,4BAA4B,CAAC,IAAI;YAClD,OAAO,GAAG,+BAAa,CAAC,4BAA4B,CAAC,OAAO,CAAC;YAC7D,MAAM;QACR,KAAK,+BAAa,CAAC,kBAAkB,CAAC,IAAI;YACxC,OAAO,GAAG,+BAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACnD,MAAM;QACR,KAAK,+BAAa,CAAC,6BAA6B,CAAC,IAAI;YACnD,OAAO,GAAG,+BAAa,CAAC,6BAA6B,CAAC,OAAO,CAAC;YAC9D,MAAM;QACR,KAAK,+BAAa,CAAC,mBAAmB,CAAC,IAAI;YACzC,OAAO,GAAG,+BAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACpD,MAAM;QACR,KAAK,+BAAa,CAAC,iBAAiB,CAAC,IAAI;YACvC,OAAO,GAAG,+BAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC;YAClD,MAAM;QACR,KAAK,+BAAa,CAAC,cAAc,CAAC,IAAI;YACpC,OAAO,GAAG,+BAAa,CAAC,cAAc,CAAC,OAAO,CAAC;YAC/C,MAAM;QACR;YACE,MAAM,IAAI,4CAAoB,CAAC,SAAS,CAAC,CAAC;KAC7C;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACI,MAAM,mBAAmB,GAAG,CACjC,GAAY,EACZ,QAA+C,EAC/C,KAAa,EACb,UAAyC,EAMzC,EAAE;IACF,IAAI,IAA2B,CAAC;IAChC,IAAI,OAA2B,CAAC;IAChC,IAAI,aAAgC,CAAC;IACrC,IAAI,OAAqD,CAAC;IAE1D,IAAI,GAAG,YAAY,sBAAG,CAAC,iBAAiB,EAAE;QACxC,IAAI,GAAG,+BAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC;QAC7C,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;KACnE;SAAM,IAAI,GAAG,YAAY,IAAI,CAAC,uBAAuB,EAAE;QACtD,IAAI,GAAG,+BAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC;QAC7C,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAElE,MAAM,YAAY,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,OAAO,GAAG;gBACR,QAAQ,EAAG,YAA8B,CAAC,GAAG;aAC9C,CAAC;SACH;aAAM;YACL,IACG,YAA+C,CAAC,QAAQ;gBACvD,UAAU,CAAC,QAAQ;gBACpB,YAA+C,CAAC,aAAa;oBAC5D,UAAU,CAAC,aAAa,EAC1B;gBACA,OAAO,GAAG;oBACR,OAAO,EAAE;wBACP,QAAQ,EAAE,UAAU,CAAC,QAAQ;wBAC7B,aAAa,EAAE,UAAU,CAAC,aAAa;qBACxC;oBACD,KAAK,EAAE;wBACL,QAAQ,EAAG,YAA+C,CAAC,QAAQ;wBACnE,aAAa,EAAG,YAA+C;6BAC5D,aAAa;qBACjB;iBACF,CAAC;aACH;SACF;KACF;SAAM,IAAI,GAAG,YAAY,IAAI,CAAC,SAAS,EAAE;QACxC,IAAI,GAAG,+BAAa,CAAC,SAAS,CAAC,IAAI,CAAC;QACpC,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;KACnE;SAAM,IAAK,GAAyB,CAAC,IAAI,KAAK,cAAc,EAAE;QAC7D,IAAI;YACF,QAAQ,KAAK,UAAU;gBACrB,CAAC,CAAC,+BAAa,CAAC,wBAAwB,CAAC,IAAI;gBAC7C,CAAC,CAAC,+BAAa,CAAC,4BAA4B,CAAC,IAAI,CAAC;QACtD,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;KACnE;SAAM,IAAI,GAAG,YAAY,WAAW,EAAE;QACrC,IAAI,GAAG,+BAAa,CAAC,cAAc,CAAC,IAAI,CAAC;QACzC,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;KACnE;SAAM;QACL,IAAI,GAAG,+BAAa,CAAC,6BAA6B,CAAC,IAAI,CAAC;QACxD,OAAO,GAAG,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;KACnE;IAED,4EAA4E;IAC5E,yEAAyE;IACzE,cAAc;IACd,IAAI,GAAG,YAAY,KAAK,EAAE;QACxB,aAAa,GAAG,GAAG,CAAC;KACrB;SAAM;QACL,aAAa,GAAG,IAAI,mCAAW,CAAC,GAAG,CAAC,CAAC;KACtC;IACD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC,CAAC;AA3EW,QAAA,mBAAmB,uBA2E9B"}
|
|
@@ -2,5 +2,4 @@ import { MosaicError, MosaicErrorInfo } from '@axinom/mosaic-service-common';
|
|
|
2
2
|
export declare class IdGuardError extends MosaicError {
|
|
3
3
|
constructor(info: MosaicErrorInfo);
|
|
4
4
|
}
|
|
5
|
-
export declare const assertIdGuardError: (error: unknown) => asserts error is IdGuardError;
|
|
6
5
|
//# sourceMappingURL=id-guard-error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"id-guard-error.d.ts","sourceRoot":"","sources":["../../src/common/id-guard-error.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,eAAe,
|
|
1
|
+
{"version":3,"file":"id-guard-error.d.ts","sourceRoot":"","sources":["../../src/common/id-guard-error.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,eAAe,EAEhB,MAAM,+BAA+B,CAAC;AAEvC,qBAAa,YAAa,SAAQ,WAAW;gBAC/B,IAAI,EAAE,eAAe;CAIlC"}
|
|
@@ -11,7 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
11
11
|
return t;
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.
|
|
14
|
+
exports.IdGuardError = void 0;
|
|
15
15
|
const mosaic_service_common_1 = require("@axinom/mosaic-service-common");
|
|
16
16
|
class IdGuardError extends mosaic_service_common_1.MosaicError {
|
|
17
17
|
constructor(info) {
|
|
@@ -20,10 +20,4 @@ class IdGuardError extends mosaic_service_common_1.MosaicError {
|
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
exports.IdGuardError = IdGuardError;
|
|
23
|
-
const assertIdGuardError = (error) => {
|
|
24
|
-
if (!(error instanceof IdGuardError)) {
|
|
25
|
-
throw new mosaic_service_common_1.NonMosaicError(`A caught error is not an instance of an IdGuardError class.`);
|
|
26
|
-
}
|
|
27
|
-
};
|
|
28
|
-
exports.assertIdGuardError = assertIdGuardError;
|
|
29
23
|
//# sourceMappingURL=id-guard-error.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"id-guard-error.js","sourceRoot":"","sources":["../../src/common/id-guard-error.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"id-guard-error.js","sourceRoot":"","sources":["../../src/common/id-guard-error.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,yEAIuC;AAEvC,MAAa,YAAa,SAAQ,mCAAW;IAC3C,YAAY,IAAqB;QAC/B,MAAM,EAAE,OAAO,KAAwB,IAAI,EAAvB,cAAc,UAAK,IAAI,EAArC,WAA8B,CAAO,CAAC;QAC5C,KAAK,iCAAM,cAAc,KAAE,OAAO,kCAAO,OAAO,KAAE,WAAW,EAAX,mCAAW,OAAK,CAAC;IACrE,CAAC;CACF;AALD,oCAKC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription-guard-plugin.d.ts","sourceRoot":"","sources":["../../src/graphql/subscription-guard-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"subscription-guard-plugin.d.ts","sourceRoot":"","sources":["../../src/graphql/subscription-guard-plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAYtC;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,uBAAuB,EAAE,MA+ErC,CAAC"}
|
|
@@ -49,8 +49,8 @@ const SubscriptionGuardPlugin = (builder) => {
|
|
|
49
49
|
(0, guard_utils_1.validatePostgraphileBuildOptions)(options);
|
|
50
50
|
return (0, guard_authorization_1.handleAuthorization)(subject, authErrorInfo, options, oldSubscribe, parent, args, context, info);
|
|
51
51
|
}
|
|
52
|
-
catch (
|
|
53
|
-
(0,
|
|
52
|
+
catch (e) {
|
|
53
|
+
const error = (0, mosaic_service_common_1.ensureError)(e);
|
|
54
54
|
/**
|
|
55
55
|
* If the token has expired, we close the connection with CloseCode.Forbidden, and allow the client to automatically re-establish
|
|
56
56
|
* the connection with a new token.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription-guard-plugin.js","sourceRoot":"","sources":["../../src/graphql/subscription-guard-plugin.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"subscription-guard-plugin.js","sourceRoot":"","sources":["../../src/graphql/subscription-guard-plugin.ts"],"names":[],"mappings":";;;AAAA,yEAAyE;AACzE,2CAAuC;AAEvC,sCAImB;AACnB,uDAG+B;AAC/B,+EAA4E;AAE5E;;;;;;;;;;;;;;;;GAgBG;AACI,MAAM,uBAAuB,GAAW,CAAC,OAAO,EAAE,EAAE;IACzD,OAAO,CAAC,IAAI,CACV,gCAAgC,EAChC,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;QACzB,IAAI,KAAK,CAAC,SAAS,EAAE;YACnB,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC;YACrC,KAAK,CAAC,SAAS,GAAG,KAAK,WACrB,MAAe,EACf,IAAI;YACJ,8DAA8D;YAC9D,OAAY,EACZ,IAAI;;gBAEJ,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;oBACtB,MAAM,IAAI,mCAAW,CAAC,sBAAa,CAAC,iBAAiB,CAAC,CAAC;iBACxD;gBAED,MAAM,OAAO,GAAmB;oBAC9B,oBAAoB,EAAE;wBACpB,0BAA0B,EACxB,KAAK,CAAC,OAAO,CAAC,0BAA0B;wBAC1C,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,oBAAoB,EAAE,KAAK,CAAC,OAAO,CAAC,oBAAoB;wBACxD,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS;qBACnC;oBACD,wBAAwB,EACtB,MAAA,KAAK,CAAC,OAAO,CAAC,wBAAwB,mCAAI,KAAK;iBAClD,CAAC;gBAEF,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,OAEH,CAAC,CAAC,mEAAmE;gBAErG,IAAI;oBACF,yFAAyF;oBACzF,IAAA,8CAAgC,EAAC,OAAO,CAAC,CAAC;oBAE1C,OAAO,IAAA,yCAAmB,EACxB,OAAO,EACP,aAAa,EACb,OAAO,EACP,YAAY,EACZ,MAAM,EACN,IAAI,EACJ,OAAO,EACP,IAAI,CACL,CAAC;iBACH;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,KAAK,GAAG,IAAA,mCAAW,EAAC,CAAC,CAA8B,CAAC;oBAC1D;;;uBAGG;oBACH,IAAI,KAAK,CAAC,IAAI,KAAK,sBAAa,CAAC,kBAAkB,CAAC,IAAI,EAAE;wBACxD;;;2BAGG;wBACH,OAAO,CAAC,SAAS,CAAC,KAAK,CACrB,sBAAS,CAAC,SAAS,EACnB,sBAAa,CAAC,kBAAkB,CAAC,IAAI,CACtC,CAAC;qBACH;yBAAM;wBACL,kCAAkC;wBAClC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,sBAAS,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;qBAChE;oBACD,MAAM,KAAK,CAAC;iBACb;YACH,CAAC,CAAC;SACH;QACD,OAAO,KAAK,CAAC;IACf,CAAC,EACD,EAAE,EACF,EAAE;IACF,sFAAsF;IACtF,iFAAiF;IACjF,mJAAmJ;IACnJ,CAAC,wBAAwB,CAAC,CAC3B,CAAC;AACJ,CAAC,CAAC;AA/EW,QAAA,uBAAuB,2BA+ElC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handler-authentication.d.ts","sourceRoot":"","sources":["../../src/message-bus/message-handler-authentication.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EACX,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EACL,oBAAoB,EACpB,8BAA8B,EAC9B,oBAAoB,EAErB,MAAM,WAAW,CAAC;AAGnB,MAAM,WAAW,yCAA0C,SAAQ,WAAW;IAC5E,OAAO,EAAE,8BAA8B,CAAC;CACzC;AAED,MAAM,WAAW,+BAAgC,SAAQ,WAAW;IAClE,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AAED;;;;GAIG;AACH,eAAO,MAAM,+BAA+B,YACjC,WAAW,KACnB,8BAWF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,mCACvB,MAAM,GAAG,oBAAoB,
|
|
1
|
+
{"version":3,"file":"message-handler-authentication.d.ts","sourceRoot":"","sources":["../../src/message-bus/message-handler-authentication.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EACX,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EACL,oBAAoB,EACpB,8BAA8B,EAC9B,oBAAoB,EAErB,MAAM,WAAW,CAAC;AAGnB,MAAM,WAAW,yCAA0C,SAAQ,WAAW;IAC5E,OAAO,EAAE,8BAA8B,CAAC;CACzC;AAED,MAAM,WAAW,+BAAgC,SAAQ,WAAW;IAClE,OAAO,EAAE,oBAAoB,CAAC;CAC/B;AAED;;;;GAIG;AACH,eAAO,MAAM,+BAA+B,YACjC,WAAW,KACnB,8BAWF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,mCACvB,MAAM,GAAG,oBAAoB,mEAkC1C,CAAC"}
|
|
@@ -41,8 +41,7 @@ const authenticationMiddleware = (authParams, enforceAuthentication = true) => {
|
|
|
41
41
|
subject;
|
|
42
42
|
}
|
|
43
43
|
catch (e) {
|
|
44
|
-
(0, mosaic_service_common_1.
|
|
45
|
-
error = e;
|
|
44
|
+
error = (0, mosaic_service_common_1.ensureError)(e);
|
|
46
45
|
}
|
|
47
46
|
}
|
|
48
47
|
if (enforceAuthentication && error !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handler-authentication.js","sourceRoot":"","sources":["../../src/message-bus/message-handler-authentication.ts"],"names":[],"mappings":";;;AAKA,yEAAyE;AAEzE,sCAKmB;AACnB,+DAA0D;AAU1D;;;;GAIG;AACI,MAAM,+BAA+B,GAAG,CAC7C,OAAoB,EACY,EAAE;IAClC,MAAM,oBAAoB,GACxB,OAAoD,CAAC;IACvD,IAAI,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,OAAO,EAAE;QACjC,OAAO,oBAAoB,CAAC,OAAO,CAAC;KACrC;IAED,MAAM,IAAI,mCAAW,CAAC;QACpB,IAAI,EAAE,+BAAa,CAAC,eAAe,CAAC,IAAI;QACxC,OAAO,EAAE,2IAA2I;KACrJ,CAAC,CAAC;AACL,CAAC,CAAC;AAbW,QAAA,+BAA+B,mCAa1C;AAEF;;;;;;GAMG;AACI,MAAM,wBAAwB,GAAG,CACtC,UAAyC,EACzC,qBAAqB,GAAG,IAAI,EACG,EAAE;IACjC,OAAO,KAAK,EACV,OAAkC,EAClC,OAA8B,EAC9B,SAAoB,EACpB,IAAoC,EACrB,EAAE;QACjB,IAAI,KAAK,GAAsB,SAAS,CAAC;QACzC,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC1C,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,KAAK,GAAG,IAAI,KAAK,CACf,4EAA4E,CAC7E,CAAC;SACH;aAAM;YACL,IAAI;gBACF,MAAM,OAAO,GAAG,MAAM,IAAA,0CAAiC,EACrD,KAAK,EACL,UAAU,CACX,CAAC;gBACD,OAAqD,CAAC,OAAO;oBAC5D,OAAO,CAAC;aACX;YAAC,OAAO,CAAC,EAAE;gBACV,IAAA,mCAAW,EAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"message-handler-authentication.js","sourceRoot":"","sources":["../../src/message-bus/message-handler-authentication.ts"],"names":[],"mappings":";;;AAKA,yEAAyE;AAEzE,sCAKmB;AACnB,+DAA0D;AAU1D;;;;GAIG;AACI,MAAM,+BAA+B,GAAG,CAC7C,OAAoB,EACY,EAAE;IAClC,MAAM,oBAAoB,GACxB,OAAoD,CAAC;IACvD,IAAI,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,OAAO,EAAE;QACjC,OAAO,oBAAoB,CAAC,OAAO,CAAC;KACrC;IAED,MAAM,IAAI,mCAAW,CAAC;QACpB,IAAI,EAAE,+BAAa,CAAC,eAAe,CAAC,IAAI;QACxC,OAAO,EAAE,2IAA2I;KACrJ,CAAC,CAAC;AACL,CAAC,CAAC;AAbW,QAAA,+BAA+B,mCAa1C;AAEF;;;;;;GAMG;AACI,MAAM,wBAAwB,GAAG,CACtC,UAAyC,EACzC,qBAAqB,GAAG,IAAI,EACG,EAAE;IACjC,OAAO,KAAK,EACV,OAAkC,EAClC,OAA8B,EAC9B,SAAoB,EACpB,IAAoC,EACrB,EAAE;QACjB,IAAI,KAAK,GAAsB,SAAS,CAAC;QACzC,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC1C,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,KAAK,GAAG,IAAI,KAAK,CACf,4EAA4E,CAC7E,CAAC;SACH;aAAM;YACL,IAAI;gBACF,MAAM,OAAO,GAAG,MAAM,IAAA,0CAAiC,EACrD,KAAK,EACL,UAAU,CACX,CAAC;gBACD,OAAqD,CAAC,OAAO;oBAC5D,OAAO,CAAC;aACX;YAAC,OAAO,CAAC,EAAE;gBACV,KAAK,GAAG,IAAA,mCAAW,EAAC,CAAC,CAAC,CAAC;aACxB;SACF;QAED,IAAI,qBAAqB,IAAI,KAAK,KAAK,SAAS,EAAE;YAChD,MAAM,KAAK,CAAC;SACb;QAED,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA,CAAC;IAC5C,CAAC,CAAC;AACJ,CAAC,CAAC;AAnCW,QAAA,wBAAwB,4BAmCnC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-id-guard",
|
|
3
|
-
"version": "0.29.0-rc.
|
|
3
|
+
"version": "0.29.0-rc.7",
|
|
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.14-rc.
|
|
32
|
-
"@axinom/mosaic-message-bus": "^0.24.0-rc.
|
|
33
|
-
"@axinom/mosaic-service-common": "^0.46.0-rc.
|
|
34
|
-
"@axinom/mosaic-transactional-inbox-outbox": "^0.6.0-rc.
|
|
31
|
+
"@axinom/mosaic-id-utils": "^0.15.14-rc.7",
|
|
32
|
+
"@axinom/mosaic-message-bus": "^0.24.0-rc.7",
|
|
33
|
+
"@axinom/mosaic-service-common": "^0.46.0-rc.7",
|
|
34
|
+
"@axinom/mosaic-transactional-inbox-outbox": "^0.6.0-rc.7",
|
|
35
35
|
"amqplib": "^0.10.3",
|
|
36
36
|
"express": "^4.17.1",
|
|
37
37
|
"express-bearer-token": "^2.4.0",
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"publishConfig": {
|
|
66
66
|
"access": "public"
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "09d05a96cbc03be1a9559ab2d672319f96a4458d"
|
|
69
69
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
2
|
+
MosaicError,
|
|
3
3
|
UnreachableCaseError,
|
|
4
4
|
} from '@axinom/mosaic-service-common';
|
|
5
5
|
import jwt from 'jsonwebtoken';
|
|
@@ -178,11 +178,13 @@ export const handleJwtParseError = (
|
|
|
178
178
|
message = buildJwtErrorMessage(code, authType, token, authConfig);
|
|
179
179
|
}
|
|
180
180
|
|
|
181
|
-
// If thrown error is an instance of Error, take that as the original error.
|
|
181
|
+
// If thrown error is an instance of Error, take that as the original error.
|
|
182
|
+
// If not, create a new Unhandled MosaicError and encapsulate the unknown
|
|
183
|
+
// error in it
|
|
182
184
|
if (err instanceof Error) {
|
|
183
185
|
originalError = err;
|
|
184
186
|
} else {
|
|
185
|
-
originalError = new
|
|
187
|
+
originalError = new MosaicError(err);
|
|
186
188
|
}
|
|
187
189
|
return [code, message, originalError, details];
|
|
188
190
|
};
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
MosaicError,
|
|
3
3
|
MosaicErrorInfo,
|
|
4
|
-
NonMosaicError,
|
|
5
4
|
skipMaskTag,
|
|
6
5
|
} from '@axinom/mosaic-service-common';
|
|
7
6
|
|
|
@@ -11,15 +10,3 @@ export class IdGuardError extends MosaicError {
|
|
|
11
10
|
super({ ...everythingElse, details: { ...details, skipMaskTag } });
|
|
12
11
|
}
|
|
13
12
|
}
|
|
14
|
-
|
|
15
|
-
export const assertIdGuardError: (
|
|
16
|
-
error: unknown,
|
|
17
|
-
) => asserts error is IdGuardError = (
|
|
18
|
-
error: unknown,
|
|
19
|
-
): asserts error is IdGuardError => {
|
|
20
|
-
if (!(error instanceof IdGuardError)) {
|
|
21
|
-
throw new NonMosaicError(
|
|
22
|
-
`A caught error is not an instance of an IdGuardError class.`,
|
|
23
|
-
);
|
|
24
|
-
}
|
|
25
|
-
};
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { MosaicError } from '@axinom/mosaic-service-common';
|
|
1
|
+
import { ensureError, MosaicError } from '@axinom/mosaic-service-common';
|
|
2
2
|
import { CloseCode } from 'graphql-ws';
|
|
3
3
|
import { Plugin } from 'postgraphile';
|
|
4
4
|
import {
|
|
5
|
-
assertIdGuardError,
|
|
6
5
|
EndUserAuthenticationContext,
|
|
7
6
|
IdGuardErrors,
|
|
8
7
|
ManagementAuthenticationContext,
|
|
@@ -77,8 +76,8 @@ export const SubscriptionGuardPlugin: Plugin = (builder) => {
|
|
|
77
76
|
context,
|
|
78
77
|
info,
|
|
79
78
|
);
|
|
80
|
-
} catch (
|
|
81
|
-
|
|
79
|
+
} catch (e) {
|
|
80
|
+
const error = ensureError(e) as Error & { code?: string };
|
|
82
81
|
/**
|
|
83
82
|
* If the token has expired, we close the connection with CloseCode.Forbidden, and allow the client to automatically re-establish
|
|
84
83
|
* the connection with a new token.
|
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
MessageInfo,
|
|
4
4
|
OnMessageMiddleware,
|
|
5
5
|
} from '@axinom/mosaic-message-bus';
|
|
6
|
-
import { MosaicError,
|
|
6
|
+
import { MosaicError, ensureError } from '@axinom/mosaic-service-common';
|
|
7
7
|
import { AckOrNack } from 'rascal';
|
|
8
8
|
import {
|
|
9
9
|
AuthenticatedEndUser,
|
|
@@ -73,8 +73,7 @@ export const authenticationMiddleware = <TContent = unknown>(
|
|
|
73
73
|
(message as AuthenticatedManagementSubjectMessageInfo).subject =
|
|
74
74
|
subject;
|
|
75
75
|
} catch (e) {
|
|
76
|
-
|
|
77
|
-
error = e;
|
|
76
|
+
error = ensureError(e);
|
|
78
77
|
}
|
|
79
78
|
}
|
|
80
79
|
|