From d0901d497b0ddaf2826a6fa21c7ff8c3504ff09f Mon Sep 17 00:00:00 2001
From: Elias Schneider <login@eliasschneider.com>
Date: Sat, 29 Oct 2022 22:48:00 +0200
Subject: [PATCH] ix: jwt guard when unauthenticated shares are allowed

---
 backend/src/auth/guard/jwt.guard.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/backend/src/auth/guard/jwt.guard.ts b/backend/src/auth/guard/jwt.guard.ts
index af288b39..20b684d6 100644
--- a/backend/src/auth/guard/jwt.guard.ts
+++ b/backend/src/auth/guard/jwt.guard.ts
@@ -1,16 +1,15 @@
 import { ExecutionContext } from "@nestjs/common";
 import { AuthGuard } from "@nestjs/passport";
-import { Observable } from "rxjs";
 
 export class JwtGuard extends AuthGuard("jwt") {
   constructor() {
     super();
   }
-  canActivate(
-    context: ExecutionContext
-  ): boolean | Promise<boolean> | Observable<boolean> {
-    return process.env.ALLOW_UNAUTHENTICATED_SHARES == "true"
-      ? true
-      : super.canActivate(context);
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    try {
+      return (await super.canActivate(context)) as boolean;
+    } catch {
+      return process.env.ALLOW_UNAUTHENTICATED_SHARES == "true";
+    }
   }
 }