@aeriajs/security 0.0.87 → 0.0.89

package/dist/immutability.d.ts

@@ -1,4 +1,4 @@
 import type { Context } from '@aeriajs/types';
 import type { SecurityCheckProps, SecurityCheckReadPayload, SecurityCheckWritePayload } from './types.js';
 import { ACError } from '@aeriajs/types';
-export declare const checkImmutability: (props: SecurityCheckProps<SecurityCheckReadPayload | SecurityCheckWritePayload>, context: Context) => Promise<import("@aeriajs/types").Right<SecurityCheckReadPayload | SecurityCheckWritePayload> | import("@aeriajs/types").Left<ACError.ImmutabilityParentNotFound> | import("@aeriajs/types").Left<ACError.ImmutabilityIncorrectChild> | import("@aeriajs/types").Left<ACError.ImmutabilityTargetImmutable>>;
+export declare const checkImmutability: (props: SecurityCheckProps<SecurityCheckReadPayload | SecurityCheckWritePayload>, context: Context) => Promise<import("@aeriajs/types").Right<SecurityCheckReadPayload | SecurityCheckWritePayload> | import("@aeriajs/types").Left<ACError.ResourceNotFound> | import("@aeriajs/types").Left<ACError.TargetImmutable>>;

package/dist/immutability.js

@@ -2,54 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkImmutability = void 0;
 const types_1 = require("@aeriajs/types");
-const mongodb_1 = require("mongodb");
 const common_1 = require("@aeriajs/common");
-const internalCheckImmutability = async (props, context) => {
-    const { propertyName = '', parentId, childId, payload, } = props;
-    const { description } = context;
-    const source = 'what' in payload
-        ? payload.what
-        : payload.filters;
-    const property = description.properties[propertyName];
-    if (!property) {
-        return (0, common_1.right)(props.payload);
-    }
-    const immutable = parentId && (description.immutable === true
-        || (Array.isArray(description.immutable) && description.immutable.includes(propertyName)));
-    const currentDocument = await context.collection.model.findOne({
-        _id: new mongodb_1.ObjectId(parentId),
-    });
-    if (!currentDocument) {
-        return (0, common_1.left)(types_1.ACError.ImmutabilityParentNotFound);
-    }
-    if (childId) {
-        if ((Array.isArray(currentDocument[propertyName]) && !currentDocument[propertyName].some((child) => child.toString() === childId))
-            || (!Array.isArray(currentDocument[propertyName]) && currentDocument[propertyName] && currentDocument[propertyName] !== childId.toString())) {
-            return (0, common_1.left)(types_1.ACError.ImmutabilityIncorrectChild);
-        }
-    }
-    const fulfilled = currentDocument[propertyName]
-        && (typeof currentDocument[propertyName] === 'object' && !Object.keys(currentDocument[propertyName]).length);
-    if (immutable
-        && fulfilled
-        && (property.inline || (currentDocument[propertyName]).toString() !== source[propertyName])) {
-        return (0, common_1.left)(types_1.ACError.ImmutabilityTargetImmutable);
-    }
-    return (0, common_1.right)(props.payload);
-};
 const checkImmutability = async (props, context) => {
-    if (!props.parentId) {
+    if (!context.description.immutable) {
         return (0, common_1.right)(props.payload);
     }
-    for (const propertyName of Object.keys(props.payload)) {
-        const result = await internalCheckImmutability({
-            ...props,
-            propertyName,
-        }, context);
-        if ((0, common_1.isLeft)(result)) {
-            return result;
+    const docId = 'filters' in props.payload
+        ? props.payload.filters._id
+        : props.payload.what._id;
+    if (docId) {
+        if (typeof context.description.immutable === 'function') {
+            const doc = await context.collection.model.findOne({
+                _id: docId,
+            });
+            if (!doc) {
+                return (0, common_1.left)(types_1.ACError.ResourceNotFound);
+            }
+            const isImmutable = await context.description.immutable(doc);
+            return isImmutable
+                ? (0, common_1.left)(types_1.ACError.TargetImmutable)
+                : (0, common_1.right)(props.payload);
         }
+        return (0, common_1.left)(types_1.ACError.TargetImmutable);
     }
-    return internalCheckImmutability(props, context);
+    return (0, common_1.right)(props.payload);
 };
 exports.checkImmutability = checkImmutability;

package/dist/immutability.mjs

@@ -1,50 +1,23 @@
 "use strict";
 import { ACError } from "@aeriajs/types";
-import { ObjectId } from "mongodb";
-import { left, right, isLeft } from "@aeriajs/common";
-const internalCheckImmutability = async (props, context) => {
-  const {
-    propertyName = "",
-    parentId,
-    childId,
-    payload
-  } = props;
-  const { description } = context;
-  const source = "what" in payload ? payload.what : payload.filters;
-  const property = description.properties[propertyName];
-  if (!property) {
-    return right(props.payload);
-  }
-  const immutable = parentId && (description.immutable === true || Array.isArray(description.immutable) && description.immutable.includes(propertyName));
-  const currentDocument = await context.collection.model.findOne({
-    _id: new ObjectId(parentId)
-  });
-  if (!currentDocument) {
-    return left(ACError.ImmutabilityParentNotFound);
-  }
-  if (childId) {
-    if (Array.isArray(currentDocument[propertyName]) && !currentDocument[propertyName].some((child) => child.toString() === childId) || !Array.isArray(currentDocument[propertyName]) && currentDocument[propertyName] && currentDocument[propertyName] !== childId.toString()) {
-      return left(ACError.ImmutabilityIncorrectChild);
-    }
-  }
-  const fulfilled = currentDocument[propertyName] && (typeof currentDocument[propertyName] === "object" && !Object.keys(currentDocument[propertyName]).length);
-  if (immutable && fulfilled && (property.inline || currentDocument[propertyName].toString() !== source[propertyName])) {
-    return left(ACError.ImmutabilityTargetImmutable);
-  }
-  return right(props.payload);
-};
+import { left, right } from "@aeriajs/common";
 export const checkImmutability = async (props, context) => {
-  if (!props.parentId) {
+  if (!context.description.immutable) {
     return right(props.payload);
   }
-  for (const propertyName of Object.keys(props.payload)) {
-    const result = await internalCheckImmutability({
-      ...props,
-      propertyName
-    }, context);
-    if (isLeft(result)) {
-      return result;
+  const docId = "filters" in props.payload ? props.payload.filters._id : props.payload.what._id;
+  if (docId) {
+    if (typeof context.description.immutable === "function") {
+      const doc = await context.collection.model.findOne({
+        _id: docId
+      });
+      if (!doc) {
+        return left(ACError.ResourceNotFound);
+      }
+      const isImmutable = await context.description.immutable(doc);
+      return isImmutable ? left(ACError.TargetImmutable) : right(props.payload);
     }
+    return left(ACError.TargetImmutable);
   }
-  return internalCheckImmutability(props, context);
+  return right(props.payload);
 };

package/dist/rateLimiting.d.ts

@@ -1,5 +1,5 @@
 import type { RouteContext, RateLimitingParams } from '@aeriajs/types';
-import { RateLimitingErrors } from '@aeriajs/types';
+import { HTTPStatus, RateLimitingError } from '@aeriajs/types';
 export declare const getOrCreateUsageEntry: (params: RateLimitingParams, context: RouteContext) => Promise<import("@aeriajs/types").WithId<Omit<import("@aeriajs/types").PackReferences<import("@aeriajs/types").SchemaWithId<{
     readonly $id: "resourceUsage";
     readonly required: readonly ["usage"];
@@ -34,7 +34,7 @@ export declare const getOrCreateUsageEntry: (params: RateLimitingParams, context
         };
     };
 }>>, "_id">>>;
-export declare const limitRate: (params: RateLimitingParams, context: RouteContext) => Promise<import("@aeriajs/types").Left<RateLimitingErrors.LimitReached> | import("@aeriajs/types").Right<import("@aeriajs/types").PackReferences<{} & Omit<Readonly<import("@aeriajs/types").FilterReadonlyProperties<{
+export declare const limitRate: (params: RateLimitingParams, context: RouteContext) => Promise<import("@aeriajs/types").PackReferences<{} & Omit<Readonly<import("@aeriajs/types").FilterReadonlyProperties<{
     readonly hits: {
         readonly type: "integer";
     };
@@ -54,4 +54,8 @@ export declare const limitRate: (params: RateLimitingParams, context: RouteConte
     points: number;
     last_reach: Date;
     last_maximum_reach: Date;
-}, never>>>>;
+}, never>> | import("@aeriajs/types").EndpointError<{
+    readonly code: RateLimitingError.LimitReached;
+} & {
+    httpStatus: HTTPStatus.TooManyRequests;
+}>>;

package/dist/rateLimiting.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.limitRate = exports.getOrCreateUsageEntry = void 0;
 const types_1 = require("@aeriajs/types");
-const common_1 = require("@aeriajs/common");
 const buildEntryFilter = (params, context) => {
     if (params.strategy === 'ip') {
         const address = context.response.socket.remoteAddress;
@@ -43,7 +42,9 @@ const limitRate = async (params, context) => {
         if ('scale' in params) {
             const now = new Date();
             if (params.scale > now.getTime() / 1000 - resource.last_reach.getTime() / 1000) {
-                return (0, common_1.left)(types_1.RateLimitingErrors.LimitReached);
+                return context.error(types_1.HTTPStatus.TooManyRequests, {
+                    code: types_1.RateLimitingError.LimitReached,
+                });
             }
         }
     }
@@ -61,6 +62,9 @@ const limitRate = async (params, context) => {
     }, {
         returnDocument: 'after',
     });
-    return (0, common_1.right)(newEntry.usage[resourceName]);
+    if (!newEntry) {
+        throw new Error();
+    }
+    return newEntry.usage[resourceName];
 };
 exports.limitRate = limitRate;

package/dist/rateLimiting.mjs

@@ -1,6 +1,5 @@
 "use strict";
-import { RateLimitingErrors } from "@aeriajs/types";
-import { left, right } from "@aeriajs/common";
+import { HTTPStatus, RateLimitingError } from "@aeriajs/types";
 const buildEntryFilter = (params, context) => {
   if (params.strategy === "ip") {
     const address = context.response.socket.remoteAddress;
@@ -44,7 +43,9 @@ export const limitRate = async (params, context) => {
     if ("scale" in params) {
       const now = /* @__PURE__ */ new Date();
       if (params.scale > now.getTime() / 1e3 - resource.last_reach.getTime() / 1e3) {
-        return left(RateLimitingErrors.LimitReached);
+        return context.error(HTTPStatus.TooManyRequests, {
+          code: RateLimitingError.LimitReached
+        });
       }
     }
   }
@@ -66,5 +67,8 @@ export const limitRate = async (params, context) => {
       returnDocument: "after"
     }
   );
-  return right(newEntry.usage[resourceName]);
+  if (!newEntry) {
+    throw new Error();
+  }
+  return newEntry.usage[resourceName];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/security",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,9 +28,9 @@
     "mongodb": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/core": "^0.0.87",
-    "@aeriajs/common": "^0.0.53",
-    "@aeriajs/types": "^0.0.50",
+    "@aeriajs/core": "^0.0.89",
+    "@aeriajs/common": "^0.0.55",
+    "@aeriajs/types": "^0.0.52",
     "mongodb": "^6.5.0"
   },
   "scripts": {