Merge pull request #155 from unsplash/fix/proxy-url

Fix: proxy url

src/helpers/url.ts

@@ -13,8 +13,19 @@ const addQueryToUrl = (query: Query) => (url: URL) => {
   );
 };
 
-export const buildUrl = ({ pathname, query }: BuildUrlParams) => (apiBaseUrl: string) => {
-  const url = new URL(pathname, apiBaseUrl);
+const addPathnameToUrl = (pathname: string) => (url: URL) => {
+  // When there is no existing pathname, the value is `/`. Appending would give us a URL with two
+  // forward slashes. This is why we replace the value in that scenario.
+  if (url.pathname === '/') {
+    url.pathname = pathname;
+  } else {
+    url.pathname += pathname;
+  }
+};
+
+export const buildUrl = ({ pathname, query }: BuildUrlParams) => (apiUrl: string) => {
+  const url = new URL(apiUrl);
+  addPathnameToUrl(pathname)(url);
   addQueryToUrl(query)(url);
   return url.toString();
 };

tests/index.test.ts

@@ -41,11 +41,18 @@ describe('parseQueryAndPathname', () => {
 });
 
 describe('buildUrl', () => {
-  it('combines pathname, query and domain correctly', () => {
+  it('works with apiUrl (without path)', () => {
     const output = buildUrl({ pathname: '/foo/bar', query: { a: 1, b: 2 } })('https://example.com');
     expect(output).toEqual('https://example.com/foo/bar?a=1&b=2');
   });
 
+  it('works with apiUrl (with path)', () => {
+    const output = buildUrl({ pathname: '/foo/bar', query: { a: 1, b: 2 } })(
+      'https://example.com/baz',
+    );
+    expect(output).toEqual('https://example.com/baz/foo/bar?a=1&b=2');
+  });
+
   it('handles empty query correctly', () => {
     const output = buildUrl({ pathname: '/foo/bar', query: {} })('https://example.com');
     expect(output).toEqual('https://example.com/foo/bar');