fix: env var gateway domains

nftstorage · Aug 8, 2022 · 0349690 · 0349690
1 parent 4b05d5d
commit 0349690
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/packages/api/src/env.js b/packages/api/src/env.js
@@ -8,7 +8,7 @@ import { DBClient } from './utils/db-client.js'
 /**
  * @typedef {Object} EnvInput
  * @property {string} ENV
- * @property {string[]} GATEWAY_DOMAINS
+ * @property {string} GATEWAY_DOMAINS
  * @property {string} NFT_STORAGE_API
  * @property {string} DATABASE_URL
  * @property {string} DATABASE_TOKEN
@@ -27,6 +27,7 @@ import { DBClient } from './utils/db-client.js'
  * @property {string} DEBUG
  * @property {string} SENTRY_RELEASE
  * @property {number} REQUEST_TIMEOUT
+ * @property {string[]} gatewayDomains
  * @property {DBClient} db
  * @property {Toucan} [sentry]
  * @property {Logging} [log]
@@ -54,6 +55,7 @@ export function envAll(request, env, ctx) {
     token: env.DATABASE_TOKEN,
   })
   env.NFT_STORAGE_API = env.NFT_STORAGE_API
+  env.gatewayDomains = JSON.parse(env.GATEWAY_DOMAINS)
 
   env.log = new Logging(request, env, ctx)
   env.log.time('request')

diff --git a/packages/api/src/utils/url.js b/packages/api/src/utils/url.js
@@ -30,11 +30,13 @@ export function getSourceUrl(request, env) {
     )
   }
   if (
-    !env.GATEWAY_DOMAINS.filter((gwDomain) => urlString.includes(gwDomain))
+    !env.gatewayDomains.filter((gwDomain) => urlString.includes(gwDomain))
       .length
   ) {
     throw new InvalidUrlError(
-      `invalid URL provided: ${urlString}: not ${env.GATEWAY_DOMAINS.join(' or ')} URL`
+      `invalid URL provided: ${urlString}: not ${env.gatewayDomains.join(
+        ' or '
+      )} URL`
     )
   }
 
@@ -63,7 +65,7 @@ export function getNormalizedUrl(candidateUrl, env) {
 
     // Always set normalized url as first URL in supported gateway domains (w3s.link)
     return new URL(
-      `${candidateUrl.protocol}//${cid}.ipfs.${env.GATEWAY_DOMAINS[0]}${path}${queryParams}`
+      `${candidateUrl.protocol}//${cid}.ipfs.${env.gatewayDomains[0]}${path}${queryParams}`
     )
   }
 

diff --git a/packages/api/test/scripts/worker-globals.js b/packages/api/test/scripts/worker-globals.js
@@ -3,5 +3,5 @@ export const globals = {
   NFT_STORAGE_API: 'http://localhost:9096',
   DATABASE_TOKEN:
     'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJzdXBhYmFzZSIsImlhdCI6MTYwMzk2ODgzNCwiZXhwIjoyNTUwNjUzNjM0LCJyb2xlIjoic2VydmljZV9yb2xlIn0.necIJaiP7X2T2QjGeV-FhpkizcNTX8HjDDBAxpgQTEI',
-  GATEWAY_DOMAINS: ['localhost:9081', 'localhost:9082'],
+  GATEWAY_DOMAINS: '["localhost:9081", "localhost:9082"]',
 }
diff --git a/packages/api/test/utils.js b/packages/api/test/utils.js
@@ -17,7 +17,9 @@ export function getParsedUrl(url) {
     const queryParams = queryParamsString.length ? `?${queryParamsString}` : ''
 
     normalizedUrl = new URL(
-      `${normalizedUrl.protocol}//${cid}.ipfs.${globals.GATEWAY_DOMAINS[0]}${path}${queryParams}`
+      `${normalizedUrl.protocol}//${cid}.ipfs.${
+        JSON.parse(globals.GATEWAY_DOMAINS)[0]
+      }${path}${queryParams}`
     )
   }