@aeriajs/builtins 0.0.230 → 0.0.231

package/dist/collections/user/createAccount.js

@@ -64,7 +64,7 @@ const createAccount = async (payload, context) => {
         what: {
             ...user,
             ...defaults,
-            roles,
+            roles: Array.from(roles),
         },
     }, context);
 };

package/dist/collections/user/createAccount.mjs

@@ -62,7 +62,7 @@ export const createAccount = async (payload, context) => {
     what: {
       ...user,
       ...defaults,
-      roles
+      roles: Array.from(roles)
     }
   }, context);
 };

package/dist/collections/user/index.d.ts

@@ -263,7 +263,7 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
             httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
         }> | import("@aeriajs/types").Result.Error<{
             readonly code: import("@aeriajs/types").ACError.AuthorizationError;
-            readonly message: "tried to edit an user with a roler higher in the hierarchy";
+            readonly message: "tried to edit an user with a role higher in the hierarchy";
         } & {
             httpStatus: import("@aeriajs/types").HTTPStatus.Forbidden;
         }> | import("@aeriajs/types").InsertReturnType<import("@aeriajs/types").SchemaWithId<import("@aeriajs/types").Description>>>;

package/dist/collections/user/insert.d.ts

@@ -16,7 +16,7 @@ export declare const insert: <TDescription extends Description, TInsertPayload e
     httpStatus: HTTPStatus.NotFound;
 }> | import("@aeriajs/types").Result.Error<{
     readonly code: ACError.AuthorizationError;
-    readonly message: "tried to edit an user with a roler higher in the hierarchy";
+    readonly message: "tried to edit an user with a role higher in the hierarchy";
 } & {
     httpStatus: HTTPStatus.Forbidden;
 }> | import("@aeriajs/types").InsertReturnType<SchemaWithId<TDescription>>>;

package/dist/collections/user/insert.js

@@ -6,7 +6,10 @@ const common_1 = require("@aeriajs/common");
 const core_1 = require("@aeriajs/core");
 const bcrypt = require("bcrypt");
 const isRoleAllowed = (targetRole, context) => {
-    if (!context.config.security.rolesHierarchy || !context.token.authenticated) {
+    if (!context.config.security.rolesHierarchy) {
+        return true;
+    }
+    if (!context.token.authenticated) {
         throw new Error;
     }
     for (const role of context.token.roles) {
@@ -43,24 +46,23 @@ const insert = async (payload, context) => {
                     });
                 }
             }
-            if ('_id' in payload.what && typeof payload.what._id === 'string') {
-                context.collection.description.$id === 'oi';
-                const user = await context.collections.user.model.findOne({
-                    _id: new core_1.ObjectId(payload.what._id),
-                });
-                if (!user) {
-                    return context.error(types_1.HTTPStatus.NotFound, {
-                        code: types_1.ACError.ResourceNotFound,
-                    });
-                }
-                const allowed = user.roles.every((role) => isRoleAllowed(role, context));
-                if (!allowed) {
-                    return context.error(types_1.HTTPStatus.Forbidden, {
-                        code: types_1.ACError.AuthorizationError,
-                        message: 'tried to edit an user with a roler higher in the hierarchy',
-                    });
-                }
-            }
+        }
+    }
+    if ('_id' in payload.what && typeof payload.what._id === 'string') {
+        const user = await context.collections.user.model.findOne({
+            _id: new core_1.ObjectId(payload.what._id),
+        });
+        if (!user) {
+            return context.error(types_1.HTTPStatus.NotFound, {
+                code: types_1.ACError.ResourceNotFound,
+            });
+        }
+        const allowed = user.roles.every((role) => isRoleAllowed(role, context));
+        if (!allowed) {
+            return context.error(types_1.HTTPStatus.Forbidden, {
+                code: types_1.ACError.AuthorizationError,
+                message: 'tried to edit an user with a role higher in the hierarchy',
+            });
         }
     }
     if ('password' in payload.what && typeof payload.what.password === 'string') {

package/dist/collections/user/insert.mjs

@@ -4,7 +4,10 @@ import { arraysIntersect } from "@aeriajs/common";
 import { ObjectId, insert as originalInsert } from "@aeriajs/core";
 import * as bcrypt from "bcrypt";
 const isRoleAllowed = (targetRole, context) => {
-  if (!context.config.security.rolesHierarchy || !context.token.authenticated) {
+  if (!context.config.security.rolesHierarchy) {
+    return true;
+  }
+  if (!context.token.authenticated) {
     throw new Error();
   }
   for (const role of context.token.roles) {
@@ -41,24 +44,23 @@ export const insert = async (payload, context) => {
           });
         }
       }
-      if ("_id" in payload.what && typeof payload.what._id === "string") {
-        context.collection.description.$id === "oi";
-        const user = await context.collections.user.model.findOne({
-          _id: new ObjectId(payload.what._id)
-        });
-        if (!user) {
-          return context.error(HTTPStatus.NotFound, {
-            code: ACError.ResourceNotFound
-          });
-        }
-        const allowed = user.roles.every((role) => isRoleAllowed(role, context));
-        if (!allowed) {
-          return context.error(HTTPStatus.Forbidden, {
-            code: ACError.AuthorizationError,
-            message: "tried to edit an user with a roler higher in the hierarchy"
-          });
-        }
-      }
+    }
+  }
+  if ("_id" in payload.what && typeof payload.what._id === "string") {
+    const user = await context.collections.user.model.findOne({
+      _id: new ObjectId(payload.what._id)
+    });
+    if (!user) {
+      return context.error(HTTPStatus.NotFound, {
+        code: ACError.ResourceNotFound
+      });
+    }
+    const allowed = user.roles.every((role) => isRoleAllowed(role, context));
+    if (!allowed) {
+      return context.error(HTTPStatus.Forbidden, {
+        code: ACError.AuthorizationError,
+        message: "tried to edit an user with a role higher in the hierarchy"
+      });
     }
   }
   if ("password" in payload.what && typeof payload.what.password === "string") {

package/dist/index.d.ts

@@ -727,7 +727,7 @@ export declare const collections: {
                 httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
             }> | import("@aeriajs/types").Result.Error<{
                 readonly code: import("@aeriajs/types").ACError.AuthorizationError;
-                readonly message: "tried to edit an user with a roler higher in the hierarchy";
+                readonly message: "tried to edit an user with a role higher in the hierarchy";
             } & {
                 httpStatus: import("@aeriajs/types").HTTPStatus.Forbidden;
             }> | import("@aeriajs/types").InsertReturnType<import("@aeriajs/types").SchemaWithId<import("@aeriajs/types").Description>>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/builtins",
-  "version": "0.0.230",
+  "version": "0.0.231",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -55,10 +55,10 @@
     "mongodb": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/core": "^0.0.230",
-    "@aeriajs/common": "^0.0.131",
-    "@aeriajs/entrypoint": "^0.0.134",
-    "@aeriajs/types": "^0.0.113",
-    "@aeriajs/validation": "^0.0.146"
+    "@aeriajs/core": "^0.0.231",
+    "@aeriajs/common": "^0.0.132",
+    "@aeriajs/entrypoint": "^0.0.135",
+    "@aeriajs/types": "^0.0.114",
+    "@aeriajs/validation": "^0.0.147"
   }
 }