testit-js-commons 2.1.6 → 2.1.8

package/lib/helpers/config/config.helper.d.ts

@@ -8,4 +8,5 @@ export declare class ConfigComposer implements IConfigComposer {
     mergeEnv(dotEnv?: Partial<EnvironmentOptions>, processEnv?: Partial<EnvironmentOptions>): Partial<EnvironmentOptions>;
     private resolveAllProperties;
     private resolveProperties;
+    private validateConfig;
 }

package/lib/helpers/config/config.helper.js

@@ -34,16 +34,21 @@ class ConfigComposer {
         const dotEnvironment = parseDotEnvConfig();
         const environment = this.mergeEnv(dotEnvironment, processEnvironment);
         const content = common_1.Utils.readFile((_b = (_a = dotEnvironment === null || dotEnvironment === void 0 ? void 0 : dotEnvironment.TMS_CONFIG_FILE) !== null && _a !== void 0 ? _a : processEnvironment.TMS_CONFIG_FILE) !== null && _b !== void 0 ? _b : exports.DEFAULT_CONFIG_FILE);
+        let config;
         if (content !== "") {
-            const config = JSON.parse(content);
-            if (config.privateToken) {
+            const fileConfig = JSON.parse(content);
+            if (fileConfig.privateToken) {
                 console.warn(`
         The configuration file specifies a private token. It is not safe. 
         Use TMS_PRIVATE_TOKEN environment variable`);
             }
-            return this.mergeAll(config, environment, base);
+            config = this.mergeAll(fileConfig, environment, base);
         }
-        return this.merge(environment, base);
+        else {
+            config = this.merge(environment, base);
+        }
+        this.validateConfig(config);
+        return config;
     }
     mergeAll(file, env, base) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
@@ -112,6 +117,38 @@ class ConfigComposer {
             return "";
         }
     }
+    validateConfig(config) {
+        try {
+            new URL(config.url);
+        }
+        catch (err) {
+            console.error(`Url is invalid`);
+        }
+        if (!config.privateToken) {
+            console.error(`Private Token is invalid`);
+        }
+        if (config.projectId.match('^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$') === null) {
+            console.error(`Project ID is invalid`);
+        }
+        if (config.configurationId.match('^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$') === null) {
+            console.error(`Configuration ID is invalid`);
+        }
+        if (config.adapterMode == 2) {
+            if (config.testRunId.match('^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$') !== null) {
+                console.error(`Adapter works in mode 2. Config should not contains test run id.`);
+            }
+        }
+        else if (config.adapterMode == 1) {
+            if (config.testRunId.match('^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$') === null) {
+                console.error(`Adapter works in mode 1. Config should contains valid test run id.`);
+            }
+        }
+        else {
+            if (config.testRunId.match('^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$') === null) {
+                console.error(`Adapter works in mode 0. Config should contains valid test run id.`);
+            }
+        }
+    }
 }
 exports.ConfigComposer = ConfigComposer;
 function parseDotEnvConfig() {
@@ -144,5 +181,5 @@ function stringToAdapterMode(str) {
     }
 }
 function stringToBoolean(str) {
-    return ((str === null || str === void 0 ? void 0 : str.toLowerCase()) === "true") ? true : false;
+    return ((str === null || str === void 0 ? void 0 : str.toLowerCase()) === "true");
 }

package/lib/services/autotests/autotests.service.d.ts

@@ -13,6 +13,6 @@ export declare class AutotestsService extends BaseService implements IAutotestSe
     private loadPassedAutotest;
     private loadFailedAutotest;
     loadAutotest(autotest: AutotestPost, isPassed: boolean): Promise<void>;
-    linkToWorkItems(externalId: string, workItemsIds: Array<string>): Promise<void>;
+    linkToWorkItems(externalId: string, workItemIds: Array<string>): Promise<void>;
     getAutotestByExternalId(externalId: string): Promise<AutotestGet | null>;
 }

package/lib/services/autotests/autotests.service.js

@@ -61,13 +61,13 @@ class AutotestsService extends base_service_1.BaseService {
             isPassed ? yield this.loadPassedAutotest(autotest) : yield this.loadFailedAutotest(autotest);
         });
     }
-    linkToWorkItems(externalId, workItemsIds) {
+    linkToWorkItems(externalId, workItemIds) {
         return __awaiter(this, void 0, void 0, function* () {
             const internalId = yield this.getAutotestByExternalId(externalId).then((test) => test === null || test === void 0 ? void 0 : test.id);
             if (internalId === undefined) {
                 throw new Error(`Autotest with external id ${externalId} not found`);
             }
-            const promises = workItemsIds.map((workItemId) => this._client.linkAutoTestToWorkItem(internalId, { id: workItemId }));
+            const promises = workItemIds.map((workItemId) => this._client.linkAutoTestToWorkItem(internalId, { id: workItemId }));
             yield Promise.all(promises).catch((err) => (0, autotests_handler_1.handleHttpError)(err, "Failed link work item"));
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testit-js-commons",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "JavaScript commons for Test IT",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",