froth-webdriverio-framework 3.0.36 → 3.0.38

package/api/getsuiteDetails.js

@@ -19,15 +19,15 @@ async function getSuiteDetails(frothUrl, token, id) {
             if (response.ok) {
                 const data = await response.json();
                // console.log(data)
-                jsondata.automation_suite_id = data.id;
-                jsondata.automation_suite_name = data.automation_suite_name;
-                jsondata.test_data_id = data.test_data_id;
-                jsondata.browser_stack_urls = data.browser_stack_urls;
-                jsondata.automation_script_id=data.automation_script_id;
+                jsondata.automation_suite_id = data.id == null ? 0 : data.id;
+                jsondata.automation_suite_name = data.automation_suite_name == null ? "" : data.automation_suite_name;
+                jsondata.test_data_id = data.test_data_id == null ? 0 : data.test_data_id;
+                jsondata.browser_stack_urls = data.browser_stack_urls == null ? "" : data.browser_stack_urls;
+                jsondata.script_details=data.script_details == null ? [] : data.script_details;
               //  console.log("automation_script_id:" + JSON.stringify(jsondata.automation_script_id))
-                const automationScripts = jsondata.automation_script_id.reduce((obj, item) => {
-                    obj[item.automation_script_id] = item.automation_script_id;
-                    BUFFER.setItem(item.automation_script_name, item.id);
+                const automationScripts = jsondata.script_details.reduce((obj, item) => {
+                    obj[item.script_Id] = item.script_Id;
+                    BUFFER.setItem(item.scriptName, item.scriptId);
                       return obj;
                 }, {});
                 jsondata.test_sequence = data.test_sequence;

package/api/loginapi.js

@@ -8,7 +8,7 @@ async function getLoginToken(frothUrl, email, password) {
         console.log("URL: " + url);
         const formData = new FormData();
         formData.append('email_or_username', email);
-        formData.append('password', Buffer.from(password, 'base64').toString('utf-8'));
+        formData.append('password', password);
         formData.append('is_ad_user',false)
         
         const response = await fetch(url, {

package/config/setallDatailinBuffer.js

@@ -43,7 +43,7 @@ async function setEnvVariables() {
   BUFFER.setItem("FROTH_INTEGRATION_ID", process.env.INTEGRATION_ID || 1);
   BUFFER.setItem("ORGANISATION_DOMAIN_URL", process.env.ORGANISATION_DOMAIN_URL || "https://devapi.frothtestops.com");
   BUFFER.setItem("SERVICE_USER", "frothbot@roboticodigital.com");
-  BUFFER.setItem("SERVICE_PASSWORD", "RnJvdGh0ZXN0b3BzQDU1NQ==");
+  BUFFER.setItem("SERVICE_PASSWORD", "l5xa8AozQ2xldniR1hkkGm7z1ePl7SGy00GlAIdH9v7Bq3ENQKmGCdRTZgKbbTx+");
 
 
 }
@@ -70,19 +70,7 @@ async function setExecutionDetails() {
   }
 }
 
-async function setIntegrationsDetails() {
-  try {
-    const getIntegrationDetails = await getintegrationdetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("FROTH_LOGIN_TOKEN"), BUFFER.getItem("FROTH_INTEGRATION_ID"));
-    if (getIntegrationDetails.product === "BrowserStack") {
-      process.env.BROWSERSTACK_USERNAME = getIntegrationDetails.username;
-      process.env.BROWSERSTACK_ACCESS_KEY = getIntegrationDetails.token;
-      BUFFER.setItem("BROWSERSTACK_USERNAME", process.env.BROWSERSTACK_USERNAME);
-      BUFFER.setItem("BROWSERSTACK_ACCESS_KEY", process.env.BROWSERSTACK_ACCESS_KEY);
-    }
-  } catch (error) {
-    //    console.error('Error in main function:', error);
-  }
-}
+
 async function setSuiteDetails() {
   try {
     const getSuiteDetail = await getSuiteDetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("FROTH_LOGIN_TOKEN"), BUFFER.getItem("AUTOMATION_SUITE_ID"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "froth-webdriverio-framework",
-  "version": "3.0.36",
+  "version": "3.0.38",
   "readme": "WebdriverIO Integration",
   "description": "WebdriverIO and BrowserStack App Automate",
   "license": "MIT",

package/api/getintegrationDetails.js

@@ -1,54 +0,0 @@
-
-// Function to get data from the API using the Bearer token
-async function getintegrationdetails(frothUrl, token, id) {
-    let jsondata = {};
-    if (id != 0 || id != null || id != undefined) {
-        const url = `${frothUrl}/api/intergration-view/${id}/`;
-
-        try {
-            console.log("URL: " + url)
-            const response = await fetch(url, {
-                method: 'GET',
-                headers: {
-                    'Authorization': `Bearer ${token}`,
-                    'Content-Type': 'application/json'
-
-                }
-            });
-            if (response.ok) {
-                const data = await response.json();
-                console.log(data)
-                jsondata.product = data.product;
-                jsondata.username = data.username;
-                jsondata.email = data.email;
-                jsondata.token= data.token;
-
-                console.log("json data :" + JSON.stringify(jsondata));
-
-                return jsondata;
-
-            } else if (response.status === 401) { // Unauthorized, token expired
-                // Call login function to obtain a new token
-                const newToken = await getLoginToken(BUFFER.getItem("SERVICE_USER"), BUFFER.getItem("SERVICE_PASSWORD")); // You need to implement the login function
-                // Retry the request with the new token
-                return getintegrationdetails(frothUrl, newToken, id);
-            }
-            else {
-                const errorText = await response.text();
-                console.error('Data fetch failed response in getintegrationdetails:', errorText);
-                throw new Error(`HTTP error! status: ${response.status}`);
-            }
-
-
-
-        } catch (error) {
-            console.error('Error fetching data:', error);
-
-        }
-    } else {
-        console.error('Error fetching data: Invalid ID');
-    }
-
-}
-
-module.exports = getintegrationdetails;