remove trailing slash

Signed-off-by: Chalenge Masekera <[email protected]>
faros-ai · Feb 6, 2025 · abc3352 · abc3352
1 parent 429df30
commit abc3352
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/sources/azure-workitems-source/src/azure-workitems.ts b/sources/azure-workitems-source/src/azure-workitems.ts
@@ -70,7 +70,7 @@ export class AzureWorkitems {
 
     AzureWorkitems.validateConfig(config);
 
-    const apiUrl = config.api_url ?? DEFAULT_API_URL;
+    const apiUrl = AzureWorkitems.cleanUrl(config.api_url) ?? DEFAULT_API_URL;
     const version = config.api_version ?? DEFAULT_API_VERSION;
     const accessToken = base64Encode(`:${config.access_token}`);
 
@@ -91,7 +91,8 @@ export class AzureWorkitems {
       1000
     );
 
-    const graphApiUrl = config.graph_api_url ?? DEFAULT_GRAPH_API_URL;
+    const graphApiUrl =
+      AzureWorkitems.cleanUrl(config.graph_api_url) ?? DEFAULT_GRAPH_API_URL;
 
     const graphClient = axios.create({
       baseURL: `${graphApiUrl}/${config.organization}/_apis/graph`,
@@ -146,11 +147,9 @@ export class AzureWorkitems {
     }
 
     // If using a custom API URL for Server, a custom Graph API URL must also be provided
-    const apiUrl =
-      config.api_url?.trimEnd().replace(/\/$/, '').trim() ?? DEFAULT_API_URL;
+    const apiUrl = AzureWorkitems.cleanUrl(config.api_url) ?? DEFAULT_API_URL;
     const graphApiUrl =
-      config.graph_api_url?.trimEnd().replace(/\/$/, '').trim() ??
-      DEFAULT_GRAPH_API_URL;
+      AzureWorkitems.cleanUrl(config.graph_api_url) ?? DEFAULT_GRAPH_API_URL;
 
     if (apiUrl !== DEFAULT_API_URL && graphApiUrl === DEFAULT_GRAPH_API_URL) {
       throw new VError(
@@ -159,6 +158,10 @@ export class AzureWorkitems {
     }
   }
 
+  static cleanUrl(url?: string): string | undefined {
+    return url?.trim().endsWith('/') ? url.trim().slice(0, -1) : url?.trim();
+  }
+
   async checkConnection(): Promise<void> {
     try {
       const iter = this.getUsers();