@punks/backend-entity-manager 0.0.180 → 0.0.182

package/dist/cjs/index.js

@@ -2532,11 +2532,13 @@ const AuthenticationGuardsSymbols = {
 
 const Public = () => common.SetMetadata(AuthenticationGuardsSymbols.Public, true);
 const Authenticated = () => common.SetMetadata(AuthenticationGuardsSymbols.Authenticated, true);
+const Permissions = (...permissions) => common.SetMetadata(AuthenticationGuardsSymbols.Permissions, permissions);
 const Roles = (...roles) => common.SetMetadata(AuthenticationGuardsSymbols.Roles, roles);
 const MemberOf = (...groups) => common.SetMetadata(AuthenticationGuardsSymbols.MemberOf, groups);
 const buildRolesGuard = ({ mainRole, secondaryRoles, }, options) => Roles(mainRole.uid, ...(!options?.exact && secondaryRoles
     ? secondaryRoles.map((role) => role.uid)
     : []));
+const buildPermissionsGuard = ({ permissions, }) => Permissions(...permissions.map((x) => x.uid));
 
 const WpPermissionsService = () => common.applyDecorators(common.Injectable(), common.SetMetadata(AuthenticationExtensionSymbols.PermissionsService, true));
 
@@ -2629,15 +2631,34 @@ exports.AuthGuard = AuthGuard_1 = class AuthGuard {
         const allowedRoles = this.getAllowedRoles(context);
         if (allowedRoles) {
             const isAllowed = this.isRoleMatching(allowedRoles, auth?.roles ?? []);
-            this.logger.debug(`Authorized:${isAllowed} -> authorization guard`, {
+            this.logger.debug(`Authorized:${isAllowed} -> authorization role guard`, {
                 ...this.getContextInfo({
                     context,
                     roles: auth?.roles,
                     user: auth?.user,
+                    permissions: auth?.permissions,
                 }),
                 allowedRoles,
             });
-            return isAllowed;
+            if (!isAllowed) {
+                return false;
+            }
+        }
+        const allowedPermissions = this.getAllowedPermissions(context);
+        if (allowedPermissions) {
+            const isAllowed = this.isPermissionMatching(allowedPermissions, auth?.roles ?? []);
+            this.logger.debug(`Authorized:${isAllowed} -> authorization permission guard`, {
+                ...this.getContextInfo({
+                    context,
+                    roles: auth?.roles,
+                    user: auth?.user,
+                    permissions: auth?.permissions,
+                }),
+                allowedPermissions,
+            });
+            if (!isAllowed) {
+                return false;
+            }
         }
         const isForAllAuthenticated = this.getIsForAllAuthenticated(context);
         if (isForAllAuthenticated) {
@@ -2647,6 +2668,7 @@ exports.AuthGuard = AuthGuard_1 = class AuthGuard {
                     context,
                     roles: auth?.roles,
                     user: auth?.user,
+                    permissions: auth?.permissions,
                 }),
             });
             return isAuthenticated;
@@ -2657,6 +2679,7 @@ exports.AuthGuard = AuthGuard_1 = class AuthGuard {
                 context,
                 roles: auth?.roles,
                 user: auth?.user,
+                permissions: auth?.permissions,
             }),
         });
         return isAuthenticated;
@@ -2664,6 +2687,9 @@ exports.AuthGuard = AuthGuard_1 = class AuthGuard {
     isRoleMatching(allowedRoles, userRoles) {
         return userRoles.some((role) => allowedRoles.includes(role.uid));
     }
+    isPermissionMatching(allowedPermissions, userPermissions) {
+        return userPermissions.some((permission) => allowedPermissions.includes(permission.uid));
+    }
     getIsForAllAuthenticated(context) {
         return this.getMetadata(AuthenticationGuardsSymbols.Authenticated, context);
     }
@@ -2673,12 +2699,16 @@ exports.AuthGuard = AuthGuard_1 = class AuthGuard {
     getAllowedRoles(context) {
         return this.getMetadata(AuthenticationGuardsSymbols.Roles, context);
     }
+    getAllowedPermissions(context) {
+        return this.getMetadata(AuthenticationGuardsSymbols.Permissions, context);
+    }
     getCurrentAuth(context) {
         const request = context.switchToHttp()?.getRequest();
         return request?.auth?.user
             ? {
                 user: request.auth.user,
                 roles: request.auth.roles,
+                permissions: request.auth.permissions,
             }
             : undefined;
     }
@@ -2688,7 +2718,7 @@ exports.AuthGuard = AuthGuard_1 = class AuthGuard {
             context.getClass(),
         ]);
     }
-    getContextInfo({ context, user, roles, }) {
+    getContextInfo({ context, user, roles, permissions, }) {
         return {
             request: {
                 path: context.switchToHttp()?.getRequest()?.path,
@@ -2701,6 +2731,7 @@ exports.AuthGuard = AuthGuard_1 = class AuthGuard {
                         userName: user.userName,
                         email: user.email,
                         roles: roles?.map((role) => role.uid),
+                        permissions: permissions?.map((permission) => permission.uid),
                     },
                 }
                 : {}),
@@ -28413,6 +28444,7 @@ exports.NestTypeOrmQueryBuilder = NestTypeOrmQueryBuilder;
 exports.NestTypeOrmRepository = NestTypeOrmRepository;
 exports.OperationTokenMismatchError = OperationTokenMismatchError;
 exports.PLATFORM_EVENT_NAMESPACE = PLATFORM_EVENT_NAMESPACE;
+exports.Permissions = Permissions;
 exports.PipelineController = PipelineController;
 exports.PipelineInvocationError = PipelineInvocationError;
 exports.PlatformEvents = PlatformEvents;
@@ -28448,6 +28480,7 @@ exports.WpRolesService = WpRolesService;
 exports.WpSendgridEmailTemplate = WpSendgridEmailTemplate;
 exports.WpUserRolesService = WpUserRolesService;
 exports.WpUserService = WpUserService;
+exports.buildPermissionsGuard = buildPermissionsGuard;
 exports.buildRolesGuard = buildRolesGuard;
 exports.createContainer = createContainer;
 exports.createExpressFileResponse = createExpressFileResponse;