@bearei/server-common 0.0.76 → 0.0.77
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 +2 -2
- package/dist/access/access.guard.js.map +1 -1
- package/dist/external/external.service.js +2 -8
- package/dist/external/external.service.js.map +1 -1
- package/dist/jwt/jwt.module.js +3 -2
- package/dist/jwt/jwt.module.js.map +1 -1
- package/dist/jwt/jwt.service.d.ts +3 -1
- package/dist/jwt/jwt.service.js +8 -3
- package/dist/jwt/jwt.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/util/sign.util.d.ts +1 -1
- package/dist/util/sign.util.js +1 -1
- package/dist/util/sign.util.js.map +1 -1
- package/package.json +1 -1
|
@@ -49,9 +49,9 @@ let AccessGuard = class AccessGuard {
|
|
|
49
49
|
request['subject'] = sub;
|
|
50
50
|
if (request.headers['ei-internal-authorization']) {
|
|
51
51
|
return (0, util_1.signCompare)({
|
|
52
|
+
accessKey: this.configService.get('service.accessKey'),
|
|
52
53
|
secretKey: this.configService.get('service.secretKey'),
|
|
53
|
-
serviceName: this.configService.get('service.name')
|
|
54
|
-
timestamp: request.headers['ei-timestamp']
|
|
54
|
+
serviceName: this.configService.get('service.name')
|
|
55
55
|
})(sub).then(processCompareResult(request));
|
|
56
56
|
}
|
|
57
57
|
sub === 'guest' &&
|
|
@@ -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,kCAA+D;AAC/D,yDAAyC;AAGlC,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEC;IACA;IACA;IAHrB,YACqB,UAAsB,EACtB,aAA4B,EAC5B,SAAoB;QAFpB,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,cAAS,GAAT,SAAS,CAAW;IACtC,CAAC;IAEJ,WAAW,CAAC,OAAyB;QACjC,MAAM,gBAAgB,GAAa,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,6BAAa,EAAE;YAC/E,OAAO,CAAC,QAAQ,EAAE;YAClB,OAAO,CAAC,UAAU,EAAE;SACvB,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAc,CAAA;QAC/D,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC/B,MAAM,QAAQ,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,eAAe,CAAA;QACrG,MAAM,KAAK,GAAG,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAA;QAE5C,CAAC,KAAK,IAAI,IAAA,oBAAa,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qCAAqC,EAAC,CAAC,CAAC,wBAAQ,CAAC,YAAY,CAAC,CAAA;QAEhH,MAAM,iBAAiB,GAAG,CAAC,OAAmB,EAAE,EAAE;YAC9C,MAAM,oBAAoB,GAAG,CAAC,OAAmB,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,EAAE;gBACtE,CAAC,MAAM;oBACH,IAAA,oBAAa,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,gDAAgD,EAAC,CAAC,CACtF,wBAAQ,CAAC,YAAY,CACxB,CAAA;gBAEL,OAAO,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAA;gBAElC,OAAO,MAAM,CAAA;YACjB,CAAC,CAAA;YAED,OAAO,CAAC,gBAA0B,EAAE,EAAE,CAClC,CAAC,EAAC,GAAG,EAAE,GAAG,EAAa,EAAE,EAAE;gBACvB,OAAO,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAA;gBACvB,OAAO,CAAC,SAAS,CAAC,GAAG,GAAG,CAAA;gBAExB,IAAI,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,EAAE,CAAC;oBAC/C,OAAO,IAAA,kBAAW,EAAC;wBACf,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC;wBACtD,
|
|
1
|
+
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,15 +8,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
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
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.ExternalService = void 0;
|
|
16
13
|
const axios_1 = require("@nestjs/axios");
|
|
17
14
|
const common_1 = require("@nestjs/common");
|
|
18
15
|
const config_1 = require("@nestjs/config");
|
|
19
|
-
const dayjs_1 = __importDefault(require("dayjs"));
|
|
20
16
|
const rxjs_1 = require("rxjs");
|
|
21
17
|
const app_interface_1 = require("../app.interface");
|
|
22
18
|
const jwt_1 = require("../jwt");
|
|
@@ -64,11 +60,10 @@ let ExternalService = class ExternalService {
|
|
|
64
60
|
};
|
|
65
61
|
}
|
|
66
62
|
async request({ baseURL, headers, method = 'GET', params, path = '/', serviceName, timeout, version, async = false, ...options }) {
|
|
67
|
-
const requestTimestamp = `${dayjs_1.default.utc().valueOf()}`;
|
|
68
63
|
const subject = await (0, util_1.sign)(10)({
|
|
64
|
+
accessKey: this.configService.get('service.accessKey'),
|
|
69
65
|
secretKey: this.configService.get('service.secretKey'),
|
|
70
|
-
serviceName
|
|
71
|
-
timestamp: requestTimestamp
|
|
66
|
+
serviceName
|
|
72
67
|
});
|
|
73
68
|
const token = await this.jwtService.signAsync({
|
|
74
69
|
audience: `internal:${this.configService.get('service.name')}`,
|
|
@@ -90,7 +85,6 @@ let ExternalService = class ExternalService {
|
|
|
90
85
|
'ei-internal-authorization': token,
|
|
91
86
|
'ei-ip': headers['ei-ip'],
|
|
92
87
|
'ei-subject': headers['ei-subject'],
|
|
93
|
-
'ei-timestamp': requestTimestamp,
|
|
94
88
|
authorization: headers['authorization']
|
|
95
89
|
},
|
|
96
90
|
method,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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"}
|
package/dist/jwt/jwt.module.js
CHANGED
|
@@ -31,11 +31,12 @@ exports.JWTModule = JWTModule = __decorate([
|
|
|
31
31
|
return {
|
|
32
32
|
privateKey: privateKey.export({ format: 'pem', type: 'pkcs8' }),
|
|
33
33
|
publicKey: publicKey.export({ format: 'pem', type: 'spki' }),
|
|
34
|
-
signOptions: {
|
|
34
|
+
signOptions: { algorithm: 'RS256' }
|
|
35
35
|
};
|
|
36
36
|
},
|
|
37
37
|
inject: [config_1.ConfigService]
|
|
38
|
-
})
|
|
38
|
+
}),
|
|
39
|
+
config_1.ConfigModule
|
|
39
40
|
],
|
|
40
41
|
providers: [jwt_service_1.JWTService]
|
|
41
42
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.module.js","sourceRoot":"","sources":["../../src/jwt/jwt.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAqC;AACrC,2CAA0D;AAC1D,qCAAqC;AACrC,oDAA2B;AAC3B,+CAAwC;
|
|
1
|
+
{"version":3,"file":"jwt.module.js","sourceRoot":"","sources":["../../src/jwt/jwt.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAqC;AACrC,2CAA0D;AAC1D,qCAAqC;AACrC,oDAA2B;AAC3B,+CAAwC;AAwBjC,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IAtBrB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE,CAAC,wBAAU,CAAC;QACrB,OAAO,EAAE;YACL,eAAS,CAAC,aAAa,CAAC;gBACpB,OAAO,EAAE,CAAC,qBAAY,CAAC;gBACvB,UAAU,EAAE,KAAK,EAAC,aAAa,EAAC,EAAE;oBAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAA;oBAC3D,MAAM,UAAU,GAAG,gBAAM,CAAC,gBAAgB,CAAC,EAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAC,CAAC,CAAA;oBACrE,MAAM,SAAS,GAAG,gBAAM,CAAC,eAAe,CAAC,EAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAC,CAAC,CAAA;oBAEnE,OAAO;wBACH,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAC,CAAC;wBAC7D,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC;wBAC1D,WAAW,EAAE,EAAC,SAAS,EAAE,OAAO,EAAC;qBACpC,CAAA;gBACL,CAAC;gBACD,MAAM,EAAE,CAAC,sBAAa,CAAC;aAC1B,CAAC;YACF,qBAAY;SACf;QACD,SAAS,EAAE,CAAC,wBAAU,CAAC;KAC1B,CAAC;GACW,SAAS,CAAG"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { ConfigService } from '@nestjs/config';
|
|
1
2
|
import { JwtService } from '@nestjs/jwt';
|
|
2
3
|
import { JWTSignAsyncOptions } from './jwt.interface';
|
|
3
4
|
export declare class JWTService {
|
|
5
|
+
private readonly configService;
|
|
4
6
|
private readonly jwtService;
|
|
5
|
-
constructor(jwtService: JwtService);
|
|
7
|
+
constructor(configService: ConfigService, jwtService: JwtService);
|
|
6
8
|
signAsync({ issuer, audience, jwtId, notBefore, jwtSignOptions }: JWTSignAsyncOptions): (subject: string) => Promise<string>;
|
|
7
9
|
verifyAsync(token: string): Promise<any>;
|
|
8
10
|
}
|
package/dist/jwt/jwt.service.js
CHANGED
|
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.JWTService = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
|
+
const config_1 = require("@nestjs/config");
|
|
17
18
|
const jwt_1 = require("@nestjs/jwt");
|
|
18
19
|
const dayjs_1 = __importDefault(require("dayjs"));
|
|
19
20
|
const utc_1 = __importDefault(require("dayjs/plugin/utc"));
|
|
@@ -21,12 +22,15 @@ const nanoid_1 = require("nanoid");
|
|
|
21
22
|
const app_interface_1 = require("../app.interface");
|
|
22
23
|
const util_1 = require("../util");
|
|
23
24
|
let JWTService = class JWTService {
|
|
25
|
+
configService;
|
|
24
26
|
jwtService;
|
|
25
|
-
constructor(jwtService) {
|
|
27
|
+
constructor(configService, jwtService) {
|
|
28
|
+
this.configService = configService;
|
|
26
29
|
this.jwtService = jwtService;
|
|
27
30
|
dayjs_1.default.extend(utc_1.default);
|
|
28
31
|
}
|
|
29
32
|
signAsync({ issuer, audience, jwtId, notBefore, jwtSignOptions }) {
|
|
33
|
+
const { expiresIn = this.configService.get('jwt.expiresIn'), ...otherJWTSignOptions } = jwtSignOptions;
|
|
30
34
|
return async (subject) => {
|
|
31
35
|
const payload = {
|
|
32
36
|
aud: audience,
|
|
@@ -35,7 +39,7 @@ let JWTService = class JWTService {
|
|
|
35
39
|
nbf: notBefore ?? parseInt(`${dayjs_1.default.utc().valueOf() / 1000}`),
|
|
36
40
|
sub: subject
|
|
37
41
|
};
|
|
38
|
-
const token = await this.jwtService.signAsync(payload,
|
|
42
|
+
const token = await this.jwtService.signAsync(payload, { ...otherJWTSignOptions, expiresIn });
|
|
39
43
|
return token;
|
|
40
44
|
};
|
|
41
45
|
}
|
|
@@ -48,6 +52,7 @@ let JWTService = class JWTService {
|
|
|
48
52
|
exports.JWTService = JWTService;
|
|
49
53
|
exports.JWTService = JWTService = __decorate([
|
|
50
54
|
(0, common_1.Injectable)(),
|
|
51
|
-
__metadata("design:paramtypes", [
|
|
55
|
+
__metadata("design:paramtypes", [config_1.ConfigService,
|
|
56
|
+
jwt_1.JwtService])
|
|
52
57
|
], JWTService);
|
|
53
58
|
//# sourceMappingURL=jwt.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.service.js","sourceRoot":"","sources":["../../src/jwt/jwt.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyC;AACzC,qCAAsC;AACtC,kDAAyB;AACzB,2DAAkC;AAClC,mCAA6B;AAC7B,oDAAyC;AACzC,kCAAqC;AAI9B,IAAM,UAAU,GAAhB,MAAM,UAAU;
|
|
1
|
+
{"version":3,"file":"jwt.service.js","sourceRoot":"","sources":["../../src/jwt/jwt.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyC;AACzC,2CAA4C;AAC5C,qCAAsC;AACtC,kDAAyB;AACzB,2DAAkC;AAClC,mCAA6B;AAC7B,oDAAyC;AACzC,kCAAqC;AAI9B,IAAM,UAAU,GAAhB,MAAM,UAAU;IAEE;IACA;IAFrB,YACqB,aAA4B,EAC5B,UAAsB;QADtB,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;QAEvC,eAAK,CAAC,MAAM,CAAC,aAAG,CAAC,CAAA;IACrB,CAAC;IAED,SAAS,CAAC,EAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAsB;QAC/E,MAAM,EAAC,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,mBAAmB,EAAC,GAAG,cAAc,CAAA;QAEpG,OAAO,KAAK,EAAE,OAAe,EAAE,EAAE;YAC7B,MAAM,OAAO,GAAG;gBACZ,GAAG,EAAE,QAAQ;gBACb,GAAG,EAAE,MAAM;gBACX,GAAG,EAAE,KAAK,IAAI,IAAA,eAAM,GAAE;gBACtB,GAAG,EAAE,SAAS,IAAI,QAAQ,CAAC,GAAG,eAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;gBAC7D,GAAG,EAAE,OAAO;aACf,CAAA;YAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,EAAC,GAAG,mBAAmB,EAAE,SAAS,EAAC,CAAC,CAAA;YAE3F,OAAO,KAAK,CAAA;QAChB,CAAC,CAAA;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,UAAU;aACjB,WAAW,CAAC,KAAK,CAAC;aAClB,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,IAAA,oBAAa,EAAC,EAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAC,CAAC,CAAC,wBAAQ,CAAC,YAAY,CAAC,CAAC,CAAA;IACvF,CAAC;CACJ,CAAA;AA/BY,gCAAU;qBAAV,UAAU;IADtB,IAAA,mBAAU,GAAE;qCAG2B,sBAAa;QAChB,gBAAU;GAHlC,UAAU,CA+BtB"}
|