@elisra-devops/docgen-data-provider 1.63.13 → 1.68.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elisra-devops/docgen-data-provider",
-  "version": "1.63.13",
+  "version": "1.68.0",
   "description": "A document generator data provider, aimed to retrive data from azure devops",
   "repository": {
     "type": "git",
@@ -19,6 +19,7 @@
     "@types/caseless": "^0.12.5",
     "@types/istanbul-lib-report": "^3.0.3",
     "@types/jest": "^29.5.12",
+    "@types/node": "^24.10.1",
     "@types/tough-cookie": "^4.0.5",
     "@types/yargs-parser": "^21.0.3",
     "baseline-browser-mapping": "^2.9.0",
@@ -39,6 +40,13 @@
   },
   "jest": {
     "preset": "ts-jest",
+    "testMatch": [
+      "<rootDir>/src/tests/**/*.test.ts"
+    ],
+    "collectCoverageFrom": [
+      "src/**/*.ts",
+      "!src/tests/**"
+    ],
     "testPathIgnorePatterns": [
       "/bin/"
     ],

package/src/helpers/tfs.ts

@@ -31,13 +31,53 @@ export class TFSServices {
         }
   );
 
+  private static getBearerToken(rawToken: string): string | null {
+    const token = String(rawToken || '').trim();
+    if (!token) return null;
+    if (/^bearer:/i.test(token)) {
+      return token.slice('bearer:'.length).trim() || null;
+    }
+    const m = /^bearer\s+(.+)$/i.exec(token);
+    if (m?.[1]) return m[1].trim() || null;
+    return null;
+  }
+
+  private static addAuthHeader(config: AxiosRequestConfig, headerName: string, value: string) {
+    const existing = (config.headers ?? {}) as any;
+    if (
+      existing &&
+      typeof existing === 'object' &&
+      existing.headers &&
+      typeof existing.headers === 'object'
+    ) {
+      config.headers = { ...existing, headers: { ...existing.headers, [headerName]: value } };
+      return;
+    }
+    config.headers = { ...existing, [headerName]: value };
+  }
+
+  private static applyAuth(config: AxiosRequestConfig, rawToken: string) {
+    const bearer = this.getBearerToken(rawToken);
+    if (bearer) {
+      this.addAuthHeader(config, 'Authorization', `Bearer ${bearer}`);
+      delete (config as any).auth;
+      return;
+    }
+
+    const token = String(rawToken || '').trim();
+    if (token) {
+      (config as any).auth = { username: '', password: token };
+    }
+  }
+
   public static async downloadZipFile(url: string, pat: string): Promise<any> {
     try {
-      const res = await this.axiosInstance.request({
+      const config: AxiosRequestConfig = {
         url: url,
         headers: { 'Content-Type': 'application/zip' },
-        auth: { username: '', password: pat },
-      });
+      };
+      this.applyAuth(config, pat);
+      const res = await this.axiosInstance.request(config);
       return res;
     } catch (e) {
       logger.error(`error download zip file , url : ${url}`);
@@ -56,11 +96,12 @@ export class TFSServices {
     const config: AxiosRequestConfig = {
       headers: customHeaders,
       method: requestMethod,
-      auth: { username: '', password: pat },
       data: data,
       responseType: 'arraybuffer', // Important for binary data
     };
 
+    this.applyAuth(config, pat);
+
     return this.executeWithRetry(url, config, printError, (response) => {
       // Convert binary data to Base64
       const base64String = Buffer.from(response.data, 'binary').toString('base64');
@@ -87,11 +128,12 @@ export class TFSServices {
     const config: AxiosRequestConfig = {
       headers: customHeaders,
       method: requestMethod,
-      auth: { username: '', password: pat },
       data: data,
       timeout: requestMethod.toLocaleLowerCase() === 'get' ? 10000 : undefined, // More reasonable timeout
     };
 
+    this.applyAuth(config, pat);
+
     return this.executeWithRetry(cleanUrl, config, printError, (response) => {
       // Direct return of data without extra JSON parsing
       return response.data;
@@ -112,11 +154,12 @@ export class TFSServices {
     const config: AxiosRequestConfig = {
       headers: customHeaders,
       method: requestMethod,
-      auth: { username: '', password: pat },
       data: data,
       timeout: requestMethod.toLocaleLowerCase() === 'get' ? 10000 : undefined,
     };
 
+    this.applyAuth(config, pat);
+
     return this.executeWithRetry(cleanUrl, config, printError, (response) => {
       return { data: response.data, headers: response.headers };
     });
@@ -149,10 +192,11 @@ export class TFSServices {
       url: url,
       headers: customHeaders,
       method: requestMethod,
-      auth: { username: '', password: pat },
       data: data,
     };
 
+    this.applyAuth(config, pat);
+
     try {
       const result = await this.axiosInstance.request(config);
       return result;

package/src/modules/GitDataProvider.ts

@@ -74,6 +74,16 @@ export default class GitDataProvider {
     return null;
   } //GetBranch
 
+  /**
+   * Gets a file from a Git repository.
+   *
+   * @param projectName - The name of the project.
+   * @param repoId - The ID of the repository.
+   * @param fileName - The name of the file to retrieve.
+   * @param version - The version descriptor for the file.
+   * @param gitRepoUrl - Optional URL of the Git repository.
+   * @returns The file content as a string.
+   */
   async GetFileFromGitRepo(
     projectName: string,
     repoId: string,

package/src/modules/TestDataProvider.ts

@@ -381,7 +381,6 @@ export default class TestDataProvider {
                   }
                 } catch (fetchError) {
                   // Log error silently or handle as needed
-                  console.error('Failed to fetch relation content', fetchError);
                   logger.error(`Failed to fetch relation content for URL ${relation.url}: ${fetchError}`);
                 }
               }