@holoyan/adonisjs-permissions 2.0.0-beta.2 → 2.0.2

package/README.md

@@ -1,7 +1,13 @@
-# Role permissions system for AdonisJS V6+
+# Role permissions system for AdonisJS
+
+| Package version | AdonisJS version |
+|----------------|-----------------|
+| v1.x           | v6              |
+| v2.x           | v7              |
 
 Checkout other AdonisJS packages
 
+- [AdonisJs Lucid Polymorphic Relations](https://github.com/holoyan/adonisjs-polymorphic)
 - [AdonisJs activity log](https://github.com/holoyan/adonisjs-activitylog)
 
 [//]: # ([![test](https://github.com/holoyan/adonisjs-permissions/actions/workflows/test.yml/badge.svg)](https://github.com/holoyan/adonisjs-permissions/actions/workflows/test.yml))
@@ -14,8 +20,8 @@ Checkout other AdonisJS packages
 
 ## Release Notes
 
-Version: >= v2.0.0-beta.2
-* Fixed `permissionQueryHelpers()` mixin leaking internal relations (`_roles`, `_permissions`, `_model_roles`) into the public `related()` API, which caused incorrect IDE type inference on user-defined relations
+Version: v2.0.2
+* Fixed `PermissionsService.forbidden()` returning `false` for explicitly denied permissions ([#36](https://github.com/holoyan/adonisjs-permissions/issues/36)). The method was missing `await` on an async call (`!Promise` is always `false`) and used the wrong semantic (negating `hasAny` conflated "never granted" with "explicitly denied"). It now queries the forbid rows directly and is correctly `async`.
 
 ## Table of Contents
 
@@ -89,9 +95,15 @@ await user.allow('delete', post)
 To be able to use the full power of Acl, you should have a clear understanding of how it is structured and how it works. That's why the documentation will be divided into two parts: [Basic usage](#basic-usage) and [Advanced usage](#digging-deeper). For most applications, Basic Usage will be enough.
 
 ## Installation
-    
+
+For AdonisJS v7 (latest):
+
     npm i @holoyan/adonisjs-permissions
 
+For AdonisJS v6:
+
+    npm i @holoyan/adonisjs-permissions@v1-latest
+
 
 Next publish config files
 
@@ -1364,8 +1376,6 @@ await Acl.permission(myPermission).detachFromRole(role_slug)
 |------------------------|-----------------|
 | v20.x                  | 0.10.x          |
 | v21.x                  | 1.x             |
-| v22.x                  | 2.x             |
-
 
 
 

package/build/src/services/permissions/permissions_service.d.ts

@@ -78,9 +78,9 @@ export default class PermissionsService extends BaseService {
      */
     containsAnyDirect(modelType: string, modelId: ModelIdType, permission: string[]): Promise<boolean>;
     /**
-     * check if permission is forbidden, if there is same permission with allowed=false then return true;
+     * check if permission is forbidden if there is the same permission with allowed=false then return true;
      */
-    forbidden(modelType: string, modelId: ModelIdType, permission: string, entityType: string | null, entityId: ModelIdType | null): boolean;
+    forbidden(modelType: string, modelId: ModelIdType, permission: string, entityType: string | null, entityId: ModelIdType | null): Promise<boolean>;
     /**
      * give permission to model
      */

package/build/src/services/permissions/permissions_service.js

@@ -291,10 +291,24 @@ export default class PermissionsService extends BaseService {
         return r.length > 0;
     }
     /**
-     * check if permission is forbidden, if there is same permission with allowed=false then return true;
+     * check if permission is forbidden if there is the same permission with allowed=false then return true;
      */
-    forbidden(modelType, modelId, permission, entityType, entityId) {
-        return !this.hasAny(modelType, modelId, [permission], entityType, entityId);
+    async forbidden(modelType, modelId, permission, entityType, entityId) {
+        const { slugs, ids } = this.formatList([permission]);
+        const q = this.permissionQuery
+            .leftJoin(this.modelPermissionTable + ' as mp', 'mp.permission_id', '=', this.permissionTable + '.id')
+            .where('mp.model_type', modelType)
+            .where('mp.model_id', modelId)
+            .where(this.permissionTable + '.allowed', false)
+            .where((sub) => {
+            if (slugs.length)
+                sub.orWhereIn(this.permissionTable + '.slug', slugs);
+            if (ids.length)
+                sub.orWhereIn(this.permissionTable + '.id', ids);
+        });
+        this.applyTargetRestriction(this.permissionTable, q, entityType, entityId);
+        const r = await q.select(this.permissionTable + '.id').limit(1);
+        return r.length > 0;
     }
     /**
      * give permission to model

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@holoyan/adonisjs-permissions",
   "description": "AdonisJs roles and permissions system",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.2",
   "engines": {
-    "node": ">=24.0.0"
+    "node": ">=18.16.0"
   },
   "type": "module",
   "files": [
@@ -41,12 +41,12 @@
   "author": "holoyan",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/assembler": "^8.0.0-next.0",
-    "@adonisjs/core": "^7.0.0-next.0",
+    "@adonisjs/assembler": "^8.0.1",
+    "@adonisjs/core": "^7.0.1",
     "@adonisjs/eslint-config": "^1.2.1",
-    "@adonisjs/lucid": "^22.0.0-next.0",
+    "@adonisjs/lucid": "^22.1.1",
     "@adonisjs/prettier-config": "^1.2.1",
-    "@adonisjs/tsconfig": "^2.0.0-next.3",
+    "@adonisjs/tsconfig": "^2.0.0",
     "@japa/assert": "^4.2.0",
     "@japa/runner": "^5.3.0",
     "@swc/core": "^1.3.102",
@@ -71,20 +71,20 @@
     "uuid": "^10.0.0"
   },
   "peerDependencies": {
-    "@adonisjs/core": "^7.0.0-next.0",
-    "@adonisjs/lucid": "^22.0.0-next.0",
+    "@adonisjs/core": "^7.0.1",
+    "@adonisjs/lucid": "^22.1.1",
     "@types/uuid": "^10.0.0",
-    "luxon": "^3.4.4",
+    "luxon": "^3.7.2",
     "uuid": "^10.0.0"
   },
   "publishConfig": {
     "access": "public",
-    "tag": "beta"
+    "tag": "latest"
   },
   "np": {
     "message": "chore(release): %s",
-    "tag": "beta",
-    "branch": "2.0.0-beta.1",
+    "tag": "latest",
+    "branch": "master",
     "anyBranch": false
   },
   "c8": {
@@ -101,7 +101,7 @@
   },
   "prettier": "@adonisjs/prettier-config",
   "dependencies": {
-    "@holoyan/morph-map-js": "^0.1.2",
+    "@holoyan/morph-map-js": "^0.1.1",
     "@poppinss/hooks": "7.3.0"
   }
 }