@bearei/server-common 0.0.75 → 0.0.76
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/access/access.guard.js +6 -7
- package/dist/access/access.guard.js.map +1 -1
- package/dist/external/external.service.js +1 -2
- package/dist/external/external.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/util/sign.util.d.ts +2 -2
- package/dist/util/sign.util.js +47 -16
- package/dist/util/sign.util.js.map +1 -1
- package/package.json +1 -1
|
@@ -37,10 +37,10 @@ let AccessGuard = class AccessGuard {
|
|
|
37
37
|
const tokenKey = headers['ei-internal-authorization'] ? 'ei-internal-authorization' : 'authorization';
|
|
38
38
|
const token = (0, util_1.formatToken)(headers)(tokenKey);
|
|
39
39
|
!token && (0, util_1.throwAPIError)({ code: '401001', message: 'Authentication token does not exist' })(app_interface_1.APIError.UNAUTHORIZED);
|
|
40
|
-
const
|
|
41
|
-
const
|
|
40
|
+
const processJWTPayload = (request) => {
|
|
41
|
+
const processCompareResult = (request) => (result) => {
|
|
42
42
|
!result &&
|
|
43
|
-
(0, util_1.throwAPIError)({ code: '401007', message: 'Internal service signature verification failed' })(app_interface_1.APIError.
|
|
43
|
+
(0, util_1.throwAPIError)({ code: '401007', message: 'Internal service signature verification failed' })(app_interface_1.APIError.UNAUTHORIZED);
|
|
44
44
|
request['internalAccess'] = result;
|
|
45
45
|
return result;
|
|
46
46
|
};
|
|
@@ -48,12 +48,11 @@ let AccessGuard = class AccessGuard {
|
|
|
48
48
|
request['issuer'] = iss;
|
|
49
49
|
request['subject'] = sub;
|
|
50
50
|
if (request.headers['ei-internal-authorization']) {
|
|
51
|
-
return (0, util_1.
|
|
52
|
-
accessKey: this.configService.get('service.accessKey'),
|
|
51
|
+
return (0, util_1.signCompare)({
|
|
53
52
|
secretKey: this.configService.get('service.secretKey'),
|
|
54
53
|
serviceName: this.configService.get('service.name'),
|
|
55
54
|
timestamp: request.headers['ei-timestamp']
|
|
56
|
-
})(sub).then(
|
|
55
|
+
})(sub).then(processCompareResult(request));
|
|
57
56
|
}
|
|
58
57
|
sub === 'guest' &&
|
|
59
58
|
!requiredAccesses?.includes(access_interface_1.Access.GUEST) &&
|
|
@@ -61,7 +60,7 @@ let AccessGuard = class AccessGuard {
|
|
|
61
60
|
return Boolean(sub);
|
|
62
61
|
};
|
|
63
62
|
};
|
|
64
|
-
return this.jwtService.verifyAsync(token).then(
|
|
63
|
+
return this.jwtService.verifyAsync(token).then(processJWTPayload(request)(requiredAccesses));
|
|
65
64
|
}
|
|
66
65
|
};
|
|
67
66
|
exports.AccessGuard = AccessGuard;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwE;AACxE,2CAA4C;AAC5C,uCAAsC;AACtC,oDAA8C;AAC9C,oDAAyC;AAEzC,gCAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,8 +65,7 @@ let ExternalService = class ExternalService {
|
|
|
65
65
|
}
|
|
66
66
|
async request({ baseURL, headers, method = 'GET', params, path = '/', serviceName, timeout, version, async = false, ...options }) {
|
|
67
67
|
const requestTimestamp = `${dayjs_1.default.utc().valueOf()}`;
|
|
68
|
-
const subject = await (0, util_1.
|
|
69
|
-
accessKey: this.configService.get('service.accessKey'),
|
|
68
|
+
const subject = await (0, util_1.sign)(10)({
|
|
70
69
|
secretKey: this.configService.get('service.secretKey'),
|
|
71
70
|
serviceName,
|
|
72
71
|
timestamp: requestTimestamp
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAAyC;AACzC,2CAAyC;AACzC,2CAA4C;AAC5C,kDAAyB;AACzB,+BAA+C;AAC/C,oDAAqD;AACrD,gCAAiC;AACjC,kCAA2C;AAQpC,IAAM,eAAe,GAArB,MAAM,eAAe;IAEH;IACA;IACA;IAHrB,YACqB,aAA4B,EAC5B,WAAwB,EACxB,UAAsB;QAFtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,eAAU,GAAV,UAAU,CAAY;IACxC,CAAC;IAEJ,4BAA4B,CAAC,OAAmB;QAC5C,OAAO,KAAK,EAAE,OAAgD,EAAE,EAAE;YAC9D,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,OAAO;gBACP,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,OAAO;gBACf,IAAI,EAAE,mCAAmC;gBACzC,WAAW,EAAE,cAAc;aAC9B,CAAC,CAAA;QACN,CAAC,CAAA;IACL,CAAC;IAED,eAAe,CAAC,OAAmB;QAC/B,OAAO,KAAK,EAAE,EAAC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAiC,EAAE,EAAE;YAC5E,MAAM,IAAI,CAAC,OAAO,CAAC;gBACf,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,OAAO;gBACvC,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,cAAc;gBACpB,WAAW,EAAE,aAAa;gBAC1B,IAAI,EAAE;oBACF,GAAG,IAAI;oBACP,MAAM;oBACN,OAAO,EAAE,GAAG,MAAM,IAAI,WAAW,EAAE;oBACnC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC;oBAC5B,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC;oBACjC,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC;oBACpB,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC;oBAClD,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC;oBAChC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;iBAChC;gBACD,OAAO;aACV,CAAC,CAAA;QACN,CAAC,CAAA;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EACV,OAAO,EACP,OAAO,EACP,MAAM,GAAG,KAAK,EACd,MAAM,EACN,IAAI,GAAG,GAAG,EACV,WAAW,EACX,OAAO,EACP,OAAO,EACP,KAAK,GAAG,KAAK,EACb,GAAG,OAAO,EACG;QACb,MAAM,gBAAgB,GAAG,GAAG,eAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAA;QACnD,MAAM,OAAO,GAAG,MAAM,IAAA,WAAI,EAAC,EAAE,CAAC,CAAC;YAC3B,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC;YACtD,
|
|
1
|
+
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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"}
|