feat(guard): not throw error in guard default

jiawei397 · Dec 23, 2021 · c537009 · c537009
1 parent 8488ccd
commit c537009
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/deps.ts b/deps.ts
@@ -8,6 +8,7 @@ export {
   Router as OriginRouter,
   send,
   Status,
+  STATUS_TEXT,
 } from "https://deno.land/x/[email protected]/mod.ts";
 
 export type {

diff --git a/example/guards/auth.guard.ts b/example/guards/auth.guard.ts
@@ -4,6 +4,7 @@ import {
   getMetadataForGuard,
   Injectable,
   Reflector,
+  UnauthorizedException,
 } from "../../mod.ts";
 import { delay } from "../deps.ts";
 import { RoleService } from "../user/services/role.service.ts";
@@ -23,6 +24,7 @@ export class AuthGuard implements CanActivate {
       this.reflector.get<string[]>("roles", context),
     );
     await delay(10);
+    // throw new UnauthorizedException("Unauthorized");
     // throw new ForbiddenException("this is AuthGuard error message");
     return true;
     // return false;

diff --git a/src/guard.ts b/src/guard.ts
@@ -43,10 +43,11 @@ export async function checkByGuard(
       Reflect.defineMetadata(META_FUNCTION_KEY, fn, context); // record the function to context
       const result = await _guard.canActivate(context);
       if (!result) {
-        throw new UnauthorizedException(UnauthorizedException.name);
+        return false; // will not continue to next guard and not throw an exception
       }
     }
   }
+  return true;
 }
 
 export function SetMetadata<K = string, V = any>(

diff --git a/src/router.ts b/src/router.ts
@@ -6,6 +6,8 @@ import {
   OriginRouter,
   red,
   Reflect,
+  Status,
+  STATUS_TEXT,
   yellow,
 } from "../deps.ts";
 import { checkByGuard } from "./guard.ts";
@@ -125,7 +127,12 @@ export class Router extends OriginRouter {
         const methodKey = join(modelPath, route);
         const funcStart = Date.now();
         this[methodType.toLowerCase()](methodKey, async (context: Context) => {
-          await checkByGuard(instance, fn, context);
+          const guardResult = await checkByGuard(instance, fn, context);
+          if (!guardResult) {
+            context.response.status = Status.Forbidden;
+            context.response.body = STATUS_TEXT.get(Status.Forbidden);
+            return;
+          }
           const args = await transferParam(instance, methodName, context);
           const result = await checkByInterceptors(
             context,

diff --git a/src/router_test.ts b/src/router_test.ts
@@ -26,6 +26,7 @@ Deno.test("join", () => {
   assertEquals(join("/api", "/user", "add/"), "/api/user/add");
   assertEquals(join("/api", "/user/", "add/"), "/api/user/add");
   assertEquals(join("/api", "/user/", "/add"), "/api/user/add");
+  assertEquals(join("/api", "/user/", "/add/"), "/api/user/add");
 });
 
 Deno.test("mapRoute without controller route", async () => {