Merge pull request #1471 from mars-protocol/develop

x-apikey update

Author: linkielink

src/api/assets/getDexAssets.ts

@@ -1,13 +1,13 @@
+import { LocalStorageKeys } from 'constants/localStorageKeys'
+import { FETCH_TIMEOUT } from 'constants/query'
 import { convertAstroportAssetsResponse } from 'utils/assets'
 import { setApiError } from 'utils/error'
 import { fetchWithTimeout } from 'utils/fetch'
-import { FETCH_TIMEOUT } from 'constants/query'
-import { LocalStorageKeys } from 'constants/localStorageKeys'
-
+import { getUrl } from 'utils/url'
 type StoredPerpAsset = Omit<AstroportAsset, 'icon'>
 
 export default async function getDexAssets(chainConfig: ChainConfig) {
-  const uri = new URL(chainConfig.endpoints.dexAssets)
+  const uri = getUrl(chainConfig.endpoints.dexAssets, '')
   try {
     const assets = await fetchWithTimeout(uri.toString(), FETCH_TIMEOUT).then(async (res) => {
       const data = (await res.json()) as AstroportAssetsCached
@@ -72,7 +72,7 @@ export default async function getDexAssets(chainConfig: ChainConfig) {
     })
     return assets
   } catch (e) {
-    setApiError(uri.toString(), e)
+    setApiError(uri, e)
     return []
   }
 }

src/api/assets/getDexPools.ts

@@ -1,16 +1,16 @@
 import { setApiError } from 'utils/error'
-
+import { getUrl } from 'utils/url'
 export default async function getDexPools(chainConfig: ChainConfig) {
   if (!chainConfig.endpoints.dexPools) return []
-  const uri = new URL(chainConfig.endpoints.dexPools)
+  const uri = getUrl(chainConfig.endpoints.dexPools, '')
   try {
     const pools = await fetch(uri.toString()).then(async (res) => {
       const data = (await res.json()) as AstroportPoolsCached
       return data.pools
     })
     return pools
   } catch (e) {
-    setApiError(uri.toString(), e)
+    setApiError(uri, e)
     return []
   }
 }

src/hooks/perps/usePerpsVault.ts

@@ -7,6 +7,7 @@ import useChainConfig from 'hooks/chain/useChainConfig'
 import useClients from 'hooks/chain/useClients'
 import { fetchWithTimeout } from 'utils/fetch'
 import { BN } from 'utils/helpers'
+import { getUrl } from 'utils/url'
 
 export default function usePerpsVault() {
   const chainConfig = useChainConfig()
@@ -21,7 +22,7 @@ export default function usePerpsVault() {
       try {
         if (chainConfig.endpoints.aprs.perpsVault) {
           const response = await fetchWithTimeout(
-            chainConfig.endpoints.aprs.perpsVault,
+            getUrl(chainConfig.endpoints.aprs.perpsVault, ''),
             FETCH_TIMEOUT,
           )
           if (response.ok) {

src/hooks/vaults/useVaultAprs.ts

@@ -4,6 +4,7 @@ import { FETCH_TIMEOUT } from 'constants/query'
 import useChainConfig from 'hooks/chain/useChainConfig'
 import { fetchWithTimeout } from 'utils/fetch'
 import { convertAprToApy } from 'utils/parsers'
+import { getUrl } from 'utils/url'
 
 export default function useVaultAprs() {
   const chainConfig = useChainConfig()
@@ -16,7 +17,10 @@ export default function useVaultAprs() {
 async function getAprs(chainConfig: ChainConfig) {
   if (!chainConfig.farm) return []
   try {
-    const response = await fetchWithTimeout(chainConfig.endpoints.aprs.vaults, FETCH_TIMEOUT)
+    const response = await fetchWithTimeout(
+      getUrl(chainConfig.endpoints.aprs.vaults, ''),
+      FETCH_TIMEOUT,
+    )
 
     if (response.ok) {
       const data: AprResponse = await response.json()

src/utils/url.ts

@@ -3,10 +3,11 @@ export const getUrl = (baseUrl: string, path: string = ''): string => {
 
   if (isPlaceholder) return baseUrl + '/' + path
 
-  const url = new URL(baseUrl.split('?')[0])
+  let url = new URL(baseUrl)
+  if (path !== '') url = new URL(path, url)
 
   if (process.env.NEXT_PUBLIC_API_KEY)
-    return `${url.href}${path}?x-apikey=${process.env.NEXT_PUBLIC_API_KEY}`
+    url.searchParams.append('x-apikey', process.env.NEXT_PUBLIC_API_KEY)
 
-  return url.href + path
+  return url.toString()
 }