@bearei/server-common 0.0.217 → 0.0.219
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 +5 -5
- package/dist/access/access.guard.js.map +1 -1
- package/dist/external/external.service.d.ts +4 -0
- package/dist/external/external.service.js +9 -6
- package/dist/external/external.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/utils/sign/sign.utils.d.ts +5 -3
- package/dist/utils/sign/sign.utils.js +29 -15
- package/dist/utils/sign/sign.utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -47,7 +47,7 @@ let AccessGuard = class AccessGuard {
|
|
|
47
47
|
})(exception_1.HTTP_EXCEPTION.UNAUTHORIZED);
|
|
48
48
|
}
|
|
49
49
|
const validatePayload = (request) => {
|
|
50
|
-
const
|
|
50
|
+
const assertInternalSignature = (value) => {
|
|
51
51
|
if (!value) {
|
|
52
52
|
(0, exception_1.throwHTTPException)({
|
|
53
53
|
code: exception_1.HTTP_EXCEPTION_CODE.INTERNAL_SERVER_SIGNATURE_VERIFICATION_FAILED,
|
|
@@ -59,11 +59,11 @@ let AccessGuard = class AccessGuard {
|
|
|
59
59
|
};
|
|
60
60
|
return (requiredAccesses = []) => ({ sub: subject, iss: issuer, aud: audience }) => {
|
|
61
61
|
if (request.headers['x-ei-internal-authorization']) {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
secretKey: this.configService.get('service.secretKey'),
|
|
62
|
+
const secret = `${this.configService.get('service.accessKey')}:${this.configService.get('service.secretKey')}`;
|
|
63
|
+
const isValid = (0, utils_1.createHmacVerifier)(secret)({
|
|
65
64
|
serviceName: this.configService.get('service.name')
|
|
66
|
-
})(subject)
|
|
65
|
+
})(subject);
|
|
66
|
+
return assertInternalSignature(isValid);
|
|
67
67
|
}
|
|
68
68
|
const isDisabledGuestAccess = subject === access_enum_1.ACCESS.GUEST && !requiredAccesses.includes(access_enum_1.ACCESS.GUEST);
|
|
69
69
|
if (isDisabledGuestAccess) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAyC;AACzC,2CAA4C;AAC5C,uCAAsC;AACtC,8CAA6C;AAC7C,4CAAoF;AAGpF,gCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import { HttpService } from '@nestjs/axios';
|
|
2
2
|
import { ConfigService } from '@nestjs/config';
|
|
3
|
+
import { Agent as HttpAgent } from 'http';
|
|
4
|
+
import { Agent as HttpsAgent } from 'https';
|
|
3
5
|
import type { FindResult, RequestHeaders } from '../app.interface';
|
|
4
6
|
import { JWTService } from '../jwt';
|
|
5
7
|
import type { AuthenticationExternalPermissionsOptions, AuthenticationExternalSubscriptionFeaturesOptions, CreateExternalActionLogOptions, FeatureEntity, PermissionEntity, RequestOptions } from './external.interface';
|
|
8
|
+
export declare const httpAgent: HttpAgent;
|
|
9
|
+
export declare const httpsAgent: HttpsAgent;
|
|
6
10
|
export declare class ExternalService {
|
|
7
11
|
private readonly configService;
|
|
8
12
|
private readonly httpService;
|
|
@@ -9,14 +9,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.ExternalService = void 0;
|
|
12
|
+
exports.ExternalService = exports.httpsAgent = exports.httpAgent = void 0;
|
|
13
13
|
const axios_1 = require("@nestjs/axios");
|
|
14
14
|
const common_1 = require("@nestjs/common");
|
|
15
15
|
const config_1 = require("@nestjs/config");
|
|
16
|
+
const http_1 = require("http");
|
|
17
|
+
const https_1 = require("https");
|
|
16
18
|
const rxjs_1 = require("rxjs");
|
|
17
19
|
const exception_1 = require("../exception");
|
|
18
20
|
const jwt_1 = require("../jwt");
|
|
19
21
|
const utils_1 = require("../utils");
|
|
22
|
+
exports.httpAgent = new http_1.Agent({ keepAlive: true });
|
|
23
|
+
exports.httpsAgent = new https_1.Agent({ keepAlive: true });
|
|
20
24
|
let ExternalService = class ExternalService {
|
|
21
25
|
configService;
|
|
22
26
|
httpService;
|
|
@@ -65,11 +69,8 @@ let ExternalService = class ExternalService {
|
|
|
65
69
|
});
|
|
66
70
|
}
|
|
67
71
|
async request({ async = false, baseURL, headers, method = 'GET', params, path = '/', serviceName, timeout, version, ...restOptions }) {
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
secretKey: this.configService.get('service.secretKey'),
|
|
71
|
-
serviceName
|
|
72
|
-
});
|
|
72
|
+
const secret = `${this.configService.get('service.accessKey')}:${this.configService.get('service.secretKey')}`;
|
|
73
|
+
const subject = (0, utils_1.createHmacSigner)(secret)({ serviceName });
|
|
73
74
|
const token = await this.jwtService.signAsync({
|
|
74
75
|
audience: `internal:${this.configService.get('service.name')}`,
|
|
75
76
|
issuer: `${this.configService.get('service.name')}:${headers['x-ei-domain-id']}`
|
|
@@ -92,6 +93,8 @@ let ExternalService = class ExternalService {
|
|
|
92
93
|
'x-ei-subject': headers['x-ei-subject'],
|
|
93
94
|
authorization: headers['authorization']
|
|
94
95
|
},
|
|
96
|
+
httpAgent: exports.httpAgent,
|
|
97
|
+
httpsAgent: exports.httpsAgent,
|
|
95
98
|
method,
|
|
96
99
|
timeout: timeout ?? this.configService.get('apiService.timeout'),
|
|
97
100
|
url
|
|
@@ -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,+BAA+C;AAE/C,4CAAoF;AACpF,gCAAiC;
|
|
1
|
+
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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"}
|