@bearei/server-common 0.0.113 → 0.0.115
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/access/access.interceptor.js +6 -6
- package/dist/access/access.interceptor.js.map +1 -1
- package/dist/action-logs/action-logs.interface.d.ts +2 -2
- package/dist/app.dto.js +1 -2
- package/dist/app.dto.js.map +1 -1
- package/dist/app.interface.d.ts +4 -7
- package/dist/app.interface.js +12 -17
- package/dist/app.interface.js.map +1 -1
- package/dist/authentication/authentication.service.d.ts +2 -2
- package/dist/authentication/authentication.service.js.map +1 -1
- package/dist/base/base.interface.d.ts +6 -6
- package/dist/base/base.service.d.ts +1 -1
- package/dist/base/base.service.js +13 -13
- package/dist/base/base.service.js.map +1 -1
- package/dist/external/external.interface.d.ts +4 -4
- package/dist/external/external.service.d.ts +4 -4
- package/dist/external/external.service.js +14 -14
- package/dist/external/external.service.js.map +1 -1
- package/dist/jwt/jwt.service.js +1 -1
- package/dist/jwt/jwt.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/utils/error.util.d.ts +3 -3
- package/dist/utils/error.util.js +13 -13
- package/dist/utils/error.util.js.map +1 -1
- package/dist/utils/format.util.d.ts +2 -2
- package/dist/utils/format.util.js.map +1 -1
- package/dist/utils/index.d.ts +1 -1
- package/dist/utils/index.js +1 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/sign.util.js +2 -2
- package/dist/utils/sign.util.js.map +1 -1
- package/dist/utils/{util.interface.d.ts → utils.interface.d.ts} +1 -1
- package/dist/utils/{util.interface.js → utils.interface.js} +1 -1
- package/dist/utils/utils.interface.js.map +1 -0
- package/package.json +1 -1
- package/dist/utils/util.interface.js.map +0 -1
|
@@ -34,15 +34,15 @@ let AccessGuard = class AccessGuard {
|
|
|
34
34
|
]);
|
|
35
35
|
const request = context.switchToHttp().getRequest();
|
|
36
36
|
const headers = request.headers;
|
|
37
|
-
const authorization = headers['ei-internal-authorization'] ? 'ei-internal-authorization' : 'authorization';
|
|
37
|
+
const authorization = headers['x-ei-internal-authorization'] ? 'x-ei-internal-authorization' : 'authorization';
|
|
38
38
|
const token = (0, utils_1.formatToken)(headers)(authorization);
|
|
39
39
|
if (!token) {
|
|
40
|
-
(0, utils_1.
|
|
40
|
+
(0, utils_1.throwHTTPError)({ code: '401001', message: 'Authentication token does not exist' })(app_interface_1.HTTPError.UNAUTHORIZED);
|
|
41
41
|
}
|
|
42
42
|
const handleJWTPayload = (request) => {
|
|
43
43
|
const handleCompareResult = (request) => (result) => {
|
|
44
44
|
if (!result) {
|
|
45
|
-
(0, utils_1.
|
|
45
|
+
(0, utils_1.throwHTTPError)({ code: '401007', message: 'Internal service signature verification failed' })(app_interface_1.HTTPError.UNAUTHORIZED);
|
|
46
46
|
}
|
|
47
47
|
request['internalAccess'] = result;
|
|
48
48
|
return result;
|
|
@@ -50,7 +50,7 @@ let AccessGuard = class AccessGuard {
|
|
|
50
50
|
return (requiredAccesses) => ({ sub: subject, iss: issuer }) => {
|
|
51
51
|
request['issuer'] = issuer;
|
|
52
52
|
request['subject'] = subject;
|
|
53
|
-
if (request.headers['ei-internal-authorization']) {
|
|
53
|
+
if (request.headers['x-ei-internal-authorization']) {
|
|
54
54
|
return (0, utils_1.signCompare)({
|
|
55
55
|
accessKey: this.configService.get('service.accessKey'),
|
|
56
56
|
secretKey: this.configService.get('service.secretKey'),
|
|
@@ -59,7 +59,7 @@ let AccessGuard = class AccessGuard {
|
|
|
59
59
|
}
|
|
60
60
|
const disableGuestAccess = subject === 'guest' && !requiredAccesses?.includes(access_interface_1.Access.GUEST);
|
|
61
61
|
if (disableGuestAccess) {
|
|
62
|
-
(0, utils_1.
|
|
62
|
+
(0, utils_1.throwHTTPError)({ code: '401002', message: 'Guest user do not have access to current resource' })(app_interface_1.HTTPError.UNAUTHORIZED);
|
|
63
63
|
}
|
|
64
64
|
return Boolean(subject);
|
|
65
65
|
};
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,14 +11,14 @@ const common_1 = require("@nestjs/common");
|
|
|
11
11
|
let AccessInterceptor = class AccessInterceptor {
|
|
12
12
|
intercept(context, next) {
|
|
13
13
|
const request = context.switchToHttp().getRequest();
|
|
14
|
-
if (!request.headers['ei-ip']) {
|
|
15
|
-
request.headers['ei-ip'] = request.headers['x-forwarded-for'] ?? request.headers['x-real-ip'];
|
|
14
|
+
if (!request.headers['x-ei-ip']) {
|
|
15
|
+
request.headers['x-ei-ip'] = request.headers['x-forwarded-for'] ?? request.headers['x-real-ip'];
|
|
16
16
|
}
|
|
17
|
-
if (!request.headers['ei-subject']) {
|
|
18
|
-
request.headers['ei-subject'] = request.subject;
|
|
17
|
+
if (!request.headers['x-ei-subject']) {
|
|
18
|
+
request.headers['x-ei-subject'] = request.subject;
|
|
19
19
|
}
|
|
20
|
-
if (!request.headers['ei-domainId']) {
|
|
21
|
-
request.headers['ei-domainId'] = request.issuer;
|
|
20
|
+
if (!request.headers['x-ei-domainId']) {
|
|
21
|
+
request.headers['x-ei-domainId'] = request.issuer;
|
|
22
22
|
}
|
|
23
23
|
return next.handle();
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAyF;AAGlF,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC1B,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAA;QAEnD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAyF;AAGlF,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC1B,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAA;QAEnD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QACnG,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,OAAO,CAAA;QACrD,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,MAAM,CAAA;QACrD,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IACxB,CAAC;CACJ,CAAA;AAlBY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CAkB7B"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Action, ActionResult,
|
|
1
|
+
import { Action, ActionResult, RequestHeaders } from '../app.interface';
|
|
2
2
|
export interface ActionLogsOptions {
|
|
3
3
|
action: Action;
|
|
4
4
|
enableLogging?: boolean;
|
|
5
|
-
headers:
|
|
5
|
+
headers: RequestHeaders;
|
|
6
6
|
message?: string;
|
|
7
7
|
raw: Record<string, unknown>;
|
|
8
8
|
serviceName: string;
|
package/dist/app.dto.js
CHANGED
|
@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.NotIdDTO = exports.ByEmailDTO = exports.ByIdDTO = exports.IndexDTO = void 0;
|
|
13
13
|
const class_transformer_1 = require("class-transformer");
|
|
14
14
|
const class_validator_1 = require("class-validator");
|
|
15
|
-
const app_interface_1 = require("./app.interface");
|
|
16
15
|
const decorators_1 = require("./decorators");
|
|
17
16
|
class IndexDTO {
|
|
18
17
|
id;
|
|
@@ -47,7 +46,7 @@ __decorate([
|
|
|
47
46
|
__metadata("design:type", Boolean)
|
|
48
47
|
], IndexDTO.prototype, "count", void 0);
|
|
49
48
|
__decorate([
|
|
50
|
-
(0, class_validator_1.IsEnum)(
|
|
49
|
+
(0, class_validator_1.IsEnum)(['ASC', 'DESC']),
|
|
51
50
|
__metadata("design:type", String)
|
|
52
51
|
], IndexDTO.prototype, "order", void 0);
|
|
53
52
|
__decorate([
|
package/dist/app.dto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.dto.js","sourceRoot":"","sources":["../src/app.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAWwB;
|
|
1
|
+
{"version":3,"file":"app.dto.js","sourceRoot":"","sources":["../src/app.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAWwB;AAExB,6CAAqC;AAErC,MAAa,QAAQ;IAEjB,EAAE,CAAS;IAKX,IAAI,CAAS;IAMb,IAAI,CAAS;IAIb,KAAK,CAAU;IAGf,KAAK,CAAQ;IAMb,GAAG,CAAW;IAOd,cAAc,CAAW;CAC5B;AAlCD,4BAkCC;AAhCG;IADC,IAAA,qBAAQ,GAAE;;oCACA;AAKX;IAHC,IAAA,0BAAQ,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;IAC3B,IAAA,qBAAG,EAAC,CAAC,CAAC;IACN,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;sCAC7C;AAMb;IAJC,IAAA,0BAAQ,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;IAC3B,IAAA,qBAAG,EAAC,IAAI,CAAC;IACT,IAAA,qBAAG,EAAC,CAAC,CAAC;IACN,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;sCAC7C;AAIb;IAFC,IAAA,2BAAS,GAAE;IACX,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;uCAChE;AAGf;IADC,IAAA,wBAAM,EAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;;uCACX;AAMb;IAJC,IAAA,8BAAY,EAAC,IAAI,CAAC;IAClB,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,qBAAQ,EAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IACtB,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;qCACjE;AAOd;IALC,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,8BAAY,EAAC,SAAS,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IACrC,IAAA,qBAAQ,EAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IACtB,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;gDACtD;AAG7B,MAAa,OAAO;IAGhB,EAAE,CAAQ;CACb;AAJD,0BAIC;AADG;IAFC,IAAA,2BAAS,GAAE;IACX,IAAA,qBAAQ,GAAE;;mCACD;AAGd,MAAa,UAAU;IAGnB,KAAK,CAAQ;CAChB;AAJD,gCAIC;AADG;IAFC,IAAA,2BAAS,GAAE;IACX,IAAA,yBAAO,GAAE;;yCACG;AAGjB,MAAa,QAAQ;IAEjB,KAAK,CAAS;CACjB;AAHD,4BAGC;AADG;IADC,IAAA,qBAAQ,GAAE;;uCACG"}
|
package/dist/app.interface.d.ts
CHANGED
|
@@ -8,13 +8,10 @@ export declare enum Language {
|
|
|
8
8
|
EN_US = "enUS",
|
|
9
9
|
ZH_CN = "zhCN"
|
|
10
10
|
}
|
|
11
|
-
export
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
export type CustomHeaders = Record<'ei-domain-id' | 'ei-ip' | 'ei-client' | 'ei-internal-authorization' | 'ei-subject', string>;
|
|
16
|
-
export type APIHeaders = Record<string, string> | CustomHeaders | AxiosRequestConfig['headers'];
|
|
17
|
-
export declare enum APIError {
|
|
11
|
+
export type Order = 'ASC' | 'DESC';
|
|
12
|
+
export type CustomHeaders = Record<'x-ei-domain-id' | 'x-ei-ip' | 'x-ei-client' | 'x-ei-internal-authorization' | 'x-ei-subject', string>;
|
|
13
|
+
export type RequestHeaders = Record<string, string> | CustomHeaders | AxiosRequestConfig['headers'];
|
|
14
|
+
export declare enum HTTPError {
|
|
18
15
|
BAD_REQUEST = "badRequest",
|
|
19
16
|
FORBIDDEN = "forbidden",
|
|
20
17
|
HTTP_EXCEPTION = "httpException",
|
package/dist/app.interface.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Action = exports.ActionResult = exports.
|
|
3
|
+
exports.Action = exports.ActionResult = exports.HTTPError = exports.Language = exports.EntityStatus = void 0;
|
|
4
4
|
var EntityStatus;
|
|
5
5
|
(function (EntityStatus) {
|
|
6
6
|
EntityStatus["SOFT_REMOVED"] = "softRemoved";
|
|
@@ -11,22 +11,17 @@ var Language;
|
|
|
11
11
|
Language["EN_US"] = "enUS";
|
|
12
12
|
Language["ZH_CN"] = "zhCN";
|
|
13
13
|
})(Language || (exports.Language = Language = {}));
|
|
14
|
-
var
|
|
15
|
-
(function (
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
APIError["NOT_FOUND"] = "notFound";
|
|
26
|
-
APIError["REQUEST_TIMEOUT"] = "requestTimeout";
|
|
27
|
-
APIError["UNAUTHORIZED"] = "unauthorized";
|
|
28
|
-
APIError["UNPROCESSABLE_ENTITY"] = "unprocessableEntity";
|
|
29
|
-
})(APIError || (exports.APIError = APIError = {}));
|
|
14
|
+
var HTTPError;
|
|
15
|
+
(function (HTTPError) {
|
|
16
|
+
HTTPError["BAD_REQUEST"] = "badRequest";
|
|
17
|
+
HTTPError["FORBIDDEN"] = "forbidden";
|
|
18
|
+
HTTPError["HTTP_EXCEPTION"] = "httpException";
|
|
19
|
+
HTTPError["INTERNAL_SERVER_ERROR"] = "internalServerError";
|
|
20
|
+
HTTPError["NOT_FOUND"] = "notFound";
|
|
21
|
+
HTTPError["REQUEST_TIMEOUT"] = "requestTimeout";
|
|
22
|
+
HTTPError["UNAUTHORIZED"] = "unauthorized";
|
|
23
|
+
HTTPError["UNPROCESSABLE_ENTITY"] = "unprocessableEntity";
|
|
24
|
+
})(HTTPError || (exports.HTTPError = HTTPError = {}));
|
|
30
25
|
var ActionResult;
|
|
31
26
|
(function (ActionResult) {
|
|
32
27
|
ActionResult["FAILURE"] = "failure";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.interface.js","sourceRoot":"","sources":["../src/app.interface.ts"],"names":[],"mappings":";;;AAGA,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,4CAA4B,CAAA;IAC5B,uCAAuB,CAAA;AAC3B,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,0BAAc,CAAA;IACd,0BAAc,CAAA;AAClB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;
|
|
1
|
+
{"version":3,"file":"app.interface.js","sourceRoot":"","sources":["../src/app.interface.ts"],"names":[],"mappings":";;;AAGA,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,4CAA4B,CAAA;IAC5B,uCAAuB,CAAA;AAC3B,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,0BAAc,CAAA;IACd,0BAAc,CAAA;AAClB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AASD,IAAY,SASX;AATD,WAAY,SAAS;IACjB,uCAA0B,CAAA;IAC1B,oCAAuB,CAAA;IACvB,6CAAgC,CAAA;IAChC,0DAA6C,CAAA;IAC7C,mCAAsB,CAAA;IACtB,+CAAkC,CAAA;IAClC,0CAA6B,CAAA;IAC7B,yDAA4C,CAAA;AAChD,CAAC,EATW,SAAS,yBAAT,SAAS,QASpB;AAED,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;AACvB,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAED,IAAY,MASX;AATD,WAAY,MAAM;IACd,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,4BAAkB,CAAA;IAClB,8BAAoB,CAAA;IACpB,4BAAkB,CAAA;IAClB,2BAAiB,CAAA;AACrB,CAAC,EATW,MAAM,sBAAN,MAAM,QASjB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RequestHeaders } from '../app.interface';
|
|
2
2
|
import { ExternalService } from '../external';
|
|
3
3
|
import { AuthenticationPermissionsOptions } from './authentication.interface';
|
|
4
4
|
export declare class AuthenticationService {
|
|
5
5
|
private readonly externalService;
|
|
6
6
|
constructor(externalService: ExternalService);
|
|
7
|
-
authenticationPermissions(headers:
|
|
7
|
+
authenticationPermissions(headers: RequestHeaders): (options: AuthenticationPermissionsOptions) => Promise<any>;
|
|
8
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../src/authentication/authentication.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyC;AAEzC,0CAA2C;AAIpC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACD;IAA7B,YAA6B,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAEjE,yBAAyB,CAAC,
|
|
1
|
+
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../src/authentication/authentication.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyC;AAEzC,0CAA2C;AAIpC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACD;IAA7B,YAA6B,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAEjE,yBAAyB,CAAC,OAAuB;QAC7C,OAAO,KAAK,EAAE,OAAyC,EAAE,EAAE,CACvD,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAA;IAC5E,CAAC;CACJ,CAAA;AAPY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAEqC,0BAAe;GADpD,qBAAqB,CAOjC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { DeepPartial, FindManyOptions, FindOptionsWhere, Repository } from 'typeorm';
|
|
2
2
|
import { ActionLogsOptions } from '../action-logs';
|
|
3
3
|
import { IndexDTO, NotIdDTO } from '../app.dto';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
4
|
+
import { HTTPError, RequestHeaders } from '../app.interface';
|
|
5
|
+
import { ThrowHTTPErrorOptions } from '../utils';
|
|
6
6
|
export interface BaseServiceOptions<T> extends Pick<ActionLogsOptions, 'enableLogging'> {
|
|
7
7
|
entityOptions: DeepPartial<T>;
|
|
8
8
|
findOptions: FindOptionsWhere<T>;
|
|
9
|
-
headers:
|
|
9
|
+
headers: RequestHeaders;
|
|
10
10
|
preValidateOptions?: Omit<PreValidateOptions<T>, 'serviceName' | 'actionLogsOptions'>;
|
|
11
11
|
serviceName: string;
|
|
12
12
|
}
|
|
@@ -36,8 +36,8 @@ export type CountResult = {
|
|
|
36
36
|
count?: string;
|
|
37
37
|
};
|
|
38
38
|
export interface UpdateAssociationOptions<T> extends Omit<BaseServiceOptions<T>, 'entityOptions' | 'findOptions'>, Pick<FindOptions<T>, 'findOptions'> {
|
|
39
|
-
entityIds: string[];
|
|
40
39
|
addEntityOptions?: DeepPartial<T>;
|
|
40
|
+
entityIds: string[];
|
|
41
41
|
}
|
|
42
42
|
export interface FindOneOptions<T> extends Omit<BaseServiceOptions<T>, 'headers' | 'entityOptions'> {
|
|
43
43
|
actionLogsOptions?: ActionLogsOptions;
|
|
@@ -49,8 +49,8 @@ export interface PreValidateOptions<T> {
|
|
|
49
49
|
serviceName: string;
|
|
50
50
|
validateMethod?: 'and' | 'or';
|
|
51
51
|
}
|
|
52
|
-
export interface ThrowErrorOptions extends
|
|
53
|
-
errorType:
|
|
52
|
+
export interface ThrowErrorOptions extends ThrowHTTPErrorOptions {
|
|
53
|
+
errorType: HTTPError;
|
|
54
54
|
}
|
|
55
55
|
export interface HandleOrValidateWhereResult<T> {
|
|
56
56
|
findOrOptions?: FindOptionsWhere<T>[];
|
|
@@ -23,6 +23,6 @@ export declare class BaseService {
|
|
|
23
23
|
checkProhibited<T extends AppEntity>(actionLogsOptions?: ActionLogsOptions): (entity: T & {
|
|
24
24
|
protected?: boolean;
|
|
25
25
|
}) => Promise<void>;
|
|
26
|
-
|
|
26
|
+
actionLogsSuccess<T extends AppEntity>(actionLogsOptions: ActionLogsOptions): (entity: T | T[]) => Promise<void>;
|
|
27
27
|
throwError({ errorType, ...args }: ThrowErrorOptions): (actionLogsOptions: ActionLogsOptions) => Promise<void>;
|
|
28
28
|
}
|
|
@@ -39,7 +39,7 @@ let BaseService = class BaseService {
|
|
|
39
39
|
const createdEntity = repository.create({ ...entityOptions });
|
|
40
40
|
return async (entityManager) => {
|
|
41
41
|
const entity = await (entityManager ? entityManager.save(createdEntity) : createdEntity.save());
|
|
42
|
-
await this.
|
|
42
|
+
await this.actionLogsSuccess(actionLogsOptions)(entity);
|
|
43
43
|
return entity;
|
|
44
44
|
};
|
|
45
45
|
};
|
|
@@ -60,7 +60,7 @@ let BaseService = class BaseService {
|
|
|
60
60
|
await entity.softRemove();
|
|
61
61
|
return async (entityManager) => {
|
|
62
62
|
await (entityManager ? entityManager.save(entity) : entity.save());
|
|
63
|
-
await this.
|
|
63
|
+
await this.actionLogsSuccess({ ...actionLogsOptions, raw })(entity);
|
|
64
64
|
};
|
|
65
65
|
};
|
|
66
66
|
}
|
|
@@ -81,7 +81,7 @@ let BaseService = class BaseService {
|
|
|
81
81
|
}
|
|
82
82
|
: accumulator;
|
|
83
83
|
const updatePreValidate = (preValidateOptions) => (actionLogsOptions) => async ({ entity, repository }) => {
|
|
84
|
-
const { validateKeys = [],
|
|
84
|
+
const { findOptions: rawPreValidateFindOptions, validateKeys = [], ...otherPreValidateOptions } = preValidateOptions;
|
|
85
85
|
const preValidateKeys = [
|
|
86
86
|
...new Set([
|
|
87
87
|
...(rawPreValidateFindOptions ?
|
|
@@ -112,7 +112,7 @@ let BaseService = class BaseService {
|
|
|
112
112
|
repository.merge(entity, entityOptions);
|
|
113
113
|
return async (entityManager) => {
|
|
114
114
|
await (entityManager ? entityManager.save(entity) : entity.save());
|
|
115
|
-
await this.
|
|
115
|
+
await this.actionLogsSuccess({ ...actionLogsOptions, raw })(entity);
|
|
116
116
|
return entity;
|
|
117
117
|
};
|
|
118
118
|
};
|
|
@@ -132,12 +132,12 @@ let BaseService = class BaseService {
|
|
|
132
132
|
const entityName = alias ?? repository.metadata.name;
|
|
133
133
|
const findQueryBuilder = repository.createQueryBuilder(entityName);
|
|
134
134
|
const distinctOnAliasFields = distinctOnFields ? distinctOnFields.map(field => `${entityName}.${field}`) : undefined;
|
|
135
|
-
const orderBy =
|
|
135
|
+
const orderBy = distinctOnAliasFields ?
|
|
136
136
|
{
|
|
137
137
|
...distinctOnAliasFields.reduce((accumulator, currentValue) => currentValue ? { ...accumulator, [currentValue]: 'ASC' } : accumulator, {}),
|
|
138
138
|
[`${entityName}.${orderByField}`]: order
|
|
139
139
|
}
|
|
140
|
-
: { [`${entityName}.${orderByField}`]: order }
|
|
140
|
+
: { [`${entityName}.${orderByField}`]: order };
|
|
141
141
|
findQueryBuilder.orderBy(orderBy);
|
|
142
142
|
if (distinctOnAliasFields) {
|
|
143
143
|
findQueryBuilder.distinctOn(distinctOnAliasFields);
|
|
@@ -192,7 +192,7 @@ let BaseService = class BaseService {
|
|
|
192
192
|
if (!entity) {
|
|
193
193
|
const fields = JSON.stringify(Object.keys(findOptions));
|
|
194
194
|
await this.throwError({
|
|
195
|
-
errorType: app_interface_1.
|
|
195
|
+
errorType: app_interface_1.HTTPError.NOT_FOUND,
|
|
196
196
|
message: `The ${serviceName} does not exist. Find by fields ${fields}`
|
|
197
197
|
})(actionLogsOptions);
|
|
198
198
|
}
|
|
@@ -245,7 +245,7 @@ let BaseService = class BaseService {
|
|
|
245
245
|
const savedEntities = await (entityManager ?
|
|
246
246
|
entityManager.save(entityActions)
|
|
247
247
|
: repository.save(entityActions));
|
|
248
|
-
await this.
|
|
248
|
+
await this.actionLogsSuccess({ ...actionLogsOptions, raw })(savedEntities);
|
|
249
249
|
return [...entities, ...entitiesToAdd].filter(filterSoftRemoved);
|
|
250
250
|
};
|
|
251
251
|
};
|
|
@@ -264,7 +264,7 @@ let BaseService = class BaseService {
|
|
|
264
264
|
]);
|
|
265
265
|
await this.throwError({
|
|
266
266
|
code: '400001',
|
|
267
|
-
errorType: app_interface_1.
|
|
267
|
+
errorType: app_interface_1.HTTPError.BAD_REQUEST,
|
|
268
268
|
message: `When using "or" as a validation method, "orValidateKeysGroups" must be a nested array.
|
|
269
269
|
${orValidateKeysGroups}`
|
|
270
270
|
})(actionLogsOptions);
|
|
@@ -295,7 +295,7 @@ let BaseService = class BaseService {
|
|
|
295
295
|
}));
|
|
296
296
|
await this.throwError({
|
|
297
297
|
code: '400002',
|
|
298
|
-
errorType: app_interface_1.
|
|
298
|
+
errorType: app_interface_1.HTTPError.BAD_REQUEST,
|
|
299
299
|
message: `The ${serviceName} fields already exists. ${fields}`
|
|
300
300
|
})(actionLogsOptions);
|
|
301
301
|
}
|
|
@@ -306,19 +306,19 @@ let BaseService = class BaseService {
|
|
|
306
306
|
if (typeof entity.protected === 'boolean' && entity.protected) {
|
|
307
307
|
await this.throwError({
|
|
308
308
|
code: '403001',
|
|
309
|
-
errorType: app_interface_1.
|
|
309
|
+
errorType: app_interface_1.HTTPError.FORBIDDEN,
|
|
310
310
|
message: `ALL actions on default ${actionLogsOptions.serviceName} are prohibited`
|
|
311
311
|
})(actionLogsOptions);
|
|
312
312
|
}
|
|
313
313
|
};
|
|
314
314
|
}
|
|
315
|
-
|
|
315
|
+
actionLogsSuccess(actionLogsOptions) {
|
|
316
316
|
return async (entity) => await this.actionLogsService.success(actionLogsOptions)({ entity });
|
|
317
317
|
}
|
|
318
318
|
throwError({ errorType, ...args }) {
|
|
319
319
|
return async (actionLogsOptions) => {
|
|
320
320
|
try {
|
|
321
|
-
(0, utils_1.
|
|
321
|
+
(0, utils_1.throwHTTPError)(args)(errorType);
|
|
322
322
|
}
|
|
323
323
|
catch (error) {
|
|
324
324
|
if (actionLogsOptions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../src/base/base.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../src/base/base.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { AxiosRequestConfig } from 'axios';
|
|
2
|
-
import { Action, ActionResult,
|
|
2
|
+
import { Action, ActionResult, RequestHeaders } from '../app.interface';
|
|
3
3
|
import { Permission } from '../permissions';
|
|
4
4
|
export interface RequestOptions extends Omit<AxiosRequestConfig, 'headers'> {
|
|
5
5
|
async?: boolean;
|
|
6
|
-
headers:
|
|
6
|
+
headers: RequestHeaders;
|
|
7
7
|
path?: string;
|
|
8
8
|
serviceName: string;
|
|
9
9
|
version?: string;
|
|
10
10
|
}
|
|
11
11
|
export interface ExternalServiceOptions {
|
|
12
|
-
headers:
|
|
12
|
+
headers: RequestHeaders;
|
|
13
13
|
}
|
|
14
14
|
export interface CreateExternalActionLogsOptions {
|
|
15
15
|
action: Action;
|
|
@@ -25,7 +25,7 @@ export interface AuthenticationExternalPermissionsOptions {
|
|
|
25
25
|
userId: string;
|
|
26
26
|
}
|
|
27
27
|
export interface APIRequest {
|
|
28
|
-
headers:
|
|
28
|
+
headers: RequestHeaders;
|
|
29
29
|
internalAccess?: boolean;
|
|
30
30
|
issuer: string;
|
|
31
31
|
params: Record<string, string>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { HttpService } from '@nestjs/axios';
|
|
2
2
|
import { ConfigService } from '@nestjs/config';
|
|
3
|
-
import {
|
|
3
|
+
import { RequestHeaders } from '../app.interface';
|
|
4
4
|
import { JWTService } from '../jwt';
|
|
5
5
|
import { AuthenticationExternalPermissionsOptions, CreateExternalActionLogsOptions, RequestOptions } from './external.interface';
|
|
6
6
|
export declare class ExternalService {
|
|
@@ -8,7 +8,7 @@ export declare class ExternalService {
|
|
|
8
8
|
private readonly httpService;
|
|
9
9
|
private readonly jwtService;
|
|
10
10
|
constructor(configService: ConfigService, httpService: HttpService, jwtService: JWTService);
|
|
11
|
-
authenticationUserPermissions(headers:
|
|
12
|
-
createActionLogs(headers:
|
|
13
|
-
request({ baseURL, headers, method, params, path, serviceName, timeout, version,
|
|
11
|
+
authenticationUserPermissions(headers: RequestHeaders): (options: AuthenticationExternalPermissionsOptions) => Promise<any>;
|
|
12
|
+
createActionLogs(headers: RequestHeaders): ({ action, serviceName, ...args }: CreateExternalActionLogsOptions) => Promise<void>;
|
|
13
|
+
request({ async, baseURL, headers, method, params, path, serviceName, timeout, version, ...options }: RequestOptions): Promise<any>;
|
|
14
14
|
}
|
|
@@ -48,18 +48,18 @@ let ExternalService = class ExternalService {
|
|
|
48
48
|
...args,
|
|
49
49
|
action,
|
|
50
50
|
apiName: `${action}:${serviceName}`,
|
|
51
|
-
client: headers['ei-client'],
|
|
52
|
-
domainId: headers['ei-domain-id'],
|
|
53
|
-
ip: headers['ei-ip'],
|
|
51
|
+
client: headers['x-ei-client'],
|
|
52
|
+
domainId: headers['x-ei-domain-id'],
|
|
53
|
+
ip: headers['x-ei-ip'],
|
|
54
54
|
serviceName: this.configService.get('service.name'),
|
|
55
55
|
userAgent: headers['user-agent'],
|
|
56
|
-
userId: headers['ei-subject']
|
|
56
|
+
userId: headers['x-ei-subject']
|
|
57
57
|
},
|
|
58
58
|
headers
|
|
59
59
|
});
|
|
60
60
|
};
|
|
61
61
|
}
|
|
62
|
-
async request({ baseURL, headers, method = 'GET', params, path = '/', serviceName, timeout, version,
|
|
62
|
+
async request({ async = false, baseURL, headers, method = 'GET', params, path = '/', serviceName, timeout, version, ...options }) {
|
|
63
63
|
const subject = await (0, utils_1.sign)(10)({
|
|
64
64
|
accessKey: this.configService.get('service.accessKey'),
|
|
65
65
|
secretKey: this.configService.get('service.secretKey'),
|
|
@@ -67,7 +67,7 @@ let ExternalService = class ExternalService {
|
|
|
67
67
|
});
|
|
68
68
|
const token = await this.jwtService.signAsync({
|
|
69
69
|
audience: `internal:${this.configService.get('service.name')}`,
|
|
70
|
-
issuer: `${this.configService.get('service.name')}:${headers['ei-domainId']}`
|
|
70
|
+
issuer: `${this.configService.get('service.name')}:${headers['x-ei-domainId']}`
|
|
71
71
|
})({ expiresIn: '3m' })(subject);
|
|
72
72
|
const handleParams = (params = {}) => Object.entries(params).reduce((accumulator, [key, value]) => (Array.isArray(value) ? value.length : typeof value !== 'undefined') ?
|
|
73
73
|
{ ...accumulator, [key]: Array.isArray(value) ? value.join(',') : value }
|
|
@@ -80,11 +80,11 @@ let ExternalService = class ExternalService {
|
|
|
80
80
|
baseURL: baseURL ?? this.configService.get('apiService.url'),
|
|
81
81
|
headers: {
|
|
82
82
|
...(async && { 'x-fc-invocation-type': 'Async' }),
|
|
83
|
-
'ei-client': headers['ei-client'],
|
|
84
|
-
'ei-domainId': headers['ei-domainId'],
|
|
85
|
-
'ei-internal-authorization': `Bearer ${token}`,
|
|
86
|
-
'ei-ip': headers['ei-ip'],
|
|
87
|
-
'ei-subject': headers['ei-subject'],
|
|
83
|
+
'x-ei-client': headers['x-ei-client'],
|
|
84
|
+
'x-ei-domainId': headers['x-ei-domainId'],
|
|
85
|
+
'x-ei-internal-authorization': `Bearer ${token}`,
|
|
86
|
+
'x-ei-ip': headers['x-ei-ip'],
|
|
87
|
+
'x-ei-subject': headers['x-ei-subject'],
|
|
88
88
|
authorization: headers['authorization']
|
|
89
89
|
},
|
|
90
90
|
method,
|
|
@@ -95,16 +95,16 @@ let ExternalService = class ExternalService {
|
|
|
95
95
|
.pipe((0, rxjs_1.catchError)(error => {
|
|
96
96
|
const response = error.response;
|
|
97
97
|
if (error.code === 'ETIMEDOUT') {
|
|
98
|
-
(0, utils_1.
|
|
98
|
+
(0, utils_1.throwHTTPError)({ code: '4080001', message: 'Internal service request timeout' })(app_interface_1.HTTPError.REQUEST_TIMEOUT);
|
|
99
99
|
}
|
|
100
100
|
if (error.status) {
|
|
101
|
-
(0, utils_1.
|
|
101
|
+
(0, utils_1.throwHTTPError)({
|
|
102
102
|
code: response?.data?.code ?? `${error.status}999`,
|
|
103
103
|
error: response?.data,
|
|
104
104
|
message: response?.data?.message ?? error.message,
|
|
105
105
|
service: `${method}:${url}`,
|
|
106
106
|
status: error.status
|
|
107
|
-
})(app_interface_1.
|
|
107
|
+
})(app_interface_1.HTTPError.HTTP_EXCEPTION);
|
|
108
108
|
}
|
|
109
109
|
throw error;
|
|
110
110
|
}))).then(({ data }) => data);
|
|
@@ -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;AAC/C,
|
|
1
|
+
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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"}
|
package/dist/jwt/jwt.service.js
CHANGED
|
@@ -42,7 +42,7 @@ let JWTService = class JWTService {
|
|
|
42
42
|
async verifyAsync(token) {
|
|
43
43
|
return this.jwtService
|
|
44
44
|
.verifyAsync(token)
|
|
45
|
-
.catch(error => (0, utils_1.
|
|
45
|
+
.catch(error => (0, utils_1.throwHTTPError)({ message: error.message })(app_interface_1.HTTPError.UNAUTHORIZED));
|
|
46
46
|
}
|
|
47
47
|
};
|
|
48
48
|
exports.JWTService = JWTService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.service.js","sourceRoot":"","sources":["../../src/jwt/jwt.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyC;AACzC,qCAAsD;AACtD,kDAAyB;AACzB,2DAAkC;AAClC,mCAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"jwt.service.js","sourceRoot":"","sources":["../../src/jwt/jwt.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyC;AACzC,qCAAsD;AACtD,kDAAyB;AACzB,2DAAkC;AAClC,mCAA6B;AAC7B,oDAA0C;AAC1C,oCAAuC;AAIhC,IAAM,UAAU,GAAhB,MAAM,UAAU;IACU;IAA7B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QAC/C,eAAK,CAAC,MAAM,CAAC,aAAG,CAAC,CAAA;IACrB,CAAC;IAED,SAAS,CAAC,EAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAoB;QAC7D,OAAO,CAAC,cAA+B,EAAE,EAAE,CAAC,KAAK,EAAE,OAAe,EAAE,EAAE;YAClE,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,cAAc,CAAC,CAAA;YAEtE,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,sBAAc,EAAC,EAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAC,CAAC,CAAC,yBAAS,CAAC,YAAY,CAAC,CAAC,CAAA;IACzF,CAAC;CACJ,CAAA;AA1BY,gCAAU;qBAAV,UAAU;IADtB,IAAA,mBAAU,GAAE;qCAEgC,gBAAU;GAD1C,UAAU,CA0BtB"}
|