fix: implement some feedback

Author: khendrikse

packages/config/src/api/integrations.ts

@@ -4,19 +4,17 @@ import { TestOptions } from '../types/options.js'
 
 type AvailableIntegration = { slug: string; hostSiteUrl: string; hasBuild?: boolean }
 
-type GetAvailableIntegrationsOpts = { testOpts: TestOptions; offline: boolean; netlifyApiHost: string }
+type GetAvailableIntegrationsOpts = { testOpts: TestOptions; offline: boolean; extensionApiBaseUrl: string }
 
 export const getAvailableIntegrations = async function ({
   testOpts,
   offline,
-  netlifyApiHost,
+  extensionApiBaseUrl,
 }: GetAvailableIntegrationsOpts): Promise<AvailableIntegration[]> {
   if (offline) {
     return []
   }
   const { host } = testOpts
-  const extensionApiBaseUrl =
-    netlifyApiHost === 'api.netlify.com' ? 'https://api.netlifysdk.com/' : `https://api-staging.netlifysdk.com/`
   const baseUrl = new URL(host ? `http://${host}/` : extensionApiBaseUrl)
 
   try {

packages/config/src/api/site_info.ts

@@ -19,7 +19,7 @@ type GetSiteInfoOpts = {
   testOpts?: TestOptions
   siteFeatureFlagPrefix: string
   token: string
-  netlifyApiHost: string
+  extensionApiBaseUrl: string
 }
 /**
  * Retrieve Netlify Site information, if available.
@@ -41,7 +41,7 @@ export const getSiteInfo = async function ({
   siteFeatureFlagPrefix,
   token,
   featureFlags = {},
-  netlifyApiHost,
+  extensionApiBaseUrl,
 }: GetSiteInfoOpts) {
   const { env: testEnv = false } = testOpts
 
@@ -53,7 +53,7 @@ export const getSiteInfo = async function ({
 
     const integrations =
       mode === 'buildbot' && !offline
-        ? await getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags, netlifyApiHost })
+        ? await getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags, extensionApiBaseUrl })
         : []
 
     return { siteInfo, accounts: [], addons: [], integrations }
@@ -63,7 +63,7 @@ export const getSiteInfo = async function ({
     getSite(api, siteId, siteFeatureFlagPrefix),
     getAccounts(api),
     getAddons(api, siteId),
-    getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags, netlifyApiHost }),
+    getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags, extensionApiBaseUrl }),
   ]
 
   const [siteInfo, accounts, addons, integrations] = await Promise.all(promises)
@@ -119,7 +119,7 @@ type GetIntegrationsOpts = {
   offline: boolean
   token?: string
   featureFlags?: Record<string, boolean>
-  netlifyApiHost: string
+  extensionApiBaseUrl: string
 }
 
 const getIntegrations = async function ({
@@ -129,15 +129,13 @@ const getIntegrations = async function ({
   offline,
   token,
   featureFlags,
-  netlifyApiHost,
+  extensionApiBaseUrl,
 }: GetIntegrationsOpts): Promise<IntegrationResponse[]> {
   if (!siteId || offline) {
     return []
   }
   const sendBuildBotTokenToJigsaw = featureFlags?.send_build_bot_token_to_jigsaw
   const { host } = testOpts
-  const extensionApiBaseUrl =
-    netlifyApiHost === 'api.netlify.com' ? 'https://api.netlifysdk.com' : `https://api-staging.netlifysdk.com `
   const baseUrl = new URL(host ? `http://${host}` : extensionApiBaseUrl)
 
   // if accountId isn't present, use safe v1 endpoint

packages/config/src/integrations.ts

@@ -9,7 +9,7 @@ type MergeIntegrationsOpts = {
   context: string
   testOpts?: TestOptions
   offline: boolean
-  netlifyApiHost: string
+  extensionApiBaseUrl: string
 }
 
 export const mergeIntegrations = async function ({
@@ -18,9 +18,9 @@ export const mergeIntegrations = async function ({
   context,
   testOpts = {},
   offline,
-  netlifyApiHost,
+  extensionApiBaseUrl,
 }: MergeIntegrationsOpts): Promise<Integration[]> {
-  const availableIntegrations = await getAvailableIntegrations({ testOpts, offline, netlifyApiHost })
+  const availableIntegrations = await getAvailableIntegrations({ testOpts, offline, extensionApiBaseUrl })
 
   // Include all API integrations, unless they have a `dev` property and we are in the `dev` context
   const resolvedApiIntegrations = apiIntegrations.filter(

packages/config/src/main.ts

@@ -49,6 +49,10 @@ export const resolveConfig = async function (opts) {
     return parsedCachedConfig
   }
 
+  // TODO(kh): remove this mapping and get the extensionApiHost from the opts
+  const extensionApiBaseUrl =
+    host === 'api.netlify.com' ? 'https://api.netlifysdk.com' : `https://api-staging.netlifysdk.com `
+
   const {
     config: configOpt,
     defaultConfig,
@@ -81,7 +85,7 @@ export const resolveConfig = async function (opts) {
     featureFlags,
     testOpts,
     token,
-    netlifyApiHost: host,
+    extensionApiBaseUrl,
   })
 
   const { defaultConfig: defaultConfigA, baseRelDir: baseRelDirA } = parseDefaultConfig({
@@ -132,7 +136,7 @@ export const resolveConfig = async function (opts) {
     context: context,
     testOpts,
     offline,
-    netlifyApiHost: host,
+    extensionApiBaseUrl,
   })
 
   const result = {