From d8e0f8df98c5100fb6360b72aca9d030ec0e9541 Mon Sep 17 00:00:00 2001
From: izzy <me@insrt.uk>
Date: Fri, 26 Jun 2026 13:18:52 +0100
Subject: [PATCH] refactor: collapse canActivate into one path

---
 server/src/middleware/auth.guard.ts | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/server/src/middleware/auth.guard.ts b/server/src/middleware/auth.guard.ts
index 49ae077a99..f09e33c85b 100644
--- a/server/src/middleware/auth.guard.ts
+++ b/server/src/middleware/auth.guard.ts
@@ -88,17 +88,11 @@ export class AuthGuard implements CanActivate {
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest<AuthRequest>();
 
-    if (request.path.startsWith('/api/yucca')) {
-      request.user = await this.authService.authenticate({
-        headers: request.headers,
-        queryParams: request.query as Record<string, string>,
-        metadata: { adminRoute: true, sharedLinkRoute: false, uri: request.path },
-      });
-      return true;
-    }
-
     const targets = [context.getHandler()];
-    const options = this.reflector.getAllAndOverride<AuthenticatedOptions | undefined>(MetadataKey.AuthRoute, targets);
+    const options = request.path.startsWith('/api/yucca')
+      ? { admin: true, permission: undefined }
+      : this.reflector.getAllAndOverride<AuthenticatedOptions | undefined>(MetadataKey.AuthRoute, targets);
+
     if (!options) {
       return true;
     }