Fix auth issues. (#388)

Author: xiangkaiz

mcp_servers/attio/index.ts

@@ -614,7 +614,7 @@ function extractAccessToken(req: Request): string {
 
     if (!authData) {
         console.error('Error: Attio access token is missing. Provide it via ACCESS_TOKEN env var or x-auth-data header with access_token field.');
-        authData = '';
+        return '';
     }
 
     const authDataJson = JSON.parse(authData);

mcp_servers/exa/server.py

@@ -40,6 +40,7 @@
 def extract_api_key(request_or_scope) -> str:
     """Extract API key from headers or environment."""
     api_key = os.getenv("API_KEY")
+    auth_data = None
 
     if not api_key:
         # Handle different input types (request object for SSE, scope dict for StreamableHTTP)
@@ -54,8 +55,6 @@ def extract_api_key(request_or_scope) -> str:
             auth_data = headers.get(b'x-auth-data')
             if auth_data:
                 auth_data = base64.b64decode(auth_data).decode('utf-8')
-        else:
-            auth_data = None
 
         if auth_data:
             try:

mcp_servers/firecrawl/index.ts

@@ -1474,6 +1474,10 @@ function trimResponseText(text: string): string {
 function extractApiKey(req: Request): string {
     let authData = process.env.API_KEY;
 
+    if (authData) {
+        return authData;
+    }
+    
     if (!authData && req.headers['x-auth-data']) {
         try {
             authData = Buffer.from(req.headers['x-auth-data'] as string, 'base64').toString('utf8');

mcp_servers/firecrawl_deep_research/index.ts

@@ -304,6 +304,10 @@ const getFirecrawlDeepResearchMcpServer = () => {
 
 function extractApiKey(req: Request): string {
     let authData = process.env.API_KEY;
+
+    if (authData) {
+        return authData;
+    }
 
     if (!authData && req.headers['x-auth-data']) {
         try {

mcp_servers/freshdesk/server.py

@@ -103,6 +103,7 @@ def extract_credentials(request_or_scope) -> Dict[str, str]:
     """Extract API key and domain from headers or environment."""
     api_key = os.getenv("API_KEY")
     domain = os.getenv("DOMAIN")
+    auth_data = None
 
     # Handle different input types (request object for SSE, scope dict for StreamableHTTP)
     if hasattr(request_or_scope, 'headers'):
@@ -116,9 +117,7 @@ def extract_credentials(request_or_scope) -> Dict[str, str]:
         headers = dict(request_or_scope.get("headers", []))
         header_value = headers.get(b'x-auth-data')
         if header_value:
-            auth_data = base64.b64decode(header_value).decode('utf-8')
-    else:
-        auth_data = None
+            auth_data = base64.b64decode(header_value).decode('utf-8') 
 
     # If no API key from environment, try to parse from auth_data
     if not api_key and auth_data:

mcp_servers/google_jobs/server.py

@@ -37,6 +37,7 @@
 def extract_api_key(request_or_scope) -> str:
     """Extract API key from headers or environment."""
     api_key = os.getenv("API_KEY")
+    auth_data = None
 
     if not api_key:
         # Handle different input types (request object for SSE, scope dict for StreamableHTTP)
@@ -51,8 +52,6 @@ def extract_api_key(request_or_scope) -> str:
             auth_data = headers.get(b'x-auth-data')
             if auth_data:
                 auth_data = base64.b64decode(auth_data).decode('utf-8')
-        else:
-            auth_data = None
 
         if auth_data:
             try:

mcp_servers/postgres/index.ts

@@ -152,6 +152,10 @@ function getPool() {
 
 function extractApiKey(req: Request): string {
   let authData = process.env.API_KEY;
+
+  if (authData) {
+    return authData;
+  }
 
   if (!authData && req.headers['x-auth-data']) {
     try {

mcp_servers/quickbooks/session_manager.py

@@ -97,12 +97,15 @@ def extract_credentials_from_headers(self, request_or_scope) -> Tuple[str, str,
             # Get headers based on input type
             if hasattr(request_or_scope, 'headers'):
                 # SSE request object
-                headers = request_or_scope.headers
+                header_value = request_or_scope.headers.get(b'x-auth-data')
+                if header_value:
+                    auth_data = base64.b64decode(header_value).decode('utf-8')
             elif isinstance(request_or_scope, dict) and 'headers' in request_or_scope:
                 # StreamableHTTP scope object
                 headers = dict(request_or_scope.get("headers", []))
-            else:
-                return "", "", ""
+                header_value = headers.get(b'x-auth-data')
+                if header_value:
+                    auth_data = base64.b64decode(header_value).decode('utf-8')
 
             # Extract auth data from x-auth-data header
             auth_data = base64.b64decode(headers.get(b'x-auth-data')).decode('utf-8')

mcp_servers/resend/index.ts

@@ -682,6 +682,10 @@ const getResendMcpServer = () => {
 
 function extractApiKey(req: Request): string {
   let authData = process.env.API_KEY;
+
+  if (authData) {
+    return authData;
+  }
 
   if (!authData && req.headers['x-auth-data']) {
     try {

mcp_servers/salesforce/server.py

@@ -53,15 +53,15 @@ def extract_auth_credentials(request_or_scope) -> tuple[str, str]:
         # Get headers based on input type
         if hasattr(request_or_scope, 'headers'):
             # SSE request object
-            headers = request_or_scope.headers
+            header_value = request_or_scope.headers.get(b'x-auth-data')
+            if header_value:
+                auth_data = base64.b64decode(header_value).decode('utf-8')
         elif isinstance(request_or_scope, dict) and 'headers' in request_or_scope:
             # StreamableHTTP scope object
             headers = dict(request_or_scope.get("headers", []))
-        else:
-            return "", ""
-    
-        # Extract auth data from x-auth-data header
-        auth_data = base64.b64decode(headers.get(b'x-auth-data')).decode('utf-8')
+            header_value = headers.get(b'x-auth-data')
+            if header_value:
+                auth_data = base64.b64decode(header_value).decode('utf-8')
 
     if not auth_data:
         return "", ""