@bearei/server-common 0.0.147 → 0.0.148
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 +4 -4
- package/dist/access/access.guard.js.map +1 -1
- package/dist/access/access.interceptor.js +16 -7
- package/dist/access/access.interceptor.js.map +1 -1
- package/dist/app.entity.js +1 -1
- package/dist/app.entity.js.map +1 -1
- package/dist/app.interface.d.ts +2 -1
- package/dist/app.interface.js +2 -1
- package/dist/app.interface.js.map +1 -1
- package/dist/base/base.interface.d.ts +1 -1
- package/dist/base/base.service.d.ts +1 -1
- package/dist/base/base.service.js +10 -14
- package/dist/base/base.service.js.map +1 -1
- package/dist/decorators/is-captcha.decorator.js +2 -1
- package/dist/decorators/is-captcha.decorator.js.map +1 -1
- package/dist/decorators/is-password.decorator.js +1 -1
- package/dist/decorators/is-password.decorator.js.map +1 -1
- package/dist/external/external.interface.d.ts +1 -0
- package/dist/external/external.service.js +1 -1
- package/dist/external/external.service.js.map +1 -1
- package/dist/permission/permission.guard.js +2 -2
- package/dist/permission/permission.guard.js.map +1 -1
- package/dist/subscription/subscription.guard.js +3 -3
- package/dist/subscription/subscription.guard.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/utils/sign.utils.js +1 -2
- package/dist/utils/sign.utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -40,15 +40,15 @@ let AccessGuard = class AccessGuard {
|
|
|
40
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
|
-
const handleCompareResult = (request) => (
|
|
44
|
-
if (!
|
|
43
|
+
const handleCompareResult = (request) => (value) => {
|
|
44
|
+
if (!value) {
|
|
45
45
|
(0, utils_1.throwHTTPError)({
|
|
46
46
|
code: '401007',
|
|
47
47
|
message: 'Internal service signature verification failed'
|
|
48
48
|
})(app_interface_1.HTTPError.UNAUTHORIZED);
|
|
49
49
|
}
|
|
50
|
-
request.internalAccess =
|
|
51
|
-
return
|
|
50
|
+
request.internalAccess = value;
|
|
51
|
+
return value;
|
|
52
52
|
};
|
|
53
53
|
return (requiredAccesses) => ({ sub: subject, iss: issuer }) => {
|
|
54
54
|
request.issuer = issuer;
|
|
@@ -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,oDAA0C;AAC1C,8CAA2C;AAE3C,gCAA6C;AAC7C,oCAAiE;AACjE,yDAAyC;AAGlC,IAAM,WAAW,GAAjB,MAAM,WAAW;IAES;IACA;IACA;IAHzB,YACyB,aAA4B,EAC5B,UAAsB,EACtB,SAAoB;QAFpB,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAW;IAC1C,CAAC;IAEJ,WAAW,CAAC,OAAyB;QAC7B,MAAM,gBAAgB,GAAa,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,0BAAa,EAAE;YAC3E,OAAO,CAAC,QAAQ,EAAE;YAClB,OAAO,CAAC,UAAU,EAAE;SAC3B,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAe,CAAA;QAChE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC/B,MAAM,aAAa,GACX,OAAO,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,eAAe,CAAA;QAEhG,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAA;QAEjD,IAAI,CAAC,KAAK,EAAE,CAAC;YACL,IAAA,sBAAc,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qCAAqC,EAAC,CAAC,CACxE,yBAAS,CAAC,YAAY,CAC7B,CAAA;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,CAAC,OAAoB,EAAE,EAAE;YAC1C,MAAM,mBAAmB,GAAG,CAAC,OAAoB,EAAE,EAAE,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,18 +8,27 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.AccessInterceptor = void 0;
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
|
+
const app_interface_1 = require("../app.interface");
|
|
12
|
+
const utils_1 = require("../utils");
|
|
11
13
|
let AccessInterceptor = class AccessInterceptor {
|
|
12
14
|
intercept(context, next) {
|
|
13
15
|
const request = context.switchToHttp().getRequest();
|
|
14
|
-
if (
|
|
15
|
-
|
|
16
|
+
if (request.headers['x-ei-internal-authorization']) {
|
|
17
|
+
return next.handle();
|
|
16
18
|
}
|
|
17
|
-
|
|
18
|
-
request.headers['x-ei-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
request.headers['x-ei-
|
|
19
|
+
const invalidRequestHeader = [
|
|
20
|
+
request.headers['x-ei-domainId'],
|
|
21
|
+
request.headers['x-ei-ip'],
|
|
22
|
+
request.headers['x-ei-subject'],
|
|
23
|
+
request.headers['x-ei-subscription']
|
|
24
|
+
].some(Boolean);
|
|
25
|
+
if (invalidRequestHeader) {
|
|
26
|
+
(0, utils_1.throwHTTPError)({ code: '400007', message: 'Invalid request header' })(app_interface_1.HTTPError.BAD_REQUEST);
|
|
22
27
|
}
|
|
28
|
+
request.headers['x-ei-domainId'] = request.issuer;
|
|
29
|
+
request.headers['x-ei-ip'] = request.headers['x-forwarded-for'] ?? request.headers['x-real-ip'];
|
|
30
|
+
request.headers['x-ei-subject'] = request.subject;
|
|
31
|
+
request.headers['x-ei-subscription'] = Boolean(request.subscription);
|
|
23
32
|
return next.handle();
|
|
24
33
|
}
|
|
25
34
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAyF;
|
|
1
|
+
{"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAyF;AACzF,oDAA0C;AAE1C,oCAAuC;AAGhC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACtB,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAe,CAAA;QAEhE,IAAI,OAAO,CAAC,OAAO,CAAC,6BAA6B,CAAC,EAAE,CAAC;YAC7C,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QAC5B,CAAC;QAED,MAAM,oBAAoB,GAAG;YACrB,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;YAChC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;YAC1B,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;YAC/B,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC;SAC3C,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEf,IAAI,oBAAoB,EAAE,CAAC;YACnB,IAAA,sBAAc,EAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,wBAAwB,EAAC,CAAC,CAAC,yBAAS,CAAC,WAAW,CAAC,CAAA;QAClG,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,MAAM,CAAA;QACjD,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC/F,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,OAAO,CAAA;QACjD,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QAEpE,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IAC5B,CAAC;CACR,CAAA;AA1BY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CA0B7B"}
|
package/dist/app.entity.js
CHANGED
|
@@ -50,7 +50,7 @@ __decorate([
|
|
|
50
50
|
__metadata("design:type", String)
|
|
51
51
|
], CommonEntity.prototype, "id", void 0);
|
|
52
52
|
__decorate([
|
|
53
|
-
(0, typeorm_1.Column)({ default: app_interface_1.EntityStatus.
|
|
53
|
+
(0, typeorm_1.Column)({ default: app_interface_1.EntityStatus.STANDARD, enum: app_interface_1.EntityStatus, nullable: false, type: 'enum' }),
|
|
54
54
|
__metadata("design:type", String)
|
|
55
55
|
], CommonEntity.prototype, "entityStatus", void 0);
|
|
56
56
|
__decorate([
|
package/dist/app.entity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.entity.js","sourceRoot":"","sources":["../src/app.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,mCAA6B;AAC7B,qCAagB;AAChB,mDAA4C;AAIrC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,oBAAU;IAEpC,SAAS,CAAQ;IAGjB,EAAE,CAAQ;IAGV,YAAY,CAAc;IAG1B,SAAS,CAAM;IAGf,SAAS,CAAM;IAGf,OAAO,CAAQ;IAGf,SAAS,CAAM;IAGf,YAAY;QACJ,IAAI,CAAC,EAAE,GAAG,IAAA,eAAM,GAAE,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,eAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAA;IAC7C,CAAC;IAGD,YAAY;QACJ,IAAI,CAAC,SAAS,GAAG,eAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAA;IAC7C,CAAC;IAGD,gBAAgB;QACR,IAAI,CAAC,SAAS,GAAG,eAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAA;QACrC,IAAI,CAAC,YAAY,GAAG,4BAAY,CAAC,YAAY,CAAA;IACrD,CAAC;IAGD,aAAa;QACL,IAAI,CAAC,YAAY,GAAG,4BAAY,CAAC,SAAS,CAAA;IAClD,CAAC;CACR,CAAA;AA3CY,oCAAY;AAEjB;IADC,IAAA,gCAAsB,EAAC,UAAU,CAAC;;+CAClB;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC;;wCAC7C;AAGV;IADC,IAAA,gBAAM,EAAC,EAAC,OAAO,EAAE,4BAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"app.entity.js","sourceRoot":"","sources":["../src/app.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,mCAA6B;AAC7B,qCAagB;AAChB,mDAA4C;AAIrC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,oBAAU;IAEpC,SAAS,CAAQ;IAGjB,EAAE,CAAQ;IAGV,YAAY,CAAc;IAG1B,SAAS,CAAM;IAGf,SAAS,CAAM;IAGf,OAAO,CAAQ;IAGf,SAAS,CAAM;IAGf,YAAY;QACJ,IAAI,CAAC,EAAE,GAAG,IAAA,eAAM,GAAE,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,eAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAA;IAC7C,CAAC;IAGD,YAAY;QACJ,IAAI,CAAC,SAAS,GAAG,eAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAA;IAC7C,CAAC;IAGD,gBAAgB;QACR,IAAI,CAAC,SAAS,GAAG,eAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAA;QACrC,IAAI,CAAC,YAAY,GAAG,4BAAY,CAAC,YAAY,CAAA;IACrD,CAAC;IAGD,aAAa;QACL,IAAI,CAAC,YAAY,GAAG,4BAAY,CAAC,SAAS,CAAA;IAClD,CAAC;CACR,CAAA;AA3CY,oCAAY;AAEjB;IADC,IAAA,gCAAsB,EAAC,UAAU,CAAC;;+CAClB;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC;;wCAC7C;AAGV;IADC,IAAA,gBAAM,EAAC,EAAC,OAAO,EAAE,4BAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,4BAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC;;kDAClE;AAG1B;IADC,IAAA,0BAAgB,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAC,CAAC;8BAC9C,IAAI;+CAAA;AAGf;IADC,IAAA,0BAAgB,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAC,CAAC;8BAC9C,IAAI;+CAAA;AAGf;IADC,IAAA,uBAAa,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;;6CAClB;AAGf;IADC,IAAA,0BAAgB,EAAC,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAC,CAAC;8BAC5C,IAAI;+CAAA;AAGf;IADC,IAAA,sBAAY,GAAE;;;;gDAId;AAGD;IADC,IAAA,sBAAY,GAAE;;;;gDAGd;AAGD;IADC,IAAA,0BAAgB,GAAE;;;;oDAIlB;AAGD;IADC,IAAA,uBAAa,GAAE;;;;iDAGf;uBA1CI,YAAY;IAFxB,IAAA,eAAK,EAAC,CAAC,WAAW,CAAC,CAAC;IACpB,IAAA,eAAK,EAAC,CAAC,IAAI,CAAC,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;GACjB,YAAY,CA2CxB"}
|
package/dist/app.interface.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { AxiosRequestConfig } from 'axios';
|
|
2
2
|
import { CommonEntity } from './app.entity';
|
|
3
3
|
export declare enum EntityStatus {
|
|
4
|
+
RECOVERED = "recovered",
|
|
4
5
|
SOFT_REMOVED = "softRemoved",
|
|
5
|
-
|
|
6
|
+
STANDARD = "standard"
|
|
6
7
|
}
|
|
7
8
|
export declare enum Language {
|
|
8
9
|
EN_US = "enUS",
|
package/dist/app.interface.js
CHANGED
|
@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Action = exports.ActionResult = exports.HTTPError = exports.Language = exports.EntityStatus = void 0;
|
|
4
4
|
var EntityStatus;
|
|
5
5
|
(function (EntityStatus) {
|
|
6
|
-
EntityStatus["SOFT_REMOVED"] = "softRemoved";
|
|
7
6
|
EntityStatus["RECOVERED"] = "recovered";
|
|
7
|
+
EntityStatus["SOFT_REMOVED"] = "softRemoved";
|
|
8
|
+
EntityStatus["STANDARD"] = "standard";
|
|
8
9
|
})(EntityStatus || (exports.EntityStatus = EntityStatus = {}));
|
|
9
10
|
var Language;
|
|
10
11
|
(function (Language) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.interface.js","sourceRoot":"","sources":["../src/app.interface.ts"],"names":[],"mappings":";;;AAGA,IAAY,
|
|
1
|
+
{"version":3,"file":"app.interface.js","sourceRoot":"","sources":["../src/app.interface.ts"],"names":[],"mappings":";;;AAGA,IAAY,YAIX;AAJD,WAAY,YAAY;IAChB,uCAAuB,CAAA;IACvB,4CAA4B,CAAA;IAC5B,qCAAqB,CAAA;AAC7B,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IACZ,0BAAc,CAAA;IACd,0BAAc,CAAA;AACtB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AAcD,IAAY,SASX;AATD,WAAY,SAAS;IACb,uCAA0B,CAAA;IAC1B,oCAAuB,CAAA;IACvB,6CAAgC,CAAA;IAChC,0DAA6C,CAAA;IAC7C,mCAAsB,CAAA;IACtB,+CAAkC,CAAA;IAClC,0CAA6B,CAAA;IAC7B,yDAA4C,CAAA;AACpD,CAAC,EATW,SAAS,yBAAT,SAAS,QASpB;AAED,IAAY,YAGX;AAHD,WAAY,YAAY;IAChB,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;AAC3B,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAED,IAAY,MASX;AATD,WAAY,MAAM;IACV,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,4BAAkB,CAAA;IAClB,8BAAoB,CAAA;IACpB,4BAAkB,CAAA;IAClB,2BAAiB,CAAA;AACzB,CAAC,EATW,MAAM,sBAAN,MAAM,QASjB"}
|
|
@@ -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
|
-
updateEntityOptions?: Record<string, DeepPartial<T>>;
|
|
40
39
|
entityIds: string[];
|
|
40
|
+
updateEntityOptions?: Record<string, DeepPartial<T>>;
|
|
41
41
|
}
|
|
42
42
|
export interface FindOneOptions<T> extends Omit<BaseServiceOptions<T>, 'headers' | 'entityOptions'> {
|
|
43
43
|
actionLogOptions?: ActionLogOptions;
|
|
@@ -24,5 +24,5 @@ export declare class BaseService {
|
|
|
24
24
|
protected?: boolean;
|
|
25
25
|
}) => Promise<void>;
|
|
26
26
|
actionLogSuccess<T extends CommonEntity>(actionLogOptions: ActionLogOptions): (entity: T | T[]) => Promise<void>;
|
|
27
|
-
throwError({ errorType, ...restOptions }: ThrowErrorOptions): (actionLogOptions
|
|
27
|
+
throwError({ errorType, ...restOptions }: ThrowErrorOptions): (actionLogOptions?: ActionLogOptions) => Promise<void>;
|
|
28
28
|
}
|
|
@@ -80,12 +80,9 @@ let BaseService = class BaseService {
|
|
|
80
80
|
};
|
|
81
81
|
const handleFindOptions = (accumulator, [key, value]) => typeof value !== 'undefined' ? [...accumulator, key] : accumulator;
|
|
82
82
|
const handlePreValidateFindOptions = (rawPreValidateFindOptions) => (entity) => (accumulator, value) => value ?
|
|
83
|
-
{
|
|
84
|
-
...accumulator,
|
|
85
|
-
[value]: rawPreValidateFindOptions[value] ?? entity[value]
|
|
86
|
-
}
|
|
83
|
+
{ ...accumulator, [value]: rawPreValidateFindOptions[value] ?? entity[value] }
|
|
87
84
|
: accumulator;
|
|
88
|
-
const
|
|
85
|
+
const handleUpdatePreValidate = (preValidateOptions) => (actionLogOptions) => async ({ entity, repository }) => {
|
|
89
86
|
const { findOptions: rawPreValidateFindOptions, validateKeys = [], ...restPreValidateOptions } = preValidateOptions;
|
|
90
87
|
const preValidateKeys = [
|
|
91
88
|
...new Set([
|
|
@@ -116,7 +113,10 @@ let BaseService = class BaseService {
|
|
|
116
113
|
const nextActionLogOptions = { ...actionLogOptions, raw };
|
|
117
114
|
await this.checkProhibited(nextActionLogOptions)(entity);
|
|
118
115
|
if (preValidateOptions) {
|
|
119
|
-
await
|
|
116
|
+
await handleUpdatePreValidate(preValidateOptions)(nextActionLogOptions)({
|
|
117
|
+
entity,
|
|
118
|
+
repository
|
|
119
|
+
});
|
|
120
120
|
}
|
|
121
121
|
repository.merge(entity, entityOptions);
|
|
122
122
|
return async (entityManager) => {
|
|
@@ -135,9 +135,7 @@ let BaseService = class BaseService {
|
|
|
135
135
|
const where = {
|
|
136
136
|
...Object.entries(restFindOptions).reduce((accumulator, [key, value]) => typeof value !== 'undefined' ? { ...accumulator, [key]: value } : accumulator, {}),
|
|
137
137
|
...(ids && { id: (0, typeorm_1.In)(ids) }),
|
|
138
|
-
...(createdAtRanges && {
|
|
139
|
-
createdAt: (0, typeorm_1.Between)(createdAtRanges[0], createdAtRanges[1])
|
|
140
|
-
})
|
|
138
|
+
...(createdAtRanges && { createdAt: (0, typeorm_1.Between)(createdAtRanges[0], createdAtRanges[1]) })
|
|
141
139
|
};
|
|
142
140
|
return async (repository) => {
|
|
143
141
|
if (ids && !ids.length) {
|
|
@@ -197,9 +195,7 @@ let BaseService = class BaseService {
|
|
|
197
195
|
{ ...accumulator, [key]: value }
|
|
198
196
|
: accumulator, {}),
|
|
199
197
|
...(ids && { id: (0, typeorm_1.In)(ids) }),
|
|
200
|
-
...(createdAtRanges && {
|
|
201
|
-
createdAt: (0, typeorm_1.Between)(createdAtRanges[0], createdAtRanges[1])
|
|
202
|
-
})
|
|
198
|
+
...(createdAtRanges && { createdAt: (0, typeorm_1.Between)(createdAtRanges[0], createdAtRanges[1]) })
|
|
203
199
|
};
|
|
204
200
|
const distinctOnAliasFields = distinctOnFields ?
|
|
205
201
|
distinctOnFields.map(field => `${entityName}.${field}`)
|
|
@@ -314,8 +310,8 @@ let BaseService = class BaseService {
|
|
|
314
310
|
await this.throwError({
|
|
315
311
|
code: '400001',
|
|
316
312
|
errorType: app_interface_1.HTTPError.BAD_REQUEST,
|
|
317
|
-
message: `When using "or" as a validation method,
|
|
318
|
-
|
|
313
|
+
message: `When using "or" as a validation method, "orValidateKeysGroups"
|
|
314
|
+
must be a nested array. ${orValidateKeysGroups}`
|
|
319
315
|
})(actionLogOptions);
|
|
320
316
|
}
|
|
321
317
|
const orValidateKeysGroupsSet = new Set(orValidateKeysGroups?.flat());
|
|
@@ -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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"}
|
|
@@ -8,7 +8,8 @@ const IsCaptcha = (validationOptions) => (object, propertyName) => (0, class_val
|
|
|
8
8
|
target: object.constructor,
|
|
9
9
|
options: {
|
|
10
10
|
...validationOptions,
|
|
11
|
-
message: `${propertyName} must be a valid captcha. Passwords should follow the pattern:
|
|
11
|
+
message: `${propertyName} must be a valid captcha. Passwords should follow the pattern:
|
|
12
|
+
"/^(\d){6}$/"`
|
|
12
13
|
},
|
|
13
14
|
validator: {
|
|
14
15
|
validate(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-captcha.decorator.js","sourceRoot":"","sources":["../../src/decorators/is-captcha.decorator.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAE7D,MAAM,SAAS,GACd,CAAmB,iBAAqC,EAAE,EAAE,CAC5D,CAAC,MAAS,EAAE,YAAoB,EAAE,EAAE,CAC5B,IAAA,mCAAiB,EAAC;IACV,IAAI,EAAE,WAAW;IACjB,YAAY,EAAE,YAAY;IAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;IAC1B,OAAO,EAAE;QACD,GAAG,iBAAiB;QACpB,OAAO,EAAE,GAAG,YAAY
|
|
1
|
+
{"version":3,"file":"is-captcha.decorator.js","sourceRoot":"","sources":["../../src/decorators/is-captcha.decorator.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAE7D,MAAM,SAAS,GACd,CAAmB,iBAAqC,EAAE,EAAE,CAC5D,CAAC,MAAS,EAAE,YAAoB,EAAE,EAAE,CAC5B,IAAA,mCAAiB,EAAC;IACV,IAAI,EAAE,WAAW;IACjB,YAAY,EAAE,YAAY;IAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;IAC1B,OAAO,EAAE;QACD,GAAG,iBAAiB;QACpB,OAAO,EAAE,GAAG,YAAY;8CACV;KACrB;IACD,SAAS,EAAE;QACH,QAAQ,CAAC,KAAK;YACN,MAAM,YAAY,GAAG,WAAW,CAAA;YAEhC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACpE,CAAC;KACR;CACR,CAAC,CAAA;AAnBL,QAAA,SAAS,aAmBJ"}
|
|
@@ -9,7 +9,7 @@ const IsPassword = (validationOptions) => (object, propertyName) => (0, class_va
|
|
|
9
9
|
options: {
|
|
10
10
|
...validationOptions,
|
|
11
11
|
message: `${propertyName} is not a valid password. Passwords should follow the pattern:
|
|
12
|
-
|
|
12
|
+
"/^(?=.*[A-Z])(?=.*\d)(?!.*\s)[\w!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]{8,32}$/"`
|
|
13
13
|
},
|
|
14
14
|
validator: {
|
|
15
15
|
validate(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-password.decorator.js","sourceRoot":"","sources":["../../src/decorators/is-password.decorator.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAE7D,MAAM,UAAU,GACf,CAAmB,iBAAqC,EAAE,EAAE,CAC5D,CAAC,MAAS,EAAE,YAAoB,EAAE,EAAE,CAC5B,IAAA,mCAAiB,EAAC;IACV,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,YAAY;IAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;IAC1B,OAAO,EAAE;QACD,GAAG,iBAAiB;QACpB,OAAO,EAAE,GAAG,YAAY;
|
|
1
|
+
{"version":3,"file":"is-password.decorator.js","sourceRoot":"","sources":["../../src/decorators/is-password.decorator.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAE7D,MAAM,UAAU,GACf,CAAmB,iBAAqC,EAAE,EAAE,CAC5D,CAAC,MAAS,EAAE,YAAoB,EAAE,EAAE,CAC5B,IAAA,mCAAiB,EAAC;IACV,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,YAAY;IAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;IAC1B,OAAO,EAAE;QACD,GAAG,iBAAiB;QACpB,OAAO,EAAE,GAAG,YAAY;+GACuD;KACtF;IACD,SAAS,EAAE;QACH,QAAQ,CAAC,KAAK;YACN,MAAM,aAAa,GACX,4EAA4E,CAAA;YAEpF,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACrE,CAAC;KACR;CACR,CAAC,CAAA;AApBL,QAAA,UAAU,cAoBL"}
|
|
@@ -107,7 +107,7 @@ let ExternalService = class ExternalService {
|
|
|
107
107
|
const response = error.response;
|
|
108
108
|
if (error.code === 'ETIMEDOUT') {
|
|
109
109
|
(0, utils_1.throwHTTPError)({
|
|
110
|
-
code: '
|
|
110
|
+
code: '408001',
|
|
111
111
|
message: 'Internal service request timeout'
|
|
112
112
|
})(app_interface_1.HTTPError.REQUEST_TIMEOUT);
|
|
113
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,8 +104,8 @@ let PermissionGuard = class PermissionGuard {
|
|
|
104
104
|
const { headers, params, subject, issuer, internalAccess } = context
|
|
105
105
|
.switchToHttp()
|
|
106
106
|
.getRequest();
|
|
107
|
-
const
|
|
108
|
-
if (
|
|
107
|
+
const publicPermission = [internalAccess, subject === params.id].some(Boolean);
|
|
108
|
+
if (publicPermission) {
|
|
109
109
|
return true;
|
|
110
110
|
}
|
|
111
111
|
return this.authenticationService
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission.guard.js","sourceRoot":"","sources":["../../src/permission/permission.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsC;AACtC,sDAAuD;AACvD,8CAA2D;AAG3D,IAAY,UAyEX;AAzED,WAAY,UAAU;IACd,mEAAqD,CAAA;IACrD,mEAAqD,CAAA;IACrD,mEAAqD,CAAA;IACrD,+DAAiD,CAAA;IACjD,+DAAiD,CAAA;IACjD,+DAAiD,CAAA;IACjD,sEAAwD,CAAA;IACxD,sEAAwD,CAAA;IACxD,sEAAwD,CAAA;IACxD,kEAAoD,CAAA;IACpD,+DAAiD,CAAA;IACjD,2DAA6C,CAAA;IAC7C,yDAA2C,CAAA;IAC3C,yDAA2C,CAAA;IAC3C,yDAA2C,CAAA;IAC3C,qDAAuC,CAAA;IACvC,2DAA6C,CAAA;IAC7C,2DAA6C,CAAA;IAC7C,2DAA6C,CAAA;IAC7C,uDAAyC,CAAA;IACzC,uDAAyC,CAAA;IACzC,uDAAyC,CAAA;IACzC,uDAAyC,CAAA;IACzC,6CAA+B,CAAA;IAC/B,4DAA8C,CAAA;IAC9C,4DAA8C,CAAA;IAC9C,4DAA8C,CAAA;IAC9C,wDAA0C,CAAA;IAC1C,8DAAgD,CAAA;IAChD,8DAAgD,CAAA;IAChD,8DAAgD,CAAA;IAChD,0DAA4C,CAAA;IAC5C,2EAA6D,CAAA;IAC7D,2EAA6D,CAAA;IAC7D,2EAA6D,CAAA;IAC7D,uEAAyD,CAAA;IACzD,uEAAyD,CAAA;IACzD,uEAAyD,CAAA;IACzD,uEAAyD,CAAA;IACzD,mEAAqD,CAAA;IACrD,+DAAiD,CAAA;IACjD,+DAAiD,CAAA;IACjD,0EAA4D,CAAA;IAC5D,0EAA4D,CAAA;IAC5D,0EAA4D,CAAA;IAC5D,sEAAwD,CAAA;IACxD,+DAAiD,CAAA;IACjD,2DAA6C,CAAA;IAC7C,+DAAiD,CAAA;IACjD,+DAAiD,CAAA;IACjD,+DAAiD,CAAA;IACjD,2DAA6C,CAAA;IAC7C,yEAA2D,CAAA;IAC3D,yEAA2D,CAAA;IAC3D,yEAA2D,CAAA;IAC3D,qEAAuD,CAAA;IACvD,qEAAuD,CAAA;IACvD,qEAAuD,CAAA;IACvD,qEAAuD,CAAA;IACvD,iEAAmD,CAAA;IACnD,yEAA2D,CAAA;IAC3D,yEAA2D,CAAA;IAC3D,yEAA2D,CAAA;IAC3D,qEAAuD,CAAA;IACvD,mFAAqE,CAAA;IACrE,mFAAqE,CAAA;IACrE,mFAAqE,CAAA;IACrE,+EAAiE,CAAA;IACjE,mDAAqC,CAAA;IACrC,mDAAqC,CAAA;IACrC,mDAAqC,CAAA;IACrC,+CAAiC,CAAA;AACzC,CAAC,EAzEW,UAAU,0BAAV,UAAU,QAyErB;AAGM,IAAM,eAAe,GAArB,MAAM,eAAe;IAEK;IACA;IAFzB,YACyB,qBAA4C,EAC5C,SAAoB;QADpB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,cAAS,GAAT,SAAS,CAAW;IAC1C,CAAC;IAEJ,WAAW,CAAC,OAAyB;QAC7B,MAAM,mBAAmB,GAAiB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAClE,0CAA6B,EAC7B,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CACjD,CAAA;QAED,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACnB,OAAO,IAAI,CAAA;QACnB,CAAC;QAED,MAAM,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAC,GAAG,OAAO;aACzD,YAAY,EAAE;aACd,UAAU,EAAe,CAAA;QAElC,MAAM,
|
|
1
|
+
{"version":3,"file":"permission.guard.js","sourceRoot":"","sources":["../../src/permission/permission.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,17 +32,17 @@ let SubscriptionGuard = class SubscriptionGuard {
|
|
|
32
32
|
if (!requiredSubscriptions) {
|
|
33
33
|
return true;
|
|
34
34
|
}
|
|
35
|
-
const
|
|
35
|
+
const request = context.switchToHttp().getRequest();
|
|
36
|
+
const { headers, subject, issuer, internalAccess } = request;
|
|
36
37
|
if (internalAccess) {
|
|
37
38
|
return true;
|
|
38
39
|
}
|
|
39
|
-
const request = context.switchToHttp().getRequest();
|
|
40
40
|
const { subscription } = await this.authenticationService.authenticationSubscription(headers)({
|
|
41
41
|
domainId: issuer,
|
|
42
42
|
keys: requiredSubscriptions,
|
|
43
43
|
userId: subject
|
|
44
44
|
});
|
|
45
|
-
request.
|
|
45
|
+
request.subscription = subscription;
|
|
46
46
|
return Boolean(subscription);
|
|
47
47
|
}
|
|
48
48
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription.guard.js","sourceRoot":"","sources":["../../src/subscription/subscription.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsC;AACtC,sDAAuD;AACvD,8CAA6D;AAG7D,IAAY,YAIX;AAJD,WAAY,YAAY;IAChB,iFAAiE,CAAA;IACjE,wFAAwE,CAAA;IACxE,6EAA6D,CAAA;AACrE,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAGM,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAEG;IACA;IAFzB,YACyB,qBAA4C,EAC5C,SAAoB;QADpB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,cAAS,GAAT,SAAS,CAAW;IAC1C,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAyB;QACnC,MAAM,qBAAqB,GAAmB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CACtE,4CAA+B,EAC/B,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CACjD,CAAA;QAED,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACrB,OAAO,IAAI,CAAA;QACnB,CAAC;QAED,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAC,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"subscription.guard.js","sourceRoot":"","sources":["../../src/subscription/subscription.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsC;AACtC,sDAAuD;AACvD,8CAA6D;AAG7D,IAAY,YAIX;AAJD,WAAY,YAAY;IAChB,iFAAiE,CAAA;IACjE,wFAAwE,CAAA;IACxE,6EAA6D,CAAA;AACrE,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAGM,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAEG;IACA;IAFzB,YACyB,qBAA4C,EAC5C,SAAoB;QADpB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,cAAS,GAAT,SAAS,CAAW;IAC1C,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAyB;QACnC,MAAM,qBAAqB,GAAmB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CACtE,4CAA+B,EAC/B,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CACjD,CAAA;QAED,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACrB,OAAO,IAAI,CAAA;QACnB,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAe,CAAA;QAChE,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAC,GAAG,OAAO,CAAA;QAE1D,IAAI,cAAc,EAAE,CAAC;YACb,OAAO,IAAI,CAAA;QACnB,CAAC;QAED,MAAM,EAAC,YAAY,EAAC,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;YACpF,QAAQ,EAAE,MAAM;YAChB,IAAI,EAAE,qBAAqB;YAC3B,MAAM,EAAE,OAAO;SACtB,CAAC,CAAA;QAEF,OAAO,CAAC,YAAY,GAAG,YAAY,CAAA;QAEnC,OAAO,OAAO,CAAC,YAAY,CAAC,CAAA;IACpC,CAAC;CACR,CAAA;AAjCY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAG2C,sCAAqB;QACjC,gBAAS;GAHxC,iBAAiB,CAiC7B"}
|