Accept baseUrl

Author: katspaugh

src/config.ts

@@ -1,4 +1,3 @@
-import config from './config'
 import { fetchJson, insertParams, stringifyQuery } from './utils'
 import { paths } from './types/gateway'
 
@@ -10,15 +9,14 @@ interface Params {
 }
 
 export function callEndpoint<T extends keyof paths>(
-  network: string,
+  baseUrl: string,
   path: T,
   parameters?: paths[T]['get']['parameters'],
   rawUrl?: string,
 ): Promise<paths[T]['get']['responses'][200]['schema']> {
   let url = rawUrl
   if (!url) {
     const params = parameters as Params
-    const baseUrl = insertParams(config.baseUrl, { network: network.toLowerCase() })
     const pathname = insertParams(path, params?.path)
     const search = stringifyQuery(params?.query)
     url = `${baseUrl}${pathname}${search}`

src/endpoint.ts

@@ -5,43 +5,43 @@ export type GatewayDefinitions = definitions
 
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-export function getSafeInfo(network: string, address: string) {
-  return callEndpoint(network, '/safes/{address}/', { path: { address } })
+export function getSafeInfo(baseUrl: string, address: string) {
+  return callEndpoint(baseUrl, '/safes/{address}/', { path: { address } })
 }
 
 export function getBalances(
-  network: string,
+  baseUrl: string,
   address: string,
   currency = 'usd',
   query: operations['safes_balances_list']['parameters']['query'] = {},
 ) {
-  return callEndpoint(network, '/safes/{address}/balances/{currency}/', { path: { address, currency }, query })
+  return callEndpoint(baseUrl, '/safes/{address}/balances/{currency}/', { path: { address, currency }, query })
 }
 
-export function getFiatCurrencies(network: string) {
-  return callEndpoint(network, '/balances/supported-fiat-codes')
+export function getFiatCurrencies(baseUrl: string) {
+  return callEndpoint(baseUrl, '/balances/supported-fiat-codes')
 }
 
 export function getCollectibles(
-  network: string,
+  baseUrl: string,
   address: string,
   query: operations['safes_collectibles_list']['parameters']['query'] = {},
 ) {
-  return callEndpoint(network, '/safes/{address}/collectibles/', { path: { address }, query })
+  return callEndpoint(baseUrl, '/safes/{address}/collectibles/', { path: { address }, query })
 }
 
-export function getTransactionHistory(network: string, address: string, pageUrl?: string) {
+export function getTransactionHistory(baseUrl: string, address: string, pageUrl?: string) {
   return callEndpoint(
-    network,
+    baseUrl,
     '/safes/{safe_address}/transactions/history',
     { path: { safe_address: address }, query: {} },
     pageUrl,
   )
 }
 
-export function getTransactionQueue(network: string, address: string, pageUrl?: string) {
+export function getTransactionQueue(baseUrl: string, address: string, pageUrl?: string) {
   return callEndpoint(
-    network,
+    baseUrl,
     '/safes/{safe_address}/transactions/queued',
     { path: { safe_address: address }, query: {} },
     pageUrl,

src/index.ts

@@ -11,39 +11,39 @@ jest.mock('unfetch', () => jest.fn(() => {
 describe('callEndpoint', () => {
   it('should accept just a path', () => {
     expect(
-      callEndpoint('xdai', '/balances/supported-fiat-codes')
+      callEndpoint('https://safe-client.xdai.staging.gnosisdev.com/v1', '/balances/supported-fiat-codes')
     ).resolves.toEqual({ success: true })
 
     expect(fetch).toHaveBeenCalledWith('https://safe-client.xdai.staging.gnosisdev.com/v1/balances/supported-fiat-codes')
   })
 
   it('should accept a path param', () => {
     expect(
-      callEndpoint('rinkeby', '/safe/{address}', { path: { address: '0x123' } })
+      callEndpoint('https://safe-client.rinkeby.staging.gnosisdev.com/v1', '/safe/{address}', { path: { address: '0x123' } })
     ).resolves.toEqual({ success: true })
 
     expect(fetch).toHaveBeenCalledWith('https://safe-client.rinkeby.staging.gnosisdev.com/v1/safe/0x123')
   })
 
   it('should accept several path params', () => {
     expect(
-      callEndpoint('rinkeby', '/balances/{address}/{currency}', { path: { address: '0x123', currency: 'usd' } })
+      callEndpoint('https://safe-client.rinkeby.staging.gnosisdev.com/v1', '/balances/{address}/{currency}', { path: { address: '0x123', currency: 'usd' } })
     ).resolves.toEqual({ success: true })
 
     expect(fetch).toHaveBeenCalledWith('https://safe-client.rinkeby.staging.gnosisdev.com/v1/balances/0x123/usd')
   })
 
   it('should accept query params', () => {
     expect(
-      callEndpoint('rinkeby', '/balances/{address}/{currency}', { path: { address: '0x123', currency: 'usd' }, query: { exclude_spam: true } })
+      callEndpoint('https://safe-client.rinkeby.staging.gnosisdev.com/v1', '/balances/{address}/{currency}', { path: { address: '0x123', currency: 'usd' }, query: { exclude_spam: true } })
     ).resolves.toEqual({ success: true })
 
     expect(fetch).toHaveBeenCalledWith('https://safe-client.rinkeby.staging.gnosisdev.com/v1/balances/0x123/usd?exclude_spam=true')
   })
 
   it('should accept a raw URL', () => {
     expect(
-      callEndpoint('rinkeby', '/balances/{address}/{currency}', { path: { address: '0x123', currency: 'usd' }, query: { exclude_spam: true } }, '/test-url?raw=true')
+      callEndpoint('https://safe-client.rinkeby.staging.gnosisdev.com/v1', '/balances/{address}/{currency}', { path: { address: '0x123', currency: 'usd' }, query: { exclude_spam: true } }, '/test-url?raw=true')
     ).resolves.toEqual({ success: true })
 
     expect(fetch).toHaveBeenCalledWith('/test-url?raw=true')