swagger fixups (#252)

* 🤏💻 fix url for swagger ui * 🔐 auth fixups for validating bearer token * 🤏🔐 typo in error msg
voteagora · Apr 23, 2024 · 9d3f38b · 9d3f38b
1 parent 941bdab
commit 9d3f38b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/spec/oas_v1.yaml b/spec/oas_v1.yaml
@@ -9,7 +9,7 @@ info:
     name: MIT
     url: https://opensource.org/licenses/MIT
 servers:
-  - url: vote.optimisim.io/api/v1
+  - url: https://vote.optimism.io/api/v1
     description: Base URL for optimism production
 security:
   - bearerAuth: []

diff --git a/src/app/lib/middleware/auth.ts b/src/app/lib/middleware/auth.ts
@@ -5,7 +5,7 @@ import { validate as validateUuid } from "uuid";
 let prismaModule: any;
 
 const HASH_FN = "sha256";
-const REASON_NO_TOKEN = "No token provided in 'authorization' header";
+const REASON_NO_TOKEN = "No token provided in 'Authorization' header";
 const REASON_INVALID_API_KEY = "Invalid API Key";
 const REASON_DISABLED_USER = "User disabled";
 
@@ -15,8 +15,15 @@ export type AuthResponse = {
   reason?: string;
 };
 
+export function extractBearerToken(token?: string | null) {
+  if (token && token.split(" ")[0] === "Bearer") {
+    return token.split(" ")[1];
+  }
+  return null;
+}
+
 export function hasApiKey(request: NextRequest): AuthResponse {
-  const token = request.headers.get("authorization");
+  const token = extractBearerToken(request.headers.get("Authorization"));
   let authResponse: AuthResponse = { authenticated: true, reason: "" };
 
   if (!token) {
@@ -52,7 +59,7 @@ export async function authenticateApiUser(
 
   let authResponse: AuthResponse = hasApiKey(request);
 
-  const key = request.headers.get("authorization");
+  const key = extractBearerToken(request.headers.get("Authorization"));
 
   if (!key) {
     return authResponse;