@aeriajs/http 0.0.8 → 0.0.9

package/dist/contract.d.ts

@@ -1,13 +1,2 @@
-import type { Property } from '@aeriajs/types';
-export type Contract = {
-    response: Property | Property[];
-} | {
-    payload: Property;
-} | {
-    query: Property;
-} | {
-    response?: Property | Property[];
-    payload?: Property;
-    query?: Property;
-};
-export declare const defineContract: <const TContract extends Contract>(contract: TContract) => TContract;
+import type { ContractWithRoles } from '@aeriajs/types';
+export declare const defineContract: <const TContractWithRoles extends ContractWithRoles>(contract: TContractWithRoles) => TContractWithRoles;

package/dist/routing.d.ts

@@ -1,41 +1,41 @@
-import type { Context, GenericRequest, GenericResponse, RequestMethod, InferProperty, InferResponse, PackReferences } from '@aeriajs/types';
-import type { Contract } from './contract.js';
+import type { Context, GenericRequest, GenericResponse, RequestMethod, InferProperty, InferResponse, PackReferences, ContractWithRoles } from '@aeriajs/types';
 export type RouteUri = `/${string}`;
 export type RouterOptions = {
     exhaust?: boolean;
     base?: RouteUri;
 };
+export type RoutesMeta = Record<RouteUri, Partial<Record<RequestMethod, ContractWithRoles | null> | undefined>>;
 export type Middleware = (context: Context) => any;
 export type RouteGroupOptions = {
     base?: RouteUri;
 };
-type TypedContext<TContract extends Contract> = Omit<Context, 'request'> & {
+type TypedContext<TContractWithRoles extends ContractWithRoles> = Omit<Context, 'request'> & {
     request: Omit<Context['request'], 'payload' | 'query'> & {
-        payload: TContract extends {
+        payload: TContractWithRoles extends {
             payload: infer Payload;
         } ? PackReferences<InferProperty<Payload>> : never;
-        query: TContract extends {
+        query: TContractWithRoles extends {
             query: infer Query;
         } ? InferProperty<Query> : any;
     };
 };
-export type ProxiedRouter<TRouter> = TRouter & Record<RequestMethod, <TCallback extends (context: TypedContext<TContract>) => TContract extends {
+export type ProxiedRouter<TRouter> = TRouter & Record<RequestMethod, <TCallback extends (context: TypedContext<TContractWithRoles>) => TContractWithRoles extends {
     response: infer Response;
-} ? InferResponse<Response> : any, const TContract extends Contract>(exp: RouteUri, cb: TCallback, contract?: TContract) => ReturnType<typeof registerRoute>>;
+} ? InferResponse<Response> : any, const TContractWithRoles extends ContractWithRoles>(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) => {
     fragments: string[];
 } | undefined;
-export declare const registerRoute: <TCallback extends (context: Context) => any>(context: Context, method: RequestMethod | RequestMethod[], exp: RouteUri, cb: TCallback, contract?: Contract, options?: RouterOptions) => Promise<any>;
+export declare const registerRoute: <TCallback extends (context: Context) => any>(context: Context, method: RequestMethod | RequestMethod[], exp: RouteUri, cb: TCallback, contract?: ContractWithRoles, options?: RouterOptions) => Promise<any>;
 export declare const wrapRouteExecution: (res: GenericResponse, cb: () => any | Promise<any>) => Promise<any>;
 export declare const createRouter: (options?: Partial<RouterOptions>) => ProxiedRouter<{
-    route: <TCallback extends (context: TypedContext<TContract>) => TContract extends {
+    route: <TCallback extends (context: TypedContext<TContractWithRoles>) => TContractWithRoles extends {
         response: infer Response;
-    } ? InferResponse<Response> : TContract, const TContract extends Contract>(method: RequestMethod | RequestMethod[], exp: RouteUri, cb: TCallback, contract?: TContract) => void;
+    } ? InferResponse<Response> : TContractWithRoles, const TContractWithRoles extends ContractWithRoles>(method: RequestMethod | RequestMethod[], exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => void;
     routes: ((_: unknown, context: Context, groupOptions?: RouteGroupOptions) => ReturnType<typeof registerRoute>)[];
-    routesMeta: Record<`/${string}`, Partial<Record<"GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "OPTIONS" | "PATCH" | "TRACE" | "SEARCH", Contract | null> | undefined>>;
+    routesMeta: RoutesMeta;
     group: <TRouter extends {
         install: (context: Context, options?: RouterOptions) => any;
-        routesMeta: Record<`/${string}`, Partial<Record<"GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "OPTIONS" | "PATCH" | "TRACE" | "SEARCH", Contract | null> | undefined>>;
+        routesMeta: RoutesMeta;
     }>(exp: RouteUri, router: TRouter, middleware?: Middleware) => void;
     install: (_context: Context, _options?: RouterOptions) => Promise<true | Promise<any>>;
 }>;

package/dist/routing.js

@@ -7,6 +7,22 @@ const common_1 = require("@aeriajs/common");
 const validation_1 = require("@aeriajs/validation");
 const payload_js_1 = require("./payload.js");
 const constants_js_1 = require("./constants.js");
+const checkUnprocessable = (validationEither, context) => {
+    if ((0, common_1.isLeft)(validationEither)) {
+        context.response.writeHead(422, {
+            'content-type': 'application/json',
+        });
+        return validationEither;
+    }
+};
+const unsufficientRoles = (context) => {
+    context.response.writeHead(403, {
+        'content-type': 'application/json',
+    });
+    return {
+        error: types_1.ACErrors.AuthorizationError,
+    };
+};
 const matches = (req, method, exp, options) => {
     const { url } = req;
     const { base = constants_js_1.DEFAULT_BASE_URI } = options;
@@ -47,17 +63,19 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
         }
         Object.assign(context.request, match);
         if (contract) {
-            const checkUnprocessable = (validationEither) => {
-                if ((0, common_1.isLeft)(validationEither)) {
-                    context.response.writeHead(422, {
-                        'content-type': 'application/json',
-                    });
-                    return validationEither;
+            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)) {
+                    return unsufficientRoles(context);
+                }
+            }
             if ('payload' in contract && contract.payload) {
                 const validationEither = (0, validation_1.validate)(context.request.payload, contract.payload);
-                const error = checkUnprocessable(validationEither);
+                const error = checkUnprocessable(validationEither, context);
                 if (error) {
                     return error;
                 }
@@ -66,7 +84,7 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
                 const validationEither = (0, validation_1.validate)(context.request.query, contract.query, {
                     coerce: true,
                 });
-                const error = checkUnprocessable(validationEither);
+                const error = checkUnprocessable(validationEither, context);
                 if (error) {
                     return error;
                 }

package/dist/routing.mjs

@@ -154,12 +154,28 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import { REQUEST_METHODS } from "@aeriajs/types";
+import { ACErrors, REQUEST_METHODS } from "@aeriajs/types";
 import { Stream } from "stream";
-import { pipe, left, isLeft, unwrapEither, deepMerge } from "@aeriajs/common";
+import { pipe, arraysIntersects, left, isLeft, unwrapEither, deepMerge } from "@aeriajs/common";
 import { validate } from "@aeriajs/validation";
 import { safeJson } from "./payload.mjs";
 import { DEFAULT_BASE_URI } from "./constants.mjs";
+var checkUnprocessable = function(validationEither, context) {
+    if (isLeft(validationEither)) {
+        context.response.writeHead(422, {
+            "content-type": "application/json"
+        });
+        return validationEither;
+    }
+};
+var unsufficientRoles = function(context) {
+    context.response.writeHead(403, {
+        "content-type": "application/json"
+    });
+    return {
+        error: ACErrors.AuthorizationError
+    };
+};
 export var matches = function(req, method, exp, options) {
     var url = req.url;
     var _options_base = options.base, base = _options_base === void 0 ? DEFAULT_BASE_URI : _options_base;
@@ -179,7 +195,7 @@ export var matches = function(req, method, exp, options) {
 };
 export var registerRoute = function() {
     var _ref = _async_to_generator(function(context, method, exp, cb, contract) {
-        var options, match, checkUnprocessable, validationEither, error, validationEither1, error1, result;
+        var options, match, validationEither, error, validationEither1, error1, result;
         var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
@@ -209,17 +225,24 @@ export var registerRoute = function() {
                     }
                     Object.assign(context.request, match);
                     if (contract) {
-                        checkUnprocessable = function(validationEither) {
-                            if (isLeft(validationEither)) {
-                                context.response.writeHead(422, {
-                                    "content-type": "application/json"
-                                });
-                                return validationEither;
+                        if (contract.roles) {
+                            if (!context.token.authenticated) {
+                                if (!contract.roles.includes("guest")) {
+                                    return [
+                                        2,
+                                        unsufficientRoles(context)
+                                    ];
+                                }
+                            } else if (!arraysIntersects(context.token.roles, contract.roles)) {
+                                return [
+                                    2,
+                                    unsufficientRoles(context)
+                                ];
                             }
-                        };
+                        }
                         if ("payload" in contract && contract.payload) {
                             validationEither = validate(context.request.payload, contract.payload);
-                            error = checkUnprocessable(validationEither);
+                            error = checkUnprocessable(validationEither, context);
                             if (error) {
                                 return [
                                     2,
@@ -231,7 +254,7 @@ export var registerRoute = function() {
                             validationEither1 = validate(context.request.query, contract.query, {
                                 coerce: true
                             });
-                            error1 = checkUnprocessable(validationEither1);
+                            error1 = checkUnprocessable(validationEither1, context);
                             if (error1) {
                                 return [
                                     2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/http",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -22,10 +22,10 @@
     "dist"
   ],
   "peerDependencies": {
-    "@aeriajs/access-control": "^0.0.5",
-    "@aeriajs/common": "^0.0.5",
-    "@aeriajs/types": "^0.0.4",
-    "@aeriajs/validation": "^0.0.8"
+    "@aeriajs/access-control": "^0.0.6",
+    "@aeriajs/common": "^0.0.6",
+    "@aeriajs/types": "^0.0.5",
+    "@aeriajs/validation": "^0.0.9"
   },
   "scripts": {
     "test": "echo skipping",