@vorplex/api 0.0.79 → 0.0.81

package/dist/server/index.js

@@ -2,7 +2,6 @@
 export * from './jwt.util';
 export * from './server/server.model';
 export * from './server/controller/controller.interface';
-export * from './server/controller/guard.type';
 export * from './server/controller/handler.interface';
 export * from './server/http/error.model';
 export * from './server/http/reader.util';

package/dist/server/server/controller/controller.interface.d.ts

@@ -1,7 +1,15 @@
-import { Guard } from './guard.type';
+import { Awaitable, Injector } from '@vorplex/core';
+import { Server } from '../server.model';
 import { Handler } from './handler.interface';
+import { IncomingMessage, ServerResponse } from 'http';
+export type ControllerGuard = (params: {
+    injector: Injector;
+    server: Server;
+    request: IncomingMessage;
+    response: ServerResponse;
+}) => Awaitable<boolean>;
 export interface Controller {
     route: string;
-    guards?: Guard[];
-    handlers?: Handler[];
+    guards?: ControllerGuard[];
+    handlers: Handler[];
 }

package/dist/server/server/controller/handler.interface.d.ts

@@ -1,9 +1,8 @@
 import { Awaitable, ExtractRouteParams, Injector, Task } from '@vorplex/core';
-import { IncomingMessage, ServerResponse } from 'http';
 import { HttpRequestMethod } from '../http/request-method.enum';
+import { IncomingMessage, ServerResponse } from 'http';
 import { HttpResponses } from '../http/response.interface';
 import { Server } from '../server.model';
-import { Guard } from './guard.type';
 type QueryKeys<T extends readonly string[]> = {
     [K in T[number] as K extends `${string}?` ? never : K]: string;
 } & {
@@ -24,7 +23,6 @@ export interface Handler<TRoute extends string = string, TParameters extends str
     route: TRoute;
     parameters?: TParameters;
     method: HttpRequestMethod;
-    guards?: Guard[];
     callback: (params: HandlerParams<ExtractRouteParams<TRoute>, TParameters>) => Awaitable<HttpResponses | void>;
 }
 export {};

package/dist/server/server/server.model.js

@@ -84,8 +84,8 @@ export class Server {
                 for (const controller of this.controllers) {
                     for (const handler of controller.handlers) {
                         if (handler.method === request.method) {
-                            const routeParameters = $Router.match(`${controller.route}${handler.route}`, request.url);
-                            if (routeParameters) {
+                            const match = $Router.match(`${controller.route}${handler.route}`, request.url);
+                            if (match) {
                                 const query = $Router.getQueryParameters(request.url);
                                 task.log(`Forwarding request to controller (${controller.route}) handler (${handler.route})`);
                                 for (const guard of controller.guards ?? []) {
@@ -93,19 +93,7 @@ export class Server {
                                         injector: this.injector,
                                         server: this,
                                         request,
-                                        response,
-                                        routeParameters
-                                    });
-                                    if (!authorized)
-                                        throw new HttpError(HttpResponseCodes.Unauthorized);
-                                }
-                                for (const guard of handler.guards ?? []) {
-                                    const authorized = await guard({
-                                        injector: this.injector,
-                                        server: this,
-                                        request,
-                                        response,
-                                        routeParameters
+                                        response
                                     });
                                     if (!authorized)
                                         throw new HttpError(HttpResponseCodes.Unauthorized);
@@ -125,7 +113,7 @@ export class Server {
                                     server: this,
                                     task,
                                     parameters: {
-                                        route: routeParameters,
+                                        route: match,
                                         query
                                     },
                                     request,