asd

nhost · Feb 9, 2024 · c99d24b · c99d24b
1 parent 9618af0
commit c99d24b
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/middleware/auth.ts b/src/middleware/auth.ts
@@ -30,24 +30,19 @@ export const authenticationGate = (
       return sendError(res, 'unauthenticated-user');
     }
 
-    const auth = req.auth as RequestAuth;
-    if (await failsElevatedCheck(auth, bypassIfNoKeys)) {
+    if (checkElevatedPermissions) {
+      const auth = req.auth as RequestAuth;
+      if (await failsElevatedCheck(auth, bypassIfNoKeys)) {
         return sendError(res, 'elevated-claim-required');
+      }
     }
 
     return next();
   };
 }
 
 export const failsElevatedCheck = async (auth: RequestAuth, bypassIfNoKeys = false) => {
-  if (!checkElevatedPermissions ||
-    ENV.AUTH_REQUIRE_ELEVATED_CLAIM === 'disabled' ||
-    !ENV.AUTH_WEBAUTHN_ENABLED
-  ) {
-    return false;
-  }
-
-  if (auth.elevated) {
+  if (ENV.AUTH_REQUIRE_ELEVATED_CLAIM === 'disabled' || !ENV.AUTH_WEBAUTHN_ENABLED || auth.elevated) {
     return false;
   }