select api key from env var first

forta-network · Oct 19, 2023 · 594ab2e · 594ab2e
1 parent a659e25
commit 594ab2e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/python-sdk/src/forta_agent/utils.py b/python-sdk/src/forta_agent/utils.py
@@ -95,11 +95,12 @@ def get_forta_api_url():
 def get_forta_api_headers():
     headers = {"content-type": "application/json"}
 
-    config = get_forta_config()
-    if "fortaApiKey" in config:
-        headers["Authorization"] = f'Bearer {config.get("fortaApiKey")}'
-    elif 'FORTA_API_KEY' in os.environ:
+    if 'FORTA_API_KEY' in os.environ:
         headers["Authorization"] = f'Bearer {os.environ["FORTA_API_KEY"]}'
+    else:
+        config = get_forta_config()
+        if "fortaApiKey" in config:
+            headers["Authorization"] = f'Bearer {config.get("fortaApiKey")}'
 
     return headers
 

diff --git a/sdk/utils.ts b/sdk/utils.ts
@@ -242,12 +242,15 @@ export const getFortaApiURL = () => {
 export const getFortaApiHeaders = () => {
   const headers: any = { "content-type": "application/json" };
 
-  // use the api key from forta config if available (only for local development)
-  let { fortaApiKey } = getFortaConfig();
-  if (fortaApiKey) {
-    headers["Authorization"] = `Bearer ${fortaApiKey}`;
-  } else if (process.env.FORTA_API_KEY) {
+  // try the api key specified in env vars first
+  if (process.env.FORTA_API_KEY) {
     headers["Authorization"] = `Bearer ${process.env.FORTA_API_KEY}`;
+  } else {
+    // use the api key from forta config if available (only for local development)
+    let { fortaApiKey } = getFortaConfig();
+    if (fortaApiKey) {
+      headers["Authorization"] = `Bearer ${fortaApiKey}`;
+    }
   }
 
   return {