@trailmix-cms/cms 0.7.1 → 0.7.2

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 (29) hide show
  1. package/dist/auth.guard.d.ts.map +1 -1
  2. package/dist/auth.guard.js +7 -10
  3. package/dist/auth.guard.js.map +1 -1
  4. package/dist/controllers/account.controller.js +1 -1
  5. package/dist/controllers/account.controller.js.map +1 -1
  6. package/dist/controllers/api-keys.controller.js +1 -1
  7. package/dist/controllers/api-keys.controller.js.map +1 -1
  8. package/dist/controllers/audit.controller.js +1 -1
  9. package/dist/controllers/audit.controller.js.map +1 -1
  10. package/dist/controllers/audits.controller.js +1 -1
  11. package/dist/controllers/audits.controller.js.map +1 -1
  12. package/dist/controllers/global-roles.controller.js +1 -1
  13. package/dist/controllers/global-roles.controller.js.map +1 -1
  14. package/dist/controllers/security-audits.controller.js +1 -1
  15. package/dist/controllers/security-audits.controller.js.map +1 -1
  16. package/dist/decorators/auth.decorator.d.ts +6 -7
  17. package/dist/decorators/auth.decorator.d.ts.map +1 -1
  18. package/dist/decorators/auth.decorator.js +4 -6
  19. package/dist/decorators/auth.decorator.js.map +1 -1
  20. package/dist/services/auth.service.d.ts +16 -6
  21. package/dist/services/auth.service.d.ts.map +1 -1
  22. package/dist/services/auth.service.js +39 -7
  23. package/dist/services/auth.service.js.map +1 -1
  24. package/dist/types/request-principal.d.ts +2 -2
  25. package/dist/types/request-principal.d.ts.map +1 -1
  26. package/package.json +7 -7
  27. package/test/unit/auth.guard.spec.ts +355 -0
  28. package/test/unit/services/auth.service.spec.ts +290 -44
  29. package/tsconfig.build.tsbuildinfo +1 -1
package/dist/auth.guard.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../src/auth.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAc,WAAW,EAAE,gBAAgB,EAA2E,MAAM,gBAAgB,CAAC;AAIpJ,OAAO,EAAc,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,OAAO,QAAQ,SAAS,CAAC;IACrB,UAAU,cAAc;QACpB,SAAS,EAAE,gBAAgB,CAAA;KAC9B;CACJ;AAED,qBACa,SAAU,YAAW,WAAW;IAErC,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,WAAW;gBADX,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW;IAG9B,WAAW,CACb,OAAO,EAAE,gBAAgB,GAC1B,OAAO,CAAC,OAAO,CAAC;CAyCtB"}
1
+ {"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../src/auth.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAc,WAAW,EAAE,gBAAgB,EAA2E,MAAM,gBAAgB,CAAC;AAIpJ,OAAO,EAAc,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,OAAO,QAAQ,SAAS,CAAC;IACrB,UAAU,cAAc;QACpB,SAAS,EAAE,gBAAgB,CAAA;KAC9B;CACJ;AAED,qBACa,SAAU,YAAW,WAAW;IAErC,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,WAAW;gBADX,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW;IAG9B,WAAW,CACb,OAAO,EAAE,gBAAgB,GAC1B,OAAO,CAAC,OAAO,CAAC;CAkCtB"}
package/dist/auth.guard.js CHANGED
@@ -22,22 +22,19 @@ let AuthGuard = class AuthGuard {
22
22
  this.authService = authService;
23
23
  }
24
24
  async canActivate(context) {
25
- const requiredGlobalRoles = this.reflector.getAllAndOverride(auth_decorator_1.ROLES_KEY, [
26
- context.getHandler(),
27
- context.getClass(),
28
- ]);
29
- const allowAnonymous = this.reflector.getAllAndOverride(auth_decorator_1.ALLOW_ANONYMOUS_KEY, [
30
- context.getHandler(),
31
- context.getClass(),
32
- ]);
33
- const requiredPrincipalTypes = this.reflector.getAllAndOverride(auth_decorator_1.PRINCIPAL_TYPES_KEY, [
25
+ const { allowAnonymous, requiredPrincipalTypes, requiredApiKeyScopes, requiredGlobalRoles } = this.reflector.getAllAndOverride(auth_decorator_1.AUTH_OPTIONS_KEY, [
34
26
  context.getHandler(),
35
27
  context.getClass(),
36
28
  ]);
37
29
  const request = context.switchToHttp().getRequest();
38
30
  const requestUrl = request.url;
39
31
  const principal = await this.authService.getPrincipal(context);
40
- const authResult = await this.authService.validateAuth(principal, allowAnonymous, requiredPrincipalTypes, requiredGlobalRoles, requestUrl);
32
+ const authResult = await this.authService.validateAuth(principal, {
33
+ allowAnonymous,
34
+ requiredPrincipalTypes,
35
+ requiredGlobalRoles,
36
+ requiredApiKeyScopes,
37
+ }, requestUrl);
41
38
  if (authResult !== auth_service_1.AuthResult.IsValid) {
42
39
  if (authResult === auth_service_1.AuthResult.Unauthorized) {
43
40
  throw new common_1.UnauthorizedException('Unauthorized request');
package/dist/auth.guard.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../src/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAyC;AACzC,2CAAoJ;AAGpJ,gEAAkG;AAClG,0DAAkE;AAU3D,IAAM,SAAS,GAAf,MAAM,SAAS;IAEN;IACA;IAFZ,YACY,SAAoB,EACpB,WAAwB;QADxB,cAAS,GAAT,SAAS,CAAW;QACpB,gBAAW,GAAX,WAAW,CAAa;IAChC,CAAC;IAEL,KAAK,CAAC,WAAW,CACb,OAAyB;QAEzB,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAwC,0BAAS,EAAE;YAC3G,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACrB,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,oCAAmB,EAAE;YAClF,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACrB,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAA6B,oCAAmB,EAAE;YAC7G,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACrB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAkB,CAAC;QACpE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;QAE/B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAClD,SAAS,EACT,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACnB,UAAU,CACb,CAAC;QAEF,IAAI,UAAU,KAAK,yBAAU,CAAC,OAAO,EAAE,CAAC;YACpC,IAAI,UAAU,KAAK,yBAAU,CAAC,YAAY,EAAE,CAAC;gBACzC,MAAM,IAAI,8BAAqB,CAAC,sBAAsB,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,UAAU,KAAK,yBAAU,CAAC,SAAS,EAAE,CAAC;gBACtC,MAAM,IAAI,2BAAkB,CAAC,gDAAgD,CAAC,CAAC;YACnF,CAAC;YACD,MAAM,IAAI,qCAA4B,CAAC,mCAAmC,CAAC,CAAC;QAChF,CAAC;QAED,OAAO,CAAC,SAAS,GAAG,SAAU,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AAjDY,8BAAS;oBAAT,SAAS;IADrB,IAAA,mBAAU,GAAE;qCAGc,gBAAS;QACP,0BAAW;GAH3B,SAAS,CAiDrB"}
1
+ {"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../src/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAyC;AACzC,2CAAoJ;AAGpJ,gEAA4E;AAC5E,0DAAkE;AAU3D,IAAM,SAAS,GAAf,MAAM,SAAS;IAEN;IACA;IAFZ,YACY,SAAoB,EACpB,WAAwB;QADxB,cAAS,GAAT,SAAS,CAAW;QACpB,gBAAW,GAAX,WAAW,CAAa;IAChC,CAAC;IAEL,KAAK,CAAC,WAAW,CACb,OAAyB;QAEzB,MAAM,EAAE,cAAc,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAc,iCAAgB,EAAE;YAC1J,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACrB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAkB,CAAC;QACpE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC;QAE/B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAClD,SAAS,EACT;YACI,cAAc;YACd,sBAAsB;YACtB,mBAAmB;YACnB,oBAAoB;SACvB,EACD,UAAU,CACb,CAAC;QAEF,IAAI,UAAU,KAAK,yBAAU,CAAC,OAAO,EAAE,CAAC;YACpC,IAAI,UAAU,KAAK,yBAAU,CAAC,YAAY,EAAE,CAAC;gBACzC,MAAM,IAAI,8BAAqB,CAAC,sBAAsB,CAAC,CAAC;YAC5D,CAAC;YACD,IAAI,UAAU,KAAK,yBAAU,CAAC,SAAS,EAAE,CAAC;gBACtC,MAAM,IAAI,2BAAkB,CAAC,gDAAgD,CAAC,CAAC;YACnF,CAAC;YACD,MAAM,IAAI,qCAA4B,CAAC,mCAAmC,CAAC,CAAC;QAChF,CAAC;QAED,OAAO,CAAC,SAAS,GAAG,SAAU,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AA1CY,8BAAS;oBAAT,SAAS;IADrB,IAAA,mBAAU,GAAE;qCAGc,gBAAS;QACP,0BAAW;GAH3B,SAAS,CA0CrB"}
package/dist/controllers/account.controller.js CHANGED
@@ -101,7 +101,7 @@ function buildAccountController(accountDto = (0, nestjs_zod_1.createZodDto)(mode
101
101
  __metadata("design:returntype", Promise)
102
102
  ], AccountController.prototype, "getGlobalRoles", null);
103
103
  AccountController = AccountController_1 = __decorate([
104
- (0, decorators_1.Auth)({ principalTypes: [models.Principal.Account] }),
104
+ (0, decorators_1.Auth)({ requiredPrincipalTypes: [models.Principal.Account] }),
105
105
  (0, swagger_1.ApiTags)('account'),
106
106
  (0, common_1.Controller)('account'),
107
107
  __param(0, (0, common_1.Inject)(provider_symbols_1.PROVIDER_SYMBOLS.ACCOUNT_MAP_ENTITY)),
package/dist/controllers/account.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"account.controller.js","sourceRoot":"","sources":["../../src/controllers/account.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,wDA0CC;AArDD,2CAAiE;AACjE,2CAA0C;AAC1C,6CAAuE;AACvE,6DAA+C;AAE/C,8CAAuD;AACvD,oEAAiE;AAEjE,wDAA0C;AAC1C,0CAAgD;AAEhD,SAAgB,sBAAsB,CAGpC,aAAkB,IAAA,yBAAY,EAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;;IAEnD,IAGM,iBAAiB,yBAHvB,MAGM,iBAAiB;QAGuC;QAC7C;QAHJ,MAAM,GAAG,IAAI,eAAM,CAAC,mBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,YAC0D,gBAA6D,EAC1G,iBAAoC;YADS,qBAAgB,GAAhB,gBAAgB,CAA6C;YAC1G,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC7C,CAAC;QAKC,AAAN,KAAK,CAAC,IAAI,CAAqB,SAA2B;YACtD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC3B,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAuB,CAAC,CAAC;QACpE,CAAC;QAKK,AAAN,KAAK,CAAC,cAAc,CACI,SAA2B;YAE/C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAClC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC5C,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG;gBAClC,cAAc,EAAE,SAAS,CAAC,cAAc;aAC3C,CAAC,CAAC;YACH,OAAO;gBACH,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,KAAK,CAAC,MAAM;aACtB,CAAC;QACN,CAAC;KACJ,CAAA;IAtBS;QAHL,IAAA,YAAG,GAAE;QACL,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;QAC7C,IAAA,uBAAa,EAAC,EAAE,WAAW,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;QACtD,WAAA,IAAA,6BAAgB,GAAE,CAAA;;;;iDAI7B;IAKK;QAHL,IAAA,YAAG,EAAC,cAAc,CAAC;QACnB,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,0CAA0C,EAAE,CAAC;QACrE,IAAA,uBAAa,EAAC,EAAE,WAAW,EAAE,+BAA+B,EAAE,IAAI,EAAE,GAAG,CAAC,gCAAgC,EAAE,CAAC;QAEvG,WAAA,IAAA,6BAAgB,GAAE,CAAA;;;;2DAWtB;IA/BC,iBAAiB;QAHtB,IAAA,iBAAI,EAAC,EAAE,cAAc,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,IAAA,iBAAO,EAAC,SAAS,CAAC;QAClB,IAAA,mBAAU,EAAC,SAAS,CAAC;QAIb,WAAA,IAAA,eAAM,EAAC,mCAAgB,CAAC,kBAAkB,CAAC,CAAA;mDAChB,4BAAiB;OAJ/C,iBAAiB,CAgCtB;IACD,OAAO,iBAAiB,CAAC;AAC7B,CAAC;AAEY,QAAA,iBAAiB,GAAG,sBAAsB,EAAE,CAAC"}
1
+ {"version":3,"file":"account.controller.js","sourceRoot":"","sources":["../../src/controllers/account.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,wDA0CC;AArDD,2CAAiE;AACjE,2CAA0C;AAC1C,6CAAuE;AACvE,6DAA+C;AAE/C,8CAAuD;AACvD,oEAAiE;AAEjE,wDAA0C;AAC1C,0CAAgD;AAEhD,SAAgB,sBAAsB,CAGpC,aAAkB,IAAA,yBAAY,EAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;;IAEnD,IAGM,iBAAiB,yBAHvB,MAGM,iBAAiB;QAGuC;QAC7C;QAHJ,MAAM,GAAG,IAAI,eAAM,CAAC,mBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,YAC0D,gBAA6D,EAC1G,iBAAoC;YADS,qBAAgB,GAAhB,gBAAgB,CAA6C;YAC1G,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC7C,CAAC;QAKC,AAAN,KAAK,CAAC,IAAI,CAAqB,SAA2B;YACtD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC3B,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAuB,CAAC,CAAC;QACpE,CAAC;QAKK,AAAN,KAAK,CAAC,cAAc,CACI,SAA2B;YAE/C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAClC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC5C,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG;gBAClC,cAAc,EAAE,SAAS,CAAC,cAAc;aAC3C,CAAC,CAAC;YACH,OAAO;gBACH,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,KAAK,CAAC,MAAM;aACtB,CAAC;QACN,CAAC;KACJ,CAAA;IAtBS;QAHL,IAAA,YAAG,GAAE;QACL,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;QAC7C,IAAA,uBAAa,EAAC,EAAE,WAAW,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;QACtD,WAAA,IAAA,6BAAgB,GAAE,CAAA;;;;iDAI7B;IAKK;QAHL,IAAA,YAAG,EAAC,cAAc,CAAC;QACnB,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,0CAA0C,EAAE,CAAC;QACrE,IAAA,uBAAa,EAAC,EAAE,WAAW,EAAE,+BAA+B,EAAE,IAAI,EAAE,GAAG,CAAC,gCAAgC,EAAE,CAAC;QAEvG,WAAA,IAAA,6BAAgB,GAAE,CAAA;;;;2DAWtB;IA/BC,iBAAiB;QAHtB,IAAA,iBAAI,EAAC,EAAE,sBAAsB,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5D,IAAA,iBAAO,EAAC,SAAS,CAAC;QAClB,IAAA,mBAAU,EAAC,SAAS,CAAC;QAIb,WAAA,IAAA,eAAM,EAAC,mCAAgB,CAAC,kBAAkB,CAAC,CAAA;mDAChB,4BAAiB;OAJ/C,iBAAiB,CAgCtB;IACD,OAAO,iBAAiB,CAAC;AAC7B,CAAC;AAEY,QAAA,iBAAiB,GAAG,sBAAsB,EAAE,CAAC"}
package/dist/controllers/api-keys.controller.js CHANGED
@@ -117,7 +117,7 @@ __decorate([
117
117
  __metadata("design:returntype", Promise)
118
118
  ], ApiKeysController.prototype, "deleteApiKey", null);
119
119
  exports.ApiKeysController = ApiKeysController = __decorate([
120
- (0, decorators_1.Auth)({ principalTypes: [trailmixModels.Principal.Account, trailmixModels.Principal.ApiKey] }),
120
+ (0, decorators_1.Auth)({ requiredPrincipalTypes: [trailmixModels.Principal.Account, trailmixModels.Principal.ApiKey] }),
121
121
  (0, swagger_1.ApiTags)('api-keys'),
122
122
  (0, common_1.Controller)('api-keys'),
123
123
  __metadata("design:paramtypes", [api_key_service_1.ApiKeyService])
package/dist/controllers/api-keys.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api-keys.controller.js","sourceRoot":"","sources":["../../src/controllers/api-keys.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api-keys.controller.js","sourceRoot":"","sources":["../../src/controllers/api-keys.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6F;AAC7F,6CAAqG;AACrG,qEAAuD;AAEvD,8CAAqE;AACrE,wDAA0C;AAE1C,iEAA4D;AAC5D,wDAAuD;AAKhD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAEL;IADrB,YACqB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAC7C,CAAC;IAKC,AAAN,KAAK,CAAC,YAAY,CACN,IAAyB,EACb,SAA2B,EAC/B,YAA+C;QAE/D,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;IAChF,CAAC;IAKK,AAAN,KAAK,CAAC,UAAU,CACQ,SAA2B,EACtC,WAAmC;QAE5C,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACvE,CAAC;IAMK,AAAN,KAAK,CAAC,SAAS,CACkB,MAAoC,EAC7C,SAA2B;QAE/C,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjE,CAAC;IAMK,AAAN,KAAK,CAAC,YAAY,CACe,MAAoC,EAC7C,SAA2B,EAC/B,YAA+C;QAE/D,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;IAC3E,CAAC;CACJ,CAAA;AAhDY,8CAAiB;AAQpB;IAHL,IAAA,aAAI,GAAE;IACN,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC;IACjD,IAAA,4BAAkB,EAAC,EAAE,WAAW,EAAE,+BAA+B,EAAE,CAAC;IAEhE,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,6BAAgB,GAAE,CAAA;IAClB,WAAA,IAAA,yBAAY,GAAE,CAAA;;qCAFD,GAAG,CAAC,eAAe;;qDAKpC;AAKK;IAHL,IAAA,YAAG,GAAE;IACL,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;IAC7C,IAAA,uBAAa,EAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAE9E,WAAA,IAAA,6BAAgB,GAAE,CAAA;IAClB,WAAA,IAAA,cAAK,GAAE,CAAA;;6CAAc,GAAG,CAAC,kBAAkB;;mDAG/C;AAMK;IAJL,IAAA,YAAG,EAAC,KAAK,CAAC;IACV,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;IACnD,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC;IACjD,IAAA,uBAAa,EAAC,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAE5C,WAAA,IAAA,cAAK,EAAC,IAAI,EAAE,6BAAc,CAAC,CAAA;IAC3B,WAAA,IAAA,6BAAgB,GAAE,CAAA;;;;kDAGtB;AAMK;IAJL,IAAA,eAAM,EAAC,KAAK,CAAC;IACb,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;IACnD,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC;IACpD,IAAA,uBAAa,EAAC,EAAE,WAAW,EAAE,+BAA+B,EAAE,CAAC;IAE3D,WAAA,IAAA,cAAK,EAAC,IAAI,EAAE,6BAAc,CAAC,CAAA;IAC3B,WAAA,IAAA,6BAAgB,GAAE,CAAA;IAClB,WAAA,IAAA,yBAAY,GAAE,CAAA;;;;qDAGlB;4BA/CQ,iBAAiB;IAH7B,IAAA,iBAAI,EAAC,EAAE,sBAAsB,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IACrG,IAAA,iBAAO,EAAC,UAAU,CAAC;IACnB,IAAA,mBAAU,EAAC,UAAU,CAAC;qCAGiB,+BAAa;GAFxC,iBAAiB,CAgD7B"}
package/dist/controllers/audit.controller.js CHANGED
@@ -99,7 +99,7 @@ __decorate([
99
99
  __metadata("design:returntype", Promise)
100
100
  ], AuditController.prototype, "getAuditRecord", null);
101
101
  exports.AuditController = AuditController = AuditController_1 = __decorate([
102
- (0, auth_decorator_1.Auth)({ globalRoles: [models_1.RoleValue.Admin] }),
102
+ (0, auth_decorator_1.Auth)({ requiredGlobalRoles: [models_1.RoleValue.Admin] }),
103
103
  (0, swagger_1.ApiTags)('audit'),
104
104
  (0, common_1.Controller)('audit'),
105
105
  __metadata("design:paramtypes", [db_1.Collections.AuditCollection, db_1.DatabaseService])
package/dist/controllers/audit.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"audit.controller.js","sourceRoot":"","sources":["../../src/controllers/audit.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAgE;AAChE,6CAAsG;AAEtG,iDAAiD;AACjD,yCAAgE;AAChE,+CAAuD;AAEvD,iEAAoD;AACpD,sDAAwC;AAKjC,IAAM,eAAe,uBAArB,MAAM,eAAe;IAIH;IACA;IAJJ,MAAM,GAAG,IAAI,eAAM,CAAC,iBAAe,CAAC,IAAI,CAAC,CAAC;IAE3D,YACqB,eAA4C,EAC5C,eAAgC;QADhC,oBAAe,GAAf,eAAe,CAA6B;QAC5C,oBAAe,GAAf,eAAe,CAAiB;IACjD,CAAC;IAWC,AAAN,KAAK,CAAC,cAAc,CACD,IAAY,EACd,EAAU;QAEvB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0CAA0C,IAAI,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAEvF,iDAAiD;QACjD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,CAAC;QAC9E,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,mBAAmB,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,wBAAgB,EAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAC3C,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,QAAQ;SACtB,CAAC,CAAC;QACH,OAAO;YACH,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,MAAM,CAAC,MAAM;SACvB,CAAC;IACN,CAAC;CACJ,CAAA;AAxCY,0CAAe;AAiBlB;IATL,IAAA,YAAG,EAAC,WAAW,CAAC;IAChB,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;IACtD,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;IAClD,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC;IAC3D,IAAA,uBAAa,EAAC;QACX,WAAW,EAAE,qBAAqB;QAClC,IAAI,EAAE,GAAG,CAAC,oBAAoB;KACjC,CAAC;IACD,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;IAE3D,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;qDAoBf;0BAvCQ,eAAe;IAH3B,IAAA,qBAAI,EAAC,EAAE,WAAW,EAAE,CAAC,kBAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IACxC,IAAA,iBAAO,EAAC,OAAO,CAAC;IAChB,IAAA,mBAAU,EAAC,OAAO,CAAC;qCAKsB,gBAAW,CAAC,eAAe,EAC3B,oBAAe;GAL5C,eAAe,CAwC3B"}
1
+ {"version":3,"file":"audit.controller.js","sourceRoot":"","sources":["../../src/controllers/audit.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAgE;AAChE,6CAAsG;AAEtG,iDAAiD;AACjD,yCAAgE;AAChE,+CAAuD;AAEvD,iEAAoD;AACpD,sDAAwC;AAKjC,IAAM,eAAe,uBAArB,MAAM,eAAe;IAIH;IACA;IAJJ,MAAM,GAAG,IAAI,eAAM,CAAC,iBAAe,CAAC,IAAI,CAAC,CAAC;IAE3D,YACqB,eAA4C,EAC5C,eAAgC;QADhC,oBAAe,GAAf,eAAe,CAA6B;QAC5C,oBAAe,GAAf,eAAe,CAAiB;IACjD,CAAC;IAWC,AAAN,KAAK,CAAC,cAAc,CACD,IAAY,EACd,EAAU;QAEvB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0CAA0C,IAAI,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAEvF,iDAAiD;QACjD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,CAAC;QAC9E,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,mBAAmB,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,wBAAgB,EAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAC3C,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,QAAQ;SACtB,CAAC,CAAC;QACH,OAAO;YACH,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,MAAM,CAAC,MAAM;SACvB,CAAC;IACN,CAAC;CACJ,CAAA;AAxCY,0CAAe;AAiBlB;IATL,IAAA,YAAG,EAAC,WAAW,CAAC;IAChB,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;IACtD,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;IAClD,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC;IAC3D,IAAA,uBAAa,EAAC;QACX,WAAW,EAAE,qBAAqB;QAClC,IAAI,EAAE,GAAG,CAAC,oBAAoB;KACjC,CAAC;IACD,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;IAE3D,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;qDAoBf;0BAvCQ,eAAe;IAH3B,IAAA,qBAAI,EAAC,EAAE,mBAAmB,EAAE,CAAC,kBAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IAChD,IAAA,iBAAO,EAAC,OAAO,CAAC;IAChB,IAAA,mBAAU,EAAC,OAAO,CAAC;qCAKsB,gBAAW,CAAC,eAAe,EAC3B,oBAAe;GAL5C,eAAe,CAwC3B"}
package/dist/controllers/audits.controller.js CHANGED
@@ -99,7 +99,7 @@ __decorate([
99
99
  __metadata("design:returntype", Promise)
100
100
  ], AuditsController.prototype, "getAuditRecord", null);
101
101
  exports.AuditsController = AuditsController = AuditsController_1 = __decorate([
102
- (0, auth_decorator_1.Auth)({ globalRoles: [models_1.RoleValue.Admin], principalTypes: [models_1.Principal.Account, models_1.Principal.ApiKey] }),
102
+ (0, auth_decorator_1.Auth)({ requiredGlobalRoles: [models_1.RoleValue.Admin], requiredPrincipalTypes: [models_1.Principal.Account, models_1.Principal.ApiKey] }),
103
103
  (0, swagger_1.ApiTags)('audits'),
104
104
  (0, common_1.Controller)('audits'),
105
105
  __metadata("design:paramtypes", [db_1.Collections.AuditCollection, db_1.DatabaseService])
package/dist/controllers/audits.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"audits.controller.js","sourceRoot":"","sources":["../../src/controllers/audits.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAqF;AACrF,6CAAsG;AACtG,yCAAgE;AAChE,iDAA4D;AAC5D,+CAAuD;AAEvD,iEAAoD;AACpD,sDAAwC;AAKjC,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAIJ;IACA;IAJJ,MAAM,GAAG,IAAI,eAAM,CAAC,kBAAgB,CAAC,IAAI,CAAC,CAAC;IAE5D,YACqB,eAA4C,EAC5C,eAAgC;QADhC,oBAAe,GAAf,eAAe,CAA6B;QAC5C,oBAAe,GAAf,eAAe,CAAiB;IACjD,CAAC;IAWC,AAAN,KAAK,CAAC,cAAc,CACD,IAAY,EACd,EAAU;QAEvB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0CAA0C,IAAI,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAEvF,iDAAiD;QACjD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,CAAC;QAC9E,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,mBAAmB,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,wBAAgB,EAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAC3C,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,QAAQ;SACtB,CAAC,CAAC;QACH,OAAO;YACH,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,MAAM,CAAC,MAAM;SACvB,CAAC;IACN,CAAC;CACJ,CAAA;AAxCY,4CAAgB;AAiBnB;IATL,IAAA,YAAG,EAAC,WAAW,CAAC;IAChB,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;IACtD,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;IAClD,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC;IAC3D,IAAA,uBAAa,EAAC;QACX,WAAW,EAAE,qBAAqB;QAClC,IAAI,EAAE,GAAG,CAAC,oBAAoB;KACjC,CAAC;IACD,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;IAE3D,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;sDAoBf;2BAvCQ,gBAAgB;IAH5B,IAAA,qBAAI,EAAC,EAAE,WAAW,EAAE,CAAC,kBAAS,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC,kBAAS,CAAC,OAAO,EAAE,kBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAC/F,IAAA,iBAAO,EAAC,QAAQ,CAAC;IACjB,IAAA,mBAAU,EAAC,QAAQ,CAAC;qCAKqB,gBAAW,CAAC,eAAe,EAC3B,oBAAe;GAL5C,gBAAgB,CAwC5B"}
1
+ {"version":3,"file":"audits.controller.js","sourceRoot":"","sources":["../../src/controllers/audits.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAqF;AACrF,6CAAsG;AACtG,yCAAgE;AAChE,iDAA4D;AAC5D,+CAAuD;AAEvD,iEAAoD;AACpD,sDAAwC;AAKjC,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAIJ;IACA;IAJJ,MAAM,GAAG,IAAI,eAAM,CAAC,kBAAgB,CAAC,IAAI,CAAC,CAAC;IAE5D,YACqB,eAA4C,EAC5C,eAAgC;QADhC,oBAAe,GAAf,eAAe,CAA6B;QAC5C,oBAAe,GAAf,eAAe,CAAiB;IACjD,CAAC;IAWC,AAAN,KAAK,CAAC,cAAc,CACD,IAAY,EACd,EAAU;QAEvB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0CAA0C,IAAI,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAEvF,iDAAiD;QACjD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,CAAC;QAC9E,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,mBAAmB,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,QAAQ,GAAG,IAAA,wBAAgB,EAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAC3C,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,QAAQ;SACtB,CAAC,CAAC;QACH,OAAO;YACH,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,MAAM,CAAC,MAAM;SACvB,CAAC;IACN,CAAC;CACJ,CAAA;AAxCY,4CAAgB;AAiBnB;IATL,IAAA,YAAG,EAAC,WAAW,CAAC;IAChB,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC;IACtD,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;IAClD,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC;IAC3D,IAAA,uBAAa,EAAC;QACX,WAAW,EAAE,qBAAqB;QAClC,IAAI,EAAE,GAAG,CAAC,oBAAoB;KACjC,CAAC;IACD,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;IAE3D,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;sDAoBf;2BAvCQ,gBAAgB;IAH5B,IAAA,qBAAI,EAAC,EAAE,mBAAmB,EAAE,CAAC,kBAAS,CAAC,KAAK,CAAC,EAAE,sBAAsB,EAAE,CAAC,kBAAS,CAAC,OAAO,EAAE,kBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;IAC/G,IAAA,iBAAO,EAAC,QAAQ,CAAC;IACjB,IAAA,mBAAU,EAAC,QAAQ,CAAC;qCAKqB,gBAAW,CAAC,eAAe,EAC3B,oBAAe;GAL5C,gBAAgB,CAwC5B"}
package/dist/controllers/global-roles.controller.js CHANGED
@@ -129,7 +129,7 @@ __decorate([
129
129
  __metadata("design:returntype", Promise)
130
130
  ], GlobalRolesController.prototype, "removeRole", null);
131
131
  exports.GlobalRolesController = GlobalRolesController = __decorate([
132
- (0, decorators_1.Auth)({ globalRoles: [trailmixModels.RoleValue.Admin] }),
132
+ (0, decorators_1.Auth)({ requiredGlobalRoles: [trailmixModels.RoleValue.Admin] }),
133
133
  (0, swagger_1.ApiTags)('global-roles'),
134
134
  (0, common_1.Controller)('global-roles'),
135
135
  __metadata("design:paramtypes", [managers_1.GlobalRoleManager])
package/dist/controllers/global-roles.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"global-roles.controller.js","sourceRoot":"","sources":["../../src/controllers/global-roles.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"global-roles.controller.js","sourceRoot":"","sources":["../../src/controllers/global-roles.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAmF;AACnF,6CAAqG;AACrG,qCAAmC;AACnC,+CAAmD;AACnD,qEAAuD;AAEvD,8CAAqE;AACrE,0CAAgD;AAChD,4DAA8C;AAMvC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAET;IADrB,YACqB,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IACrD,CAAC;IAKC,AAAN,KAAK,CAAC,UAAU,CACJ,aAAsC,EAC1B,SAA2B,EAC/B,YAA+C;QAE/D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC;YAChD,YAAY,EAAE,aAAa,CAAC,YAAY;YACxC,cAAc,EAAE,aAAa,CAAC,cAAc;YAC5C,IAAI,EAAE,aAAa,CAAC,IAAI;SAC3B,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAKK,AAAN,KAAK,CAAC,wBAAwB,CACjB,WAAiD,EACtC,SAA2B;QAE/C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;YAC5C,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,cAAc,EAAE,WAAW,CAAC,cAAc;YAC1C,IAAI,EAAE,WAAW,CAAC,IAAI;SACzB,EAAE,SAAS,CAAC,CAAC;QACd,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;IACjD,CAAC;IAMK,AAAN,KAAK,CAAC,uBAAuB,CACE,EAAY,EACnB,SAA2B;QAE/C,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAC3D,CAAC;IAMK,AAAN,KAAK,CAAC,UAAU,CACe,EAAY,EACnB,SAA2B,EAC/B,YAA+C;QAE/D,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QACpE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;CACJ,CAAA;AA5DY,sDAAqB;AAQxB;IAHL,IAAA,aAAI,GAAE;IACN,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,qCAAqC,EAAE,CAAC;IAChE,IAAA,4BAAkB,EAAC,EAAE,WAAW,EAAE,oCAAoC,EAAE,IAAI,EAAE,GAAG,CAAC,aAAa,EAAE,CAAC;IAE9F,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,6BAAgB,GAAE,CAAA;IAClB,WAAA,IAAA,yBAAY,GAAE,CAAA;;qCAFQ,GAAG,CAAC,mBAAmB;;uDAWjD;AAKK;IAHL,IAAA,YAAG,GAAE;IACL,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,iCAAiC,EAAE,CAAC;IAC5D,IAAA,uBAAa,EAAC,EAAE,WAAW,EAAE,gCAAgC,EAAE,IAAI,EAAE,GAAG,CAAC,yBAAyB,EAAE,CAAC;IAEjG,WAAA,IAAA,cAAK,GAAE,CAAA;IACP,WAAA,IAAA,6BAAgB,GAAE,CAAA;;qCADG,GAAG,CAAC,gCAAgC;;qEAS7D;AAMK;IAJL,IAAA,YAAG,EAAC,KAAK,CAAC;IACV,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,2BAA2B,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAChF,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC;IACzD,IAAA,uBAAa,EAAC,EAAE,WAAW,EAAE,+BAA+B,EAAE,IAAI,EAAE,GAAG,CAAC,aAAa,EAAE,CAAC;IAEpF,WAAA,IAAA,cAAK,EAAC,IAAI,EAAE,oBAAY,CAAC,CAAA;IACzB,WAAA,IAAA,6BAAgB,GAAE,CAAA;;qCADY,kBAAQ;;oEAI1C;AAMK;IAJL,IAAA,eAAM,EAAC,KAAK,CAAC;IACb,IAAA,kBAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,2BAA2B,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAChF,IAAA,sBAAY,EAAC,EAAE,OAAO,EAAE,iCAAiC,EAAE,CAAC;IAC5D,IAAA,uBAAa,EAAC,EAAE,WAAW,EAAE,mCAAmC,EAAE,CAAC;IAE/D,WAAA,IAAA,cAAK,EAAC,IAAI,EAAE,oBAAY,CAAC,CAAA;IACzB,WAAA,IAAA,6BAAgB,GAAE,CAAA;IAClB,WAAA,IAAA,yBAAY,GAAE,CAAA;;qCAFgB,kBAAQ;;uDAM1C;gCA3DQ,qBAAqB;IAHjC,IAAA,iBAAI,EAAC,EAAE,mBAAmB,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IAC/D,IAAA,iBAAO,EAAC,cAAc,CAAC;IACvB,IAAA,mBAAU,EAAC,cAAc,CAAC;qCAGiB,4BAAiB;GAFhD,qBAAqB,CA4DjC"}
package/dist/controllers/security-audits.controller.js CHANGED
@@ -122,7 +122,7 @@ __decorate([
122
122
  __metadata("design:returntype", Promise)
123
123
  ], SecurityAuditsController.prototype, "getSecurityAuditById", null);
124
124
  exports.SecurityAuditsController = SecurityAuditsController = SecurityAuditsController_1 = __decorate([
125
- (0, auth_decorator_1.Auth)({ globalRoles: [models_1.RoleValue.Admin], principalTypes: [models_1.Principal.Account, models_1.Principal.ApiKey] }),
125
+ (0, auth_decorator_1.Auth)({ requiredGlobalRoles: [models_1.RoleValue.Admin], requiredPrincipalTypes: [models_1.Principal.Account, models_1.Principal.ApiKey] }),
126
126
  (0, swagger_1.ApiTags)('security-audits'),
127
127
  (0, common_1.Controller)('security-audits'),
128
128
  __metadata("design:paramtypes", [security_audit_collection_1.SecurityAuditCollection])
package/dist/controllers/security-audits.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"security-audits.controller.js","sourceRoot":"","sources":["../../src/controllers/security-audits.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"security-audits.controller.js","sourceRoot":"","sources":["../../src/controllers/security-audits.controller.ts"],"names":[],"mappings":"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"}
package/dist/decorators/auth.decorator.d.ts CHANGED
@@ -1,11 +1,10 @@
1
1
  import * as trailmixModels from '@trailmix-cms/models';
2
- export declare const ALLOW_ANONYMOUS_KEY = "allowAnonymous";
3
- export declare const ROLES_KEY = "roles";
4
- export declare const PRINCIPAL_TYPES_KEY = "principalTypes";
2
+ export declare const AUTH_OPTIONS_KEY = "authOptions";
5
3
  export interface AuthOptions {
6
- globalRoles?: trailmixModels.RoleValue[];
7
- allowAnonymous?: boolean;
8
- principalTypes?: trailmixModels.Principal[];
4
+ allowAnonymous: boolean;
5
+ requiredGlobalRoles: trailmixModels.RoleValue[];
6
+ requiredPrincipalTypes: trailmixModels.Principal[];
7
+ requiredApiKeyScopes: trailmixModels.ApiKeyScope[];
9
8
  }
10
- export declare function Auth({ globalRoles, allowAnonymous, principalTypes }?: AuthOptions): <TFunction extends Function, Y>(target: TFunction | object, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
9
+ export declare function Auth({ requiredGlobalRoles, allowAnonymous, requiredPrincipalTypes, requiredApiKeyScopes }?: Partial<AuthOptions>): <TFunction extends Function, Y>(target: TFunction | object, propertyKey?: string | symbol, descriptor?: TypedPropertyDescriptor<Y>) => void;
11
10
  //# sourceMappingURL=auth.decorator.d.ts.map
package/dist/decorators/auth.decorator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auth.decorator.d.ts","sourceRoot":"","sources":["../../src/decorators/auth.decorator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAEvD,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AACpD,eAAO,MAAM,SAAS,UAAU,CAAC;AACjC,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AAEpD,MAAM,WAAW,WAAW;IACxB,WAAW,CAAC,EAAE,cAAc,CAAC,SAAS,EAAE,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,cAAc,CAAC,SAAS,EAAE,CAAC;CAC/C;AAED,wBAAgB,IAAI,CAAC,EAAE,WAAgB,EAAE,cAAsB,EAAE,cAAmD,EAAE,GAAE,WAAiB,+IASxI"}
1
+ {"version":3,"file":"auth.decorator.d.ts","sourceRoot":"","sources":["../../src/decorators/auth.decorator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAEvD,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAE9C,MAAM,WAAW,WAAW;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,mBAAmB,EAAE,cAAc,CAAC,SAAS,EAAE,CAAC;IAChD,sBAAsB,EAAE,cAAc,CAAC,SAAS,EAAE,CAAC;IACnD,oBAAoB,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC;CACtD;AAED,wBAAgB,IAAI,CAAC,EAAE,mBAAwB,EAAE,cAAsB,EAAE,sBAA2D,EAAE,oBAAyB,EAAE,GAAE,OAAO,CAAC,WAAW,CAAM,+IAO3L"}
package/dist/decorators/auth.decorator.js CHANGED
@@ -33,16 +33,14 @@ var __importStar = (this && this.__importStar) || (function () {
33
33
  };
34
34
  })();
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
- exports.PRINCIPAL_TYPES_KEY = exports.ROLES_KEY = exports.ALLOW_ANONYMOUS_KEY = void 0;
36
+ exports.AUTH_OPTIONS_KEY = void 0;
37
37
  exports.Auth = Auth;
38
38
  const auth_guard_1 = require("../auth.guard");
39
39
  const common_1 = require("@nestjs/common");
40
40
  const swagger_1 = require("@nestjs/swagger");
41
41
  const trailmixModels = __importStar(require("@trailmix-cms/models"));
42
- exports.ALLOW_ANONYMOUS_KEY = 'allowAnonymous';
43
- exports.ROLES_KEY = 'roles';
44
- exports.PRINCIPAL_TYPES_KEY = 'principalTypes';
45
- function Auth({ globalRoles = [], allowAnonymous = false, principalTypes = [trailmixModels.Principal.Account] } = {}) {
46
- return (0, common_1.applyDecorators)((0, common_1.SetMetadata)(exports.ROLES_KEY, globalRoles), (0, common_1.SetMetadata)(exports.ALLOW_ANONYMOUS_KEY, allowAnonymous), (0, common_1.SetMetadata)(exports.PRINCIPAL_TYPES_KEY, principalTypes), (0, common_1.UseGuards)(auth_guard_1.AuthGuard), ...(principalTypes.includes(trailmixModels.Principal.ApiKey) ? [(0, swagger_1.ApiSecurity)('api-key')] : []), ...(principalTypes.includes(trailmixModels.Principal.Account) ? [(0, swagger_1.ApiBearerAuth)()] : []));
42
+ exports.AUTH_OPTIONS_KEY = 'authOptions';
43
+ function Auth({ requiredGlobalRoles = [], allowAnonymous = false, requiredPrincipalTypes = [trailmixModels.Principal.Account], requiredApiKeyScopes = [] } = {}) {
44
+ return (0, common_1.applyDecorators)((0, common_1.SetMetadata)(exports.AUTH_OPTIONS_KEY, { requiredGlobalRoles, allowAnonymous, requiredPrincipalTypes, requiredApiKeyScopes }), (0, common_1.UseGuards)(auth_guard_1.AuthGuard), ...(requiredPrincipalTypes.includes(trailmixModels.Principal.ApiKey) ? [(0, swagger_1.ApiSecurity)('api-key')] : []), ...(requiredPrincipalTypes.includes(trailmixModels.Principal.Account) ? [(0, swagger_1.ApiBearerAuth)()] : []));
47
45
  }
48
46
  //# sourceMappingURL=auth.decorator.js.map
package/dist/decorators/auth.decorator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auth.decorator.js","sourceRoot":"","sources":["../../src/decorators/auth.decorator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgBA,oBASC;AAzBD,8CAAyC;AACzC,2CAAyE;AACzE,6CAA6D;AAE7D,qEAAuD;AAE1C,QAAA,mBAAmB,GAAG,gBAAgB,CAAC;AACvC,QAAA,SAAS,GAAG,OAAO,CAAC;AACpB,QAAA,mBAAmB,GAAG,gBAAgB,CAAC;AAQpD,SAAgB,IAAI,CAAC,EAAE,WAAW,GAAG,EAAE,EAAE,cAAc,GAAG,KAAK,EAAE,cAAc,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,KAAkB,EAAG;IACrI,OAAO,IAAA,wBAAe,EAClB,IAAA,oBAAW,EAAC,iBAAS,EAAE,WAAW,CAAC,EACnC,IAAA,oBAAW,EAAC,2BAAmB,EAAE,cAAc,CAAC,EAChD,IAAA,oBAAW,EAAC,2BAAmB,EAAE,cAAc,CAAC,EAChD,IAAA,kBAAS,EAAC,sBAAS,CAAC,EACpB,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,qBAAW,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAC7F,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,uBAAa,GAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAC1F,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"auth.decorator.js","sourceRoot":"","sources":["../../src/decorators/auth.decorator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,oBAOC;AAtBD,8CAAyC;AACzC,2CAAyE;AACzE,6CAA6D;AAE7D,qEAAuD;AAE1C,QAAA,gBAAgB,GAAG,aAAa,CAAC;AAS9C,SAAgB,IAAI,CAAC,EAAE,mBAAmB,GAAG,EAAE,EAAE,cAAc,GAAG,KAAK,EAAE,sBAAsB,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,EAAE,KAA2B,EAAE;IACxL,OAAO,IAAA,wBAAe,EAClB,IAAA,oBAAW,EAAC,wBAAgB,EAAE,EAAE,mBAAmB,EAAE,cAAc,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,CAAC,EACpH,IAAA,kBAAS,EAAC,sBAAS,CAAC,EACpB,GAAG,CAAC,sBAAsB,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,qBAAW,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EACrG,GAAG,CAAC,sBAAsB,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,uBAAa,GAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAClG,CAAC;AACN,CAAC"}
package/dist/services/auth.service.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { ExecutionContext } from '@nestjs/common';
2
2
  import * as trailmixModels from '@trailmix-cms/models';
3
- import { ApiKeyCollection, SecurityAuditCollection } from '../collections';
3
+ import { AccountCollection, ApiKeyCollection, SecurityAuditCollection } from '../collections';
4
4
  import { AccountService } from './account.service';
5
5
  import { GlobalRoleService } from './global-role.service';
6
6
  import { type AuthGuardHook, type RequestPrincipal } from '../types';
@@ -12,22 +12,32 @@ export declare const AuthResult: {
12
12
  export type AuthResult = typeof AuthResult[keyof typeof AuthResult];
13
13
  export declare class AuthService {
14
14
  private accountService;
15
+ private accountCollection;
15
16
  private globalRoleService;
16
17
  private securityAuditCollection;
17
18
  private authGuardHook?;
18
19
  private apiKeyCollection?;
19
20
  private readonly logger;
20
- constructor(accountService: AccountService, globalRoleService: GlobalRoleService, securityAuditCollection: SecurityAuditCollection, authGuardHook?: AuthGuardHook | undefined, apiKeyCollection?: ApiKeyCollection | undefined);
21
+ constructor(accountService: AccountService, accountCollection: AccountCollection, globalRoleService: GlobalRoleService, securityAuditCollection: SecurityAuditCollection, authGuardHook?: AuthGuardHook | undefined, apiKeyCollection?: ApiKeyCollection | undefined);
21
22
  /**
22
23
  * Validate authentication and authorization for a request
23
24
  * @param principal The principal from the request (null if not authenticated)
24
- * @param allowAnonymous Whether anonymous access is allowed
25
- * @param requiredPrincipalTypes Required principal types
26
- * @param requiredGlobalRoles Required global roles
25
+ * @param config The authentication configuration
27
26
  * @param requestUrl The request URL for audit logging
28
27
  * @returns AuthResult
29
28
  */
30
- validateAuth(principal: RequestPrincipal | null, allowAnonymous: boolean, requiredPrincipalTypes: trailmixModels.Principal[], requiredGlobalRoles: (trailmixModels.RoleValue | string)[], requestUrl: string): Promise<AuthResult>;
29
+ validateAuth(principal: RequestPrincipal | null, config: {
30
+ allowAnonymous: boolean;
31
+ requiredPrincipalTypes: trailmixModels.Principal[];
32
+ requiredGlobalRoles: (trailmixModels.RoleValue | string)[];
33
+ requiredApiKeyScopes: trailmixModels.ApiKeyScope[];
34
+ }, requestUrl: string): Promise<AuthResult>;
35
+ /**
36
+ * Get the account from the request principal, if the principal is an account API key, it will return the account associated with the API key
37
+ * @param principal The principal
38
+ * @returns The account
39
+ */
40
+ getAccountFromPrincipal(principal: RequestPrincipal): Promise<trailmixModels.Account.Entity | null>;
31
41
  /**
32
42
  * Get the principal from the request context
33
43
  * @param context The execution context
package/dist/services/auth.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGtH,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAErE,eAAO,MAAM,UAAU;;;;CAIb,CAAC;AAEX,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAEpE,qBACa,WAAW;IAIhB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,uBAAuB;IACuB,OAAO,CAAC,aAAa,CAAC;IAChE,OAAO,CAAC,gBAAgB,CAAC;IAPzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;gBAG3C,cAAc,EAAE,cAAc,EAC9B,iBAAiB,EAAE,iBAAiB,EACpC,uBAAuB,EAAE,uBAAuB,EACM,aAAa,CAAC,EAAE,aAAa,YAAA,EACvE,gBAAgB,CAAC,EAAE,gBAAgB,YAAA;IAG3D;;;;;;;;OAQG;IACG,YAAY,CACd,SAAS,EAAE,gBAAgB,GAAG,IAAI,EAClC,cAAc,EAAE,OAAO,EACvB,sBAAsB,EAAE,cAAc,CAAC,SAAS,EAAE,EAClD,mBAAmB,EAAE,CAAC,cAAc,CAAC,SAAS,GAAG,MAAM,CAAC,EAAE,EAC1D,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,UAAU,CAAC;IAwEtB;;;;OAIG;IACG,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAqBjE,UAAU;YA+CV,SAAS;CAqB1B"}
1
+ {"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGtH,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC9F,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAErE,eAAO,MAAM,UAAU;;;;CAIb,CAAC;AAEX,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAEpE,qBACa,WAAW;IAIhB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,uBAAuB;IACuB,OAAO,CAAC,aAAa,CAAC;IAChE,OAAO,CAAC,gBAAgB,CAAC;IARzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;gBAG3C,cAAc,EAAE,cAAc,EAC9B,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,uBAAuB,EAAE,uBAAuB,EACM,aAAa,CAAC,EAAE,aAAa,YAAA,EACvE,gBAAgB,CAAC,EAAE,gBAAgB,YAAA;IAG3D;;;;;;OAMG;IACG,YAAY,CACd,SAAS,EAAE,gBAAgB,GAAG,IAAI,EAClC,MAAM,EAAE;QACJ,cAAc,EAAE,OAAO,CAAC;QACxB,sBAAsB,EAAE,cAAc,CAAC,SAAS,EAAE,CAAC;QACnD,mBAAmB,EAAE,CAAC,cAAc,CAAC,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC;QAC3D,oBAAoB,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC;KACtD,EACD,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,UAAU,CAAC;IAwFtB;;;;OAIG;IACG,uBAAuB,CAAC,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAmBzG;;;;OAIG;IACG,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAqBjE,UAAU;YA+CV,SAAS;CAuB1B"}
package/dist/services/auth.service.js CHANGED
@@ -61,13 +61,15 @@ exports.AuthResult = {
61
61
  };
62
62
  let AuthService = AuthService_1 = class AuthService {
63
63
  accountService;
64
+ accountCollection;
64
65
  globalRoleService;
65
66
  securityAuditCollection;
66
67
  authGuardHook;
67
68
  apiKeyCollection;
68
69
  logger = new common_1.Logger(AuthService_1.name);
69
- constructor(accountService, globalRoleService, securityAuditCollection, authGuardHook, apiKeyCollection) {
70
+ constructor(accountService, accountCollection, globalRoleService, securityAuditCollection, authGuardHook, apiKeyCollection) {
70
71
  this.accountService = accountService;
72
+ this.accountCollection = accountCollection;
71
73
  this.globalRoleService = globalRoleService;
72
74
  this.securityAuditCollection = securityAuditCollection;
73
75
  this.authGuardHook = authGuardHook;
@@ -76,13 +78,12 @@ let AuthService = AuthService_1 = class AuthService {
76
78
  /**
77
79
  * Validate authentication and authorization for a request
78
80
  * @param principal The principal from the request (null if not authenticated)
79
- * @param allowAnonymous Whether anonymous access is allowed
80
- * @param requiredPrincipalTypes Required principal types
81
- * @param requiredGlobalRoles Required global roles
81
+ * @param config The authentication configuration
82
82
  * @param requestUrl The request URL for audit logging
83
83
  * @returns AuthResult
84
84
  */
85
- async validateAuth(principal, allowAnonymous, requiredPrincipalTypes, requiredGlobalRoles, requestUrl) {
85
+ async validateAuth(principal, config, requestUrl) {
86
+ const { allowAnonymous, requiredPrincipalTypes, requiredGlobalRoles, requiredApiKeyScopes } = config;
86
87
  if (!principal) {
87
88
  if (allowAnonymous) {
88
89
  return exports.AuthResult.IsValid;
@@ -103,6 +104,17 @@ let AuthService = AuthService_1 = class AuthService {
103
104
  });
104
105
  return exports.AuthResult.Forbidden;
105
106
  }
107
+ // Check if API key scope is required, if no required API key scopes, allow any API key scope
108
+ if (principal.principal_type === trailmixModels.Principal.ApiKey && requiredApiKeyScopes.length > 0 && !requiredApiKeyScopes.includes(principal.entity.scope_type)) {
109
+ await this.securityAuditCollection.insertOne({
110
+ event_type: trailmixModels.SecurityAuditEventType.UnauthorizedAccess,
111
+ principal_id: principal.entity._id,
112
+ principal_type: principal.principal_type,
113
+ message: `Unauthorized access to ${requestUrl}, required API key scope is not allowed:${requiredApiKeyScopes.join(', ')}`,
114
+ source: AuthService_1.name,
115
+ });
116
+ return exports.AuthResult.Forbidden;
117
+ }
106
118
  // If no roles are required, allow any authenticated principal
107
119
  if (requiredGlobalRoles.length == 0) {
108
120
  return exports.AuthResult.IsValid;
@@ -136,6 +148,25 @@ let AuthService = AuthService_1 = class AuthService {
136
148
  }
137
149
  return exports.AuthResult.IsValid;
138
150
  }
151
+ /**
152
+ * Get the account from the request principal, if the principal is an account API key, it will return the account associated with the API key
153
+ * @param principal The principal
154
+ * @returns The account
155
+ */
156
+ async getAccountFromPrincipal(principal) {
157
+ if (principal.principal_type === trailmixModels.Principal.Account) {
158
+ return principal.entity;
159
+ }
160
+ const apiKey = principal.entity;
161
+ if (apiKey.scope_type !== trailmixModels.ApiKeyScope.Account) {
162
+ throw new Error('API key is not account-scoped');
163
+ }
164
+ const account = await this.accountCollection.findOne({ _id: apiKey.scope_id });
165
+ if (!account) {
166
+ throw new Error('Account not found');
167
+ }
168
+ return account;
169
+ }
139
170
  /**
140
171
  * Get the principal from the request context
141
172
  * @param context The execution context
@@ -217,10 +248,11 @@ let AuthService = AuthService_1 = class AuthService {
217
248
  exports.AuthService = AuthService;
218
249
  exports.AuthService = AuthService = AuthService_1 = __decorate([
219
250
  (0, common_1.Injectable)(),
220
- __param(3, (0, common_1.Optional)()),
221
- __param(3, (0, common_1.Inject)(constants_1.PROVIDER_SYMBOLS.AUTH_GUARD_HOOK)),
222
251
  __param(4, (0, common_1.Optional)()),
252
+ __param(4, (0, common_1.Inject)(constants_1.PROVIDER_SYMBOLS.AUTH_GUARD_HOOK)),
253
+ __param(5, (0, common_1.Optional)()),
223
254
  __metadata("design:paramtypes", [account_service_1.AccountService,
255
+ collections_1.AccountCollection,
224
256
  global_role_service_1.GlobalRoleService,
225
257
  collections_1.SecurityAuditCollection, Object, collections_1.ApiKeyCollection])
226
258
  ], AuthService);
package/dist/services/auth.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"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"}
package/dist/types/request-principal.d.ts CHANGED
@@ -1,9 +1,9 @@
1
1
  import * as trailmixModels from '@trailmix-cms/models';
2
- export type RequestPrincipal = {
2
+ export type RequestPrincipal<AccountEntity extends trailmixModels.Account.Entity = trailmixModels.Account.Entity> = {
3
3
  principal_type: typeof trailmixModels.Principal.ApiKey;
4
4
  entity: trailmixModels.ApiKey.Entity;
5
5
  } | {
6
6
  principal_type: typeof trailmixModels.Principal.Account;
7
- entity: trailmixModels.Account.Entity;
7
+ entity: AccountEntity;
8
8
  };
9
9
  //# sourceMappingURL=request-principal.d.ts.map
package/dist/types/request-principal.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"request-principal.d.ts","sourceRoot":"","sources":["../../src/types/request-principal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAEvD,MAAM,MAAM,gBAAgB,GAAG;IAC3B,cAAc,EAAE,OAAO,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC;IACvD,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC;CACxC,GAAG;IACA,cAAc,EAAE,OAAO,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC;IACxD,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC;CACzC,CAAA"}
1
+ {"version":3,"file":"request-principal.d.ts","sourceRoot":"","sources":["../../src/types/request-principal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAEvD,MAAM,MAAM,gBAAgB,CACxB,aAAa,SAAS,cAAc,CAAC,OAAO,CAAC,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,IACnF;IACA,cAAc,EAAE,OAAO,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC;IACvD,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC;CACxC,GAAG;IACA,cAAc,EAAE,OAAO,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC;IACxD,MAAM,EAAE,aAAa,CAAC;CACzB,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trailmix-cms/cms",
3
- "version": "0.7.1",
3
+ "version": "0.7.2",
4
4
  "main": "./dist/index.js",
5
5
  "types": "./dist/index.d.ts",
6
6
  "repository": {
@@ -22,9 +22,9 @@
22
22
  "@nestjs/config": "^4.0.2",
23
23
  "@nestjs/core": "^11.1.12",
24
24
  "@nestjs/swagger": "^11.2.3",
25
- "@trailmix-cms/db": "0.7.1",
26
- "@trailmix-cms/models": "0.7.1",
27
- "@trailmix-cms/utils": "0.7.1",
25
+ "@trailmix-cms/db": "0.7.2",
26
+ "@trailmix-cms/models": "0.7.2",
27
+ "@trailmix-cms/utils": "0.7.2",
28
28
  "envalid": "^8.1.1",
29
29
  "mongodb": "^7.0.0",
30
30
  "nestjs-zod": "^5.1.1",
@@ -51,9 +51,9 @@
51
51
  "@clerk/fastify": "^2.6.8",
52
52
  "@nestjs/common": "^11.1.12",
53
53
  "@nestjs/config": "^4.0.2",
54
- "@trailmix-cms/db": "0.7.1",
55
- "@trailmix-cms/models": "0.7.1",
56
- "@trailmix-cms/utils": "0.7.1",
54
+ "@trailmix-cms/db": "0.7.2",
55
+ "@trailmix-cms/models": "0.7.2",
56
+ "@trailmix-cms/utils": "0.7.2",
57
57
  "mongodb": "^7.0.0",
58
58
  "nestjs-zod": "^5.1.1",
59
59
  "reflect-metadata": "^0.2.2",