Get availablePermissions from DiscoveryService

demo/api/src/app.module.ts

@@ -78,7 +78,6 @@ export class AppModule {
                 AuthModule,
                 UserPermissionsModule.forRootAsync({
                     useFactory: (userService: UserService, accessControlService: AccessControlService) => ({
-                        availablePermissions: ["news", "products"],
                         availableContentScopes: [
                             { domain: "main", language: "de" },
                             { domain: "main", language: "en" },

docs/docs/migration/migration-from-v5-to-v6.md

@@ -75,18 +75,7 @@ It automatically installs the new versions of all `@comet` libraries, runs an ES
 
     It is not possible anymore to use a custom CurrentUserLoader neither to augment/use the CurrentUserInterface.
 
-3. Create interface for `availablePermissions` similar to the already existing interface `interface ContentScope`
-
-    ```ts
-    declare module "@comet/cms-api" {
-        interface Permission {
-            // e.g. `products: string;`
-        }
-    }
-    export {};
-    ```
-
-4. Create necessary services for the `UserPermissionsModule` (either in a new module or where it fits best)
+3. Create necessary services for the `UserPermissionsModule` (either in a new module or where it fits best)
 
     ```ts
     // Attention: might already being provided by the library which syncs the users
@@ -113,7 +102,7 @@ It automatically installs the new versions of all `@comet` libraries, runs an ES
     }
     ```
 
-5. Replace `ContentScopeModule` with `UserPermissionsModule`
+4. Replace `ContentScopeModule` with `UserPermissionsModule`
 
     Remove `ContentScopeModule`:
 
@@ -128,7 +117,6 @@ It automatically installs the new versions of all `@comet` libraries, runs an ES
     ```ts
     UserPermissionsModule.forRootAsync({
         useFactory: (userService: UserService, accessControlService: AccessControlService) => ({
-            availablePermissions: [/* Array of strings defined in interface Permission */],
             availableContentScopes: [/* Array of content Scopes */],
             userService,
             accessControlService,
@@ -138,7 +126,7 @@ It automatically installs the new versions of all `@comet` libraries, runs an ES
     }),
     ```
 
-6. Adapt decorators
+5. Adapt decorators
 
     Add `@RequiredPermission` to resolvers and controllers
 

packages/api/cms-api/package.json

@@ -33,6 +33,7 @@
     },
     "dependencies": {
         "@comet/blocks-api": "workspace:^6.0.0",
+        "@golevelup/nestjs-discovery": "^4.0.0",
         "@hapi/accept": "^5.0.2",
         "@nestjs/jwt": "^9.0.0",
         "@nestjs/mapped-types": "^1.2.2",

packages/api/cms-api/src/index.ts

@@ -148,7 +148,6 @@ export { CurrentUser } from "./user-permissions/dto/current-user";
 export { FindUsersArgs } from "./user-permissions/dto/paginated-user-list";
 export { User } from "./user-permissions/dto/user";
 export { ContentScope } from "./user-permissions/interfaces/content-scope.interface";
-export { Permission } from "./user-permissions/interfaces/user-permission.interface";
 export { UserPermissionsModule } from "./user-permissions/user-permissions.module";
 export {
     AccessControlServiceInterface,

packages/api/cms-api/src/user-permissions/access-control.service.ts

@@ -2,15 +2,14 @@ import { Injectable } from "@nestjs/common";
 
 import { CurrentUser } from "./dto/current-user";
 import { ContentScope } from "./interfaces/content-scope.interface";
-import { Permission } from "./interfaces/user-permission.interface";
 import { AccessControlServiceInterface } from "./user-permissions.types";
 
 @Injectable()
 export abstract class AbstractAccessControlService implements AccessControlServiceInterface {
     private checkContentScope(userContentScopes: ContentScope[], contentScope: ContentScope): boolean {
         return userContentScopes.some((cs) => Object.entries(contentScope).every(([scope, value]) => cs[scope] === value));
     }
-    isAllowed(user: CurrentUser, permission: keyof Permission, contentScope?: ContentScope): boolean {
+    isAllowed(user: CurrentUser, permission: string, contentScope?: ContentScope): boolean {
         if (!user.permissions) return false;
         return user.permissions.some((p) => p.permission === permission && (!contentScope || this.checkContentScope(p.contentScopes, contentScope)));
     }

packages/api/cms-api/src/user-permissions/auth/user-permissions.guard.ts

@@ -51,9 +51,7 @@ export class UserPermissionsGuard implements CanActivate {
             }
         }
 
-        const requiredPermissions = Array.isArray(requiredPermission.requiredPermission)
-            ? requiredPermission.requiredPermission
-            : [requiredPermission.requiredPermission];
+        const requiredPermissions = requiredPermission.requiredPermission;
         if (requiredPermissions.length === 0) {
             throw new Error(`RequiredPermission decorator has empty permissions in ${context.getClass().name}::${context.getHandler().name}()`);
         }

packages/api/cms-api/src/user-permissions/decorators/required-permission.decorator.ts

@@ -1,19 +1,17 @@
 import { CustomDecorator, SetMetadata } from "@nestjs/common";
 
-import { Permission } from "../interfaces/user-permission.interface";
-
 type RequiredPermissionOptions = {
     skipScopeCheck?: boolean;
 };
 
 export type RequiredPermissionMetadata = {
-    requiredPermission: (keyof Permission)[] | keyof Permission;
+    requiredPermission: string[];
     options: RequiredPermissionOptions | undefined;
 };
 
-export const RequiredPermission = (
-    requiredPermission: (keyof Permission)[] | keyof Permission,
-    options?: RequiredPermissionOptions,
-): CustomDecorator<string> => {
-    return SetMetadata<string, RequiredPermissionMetadata>("requiredPermission", { requiredPermission, options });
+export const RequiredPermission = (requiredPermission: string | string[], options?: RequiredPermissionOptions): CustomDecorator<string> => {
+    return SetMetadata<string, RequiredPermissionMetadata>("requiredPermission", {
+        requiredPermission: Array.isArray(requiredPermission) ? requiredPermission : [requiredPermission],
+        options,
+    });
 };

packages/api/cms-api/src/user-permissions/user-permissions.module.ts

@@ -1,3 +1,4 @@
+import { DiscoveryModule } from "@golevelup/nestjs-discovery";
 import { MikroOrmModule } from "@mikro-orm/nestjs";
 import { DynamicModule, Global, Module, Provider } from "@nestjs/common";
 import { APP_GUARD } from "@nestjs/core";
@@ -20,7 +21,7 @@ import {
 
 @Global()
 @Module({
-    imports: [MikroOrmModule.forFeature([UserPermission, UserContentScopes])],
+    imports: [MikroOrmModule.forFeature([UserPermission, UserContentScopes]), DiscoveryModule],
     providers: [
         UserPermissionsService,
         UserResolver,

packages/api/cms-api/src/user-permissions/user-permissions.service.ts

@@ -1,17 +1,18 @@
+import { DiscoveryService } from "@golevelup/nestjs-discovery";
 import { EntityRepository } from "@mikro-orm/core";
 import { InjectRepository } from "@mikro-orm/nestjs";
 import { Inject, Injectable } from "@nestjs/common";
 import { isFuture, isPast } from "date-fns";
 import isEqual from "lodash.isequal";
 import getUuid from "uuid-by-string";
 
+import { RequiredPermissionMetadata } from "./decorators/required-permission.decorator";
 import { CurrentUser } from "./dto/current-user";
 import { FindUsersArgs } from "./dto/paginated-user-list";
 import { User } from "./dto/user";
 import { UserContentScopes } from "./entities/user-content-scopes.entity";
 import { UserPermission, UserPermissionSource } from "./entities/user-permission.entity";
 import { ContentScope } from "./interfaces/content-scope.interface";
-import { Permission } from "./interfaces/user-permission.interface";
 import { ACCESS_CONTROL_SERVICE, USER_PERMISSIONS_OPTIONS, USER_PERMISSIONS_USER_SERVICE } from "./user-permissions.constants";
 import {
     AccessControlServiceInterface,
@@ -28,15 +29,25 @@ export class UserPermissionsService {
         @Inject(ACCESS_CONTROL_SERVICE) private readonly accessControlService: AccessControlServiceInterface,
         @InjectRepository(UserPermission) private readonly permissionRepository: EntityRepository<UserPermission>,
         @InjectRepository(UserContentScopes) private readonly contentScopeRepository: EntityRepository<UserContentScopes>,
+        private readonly discoveryService: DiscoveryService,
     ) {}
 
     async getAvailableContentScopes(): Promise<ContentScope[]> {
         return this.options.availableContentScopes ?? [];
     }
 
-    async getAvailablePermissions(): Promise<(keyof Permission)[]> {
+    async getAvailablePermissions(): Promise<string[]> {
         return [
-            ...new Set<keyof Permission>(["dam", "pageTree", "userPermissions", "cronJobs", "builds", ...(this.options.availablePermissions ?? [])]),
+            ...new Set(
+                [
+                    ...(await this.discoveryService.providerMethodsWithMetaAtKey<RequiredPermissionMetadata>("requiredPermission")),
+                    ...(await this.discoveryService.providersWithMetaAtKey<RequiredPermissionMetadata>("requiredPermission")),
+                    ...(await this.discoveryService.controllerMethodsWithMetaAtKey<RequiredPermissionMetadata>("requiredPermission")),
+                    ...(await this.discoveryService.controllerMethodsWithMetaAtKey<RequiredPermissionMetadata>("requiredPermission")),
+                ]
+                    .flatMap((p) => p.meta.requiredPermission)
+                    .sort(),
+            ),
         ];
     }
 
@@ -88,10 +99,7 @@ export class UserPermissionsService {
 
         return permissions
             .filter((value) => availablePermissions.some((p) => p === value.permission)) // Filter out permissions that are not defined in availablePermissions (e.g. outdated database entries)
-            .sort(
-                (a, b) =>
-                    availablePermissions.indexOf(a.permission as keyof Permission) - availablePermissions.indexOf(b.permission as keyof Permission),
-            );
+            .sort((a, b) => availablePermissions.indexOf(a.permission) - availablePermissions.indexOf(b.permission));
     }
 
     async getContentScopes(userId: string, includeContentScopesManual = true): Promise<ContentScope[]> {

packages/api/cms-api/src/user-permissions/user-permissions.types.ts

@@ -5,7 +5,6 @@ import { FindUsersArgs } from "./dto/paginated-user-list";
 import { User } from "./dto/user";
 import { UserPermission } from "./entities/user-permission.entity";
 import { ContentScope } from "./interfaces/content-scope.interface";
-import { Permission } from "./interfaces/user-permission.interface";
 
 export enum UserPermissions {
     allContentScopes = "all-content-scopes",
@@ -15,15 +14,15 @@ export enum UserPermissions {
 export type Users = [User[], number];
 
 type PermissionForUser = {
-    permission: keyof Permission;
+    permission: string;
     contentScopes?: ContentScope[];
 } & Pick<UserPermission, "validFrom" | "validTo" | "reason" | "requestedBy" | "approvedBy">;
 export type PermissionsForUser = PermissionForUser[] | UserPermissions.allPermissions;
 
 export type ContentScopesForUser = ContentScope[] | UserPermissions.allContentScopes;
 
 export interface AccessControlServiceInterface {
-    isAllowed(user: CurrentUser, permission: keyof Permission, contentScope?: ContentScope): boolean;
+    isAllowed(user: CurrentUser, permission: string, contentScope?: ContentScope): boolean;
     getPermissionsForUser?: (user: User) => Promise<PermissionsForUser> | PermissionsForUser;
     getContentScopesForUser?: (user: User) => Promise<ContentScopesForUser> | ContentScopesForUser;
 }
@@ -34,7 +33,6 @@ export interface UserPermissionsUserServiceInterface {
 }
 
 export interface UserPermissionsOptions {
-    availablePermissions?: (keyof Permission)[];
     availableContentScopes?: ContentScope[];
 }
 export interface UserPermissionsModuleSyncOptions extends UserPermissionsOptions {