chore:SP-3670 handles pathname on scanner configs setup

Author: agustingroh

src/sdk/BaseConfig.ts

@@ -1,4 +1,5 @@
 import fs from 'fs';
+import { logger } from "./Logger/Logger";
 
 /**
  * Base configuration class for SCANOSS SDK services.
@@ -42,7 +43,7 @@ export abstract class BaseConfig {
       this.IGNORE_CERT_ERRORS = config.IGNORE_CERT_ERRORS ?? false;
       this.API_URL = config.API_URL || BaseConfig.getDefaultURL();
     }
-    this.API_URL = this.API_URL || BaseConfig.getDefaultURL();
+    this.API_URL = BaseConfig.getDefaultURL();
   }
 
   /**
@@ -69,7 +70,31 @@ export abstract class BaseConfig {
    * @param currentUrl - The current API URL
    * @returns The resolved API URL
    */
-  protected abstract resolveApiUrl(apiKey: string, currentUrl: string): string;
+  /**
+   * Resolves the appropriate scanner URL based on API key presence and current URL.
+   * If an API key is provided and the current URL is the default, returns the premium
+   * scanner URL, otherwise appends '/scan/direct' to the current URL.
+   * @param apiKey - The API key (if any)
+   * @param currentUrl - The current API URL
+   * @returns The resolved scanner URL
+   */
+  protected resolveApiUrl(apiKey: string, currentUrl: string): string {
+    let url = new URL(currentUrl);
+    if (url.pathname !== '/') {
+      logger.warn(`Removing ${url.pathname} from ${currentUrl}`);
+      currentUrl = url.origin;
+    }
+    if(!apiKey) {
+      if (currentUrl !== BaseConfig.getDefaultURL()) {
+        return currentUrl;
+      }
+      return BaseConfig.getDefaultURL();
+    }
+    if (currentUrl !== BaseConfig.getDefaultURL() && currentUrl !== BaseConfig.getPremiumURL()) {
+      return currentUrl;
+    }
+    return BaseConfig.getPremiumURL();
+  }
 
   /**
    * Sets the HTTPS proxy server URL.

src/sdk/Clients/http/HttpClient.ts

@@ -42,7 +42,7 @@ export class HttpClient extends Transport<Response>  {
       if (caCertPath) Utils.loadCaCertFromFile(caCertPath);
     }
 
-    protected async get(url: string): Promise<Response> {
+    public async get(url: string): Promise<Response> {
         return await fetch(url, {
             agent: this.proxyAgent,
             method: 'get',
@@ -52,7 +52,7 @@ export class HttpClient extends Transport<Response>  {
         });
     }
 
-  protected async post(url: string, body: any): Promise<Response> {
+  public async post(url: string, body: any): Promise<Response> {
     return await fetch(url, {
       agent: this.proxyAgent,
       method: 'post',
@@ -64,7 +64,7 @@ export class HttpClient extends Transport<Response>  {
     });
   }
 
-  protected async delete(url: string): Promise<Response> {
+  public async delete(url: string): Promise<Response> {
     return await fetch(url, {
       agent: this.proxyAgent,
       method: 'delete',
@@ -74,7 +74,7 @@ export class HttpClient extends Transport<Response>  {
     });
   }
 
-  protected async put(url: string, body: FormData): Promise<Response> {
+  public async put(url: string, body: FormData): Promise<Response> {
     return await fetch(url, {
       agent: this.proxyAgent,
       method: 'put',

src/sdk/Cryptography/CryptoCfg.ts

@@ -22,27 +22,6 @@ export class CryptoCfg extends BaseConfig {
      }
    }
 
-  /**
-   * Resolves the appropriate API URL based on API key presence and current URL.
-   * If an API key is provided and the current URL is the default, returns the premium
-   * URL, otherwise returns the current URL.
-   * @param apiKey - The API key (if any)
-   * @param currentUrl - The current API URL
-   * @returns The resolved API URL
-   */
-   protected resolveApiUrl(apiKey: string, currentUrl: string): string {
-    if(!apiKey) {
-      if (currentUrl !== BaseConfig.getDefaultURL()) {
-        return currentUrl;
-      }
-      return currentUrl;
-    }
-    if (currentUrl !== BaseConfig.getDefaultURL() && currentUrl !== BaseConfig.getPremiumURL()) {
-      return currentUrl;
-    }
-    return BaseConfig.getPremiumURL();
-   }
-
    public get API_URL(): string{
      return this.resolveApiUrl(this.API_KEY, super.API_URL);
    }

src/sdk/Dependencies/DependencyScannerCfg.ts

@@ -30,27 +30,6 @@ export class DependencyScannerCfg extends BaseConfig {
     this._API_KEY = value;
   }
 
-  /**
-   * Resolves the appropriate scanner URL based on API key presence and current URL.
-   * If an API key is provided and the current URL is the default, returns the premium
-   * scanner URL, otherwise appends '/scan/direct' to the current URL.
-   * @param apiKey - The API key (if any)
-   * @param currentUrl - The current API URL
-   * @returns The resolved scanner URL
-   */
-  protected resolveApiUrl(apiKey: string, currentUrl: string): string {
-    if(!apiKey) {
-      if (currentUrl !== BaseConfig.getDefaultURL()) {
-        return currentUrl;
-      }
-      return currentUrl;
-    }
-    if (currentUrl !== BaseConfig.getDefaultURL() && currentUrl !== BaseConfig.getPremiumURL()) {
-      return currentUrl;
-    }
-    return BaseConfig.getPremiumURL();
-  }
-
   get API_URL(): string {
     return this.resolveApiUrl(this.API_KEY, super.API_URL);
   }

src/sdk/Vulnerability/VulnerabilityCfg.ts

@@ -24,27 +24,6 @@ export class VulnerabilityCfg extends BaseConfig {
     this.API_KEY = config?.API_KEY ?? this.API_KEY;
   }
 
-  /**
-   * Resolves the appropriate API URL based on API key presence and current URL. See: src/sdk/BaseConfig.ts
-   * If an API key is provided and the current URL is the default, returns the premium
-   * URL, otherwise returns the current URL.
-   * @param apiKey - The API key (if any)
-   * @param currentUrl - The current API URL
-   * @returns The resolved API URL
-   */
-  protected resolveApiUrl(apiKey: string, currentUrl: string): string {
-    if(!apiKey) {
-      if (currentUrl !== BaseConfig.getDefaultURL()) {
-        return currentUrl;
-      }
-      return currentUrl;
-    }
-    if (currentUrl !== BaseConfig.getDefaultURL() && currentUrl !== BaseConfig.getPremiumURL()) {
-      return currentUrl;
-    }
-    return BaseConfig.getPremiumURL();
-  }
-
   public get API_URL(): string{
     return this.resolveApiUrl(this.API_KEY, super.API_URL);
   }

src/sdk/scanner/Dispatcher/Dispatcher.ts

@@ -174,7 +174,8 @@ export class Dispatcher extends EventEmitter {
     let plain_response: string;
     try {
       this.emit(ScannerEvents.DISPATCHER_WFP_SENDED);
-      const response = await fetch(this.scannerCfg.API_URL, {
+      const scanURL = new URL('/scan/direct', this.scannerCfg.API_URL);
+      const response = await fetch(scanURL.href, {
         agent: this.proxyAgent,
         method: 'post',
         body: item.getForm(),

src/sdk/scanner/ScannerCfg.ts

@@ -37,27 +37,6 @@ export class ScannerCfg extends BaseConfig {
     super();
   }
 
-  /**
-   * Resolves the appropriate scanner URL based on API key presence and current URL.
-   * If an API key is provided and the current URL is the default, returns the premium
-   * scanner URL, otherwise appends '/scan/direct' to the current URL.
-   * @param apiKey - The API key (if any)
-   * @param currentUrl - The current API URL
-   * @returns The resolved scanner URL
-   */
-  protected resolveApiUrl(apiKey: string, currentUrl: string): string {
-    if(!apiKey) {
-      if (currentUrl !== BaseConfig.getDefaultURL()) {
-        return currentUrl;
-      }
-      return currentUrl + "/scan/direct";
-    }
-    if (currentUrl !== BaseConfig.getDefaultURL() && currentUrl !== BaseConfig.getPremiumURL()) {
-      return currentUrl;
-    }
-    return BaseConfig.getPremiumURL() + "/scan/direct";
-  }
-
   get API_URL(): string {
     return this.resolveApiUrl(this.API_KEY, super.API_URL);
   }