@comet/cms-api 8.8.0-canary-20251124093342 → 8.8.0-canary-20251124140636
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/auth/guards/comet.guard.d.ts +2 -1
- package/lib/auth/guards/comet.guard.d.ts.map +1 -1
- package/lib/auth/guards/comet.guard.js +7 -3
- package/lib/auth/guards/comet.guard.js.map +1 -1
- package/lib/common/guards/cdn.guard.d.ts +2 -1
- package/lib/common/guards/cdn.guard.d.ts.map +1 -1
- package/lib/common/guards/cdn.guard.js +9 -3
- package/lib/common/guards/cdn.guard.js.map +1 -1
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/user-permissions/auth/user-permissions.guard.d.ts +2 -1
- package/lib/user-permissions/auth/user-permissions.guard.d.ts.map +1 -1
- package/lib/user-permissions/auth/user-permissions.guard.js +18 -8
- package/lib/user-permissions/auth/user-permissions.guard.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CanActivate, ExecutionContext } from "@nestjs/common";
|
|
1
|
+
import { CanActivate, ExecutionContext, Logger } from "@nestjs/common";
|
|
2
2
|
import { Reflector } from "@nestjs/core";
|
|
3
3
|
import { ContentScopeService } from "../content-scope.service";
|
|
4
4
|
import { AccessControlServiceInterface, UserPermissionsOptions } from "../user-permissions.types";
|
|
@@ -7,6 +7,7 @@ export declare class UserPermissionsGuard implements CanActivate {
|
|
|
7
7
|
private readonly contentScopeService;
|
|
8
8
|
private readonly accessControlService;
|
|
9
9
|
private readonly options;
|
|
10
|
+
protected readonly logger: Logger;
|
|
10
11
|
constructor(reflector: Reflector, contentScopeService: ContentScopeService, accessControlService: AccessControlServiceInterface, options: UserPermissionsOptions);
|
|
11
12
|
canActivate(context: ExecutionContext): Promise<boolean>;
|
|
12
13
|
private getUser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-permissions.guard.d.ts","sourceRoot":"","sources":["../../../src/user-permissions/auth/user-permissions.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAsB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"user-permissions.guard.d.ts","sourceRoot":"","sources":["../../../src/user-permissions/auth/user-permissions.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAsB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAKzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAK/D,OAAO,EAAE,6BAA6B,EAA0B,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAE1H,qBACa,oBAAqB,YAAW,WAAW;IAIhD,SAAS,CAAC,SAAS,EAAE,SAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACJ,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAN9D,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAyC;gBAGpD,SAAS,EAAE,SAAS,EACb,mBAAmB,EAAE,mBAAmB,EACR,oBAAoB,EAAE,6BAA6B,EACjD,OAAO,EAAE,sBAAsB;IAGhF,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAoE9D,OAAO,CAAC,OAAO;IAMf,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,uBAAuB;CASlC"}
|
|
@@ -20,6 +20,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
20
20
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
21
21
|
});
|
|
22
22
|
};
|
|
23
|
+
var UserPermissionsGuard_1;
|
|
23
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
25
|
exports.UserPermissionsGuard = void 0;
|
|
25
26
|
const common_1 = require("@nestjs/common");
|
|
@@ -30,16 +31,17 @@ const utils_1 = require("../../common/decorators/utils");
|
|
|
30
31
|
const content_scope_service_1 = require("../content-scope.service");
|
|
31
32
|
const required_permission_decorator_1 = require("../decorators/required-permission.decorator");
|
|
32
33
|
const user_permissions_constants_1 = require("../user-permissions.constants");
|
|
33
|
-
let UserPermissionsGuard = class UserPermissionsGuard {
|
|
34
|
+
let UserPermissionsGuard = UserPermissionsGuard_1 = class UserPermissionsGuard {
|
|
34
35
|
constructor(reflector, contentScopeService, accessControlService, options) {
|
|
35
36
|
this.reflector = reflector;
|
|
36
37
|
this.contentScopeService = contentScopeService;
|
|
37
38
|
this.accessControlService = accessControlService;
|
|
38
39
|
this.options = options;
|
|
40
|
+
this.logger = new common_1.Logger(UserPermissionsGuard_1.name);
|
|
39
41
|
}
|
|
40
42
|
canActivate(context) {
|
|
41
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
-
var _a, _b, _c;
|
|
44
|
+
var _a, _b, _c, _d;
|
|
43
45
|
const location = `${context.getClass().name}::${context.getHandler().name}()`;
|
|
44
46
|
const requiredPermission = this.getDecorator(context, required_permission_decorator_1.REQUIRED_PERMISSION_METADATA_KEY);
|
|
45
47
|
const skipScopeCheck = (_b = (_a = requiredPermission === null || requiredPermission === void 0 ? void 0 : requiredPermission.options) === null || _a === void 0 ? void 0 : _a.skipScopeCheck) !== null && _b !== void 0 ? _b : false;
|
|
@@ -53,8 +55,10 @@ let UserPermissionsGuard = class UserPermissionsGuard {
|
|
|
53
55
|
if (this.getDecorator(context, disable_comet_guards_decorator_1.DISABLE_COMET_GUARDS_METADATA_KEY))
|
|
54
56
|
return true;
|
|
55
57
|
const user = this.getUser(context);
|
|
56
|
-
if (!user)
|
|
58
|
+
if (!user) {
|
|
59
|
+
this.logger.debug("Could not get authenticated user. Maybe CometAuthGuard is missing?");
|
|
57
60
|
return false;
|
|
61
|
+
}
|
|
58
62
|
// System user authenticated via basic auth
|
|
59
63
|
if (typeof user === "string" && ((_c = this.options.systemUsers) === null || _c === void 0 ? void 0 : _c.includes(user)))
|
|
60
64
|
return true;
|
|
@@ -69,9 +73,11 @@ let UserPermissionsGuard = class UserPermissionsGuard {
|
|
|
69
73
|
throw new Error(`RequiredPermission decorator has empty permissions in ${location}`);
|
|
70
74
|
if (this.isResolvingGraphQLField(context) || skipScopeCheck) {
|
|
71
75
|
// At least one permission is required
|
|
72
|
-
|
|
76
|
+
if (requiredPermissions
|
|
73
77
|
.filter((permission) => permission !== required_permission_decorator_1.DisablePermissionCheck)
|
|
74
|
-
.some((permission) => this.accessControlService.isAllowed(user, permission))
|
|
78
|
+
.some((permission) => this.accessControlService.isAllowed(user, permission))) {
|
|
79
|
+
return true;
|
|
80
|
+
}
|
|
75
81
|
}
|
|
76
82
|
else {
|
|
77
83
|
if (requiredContentScopes.length === 0)
|
|
@@ -80,10 +86,14 @@ let UserPermissionsGuard = class UserPermissionsGuard {
|
|
|
80
86
|
// The first level has to be checked with AND, the second level with OR
|
|
81
87
|
// The first level consists of submitted scopes and affected entities
|
|
82
88
|
// The only case that there is more than one scope in the second level is when the ScopedEntity returns more scopes
|
|
83
|
-
|
|
89
|
+
if (requiredPermissions
|
|
84
90
|
.filter((permission) => permission !== required_permission_decorator_1.DisablePermissionCheck)
|
|
85
|
-
.some((permission) => requiredContentScopes.every((contentScopes) => contentScopes.some((contentScope) => this.accessControlService.isAllowed(user, permission, contentScope))))
|
|
91
|
+
.some((permission) => requiredContentScopes.every((contentScopes) => contentScopes.some((contentScope) => this.accessControlService.isAllowed(user, permission, contentScope))))) {
|
|
92
|
+
return true;
|
|
93
|
+
}
|
|
86
94
|
}
|
|
95
|
+
this.logger.debug(`User ${(_d = (typeof user === "string" ? user : user.id)) !== null && _d !== void 0 ? _d : "unknown"} does not have required permissions for ${location}`);
|
|
96
|
+
return false;
|
|
87
97
|
});
|
|
88
98
|
}
|
|
89
99
|
getUser(context) {
|
|
@@ -105,7 +115,7 @@ let UserPermissionsGuard = class UserPermissionsGuard {
|
|
|
105
115
|
}
|
|
106
116
|
};
|
|
107
117
|
exports.UserPermissionsGuard = UserPermissionsGuard;
|
|
108
|
-
exports.UserPermissionsGuard = UserPermissionsGuard = __decorate([
|
|
118
|
+
exports.UserPermissionsGuard = UserPermissionsGuard = UserPermissionsGuard_1 = __decorate([
|
|
109
119
|
(0, common_1.Injectable)(),
|
|
110
120
|
__param(2, (0, common_1.Inject)(user_permissions_constants_1.ACCESS_CONTROL_SERVICE)),
|
|
111
121
|
__param(3, (0, common_1.Inject)(user_permissions_constants_1.USER_PERMISSIONS_OPTIONS)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-permissions.guard.js","sourceRoot":"","sources":["../../../src/user-permissions/auth/user-permissions.guard.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user-permissions.guard.js","sourceRoot":"","sources":["../../../src/user-permissions/auth/user-permissions.guard.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@comet/cms-api",
|
|
3
|
-
"version": "8.8.0-canary-
|
|
3
|
+
"version": "8.8.0-canary-20251124140636",
|
|
4
4
|
"description": "Comet CMS API package",
|
|
5
5
|
"repository": {
|
|
6
6
|
"directory": "packages/api/cms-api",
|
|
@@ -98,7 +98,7 @@
|
|
|
98
98
|
"ts-jest": "^29.4.0",
|
|
99
99
|
"ts-node": "^10.9.2",
|
|
100
100
|
"typescript": "5.9.3",
|
|
101
|
-
"@comet/eslint-config": "8.8.0-canary-
|
|
101
|
+
"@comet/eslint-config": "8.8.0-canary-20251124140636"
|
|
102
102
|
},
|
|
103
103
|
"peerDependencies": {
|
|
104
104
|
"@kubernetes/client-node": "^1.0.0",
|