@bearei/server-common 0.0.8 → 0.0.9

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.
Files changed (25) hide show
  1. package/dist/app.decorator.d.ts +2 -2
  2. package/dist/app.decorator.js +6 -5
  3. package/dist/app.decorator.js.map +1 -1
  4. package/dist/app.dto.d.ts +1 -4
  5. package/dist/app.dto.js +5 -16
  6. package/dist/app.dto.js.map +1 -1
  7. package/dist/app.entity.js +7 -30
  8. package/dist/app.entity.js.map +1 -1
  9. package/dist/app.interface.d.ts +7 -0
  10. package/dist/app.interface.js.map +1 -1
  11. package/dist/authentication/auth/auth.service.js +2 -2
  12. package/dist/authentication/auth/auth.service.js.map +1 -1
  13. package/dist/authentication/permission/permission.guard.js +1 -1
  14. package/dist/authentication/permission/permission.guard.js.map +1 -1
  15. package/dist/base/base.interface.d.ts +5 -2
  16. package/dist/base/base.service.d.ts +8 -8
  17. package/dist/base/base.service.js +22 -19
  18. package/dist/base/base.service.js.map +1 -1
  19. package/dist/database/database.module.js +6 -6
  20. package/dist/database/database.module.js.map +1 -1
  21. package/dist/external/external.service.d.ts +2 -2
  22. package/dist/external/external.service.js +12 -6
  23. package/dist/external/external.service.js.map +1 -1
  24. package/dist/tsconfig.build.tsbuildinfo +1 -1
  25. package/package.json +1 -1
package/dist/app.decorator.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  import common from '@nestjs/common';
2
2
  import { ValidationOptions } from 'class-validator';
3
3
  import { Access, Permission } from './authentication';
4
- export declare const AUTH_PERMISSIONS_KEY = "authPermission";
5
- export declare const IS_PUBLIC_KEY = "isPublic";
4
+ export declare const AUTHENTICATION_PERMISSIONS_KEY = "authenticationPermission";
5
+ export declare const IS_PUBLIC_KEY = "Public";
6
6
  export declare const AuthPermission: (permissions: Permission[]) => common.CustomDecorator<string>;
7
7
  export declare const Public: (accesses: Access[]) => common.CustomDecorator<string>;
8
8
  export declare const IsNanoid: (validationOptions?: ValidationOptions) => (object: Record<string, any>, propertyName: string) => void;
package/dist/app.decorator.js CHANGED
@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.IsVersion = exports.IsPassword = exports.IsNanoid = exports.Public = exports.AuthPermission = exports.IS_PUBLIC_KEY = exports.AUTH_PERMISSIONS_KEY = void 0;
6
+ exports.IsVersion = exports.IsPassword = exports.IsNanoid = exports.Public = exports.AuthPermission = exports.IS_PUBLIC_KEY = exports.AUTHENTICATION_PERMISSIONS_KEY = void 0;
7
7
  const common_1 = __importDefault(require("@nestjs/common"));
8
8
  const class_validator_1 = require("class-validator");
9
- exports.AUTH_PERMISSIONS_KEY = 'authPermission';
10
- exports.IS_PUBLIC_KEY = 'isPublic';
11
- const AuthPermission = (permissions) => common_1.default.SetMetadata(exports.AUTH_PERMISSIONS_KEY, permissions);
9
+ exports.AUTHENTICATION_PERMISSIONS_KEY = 'authenticationPermission';
10
+ exports.IS_PUBLIC_KEY = 'Public';
11
+ const AuthPermission = (permissions) => common_1.default.SetMetadata(exports.AUTHENTICATION_PERMISSIONS_KEY, permissions);
12
12
  exports.AuthPermission = AuthPermission;
13
13
  const Public = (accesses) => common_1.default.SetMetadata(exports.IS_PUBLIC_KEY, accesses);
14
14
  exports.Public = Public;
@@ -37,7 +37,8 @@ const IsPassword = (validationOptions) => (object, propertyName) => {
37
37
  target: object.constructor,
38
38
  options: {
39
39
  ...validationOptions,
40
- message: `${propertyName} is not a valid password. Passwords should follow the pattern: /^(?=.[A-Z])(?=.[\\W_])(?!.*\\s).{8,32}$/`
40
+ message: `${propertyName} is not a valid password. Passwords should follow the pattern:
41
+ /^(?=.[A-Z])(?=.[\\W_])(?!.*\\s).{8,32}$/`
41
42
  },
42
43
  validator: {
43
44
  validate(value) {
package/dist/app.decorator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.decorator.js","sourceRoot":"","sources":["../src/app.decorator.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAmC;AACnC,qDAAoE;AAGvD,QAAA,oBAAoB,GAAG,gBAAgB,CAAA;AACvC,QAAA,aAAa,GAAG,UAAU,CAAA;AAEhC,MAAM,cAAc,GAAG,CAAC,WAAyB,EAAE,EAAE,CAAC,gBAAM,CAAC,WAAW,CAAC,4BAAoB,EAAE,WAAW,CAAC,CAAA;AAArG,QAAA,cAAc,kBAAuF;AAE3G,MAAM,MAAM,GAAG,CAAC,QAAkB,EAAE,EAAE,CAAC,gBAAM,CAAC,WAAW,CAAC,qBAAa,EAAE,QAAQ,CAAC,CAAA;AAA5E,QAAA,MAAM,UAAsE;AAElF,MAAM,QAAQ,GACjB,CAAC,iBAAqC,EAAE,EAAE,CAAC,CAAC,MAA2B,EAAE,YAAoB,EAAE,EAAE;IAC7F,IAAA,mCAAiB,EAAC;QACd,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,YAAY;QAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;QAC1B,OAAO,EAAE;YACL,GAAG,iBAAiB;YACpB,OAAO,EAAE,GAAG,YAAY,yBAAyB;SACpD;QACD,SAAS,EAAE;YACP,QAAQ,CAAC,KAAK;gBACV,MAAM,WAAW,GAAG,iBAAiB,CAAA;gBAErC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YAC/D,CAAC;SACJ;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAlBQ,QAAA,QAAQ,YAkBhB;AAEE,MAAM,UAAU,GACnB,CAAC,iBAAqC,EAAE,EAAE,CAAC,CAAC,MAA2B,EAAE,YAAoB,EAAE,EAAE;IAC7F,IAAA,mCAAiB,EAAC;QACd,IAAI,EAAE,YAAY;QAClB,YAAY,EAAE,YAAY;QAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;QAC1B,OAAO,EAAE;YACL,GAAG,iBAAiB;YACpB,OAAO,EAAE,GAAG,YAAY,0GAA0G;SACrI;QACD,SAAS,EAAE;YACP,QAAQ,CAAC,KAAK;gBACV,MAAM,aAAa,GAAG,yCAAyC,CAAA;gBAE/D,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACjE,CAAC;SACJ;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAlBQ,QAAA,UAAU,cAkBlB;AAEE,MAAM,SAAS,GAClB,CAAC,iBAAqC,EAAE,EAAE,CAAC,CAAC,MAA2B,EAAE,YAAoB,EAAE,EAAE;IAC7F,IAAA,mCAAiB,EAAC;QACd,IAAI,EAAE,WAAW;QACjB,YAAY,EAAE,YAAY;QAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;QAC1B,OAAO,EAAE;YACL,GAAG,iBAAiB;YACpB,OAAO,EAAE,GAAG,YAAY,iCAAiC;SAC5D;QACD,SAAS,EAAE;YACP,QAAQ,CAAC,KAAK;gBACV,MAAM,YAAY,GAAG,iBAAiB,CAAA;gBAEtC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YAChE,CAAC;SACJ;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAlBQ,QAAA,SAAS,aAkBjB"}
1
+ {"version":3,"file":"app.decorator.js","sourceRoot":"","sources":["../src/app.decorator.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAmC;AACnC,qDAAoE;AAGvD,QAAA,8BAA8B,GAAG,0BAA0B,CAAA;AAC3D,QAAA,aAAa,GAAG,QAAQ,CAAA;AAE9B,MAAM,cAAc,GAAG,CAAC,WAAyB,EAAE,EAAE,CACxD,gBAAM,CAAC,WAAW,CAAC,sCAA8B,EAAE,WAAW,CAAC,CAAA;AADtD,QAAA,cAAc,kBACwC;AAE5D,MAAM,MAAM,GAAG,CAAC,QAAkB,EAAE,EAAE,CAAC,gBAAM,CAAC,WAAW,CAAC,qBAAa,EAAE,QAAQ,CAAC,CAAA;AAA5E,QAAA,MAAM,UAAsE;AAElF,MAAM,QAAQ,GACjB,CAAC,iBAAqC,EAAE,EAAE,CAAC,CAAC,MAA2B,EAAE,YAAoB,EAAE,EAAE;IAC7F,IAAA,mCAAiB,EAAC;QACd,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,YAAY;QAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;QAC1B,OAAO,EAAE;YACL,GAAG,iBAAiB;YACpB,OAAO,EAAE,GAAG,YAAY,yBAAyB;SACpD;QACD,SAAS,EAAE;YACP,QAAQ,CAAC,KAAK;gBACV,MAAM,WAAW,GAAG,iBAAiB,CAAA;gBAErC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YAC/D,CAAC;SACJ;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAlBQ,QAAA,QAAQ,YAkBhB;AAEE,MAAM,UAAU,GACnB,CAAC,iBAAqC,EAAE,EAAE,CAAC,CAAC,MAA2B,EAAE,YAAoB,EAAE,EAAE;IAC7F,IAAA,mCAAiB,EAAC;QACd,IAAI,EAAE,YAAY;QAClB,YAAY,EAAE,YAAY;QAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;QAC1B,OAAO,EAAE;YACL,GAAG,iBAAiB;YACpB,OAAO,EAAE,GAAG,YAAY;2DACmB;SAC9C;QACD,SAAS,EAAE;YACP,QAAQ,CAAC,KAAK;gBACV,MAAM,aAAa,GAAG,yCAAyC,CAAA;gBAE/D,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACjE,CAAC;SACJ;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAnBQ,QAAA,UAAU,cAmBlB;AAEE,MAAM,SAAS,GAClB,CAAC,iBAAqC,EAAE,EAAE,CAAC,CAAC,MAA2B,EAAE,YAAoB,EAAE,EAAE;IAC7F,IAAA,mCAAiB,EAAC;QACd,IAAI,EAAE,WAAW;QACjB,YAAY,EAAE,YAAY;QAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;QAC1B,OAAO,EAAE;YACL,GAAG,iBAAiB;YACpB,OAAO,EAAE,GAAG,YAAY,iCAAiC;SAC5D;QACD,SAAS,EAAE;YACP,QAAQ,CAAC,KAAK;gBACV,MAAM,YAAY,GAAG,iBAAiB,CAAA;gBAEtC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YAChE,CAAC;SACJ;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAlBQ,QAAA,SAAS,aAkBjB"}
package/dist/app.dto.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  import { Order } from './app.interface';
2
2
  export declare class IndexDTO {
3
+ id?: string;
3
4
  projectId?: string;
4
5
  scopeId?: string;
5
- id?: string;
6
6
  page?: number;
7
7
  size?: number;
8
8
  count?: boolean;
@@ -13,9 +13,6 @@ export declare class IndexDTO {
13
13
  export declare class ByIdDTO {
14
14
  id?: string;
15
15
  }
16
- export declare class ByIdsDTO {
17
- ids?: string;
18
- }
19
16
  export declare class NotIdDTO {
20
17
  notId?: string;
21
18
  }
package/dist/app.dto.js CHANGED
@@ -9,15 +9,15 @@ 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.NotIdDTO = exports.ByIdsDTO = exports.ByIdDTO = exports.IndexDTO = void 0;
12
+ exports.NotIdDTO = 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
15
  const app_decorator_1 = require("./app.decorator");
16
16
  const common_1 = require("./common");
17
17
  class IndexDTO {
18
+ id;
18
19
  projectId;
19
20
  scopeId;
20
- id;
21
21
  page;
22
22
  size;
23
23
  count;
@@ -29,15 +29,15 @@ exports.IndexDTO = IndexDTO;
29
29
  __decorate([
30
30
  (0, app_decorator_1.IsNanoid)(),
31
31
  __metadata("design:type", String)
32
- ], IndexDTO.prototype, "projectId", void 0);
32
+ ], IndexDTO.prototype, "id", void 0);
33
33
  __decorate([
34
34
  (0, app_decorator_1.IsNanoid)(),
35
35
  __metadata("design:type", String)
36
- ], IndexDTO.prototype, "scopeId", void 0);
36
+ ], IndexDTO.prototype, "projectId", void 0);
37
37
  __decorate([
38
38
  (0, app_decorator_1.IsNanoid)(),
39
39
  __metadata("design:type", String)
40
- ], IndexDTO.prototype, "id", void 0);
40
+ ], IndexDTO.prototype, "scopeId", void 0);
41
41
  __decorate([
42
42
  (0, class_validator_1.IsNumber)({ allowNaN: false }),
43
43
  (0, class_validator_1.Min)(1),
@@ -82,17 +82,6 @@ __decorate([
82
82
  (0, app_decorator_1.IsNanoid)(),
83
83
  __metadata("design:type", String)
84
84
  ], ByIdDTO.prototype, "id", void 0);
85
- class ByIdsDTO {
86
- ids;
87
- }
88
- exports.ByIdsDTO = ByIdsDTO;
89
- __decorate([
90
- (0, class_validator_1.ArrayMaxSize)(1024),
91
- (0, class_validator_1.ArrayMinSize)(0),
92
- (0, app_decorator_1.IsNanoid)({ each: true }),
93
- (0, class_transformer_1.Transform)(({ value }) => (typeof value === 'string' ? value.split(',') : value)),
94
- __metadata("design:type", String)
95
- ], ByIdsDTO.prototype, "ids", void 0);
96
85
  class NotIdDTO {
97
86
  notId;
98
87
  }
package/dist/app.dto.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.dto.js","sourceRoot":"","sources":["../src/app.dto.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app.dto.js","sourceRoot":"","sources":["../src/app.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAAiG;AACjG,mDAAwC;AAExC,qCAA8B;AAE9B,MAAa,QAAQ;IAEjB,EAAE,CAAS;IAGX,SAAS,CAAS;IAGlB,OAAO,CAAS;IAKhB,IAAI,CAAS;IAMb,IAAI,CAAS;IAIb,KAAK,CAAU;IAGf,KAAK,CAAqB;IAM1B,GAAG,CAAW;IAMd,cAAc,CAAW;CAC5B;AAvCD,4BAuCC;AArCG;IADC,IAAA,wBAAQ,GAAE;;oCACA;AAGX;IADC,IAAA,wBAAQ,GAAE;;2CACO;AAGlB;IADC,IAAA,wBAAQ,GAAE;;yCACK;AAKhB;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,QAAQ,CAAC,KAAK,CAAC,CAAC;;sCAC3B;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,QAAQ,CAAC,KAAK,CAAC,CAAC;;sCAC3B;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,cAAK,CAAC;;uCACY;AAM1B;IAJC,IAAA,8BAAY,EAAC,IAAI,CAAC;IAClB,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,wBAAQ,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;AAMd;IAJC,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,wBAAQ,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;IAEhB,EAAE,CAAS;CACd;AAHD,0BAGC;AADG;IADC,IAAA,wBAAQ,GAAE;;mCACA;AAGf,MAAa,QAAQ;IAEjB,KAAK,CAAS;CACjB;AAHD,4BAGC;AADG;IADC,IAAA,wBAAQ,GAAE;;uCACG"}
package/dist/app.entity.js CHANGED
@@ -26,54 +26,31 @@ let AppEntity = class AppEntity extends typeorm_1.BaseEntity {
26
26
  };
27
27
  exports.AppEntity = AppEntity;
28
28
  __decorate([
29
- (0, typeorm_1.PrimaryColumn)({
30
- length: 32,
31
- nullable: false,
32
- type: 'varchar'
33
- }),
29
+ (0, typeorm_1.PrimaryColumn)({ length: 32, nullable: false, type: 'varchar' }),
34
30
  __metadata("design:type", String)
35
31
  ], AppEntity.prototype, "id", void 0);
36
32
  __decorate([
37
- (0, typeorm_1.Column)({
38
- length: 32,
39
- nullable: false,
40
- type: 'varchar'
41
- }),
33
+ (0, typeorm_1.Column)({ length: 32, nullable: false, type: 'varchar' }),
42
34
  __metadata("design:type", String)
43
35
  ], AppEntity.prototype, "projectId", void 0);
44
36
  __decorate([
45
- (0, typeorm_1.Column)({
46
- default: 'ei',
47
- length: 32,
48
- nullable: false,
49
- type: 'varchar'
50
- }),
37
+ (0, typeorm_1.Column)({ default: 'ei', length: 32, nullable: false, type: 'varchar' }),
51
38
  __metadata("design:type", String)
52
39
  ], AppEntity.prototype, "scopeId", void 0);
53
40
  __decorate([
54
- (0, typeorm_1.Column)({
55
- nullable: false,
56
- type: 'date'
57
- }),
41
+ (0, typeorm_1.Column)({ nullable: false, type: 'date' }),
58
42
  __metadata("design:type", Date)
59
43
  ], AppEntity.prototype, "createdAt", void 0);
60
44
  __decorate([
61
- (0, typeorm_1.Column)({
62
- nullable: false,
63
- type: 'date'
64
- }),
45
+ (0, typeorm_1.Column)({ nullable: false, type: 'date' }),
65
46
  __metadata("design:type", Date)
66
47
  ], AppEntity.prototype, "updatedAt", void 0);
67
48
  __decorate([
68
- (0, typeorm_1.Column)({
69
- type: 'date'
70
- }),
49
+ (0, typeorm_1.Column)({ type: 'date' }),
71
50
  __metadata("design:type", Date)
72
51
  ], AppEntity.prototype, "deletedAt", void 0);
73
52
  __decorate([
74
- (0, typeorm_1.VersionColumn)({
75
- nullable: false
76
- }),
53
+ (0, typeorm_1.VersionColumn)({ nullable: false }),
77
54
  __metadata("design:type", String)
78
55
  ], AppEntity.prototype, "version", void 0);
79
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,mCAA6B;AAC7B,qCAA6F;AAGtF,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,oBAAU;IAMrC,EAAE,CAAQ;IAOV,SAAS,CAAQ;IAQjB,OAAO,CAAQ;IAMf,SAAS,CAAM;IAMf,SAAS,CAAM;IAKf,SAAS,CAAM;IAKf,OAAO,CAAQ;IAGf,YAAY;QACR,IAAI,CAAC,EAAE,GAAG,IAAA,eAAM,GAAE,CAAA;IACtB,CAAC;CACJ,CAAA;AAjDY,8BAAS;AAMlB;IALC,IAAA,uBAAa,EAAC;QACX,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,SAAS;KAClB,CAAC;;qCACQ;AAOV;IALC,IAAA,gBAAM,EAAC;QACJ,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,SAAS;KAClB,CAAC;;4CACe;AAQjB;IANC,IAAA,gBAAM,EAAC;QACJ,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,SAAS;KAClB,CAAC;;0CACa;AAMf;IAJC,IAAA,gBAAM,EAAC;QACJ,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,MAAM;KACf,CAAC;8BACS,IAAI;4CAAA;AAMf;IAJC,IAAA,gBAAM,EAAC;QACJ,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,MAAM;KACf,CAAC;8BACS,IAAI;4CAAA;AAKf;IAHC,IAAA,gBAAM,EAAC;QACJ,IAAI,EAAE,MAAM;KACf,CAAC;8BACS,IAAI;4CAAA;AAKf;IAHC,IAAA,uBAAa,EAAC;QACX,QAAQ,EAAE,KAAK;KAClB,CAAC;;0CACa;AAGf;IADC,IAAA,sBAAY,GAAE;;;;6CAGd;oBAhDQ,SAAS;IADrB,IAAA,eAAK,EAAC,CAAC,WAAW,CAAC,CAAC;GACR,SAAS,CAiDrB"}
1
+ {"version":3,"file":"app.entity.js","sourceRoot":"","sources":["../src/app.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAA6B;AAC7B,qCAA6F;AAGtF,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,oBAAU;IAErC,EAAE,CAAQ;IAGV,SAAS,CAAQ;IAGjB,OAAO,CAAQ;IAGf,SAAS,CAAM;IAGf,SAAS,CAAM;IAGf,SAAS,CAAM;IAGf,OAAO,CAAQ;IAGf,YAAY;QACR,IAAI,CAAC,EAAE,GAAG,IAAA,eAAM,GAAE,CAAA;IACtB,CAAC;CACJ,CAAA;AA1BY,8BAAS;AAElB;IADC,IAAA,uBAAa,EAAC,EAAC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC;;qCACpD;AAGV;IADC,IAAA,gBAAM,EAAC,EAAC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC;;4CACtC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC;;0CACvD;AAGf;IADC,IAAA,gBAAM,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC;8BAC7B,IAAI;4CAAA;AAGf;IADC,IAAA,gBAAM,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC;8BAC7B,IAAI;4CAAA;AAGf;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;8BACZ,IAAI;4CAAA;AAGf;IADC,IAAA,uBAAa,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;;0CAClB;AAGf;IADC,IAAA,sBAAY,GAAE;;;;6CAGd;oBAzBQ,SAAS;IADrB,IAAA,eAAK,EAAC,CAAC,WAAW,CAAC,CAAC;GACR,SAAS,CA0BrB"}
package/dist/app.interface.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { AxiosRequestConfig } from 'axios';
2
+ import { AppEntity } from './app.entity';
2
3
  export declare enum Language {
3
4
  EN_US = "enUS",
4
5
  ZH_CN = "zhCN"
@@ -31,3 +32,9 @@ export declare enum Action {
31
32
  SIGN_UP = "signUp",
32
33
  UPDATE = "update"
33
34
  }
35
+ export interface FindResult<T extends AppEntity> {
36
+ limit: string;
37
+ offset: string;
38
+ results: T[];
39
+ total: string;
40
+ }
package/dist/app.interface.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"app.interface.js","sourceRoot":"","sources":["../src/app.interface.ts"],"names":[],"mappings":";;;AAEA,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,0BAAc,CAAA;IACd,0BAAc,CAAA;AAClB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AAED,IAAY,KAGX;AAHD,WAAY,KAAK;IACb,oBAAW,CAAA;IACX,sBAAa,CAAA;AACjB,CAAC,EAHW,KAAK,qBAAL,KAAK,QAGhB;AAQD,IAAY,QAOX;AAPD,WAAY,QAAQ;IAChB,mCAAuB,CAAA;IACvB,4CAAgC,CAAA;IAChC,2DAA+C,CAAA;IAC/C,kCAAsB,CAAA;IACtB,yCAA6B,CAAA;IAC7B,wDAA4C,CAAA;AAChD,CAAC,EAPW,QAAQ,wBAAR,QAAQ,QAOnB;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
+ {"version":3,"file":"app.interface.js","sourceRoot":"","sources":["../src/app.interface.ts"],"names":[],"mappings":";;;AAGA,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,0BAAc,CAAA;IACd,0BAAc,CAAA;AAClB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AAED,IAAY,KAGX;AAHD,WAAY,KAAK;IACb,oBAAW,CAAA;IACX,sBAAa,CAAA;AACjB,CAAC,EAHW,KAAK,qBAAL,KAAK,QAGhB;AAQD,IAAY,QAOX;AAPD,WAAY,QAAQ;IAChB,mCAAuB,CAAA;IACvB,4CAAgC,CAAA;IAChC,2DAA+C,CAAA;IAC/C,kCAAsB,CAAA;IACtB,yCAA6B,CAAA;IAC7B,wDAA4C,CAAA;AAChD,CAAC,EAPW,QAAQ,wBAAR,QAAQ,QAOnB;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"}
package/dist/authentication/auth/auth.service.js CHANGED
@@ -18,10 +18,10 @@ let AuthService = class AuthService {
18
18
  this.externalService = externalService;
19
19
  }
20
20
  async authAccess(headers) {
21
- return this.externalService.authAccess(headers);
21
+ return this.externalService.authUserAccess(headers);
22
22
  }
23
23
  authPermission(headers) {
24
- return async (options) => this.externalService.authPermission(headers)(options);
24
+ return async (options) => this.externalService.authUserPermission(headers)(options);
25
25
  }
26
26
  };
27
27
  exports.AuthService = AuthService;
package/dist/authentication/auth/auth.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/authentication/auth/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyC;AAEzC,6CAA8C;AAIvC,IAAM,WAAW,GAAjB,MAAM,WAAW;IACS;IAA7B,YAA6B,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAEjE,KAAK,CAAC,UAAU,CAAC,OAAmB;QAChC,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IACnD,CAAC;IAED,cAAc,CAAC,OAAmB;QAC9B,OAAO,KAAK,EAAE,OAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAA;IAC1G,CAAC;CACJ,CAAA;AAVY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAEqC,0BAAe;GADpD,WAAW,CAUvB"}
1
+ {"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/authentication/auth/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyC;AAEzC,6CAA8C;AAIvC,IAAM,WAAW,GAAjB,MAAM,WAAW;IACS;IAA7B,YAA6B,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAEjE,KAAK,CAAC,UAAU,CAAC,OAAmB;QAChC,OAAO,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;IACvD,CAAC;IAED,cAAc,CAAC,OAAmB;QAC9B,OAAO,KAAK,EAAE,OAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAA;IAC9G,CAAC;CACJ,CAAA;AAVY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAEqC,0BAAe;GADpD,WAAW,CAUvB"}
package/dist/authentication/permission/permission.guard.js CHANGED
@@ -22,7 +22,7 @@ let PermissionGuard = class PermissionGuard {
22
22
  this.reflector = reflector;
23
23
  }
24
24
  canActivate(context) {
25
- const requiredPermissions = this.reflector.getAllAndOverride(app_decorator_1.AUTH_PERMISSIONS_KEY, [
25
+ const requiredPermissions = this.reflector.getAllAndOverride(app_decorator_1.AUTHENTICATION_PERMISSIONS_KEY, [
26
26
  context.getHandler(),
27
27
  context.getClass()
28
28
  ]);
package/dist/authentication/permission/permission.guard.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"permission.guard.js","sourceRoot":"","sources":["../../../src/authentication/permission/permission.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsC;AACtC,uDAAwD;AAExD,kCAAmC;AAI5B,IAAM,eAAe,GAArB,MAAM,eAAe;IAEH;IACA;IAFrB,YACqB,WAAwB,EACxB,SAAoB;QADpB,gBAAW,GAAX,WAAW,CAAa;QACxB,cAAS,GAAT,SAAS,CAAW;IACtC,CAAC;IAEJ,WAAW,CAAC,OAAyB;QACjC,MAAM,mBAAmB,GAAiB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,oCAAoB,EAAE;YAC7F,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACrB,CAAC,CAAA;QAEF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;QAED,MAAM,EAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAC,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAc,CAAA;QAC/E,MAAM,MAAM,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC,EAAE,CAAA;QAEtC,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,MAAM,EAAE,CAAC;YAClC,OAAO,IAAI,CAAA;QACf,CAAC;QAED,OAAO,IAAI,CAAC,WAAW;aAClB,cAAc,CAAC,OAAO,CAAC,CAAC,EAAC,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAC,CAAC;aACtE,IAAI,CAAC,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,MAAM,KAAK,WAAW,CAAC,CAAA;IACnD,CAAC;CACJ,CAAA;AA3BY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAGyB,kBAAW;QACb,gBAAS;GAHhC,eAAe,CA2B3B"}
1
+ {"version":3,"file":"permission.guard.js","sourceRoot":"","sources":["../../../src/authentication/permission/permission.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsC;AACtC,uDAAkE;AAElE,kCAAmC;AAI5B,IAAM,eAAe,GAArB,MAAM,eAAe;IAEH;IACA;IAFrB,YACqB,WAAwB,EACxB,SAAoB;QADpB,gBAAW,GAAX,WAAW,CAAa;QACxB,cAAS,GAAT,SAAS,CAAW;IACtC,CAAC;IAEJ,WAAW,CAAC,OAAyB;QACjC,MAAM,mBAAmB,GAAiB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,8CAA8B,EAAE;YACvG,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACrB,CAAC,CAAA;QAEF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACvB,OAAO,IAAI,CAAA;QACf,CAAC;QAED,MAAM,EAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAC,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAc,CAAA;QAC/E,MAAM,MAAM,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC,EAAE,CAAA;QAEtC,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,MAAM,EAAE,CAAC;YAClC,OAAO,IAAI,CAAA;QACf,CAAC;QAED,OAAO,IAAI,CAAC,WAAW;aAClB,cAAc,CAAC,OAAO,CAAC,CAAC,EAAC,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAC,CAAC;aACtE,IAAI,CAAC,CAAC,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,MAAM,KAAK,WAAW,CAAC,CAAA;IACnD,CAAC;CACJ,CAAA;AA3BY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAGyB,kBAAW;QACb,gBAAS;GAHhC,eAAe,CA2B3B"}
package/dist/base/base.interface.d.ts CHANGED
@@ -1,10 +1,9 @@
1
- import { DeepPartial, EntityManager, FindManyOptions, FindOptionsWhere } from 'typeorm';
1
+ import { DeepPartial, FindManyOptions, FindOptionsWhere } from 'typeorm';
2
2
  import { ActionLogOptions } from '../action-log';
3
3
  import { IndexDTO, NotIdDTO } from '../app.dto';
4
4
  import { APIError, APIHeaders } from '../app.interface';
5
5
  import { ThrowAPIErrorOptions } from '../util';
6
6
  export interface BaseServiceOptions<T> extends Pick<ActionLogOptions, 'enableLogging'> {
7
- entityManager?: EntityManager;
8
7
  entityOptions: DeepPartial<T>;
9
8
  findOptions: FindOptionsWhere<T>;
10
9
  headers: APIHeaders;
@@ -38,3 +37,7 @@ export interface PreValidateOptions<T> {
38
37
  export interface ThrowErrorOptions extends ThrowAPIErrorOptions {
39
38
  errorType: APIError;
40
39
  }
40
+ export interface ProcessOrValidateWhereResult<T> {
41
+ findOrOptions?: FindOptionsWhere<T>[];
42
+ where?: FindOptionsWhere<T>[];
43
+ }
package/dist/base/base.service.d.ts CHANGED
@@ -1,21 +1,21 @@
1
- import { Repository } from 'typeorm';
1
+ import { EntityManager, Repository } from 'typeorm';
2
2
  import { ActionLogOptions, ActionLogService } from '../action-log';
3
3
  import { AppEntity } from '../app.entity';
4
4
  import { CreateOptions, DelOptions, FindOneOptions, FindOptions, PreValidateOptions, ThrowErrorOptions, UpdateAssociationOptions, UpdateOptions } from './base.interface';
5
5
  export declare class BaseService {
6
6
  private readonly actionLogService;
7
7
  constructor(actionLogService: ActionLogService);
8
- create<T extends AppEntity>({ enableLogging, entityManager, entityOptions, headers, preValidateOptions, serviceName }: CreateOptions<T>): (repository: Repository<T>) => Promise<T>;
9
- del<T extends AppEntity>({ entityManager, findOptions, serviceName, headers, enableLogging }: DelOptions<T>): (repository: Repository<T>) => Promise<void>;
10
- update<T extends AppEntity>({ enableLogging, entityManager, entityOptions, findOptions, headers, preValidateOptions, serviceName }: UpdateOptions<T>): (repository: Repository<T>) => Promise<T>;
8
+ create<T extends AppEntity>({ enableLogging, entityOptions, headers, preValidateOptions, serviceName }: CreateOptions<T>): (repository: Repository<T>) => (entityManager?: EntityManager) => Promise<T>;
9
+ del<T extends AppEntity>({ findOptions, serviceName, headers, enableLogging }: DelOptions<T>): (repository: Repository<T>) => (entityManager?: EntityManager) => Promise<void>;
10
+ update<T extends AppEntity>({ enableLogging, entityOptions, findOptions, headers, preValidateOptions, serviceName }: UpdateOptions<T>): (repository: Repository<T>) => (entityManager?: EntityManager) => Promise<T>;
11
11
  find<T extends AppEntity>({ findOptions, findManyOptions }: FindOptions<T>): (repository: Repository<T>) => Promise<{
12
12
  results: T[];
13
- limit: number;
14
- offset: number;
15
- total: number;
13
+ limit: string;
14
+ offset: string;
15
+ total: string;
16
16
  }>;
17
17
  findOne<T extends AppEntity>({ serviceName, findOptions, actionLogOptions }: FindOneOptions<T>): (repository: Repository<T>) => Promise<T>;
18
- updateAssociation<T extends AppEntity>({ enableLogging, entityIds: rawEntityIds, entityManager, findOptions, headers, serviceName }: UpdateAssociationOptions<T>): (associationKey: string) => (repository: Repository<T>) => Promise<T[]>;
18
+ updateAssociation<T extends AppEntity>({ enableLogging, entityIds: rawEntityIds, findOptions, headers, serviceName }: UpdateAssociationOptions<T>): (associationKey: string) => (repository: Repository<T>) => Promise<(entityManager?: EntityManager) => Promise<T[]>>;
19
19
  preValidate<T extends AppEntity>({ actionLogOptions, findOptions, serviceName, validateKeys, validateMethod }: PreValidateOptions<T>): Promise<(repository: Repository<T>) => Promise<void>>;
20
20
  checkProhibited<T extends AppEntity>(actionLogOptions?: ActionLogOptions): (entity: T & {
21
21
  protected?: boolean;
package/dist/base/base.service.js CHANGED
@@ -20,7 +20,7 @@ let BaseService = class BaseService {
20
20
  constructor(actionLogService) {
21
21
  this.actionLogService = actionLogService;
22
22
  }
23
- create({ enableLogging, entityManager, entityOptions, headers, preValidateOptions, serviceName }) {
23
+ create({ enableLogging, entityOptions, headers, preValidateOptions, serviceName }) {
24
24
  const actionLogOptions = {
25
25
  action: app_interface_1.Action.CREATE,
26
26
  enableLogging,
@@ -29,7 +29,7 @@ let BaseService = class BaseService {
29
29
  raw: { entityOptions },
30
30
  serviceName
31
31
  };
32
- return async (repository) => {
32
+ return (repository) => async (entityManager) => {
33
33
  preValidateOptions &&
34
34
  (await (await this.preValidate({ ...preValidateOptions, serviceName, actionLogOptions }))(repository));
35
35
  const createdEntity = repository.create(entityOptions);
@@ -38,7 +38,7 @@ let BaseService = class BaseService {
38
38
  return entity;
39
39
  };
40
40
  }
41
- del({ entityManager, findOptions, serviceName, headers, enableLogging }) {
41
+ del({ findOptions, serviceName, headers, enableLogging }) {
42
42
  const actionLogOptions = {
43
43
  action: app_interface_1.Action.DELETE,
44
44
  enableLogging,
@@ -46,7 +46,7 @@ let BaseService = class BaseService {
46
46
  message: `Delete a ${serviceName}`,
47
47
  serviceName
48
48
  };
49
- return async (repository) => {
49
+ return (repository) => async (entityManager) => {
50
50
  const entity = await this.findOne({ serviceName, findOptions, actionLogOptions })(repository);
51
51
  const raw = enableLogging ? { findOptions, entity: { ...entity } } : undefined;
52
52
  await this.checkProhibited(actionLogOptions)(entity);
@@ -55,7 +55,7 @@ let BaseService = class BaseService {
55
55
  await this.actionLogSuccess({ ...actionLogOptions, raw })(entity);
56
56
  };
57
57
  }
58
- update({ enableLogging, entityManager, entityOptions, findOptions, headers, preValidateOptions, serviceName }) {
58
+ update({ enableLogging, entityOptions, findOptions, headers, preValidateOptions, serviceName }) {
59
59
  const actionLogOptions = {
60
60
  action: app_interface_1.Action.UPDATE,
61
61
  enableLogging,
@@ -63,7 +63,7 @@ let BaseService = class BaseService {
63
63
  message: `Update a ${serviceName}`,
64
64
  serviceName
65
65
  };
66
- return async (repository) => {
66
+ return (repository) => async (entityManager) => {
67
67
  const entity = await this.findOne({ actionLogOptions, findOptions, serviceName })(repository);
68
68
  const raw = enableLogging ? { findOptions, entity: { ...entity }, entityOptions } : undefined;
69
69
  const nextActionLogOptions = { ...actionLogOptions, raw };
@@ -76,7 +76,7 @@ let BaseService = class BaseService {
76
76
  const findOptions = preValidateKeys
77
77
  .filter(key => key === 'id')
78
78
  .map(key => ({ [key]: entityOptions[key] ?? entity[key] }))
79
- .reduce((acc, cur) => ({ ...acc, ...cur }), {});
79
+ .reduce((accumulator, currentValue) => ({ ...accumulator, ...currentValue }), {});
80
80
  await (await this.preValidate({
81
81
  ...args,
82
82
  actionLogOptions: nextActionLogOptions,
@@ -108,7 +108,7 @@ let BaseService = class BaseService {
108
108
  repository.find({ ...findManyOptions, order: orderOptions, skip: offset, take: limit, where }),
109
109
  isCount ? repository.count({ where }) : undefined
110
110
  ]);
111
- return { results: entities, limit, offset, total };
111
+ return { results: entities, limit: `${limit}`, offset: `${offset}`, total: `${total}` };
112
112
  };
113
113
  }
114
114
  findOne({ serviceName, findOptions, actionLogOptions }) {
@@ -124,7 +124,7 @@ let BaseService = class BaseService {
124
124
  return entity;
125
125
  };
126
126
  }
127
- updateAssociation({ enableLogging, entityIds: rawEntityIds, entityManager, findOptions, headers, serviceName }) {
127
+ updateAssociation({ enableLogging, entityIds: rawEntityIds, findOptions, headers, serviceName }) {
128
128
  return (associationKey) => {
129
129
  const size = 1024;
130
130
  const entityIds = [...new Set(rawEntityIds)];
@@ -132,8 +132,8 @@ let BaseService = class BaseService {
132
132
  action: app_interface_1.Action.UPDATE,
133
133
  enableLogging,
134
134
  headers,
135
- serviceName,
136
- message: `Update ${serviceName} and ${associationKey} associations.`
135
+ message: `Update ${serviceName} and ${associationKey} associations.`,
136
+ serviceName
137
137
  };
138
138
  return async (repository) => {
139
139
  const entities = await this.find({
@@ -154,25 +154,28 @@ let BaseService = class BaseService {
154
154
  .filter(entity => entityIds.includes(entity[associationKey]) && entity.deletedAt)
155
155
  .map(entity => entity.recover()));
156
156
  const entityActions = [...entitiesToAdd, ...entitiesToRecover, ...entitiesToRemove];
157
- const savedEntities = await (entityManager ?
158
- entityManager.save(entityActions)
159
- : repository.save(entityActions));
160
- await this.actionLogSuccess({ ...actionLogOptions, raw })(savedEntities);
161
- return savedEntities.filter(entity => entity.deletedAt);
157
+ return async (entityManager) => {
158
+ const savedEntities = await (entityManager ?
159
+ entityManager.save(entityActions)
160
+ : repository.save(entityActions));
161
+ await this.actionLogSuccess({ ...actionLogOptions, raw })(savedEntities);
162
+ return savedEntities;
163
+ };
162
164
  };
163
165
  };
164
166
  }
165
167
  async preValidate({ actionLogOptions, findOptions, serviceName, validateKeys = [], validateMethod = 'and' }) {
166
168
  const processOrKeys = ({ notId, ...args }) => (keys) => keys
167
169
  .map(key => ({ [key]: args[key] }))
168
- .reduce((acc, cur) => ({ ...acc, ...cur }), notId ? { id: (0, typeorm_1.Not)(notId) } : {});
170
+ .reduce((accumulator, currentValue) => ({ ...accumulator, ...currentValue }), notId ? { id: (0, typeorm_1.Not)(notId) } : {});
169
171
  const processOrValidateWhere = (findOptions) => async (validateKeys) => {
170
172
  const { notId, ...args } = findOptions;
171
173
  !Array.isArray(validateKeys[0]) &&
172
174
  (await this.throwError({
173
175
  code: 400000,
174
176
  errorType: app_interface_1.APIError.HTTP_EXCEPTION,
175
- message: `When using or as a validation method, validateKeys must be a nested array. validateKeys: ${JSON.stringify(validateKeys)}`,
177
+ message: `When using or as a validation method, validateKeys must be a nested array.
178
+ validateKeys: ${JSON.stringify(validateKeys)}`,
176
179
  status: 400
177
180
  })(actionLogOptions));
178
181
  const validateOrKeys = [...new Set(validateKeys.flat())];
@@ -197,7 +200,7 @@ let BaseService = class BaseService {
197
200
  if (entity) {
198
201
  const key = Object.keys({
199
202
  ...args,
200
- ...findOrOptions?.reduce((acc, cur) => ({ ...acc, ...cur }), {})
203
+ ...findOrOptions?.reduce((accumulator, currentValue) => ({ ...accumulator, ...currentValue }), {})
201
204
  }).join(',');
202
205
  await this.throwError({
203
206
  errorType: app_interface_1.APIError.UNPROCESSABLE_ENTITY,
package/dist/base/base.service.js.map CHANGED
@@ -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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"}
package/dist/database/database.module.js CHANGED
@@ -19,17 +19,17 @@ exports.DatabaseModule = DatabaseModule = __decorate([
19
19
  typeorm_1.TypeOrmModule.forRootAsync({
20
20
  imports: [config_1.ConfigModule],
21
21
  useFactory: configService => ({
22
- type: configService.get('database.type'),
22
+ database: configService.get('database.database'),
23
+ entities: [__dirname + '/**/*.entity{.ts,.js}'],
23
24
  host: configService.get('database.host'),
25
+ password: configService.get('database.password'),
24
26
  port: configService.get('database.port'),
27
+ type: configService.get('database.type'),
25
28
  username: configService.get('database.username'),
26
- password: configService.get('database.password'),
27
- database: configService.get('database.database'),
28
- entities: [__dirname + '/**/*.entity{.ts,.js}'],
29
29
  ...(process.env.NODE_ENV !== 'production' && {
30
- synchronize: true,
30
+ logger: 'advanced-console',
31
31
  logging: true,
32
- logger: 'advanced-console'
32
+ synchronize: true
33
33
  })
34
34
  }),
35
35
  inject: [config_1.ConfigService]
package/dist/database/database.module.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"database.module.js","sourceRoot":"","sources":["../../src/database/database.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAqC;AACrC,2CAA0D;AAC1D,6CAA6C;AAwBtC,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAtB1B,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,uBAAa,CAAC,YAAY,CAAC;gBACvB,OAAO,EAAE,CAAC,qBAAY,CAAC;gBACvB,UAAU,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;oBAC1B,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC;oBACxC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC;oBACxC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC;oBACxC,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC;oBAChD,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC;oBAChD,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC;oBAChD,QAAQ,EAAE,CAAC,SAAS,GAAG,uBAAuB,CAAC;oBAC/C,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI;wBACzC,WAAW,EAAE,IAAI;wBACjB,OAAO,EAAE,IAAI;wBACb,MAAM,EAAE,kBAAkB;qBAC7B,CAAC;iBACL,CAAC;gBACF,MAAM,EAAE,CAAC,sBAAa,CAAC;aAC1B,CAAC;SACL;KACJ,CAAC;GACW,cAAc,CAAG"}
1
+ {"version":3,"file":"database.module.js","sourceRoot":"","sources":["../../src/database/database.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAqC;AACrC,2CAA0D;AAC1D,6CAA6C;AAwBtC,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAtB1B,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,uBAAa,CAAC,YAAY,CAAC;gBACvB,OAAO,EAAE,CAAC,qBAAY,CAAC;gBACvB,UAAU,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;oBAC1B,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC;oBAChD,QAAQ,EAAE,CAAC,SAAS,GAAG,uBAAuB,CAAC;oBAC/C,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC;oBACxC,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC;oBAChD,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC;oBACxC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC;oBACxC,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC;oBAChD,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI;wBACzC,MAAM,EAAE,kBAAkB;wBAC1B,OAAO,EAAE,IAAI;wBACb,WAAW,EAAE,IAAI;qBACpB,CAAC;iBACL,CAAC;gBACF,MAAM,EAAE,CAAC,sBAAa,CAAC;aAC1B,CAAC;SACL;KACJ,CAAC;GACW,cAAc,CAAG"}
package/dist/external/external.service.d.ts CHANGED
@@ -6,8 +6,8 @@ export declare class ExternalService {
6
6
  private readonly configService;
7
7
  private readonly httpService;
8
8
  constructor(configService: ConfigService, httpService: HttpService);
9
- authAccess(headers: APIHeaders): Promise<AuthenticatedToken>;
10
- authPermission(headers: APIHeaders): (options: AuthExternalPermissionOptions) => Promise<AuthenticatedPermission>;
9
+ authUserAccess(headers: APIHeaders): Promise<AuthenticatedToken>;
10
+ authUserPermission(headers: APIHeaders): (options: AuthExternalPermissionOptions) => Promise<AuthenticatedPermission>;
11
11
  createActionLog(headers: APIHeaders): (options: CreateExternalActionLogOptions) => Promise<void>;
12
12
  request({ method, path, ...options }: RequestOptions): Promise<any>;
13
13
  }
package/dist/external/external.service.js CHANGED
@@ -23,17 +23,17 @@ let ExternalService = class ExternalService {
23
23
  this.configService = configService;
24
24
  this.httpService = httpService;
25
25
  }
26
- async authAccess(headers) {
27
- return this.request({ method: 'GET', path: '/auth/accesses', headers });
26
+ async authUserAccess(headers) {
27
+ return this.request({ method: 'GET', path: '/users/authentication-access', headers });
28
28
  }
29
- authPermission(headers) {
29
+ authUserPermission(headers) {
30
30
  return async (options) => {
31
31
  const { keys, ...args } = options;
32
32
  return this.request({
33
33
  headers,
34
34
  method: 'GET',
35
35
  params: { keys: keys.join(','), ...args },
36
- path: '/auth/permissions'
36
+ path: '/users/authentication-permissions'
37
37
  });
38
38
  };
39
39
  }
@@ -61,11 +61,17 @@ let ExternalService = class ExternalService {
61
61
  }
62
62
  async request({ method = 'GET', path = '/', ...options }) {
63
63
  return (0, rxjs_1.firstValueFrom)(this.httpService
64
- .request({ ...options, adapter: 'fetch', method, url: `${this.configService.get('url')}${path}` })
64
+ .request({
65
+ ...options,
66
+ adapter: 'fetch',
67
+ method,
68
+ timeout: this.configService.get('apiService.timeout'),
69
+ url: `${this.configService.get('apiService.url')}${path}`
70
+ })
65
71
  .pipe((0, rxjs_1.catchError)(error => {
66
72
  error.status && (0, util_1.throwAPIError)({ response: error, status: error.status })(app_interface_1.APIError.HTTP_EXCEPTION);
67
73
  throw error;
68
- }))).then(res => res.data);
74
+ }))).then(({ data }) => data);
69
75
  }
70
76
  };
71
77
  exports.ExternalService = ExternalService;
package/dist/external/external.service.js.map CHANGED
@@ -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,oDAAqD;AACrD,kCAAqC;AAU9B,IAAM,eAAe,GAArB,MAAM,eAAe;IAEH;IACA;IAFrB,YACqB,aAA4B,EAC5B,WAAwB;QADxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;IAC1C,CAAC;IAEJ,KAAK,CAAC,UAAU,CAAC,OAAmB;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAC,CAAC,CAAA;IACzE,CAAC;IAED,cAAc,CAAC,OAAmB;QAC9B,OAAO,KAAK,EAAE,OAAsC,EAAoC,EAAE;YACtF,MAAM,EAAC,IAAI,EAAE,GAAG,IAAI,EAAC,GAAG,OAAO,CAAA;YAE/B,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,OAAO;gBACP,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,EAAC;gBACvC,IAAI,EAAE,mBAAmB;aAC5B,CAAC,CAAA;QACN,CAAC,CAAA;IACL,CAAC;IAED,eAAe,CAAC,OAAmB;QAC/B,OAAO,KAAK,EAAE,OAAuC,EAAE,EAAE;YACrD,MAAM,EAAC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAC,GAAG,OAAO,CAAA;YAE9C,MAAM,IAAI,CAAC,OAAO,CAAC;gBACf,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE;oBACF,GAAG,IAAI;oBACP,MAAM;oBACN,OAAO,EAAE,GAAG,MAAM,IAAI,WAAW,EAAE;oBACnC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;oBAC3B,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC;oBACnB,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC;oBAClC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC;oBAC9B,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC;oBAClD,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC;oBAChC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC;iBACrC;gBACD,OAAO;aACV,CAAC,CAAA;QACN,CAAC,CAAA;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,GAAG,EAAE,GAAG,OAAO,EAAiB;QAClE,OAAO,IAAA,qBAAc,EACjB,IAAI,CAAC,WAAW;aACX,OAAO,CAAC,EAAC,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,EAAC,CAAC;aAC/F,IAAI,CACD,IAAA,iBAAU,EAAC,KAAK,CAAC,EAAE;YACf,KAAK,CAAC,MAAM,IAAI,IAAA,oBAAa,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAC,CAAC,CAAC,wBAAQ,CAAC,cAAc,CAAC,CAAA;YAE/F,MAAM,KAAK,CAAA;QACf,CAAC,CAAC,CACL,CACR,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC3B,CAAC;CACJ,CAAA;AA5DY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;qCAG2B,sBAAa;QACf,mBAAW;GAHpC,eAAe,CA4D3B"}
1
+ {"version":3,"file":"external.service.js","sourceRoot":"","sources":["../../src/external/external.service.ts"],"names":[],"mappings":"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"}