fix: regex for absolute url

rexerwang · Apr 30, 2023 · f3d87cc · f3d87cc
1 parent c59dd4e
commit f3d87cc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/helpers/__tests__/getUri.test.ts b/src/helpers/__tests__/getUri.test.ts
@@ -12,6 +12,15 @@ describe('getUri specs', () => {
         })
       )
     ).toBe('https://api.com/api/v1/posts')
+
+    expect(
+      getUri(
+        toAny({
+          baseURL: 'https://requete.com',
+          url: '//api.com/api/v1/posts',
+        })
+      )
+    ).toBe('//api.com/api/v1/posts')
   })
 
   it('should not join when baseURL is falsy', () => {
@@ -44,20 +53,11 @@ describe('getUri specs', () => {
       )
     ).toBe('https://requete.com/api/v1/posts')
 
-    expect(
-      getUri(
-        toAny({
-          baseURL: 'https://requete.com/',
-          url: '//api/v1/posts/',
-        })
-      )
-    ).toBe('https://requete.com/api/v1/posts/')
-
     expect(
       getUri(
         toAny({
           baseURL: 'https://requete.com//',
-          url: '//api/v1/posts/',
+          url: '/api/v1/posts/',
         })
       )
     ).toBe('https://requete.com/api/v1/posts/')

diff --git a/src/helpers/getUri.ts b/src/helpers/getUri.ts
@@ -16,10 +16,14 @@ function stringifyUrl(target: string, query: NonNullable<IRequest['params']>) {
   return url + '?' + searchParams.toString()
 }
 
+function isAbsolute(url: string) {
+  return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url)
+}
+
 export function getUri(config: IRequest) {
   let url = config.url
 
-  if (!url.includes('://') && config.baseURL) {
+  if (!isAbsolute(url) && config.baseURL) {
     url = config.baseURL.replace(/\/+$/, '') + '/' + url.replace(/^\/+/, '')
   }