From 5cc20ccd8eb6a296974a526bab54567d30e43842 Mon Sep 17 00:00:00 2001 From: Jerko Steiner Date: Fri, 30 Aug 2019 15:01:01 +0700 Subject: [PATCH] Remove baseURL from packages/jsonrpc#createRemoteClient --- packages/jsonrpc/src/redux.test.ts | 2 +- packages/jsonrpc/src/redux.ts | 1 - packages/jsonrpc/src/remote.test.ts | 4 ++-- packages/jsonrpc/src/remote.ts | 5 +---- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/jsonrpc/src/redux.test.ts b/packages/jsonrpc/src/redux.test.ts index 92b0663..7078542 100644 --- a/packages/jsonrpc/src/redux.test.ts +++ b/packages/jsonrpc/src/redux.test.ts @@ -80,7 +80,7 @@ describe('createActions', () => { function getClient() { const remoteClient = createRemoteClient( - baseUrl, '/service', keys()) + baseUrl + '/service', keys()) const client = createActions(remoteClient, 'myService') const defaultState = { diff --git a/packages/jsonrpc/src/redux.ts b/packages/jsonrpc/src/redux.ts index a8c5375..4d0aedd 100644 --- a/packages/jsonrpc/src/redux.ts +++ b/packages/jsonrpc/src/redux.ts @@ -6,7 +6,6 @@ import { TAllActions, TReduxHandlers, } from './types' -import {createRemoteClient} from './remote' export function createActions( client: TAsyncified, diff --git a/packages/jsonrpc/src/remote.test.ts b/packages/jsonrpc/src/remote.test.ts index e06d858..d1d3e2f 100644 --- a/packages/jsonrpc/src/remote.test.ts +++ b/packages/jsonrpc/src/remote.test.ts @@ -65,7 +65,7 @@ describe('remote', () => { describe('idempotent method invocation (GET)', () => { it('creates a proxy for remote service', async () => { const rpc = createRemoteClient( - baseUrl, '/myService', IServiceKeys) + baseUrl + '/myService', IServiceKeys) const result = await rpc.fetchItem({a: 10}, {b: 20}) expect(result).toEqual({a: 10, b: 20}) }) @@ -74,7 +74,7 @@ describe('remote', () => { describe('method invocation (POST)', () => { it('creates a proxy for remote service', async () => { const rpc = createRemoteClient( - baseUrl, '/myService', IServiceKeys) + baseUrl + '/myService', IServiceKeys) const result = await rpc.add(3, 7) expect(result).toBe(3 + 7) }) diff --git a/packages/jsonrpc/src/remote.ts b/packages/jsonrpc/src/remote.ts index 095e160..e812163 100644 --- a/packages/jsonrpc/src/remote.ts +++ b/packages/jsonrpc/src/remote.ts @@ -8,15 +8,12 @@ export const createNumberGenerator = (val: number) => () => ++val export const constantId = (val: string) => () => val export function createRemoteClient( - baseUrl: string, url: string, methods: Array>, getNextRequestId: TRequestIdGenerator = constantId('c'), idempotentMethodRegex = IDEMPOTENT_METHOD_REGEX, ) { - const axios = Axios.create({ - baseURL: baseUrl, - }) + const axios = Axios.create() async function createRequest( id: string | number | null,