@aeriajs/http 0.0.52 → 0.0.54

package/dist/routing.d.ts

@@ -1,4 +1,4 @@
-import type { RouteContext, GenericRequest, GenericResponse, RequestMethod, RouteUri, InferProperty, InferResponse, PackReferences, ContractWithRoles, ApiConfig } from '@aeriajs/types';
+import type { RouteContext, GenericRequest, GenericResponse, RequestMethod, RouteUri, InferProperty, InferResponse, PackReferences, ContractWithRoles, ApiConfig, UserRole } from '@aeriajs/types';
 export type RouterOptions = {
     exhaust?: boolean;
     base?: RouteUri;
@@ -8,7 +8,7 @@ export type Middleware = (context: RouteContext) => any;
 export type RouteGroupOptions = {
     base?: RouteUri;
 };
-type TypedContext<TContractWithRoles extends ContractWithRoles> = RouteContext<number extends keyof TContractWithRoles['roles'] ? TContractWithRoles['roles'][number] : null> & {
+type TypedContext<TContractWithRoles extends ContractWithRoles> = RouteContext<TContractWithRoles['roles'] extends infer AccessCondition ? number extends keyof AccessCondition ? AccessCondition[number] : AccessCondition extends true ? UserRole : AccessCondition extends false ? never : AccessCondition extends 'unauthenticated-only' ? 'guest' : AccessCondition extends 'unauthenticated' ? UserRole : null : never> & {
     request: Omit<RouteContext['request'], 'payload' | 'query'> & {
         payload: TContractWithRoles extends {
             payload: infer Payload;
@@ -20,11 +20,11 @@ type TypedContext<TContractWithRoles extends ContractWithRoles> = RouteContext<n
 };
 export type ProxiedRouter<TRouter> = TRouter & Record<RequestMethod, <const TContractWithRoles extends ContractWithRoles, TCallback extends (TContractWithRoles extends {
     response: infer Response;
-} ? InferResponse<Response> : any) extends infer Response ? TContractWithRoles['roles'] extends unknown[] ? TContractWithRoles['roles'][number] extends infer Role ? 'guest' extends Role ? (context: TypedContext<TContractWithRoles>) => Response : (context: TypedContext<TContractWithRoles> & {
+} ? InferResponse<Response> : any) extends infer Response ? TContractWithRoles['roles'] extends infer AccessCondition ? AccessCondition extends true ? (context: TypedContext<TContractWithRoles> & {
     token: {
         authenticated: true;
     };
-}) => Response : never : (context: TypedContext<TContractWithRoles>) => Response : never>(exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => ReturnType<typeof registerRoute>>;
+}) => Response : (context: TypedContext<TContractWithRoles>) => Response : never : never>(exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => ReturnType<typeof registerRoute>>;
 export declare const matches: <TRequest extends GenericRequest>(req: TRequest, method: RequestMethod | RequestMethod[] | null, exp: string | RegExp, options: RouterOptions, config?: ApiConfig) => {
     fragments: string[];
 } | undefined;
@@ -33,7 +33,7 @@ export declare const wrapRouteExecution: (res: GenericResponse, cb: () => any |
 export declare const createRouter: (options?: Partial<RouterOptions>) => ProxiedRouter<{
     route: <const TContractWithRoles extends ContractWithRoles, TCallback extends (TContractWithRoles extends {
         response: infer Response;
-    } ? InferResponse<Response> : any) extends infer Response_1 ? TContractWithRoles["roles"] extends unknown[] ? TContractWithRoles["roles"][number] extends infer Role ? "guest" extends Role ? (context: TypedContext<TContractWithRoles>) => Response_1 : (context: RouteContext<number extends keyof TContractWithRoles["roles"] ? TContractWithRoles["roles"][keyof TContractWithRoles["roles"] & number] : null> & {
+    } ? InferResponse<Response> : any) extends infer Response_1 ? TContractWithRoles["roles"] extends infer AccessCondition ? AccessCondition extends true ? (context: RouteContext<TContractWithRoles["roles"] extends infer AccessCondition_1 ? number extends keyof AccessCondition_1 ? AccessCondition_1[number] : AccessCondition_1 extends true ? any : AccessCondition_1 extends false ? never : AccessCondition_1 extends "unauthenticated-only" ? "guest" : AccessCondition_1 extends "unauthenticated" ? any : null : never> & {
         request: Omit<GenericRequest, "payload" | "query"> & {
             payload: TContractWithRoles extends {
                 payload: infer Payload;
@@ -46,7 +46,7 @@ export declare const createRouter: (options?: Partial<RouterOptions>) => Proxied
         token: {
             authenticated: true;
         };
-    }) => Response_1 : never : (context: TypedContext<TContractWithRoles>) => Response_1 : never>(method: RequestMethod | RequestMethod[], exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => void;
+    }) => Response_1 : (context: TypedContext<TContractWithRoles>) => Response_1 : never : never>(method: RequestMethod | RequestMethod[], exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => void;
     routes: ((_: unknown, context: RouteContext, groupOptions?: RouteGroupOptions) => ReturnType<typeof registerRoute>)[];
     routesMeta: RoutesMeta;
     group: <TRouter extends {

package/dist/routing.js

@@ -71,12 +71,8 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
         Object.assign(context.request, match);
         if (contract) {
             if (contract.roles) {
-                if (!context.token.authenticated) {
-                    if (!contract.roles.includes('guest')) {
-                        return unsufficientRoles(context);
-                    }
-                }
-                else if (!(0, common_1.arraysIntersects)(context.token.roles, contract.roles)) {
+                const granted = (0, common_1.isGranted)(contract.roles, context.token);
+                if (!granted) {
                     return unsufficientRoles(context);
                 }
             }

package/dist/routing.mjs

@@ -1,7 +1,7 @@
 "use strict";
 import { Stream } from "stream";
 import { ACErrors, REQUEST_METHODS } from "@aeriajs/types";
-import { pipe, arraysIntersects, left, isLeft, unwrapEither, deepMerge } from "@aeriajs/common";
+import { pipe, isGranted, left, isLeft, unwrapEither, deepMerge } from "@aeriajs/common";
 import { validate } from "@aeriajs/validation";
 import { getConfig } from "@aeriajs/entrypoint";
 import { safeJson } from "./payload.mjs";
@@ -69,11 +69,8 @@ export const registerRoute = async (context, method, exp, cb, contract, options
     Object.assign(context.request, match);
     if (contract) {
       if (contract.roles) {
-        if (!context.token.authenticated) {
-          if (!contract.roles.includes("guest")) {
-            return unsufficientRoles(context);
-          }
-        } else if (!arraysIntersects(context.token.roles, contract.roles)) {
+        const granted = isGranted(contract.roles, context.token);
+        if (!granted) {
           return unsufficientRoles(context);
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/http",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,10 +28,10 @@
     "@aeriajs/validation": "link:../validation"
   },
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.44",
-    "@aeriajs/entrypoint": "^0.0.44",
-    "@aeriajs/types": "^0.0.41",
-    "@aeriajs/validation": "^0.0.47"
+    "@aeriajs/common": "^0.0.46",
+    "@aeriajs/entrypoint": "^0.0.46",
+    "@aeriajs/types": "^0.0.43",
+    "@aeriajs/validation": "^0.0.49"
   },
   "scripts": {
     "test": "echo skipping",