Ensures there is no unexpected slash in url before query params

reduxjs · Jul 1, 2022 · d33cfee · d33cfee
1 parent 7f76635
commit d33cfee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/packages/toolkit/src/query/tests/utils.test.ts b/packages/toolkit/src/query/tests/utils.test.ts
@@ -83,6 +83,15 @@ describe('joinUrls', () => {
 
     expect(joinUrls('', '/banana')).toBe('/banana')
     expect(joinUrls('', 'banana')).toBe('banana')
+
+    expect(joinUrls('/api', '?a=1')).toBe('/api?a=1')
+    expect(joinUrls('/api/', '?a=1')).toBe('/api/?a=1')
+
+    expect(joinUrls('/api', 'banana?a=1')).toBe('/api/banana?a=1')
+    expect(joinUrls('/api/', 'banana/?a=1')).toBe('/api/banana/?a=1')
+
+    expect(joinUrls('/api', '?a=1')).toBe('/api?a=1')
+    expect(joinUrls('/api/', '?a=1')).toBe('/api/?a=1')
   })
 
   test('correctly joins variations of absolute urls', () => {

diff --git a/packages/toolkit/src/query/utils/joinUrls.ts b/packages/toolkit/src/query/utils/joinUrls.ts
@@ -18,8 +18,9 @@ export function joinUrls(
     return url
   }
 
+  const delimiter = base.endsWith('/') || !url.startsWith('?') ? '/' : ''
   base = withoutTrailingSlash(base)
   url = withoutLeadingSlash(url)
 
-  return `${base}/${url}`
+  return `${base}${delimiter}${url}`;
 }