From efa69110c5233567b7627625874e90ad0c7e8043 Mon Sep 17 00:00:00 2001
From: Frank <frankli0324@hotmail.com>
Date: Fri, 20 Oct 2023 15:46:57 +0800
Subject: [PATCH] alter getBaseUrl
---
src/url-helper.ts | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/url-helper.ts b/src/url-helper.ts
index d12a82a..a5d4f80 100644
--- a/src/url-helper.ts
+++ b/src/url-helper.ts
@@ -16,7 +16,7 @@ export function getFetchUrl(settings: IGitSourceSettings): string {
}
// "origin" is SCHEME://HOSTNAME[:PORT]
- const baseURL = getBaseUrl(serviceUrl.href)
+ const baseURL = getBaseUrl(serviceUrl)
return `${baseURL}/${encodedOwner}/${encodedName}`
}
@@ -28,9 +28,8 @@ export function getServerUrl(url?: string): URL {
return new URL(urlValue)
}
-export function getBaseUrl(url: string): string {
- const matcher = url.match(/^[^?]+/)
- return (matcher && matcher[0].replace(/\/+$/g, '')) || ''
+function getBaseUrl(u: URL) {
+ return u.protocol + "//" + u.host + u.pathname.replace(/\/+$/g, '');
}
export function getServerApiUrl(url?: string): string {