froth-webdriverio-framework 1.0.32 → 1.0.34

package/api/getexecutionDetails.js

@@ -8,10 +8,7 @@ async function getExecuitonDetails(frothUrl, token, id) {
         const url = `https://${frothUrl}/api/test-execution-retrieve/${id}`;
 
         try {
-            // const token = await login(service_username, Buffer.from(service_password, 'base64').toString('utf-8')); // Wait for the login function to resolve and get the token
-            // if (!token) {
-            //     throw new Error('Login failed, no token obtained');
-            // }
+            console.log("URL: " + url)
             console.log("setExecutionDetails token "+token)
 
             const response = await fetch(url, {

package/api/getintegrationDetails.js

@@ -6,7 +6,7 @@ async function getintegrationdetails(frothUrl, token, id) {
         const url = `https://${frothUrl}/api/intergration-view/${id}/`;
 
         try {
-
+            console.log("URL: " + url)
             const response = await fetch(url, {
                 method: 'GET',
                 headers: {

package/api/getsuiteDetails.js

@@ -6,7 +6,7 @@ async function getSuiteDetails(frothUrl, token, id) {
         const url = `https://${frothUrl}/api/automationsuite-retrieve/${id}/`;
 
         try {
-
+            console.log("URL: " + url)
             const response = await fetch(url, {
                 method: 'GET',
                 headers: {

package/api/loginapi.js

@@ -2,30 +2,34 @@
 //const FormData = require('form-data'); // Import the FormData constructor
 
 
-async function getLoginToken(frothUrl,email,password) {
-    const url = `https://${frothUrl}/api/login/`;
-    const formData = new FormData();
-    formData.append('email_or_username', email);
-    formData.append('password', Buffer.from(password, 'base64').toString('utf-8'));
-
-    const response = await fetch(url, {
-        method: 'POST',
-        headers: {
-            'accept': 'application/json',
-          //  'X-CSRFToken': 'hSb92VZT0AFMKaekBUSdlZjfHMIzhzvOyk6e5i8ZrVv6B15EtN8WLps3oyV2MOY1'
-        },
-        body: formData
-    });
-
-    if (response.ok) {
-        const data = await response.json();
-        console.log('Token:', data.access_token);
-        return data.access_token;
-    } else {
-        console.error('Login failed:', response.statusText);
-        return null;
+async function getLoginToken(frothUrl, email, password) {
+    try {
+        const url = `https://${frothUrl}/api/login/`;
+        const formData = new FormData();
+        formData.append('email_or_username', email);
+        formData.append('password', Buffer.from(password, 'base64').toString('utf-8'));
+
+        const response = await fetch(url, {
+            method: 'POST',
+            headers: {
+                'accept': 'application/json',
+                //  'X-CSRFToken': 'hSb92VZT0AFMKaekBUSdlZjfHMIzhzvOyk6e5i8ZrVv6B15EtN8WLps3oyV2MOY1'
+            },
+            body: formData
+        });
+
+        if (response.ok) {
+            const data = await response.json();
+            console.log('Token:', data.access_token);
+            return data.access_token;
+        } else {
+            console.error('Login failed:', response.statusText);
+            return null;
+        }
+    } catch (error) {
+        console.error('Error in getLoginToken function:', error);
     }
-   
+
 }
 
 // async function main() {
@@ -33,14 +37,14 @@ async function getLoginToken(frothUrl,email,password) {
 //         const frothUrl = "devapi.frothtestops.com";
 //         const username = "subhra.subudhi@roboticodigital.com";
 //         const password = "V2VsY29tZUAxMjM=";
-        
+
 //         const token = await getLoginToken(frothUrl, username, password);
 //         if (!token) {
 //             throw new Error('Login failed, no token obtained');
 //         }
-        
 
-        
+
+
 //     } catch (error) {
 //         console.error('Error in main function:', error);
 //     }

package/api/readTestdata.js

@@ -9,7 +9,7 @@ async function getDataById(frothUrl, token, id) {
         const url = `https://${frothUrl}/api/testdata-retrieve/${id}/`;
 
         try {
-            console.log("inside detdataby id "+url)
+            console.log("URL: " + url)
             const response = await fetch(url, {
                 method: 'GET',
                 headers: {

package/config/common.mobile.conf.js

@@ -3,8 +3,9 @@ const commonconfig = require('./commonconfig');
 console.log("device name in common mobile:", process.env.DEVICENAME);
 
 const commonmobconfig = deepmerge.all([commonconfig, {
-    user: process.env.BROWSERSTACK_USERNAME || 'naveen_OSt3Pw',
-    key: process.env.BROWSERSTACK_ACCESS_KEY || 'AuzPy8cHZ7sCBmMXakKe',
+    
+    user: process.env.BROWSERSTACK_USERNAME ,
+    key: Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8') ,
 
     logLevel: 'info',
     coloredLogs: true,

package/config/commonconfig.js

@@ -1,7 +1,7 @@
 const setAllDetails = require("./setallDatailinBuffer")
 const { LocalStorage } = require('node-localstorage');
 global.BUFFER = new LocalStorage('./storage');
-
+const exeDetails = require("../api/executionDetails")
 const getBSSessionDetails = require("../api/browsersatckSessionInfo")
 console.log("device name in common :", process.env.DEVICENAME);
 
@@ -16,17 +16,15 @@ const commonconfig = {
         await setAllDetails.setEnvVariables();
         await setAllDetails.setLoginToken();
         await setAllDetails.setExecutionDetails();
-        await setAllDetails.setIntegrationsDetails();
+      //  await setAllDetails.setIntegrationsDetails();
         await setAllDetails.setSuiteDetails();
         await setAllDetails.setTestDataDetails();
        // console.log("ALL JSON DATA:" + JSON.stringify(BUFFER));
-       // console.log("ALL JSON DATA in env variable :" + JSON.stringify(process.env));
+        //console.log("ALL JSON DATA in env variable :" + JSON.stringify(process.env));
     },
 
     before: function (capabilities, specs) {
 
-       
-      
         // Code to run before the test suite starts
         console.log('Starting test suite IN EBFORE HOOK ...');
         // Initialize variables, configure environment, etc.
@@ -42,8 +40,7 @@ const commonconfig = {
             console.log("Running suite:", suite.title);
             console.log("Reading test data from the API");
 
-            getBSSessionDetails("app-automate", BUFFER.getItem("BROWSERSTACK_USERNAME"),
-                BUFFER.getItem("BROWSERSTACK_ACCESS_KEY"));
+            getBSSessionDetails("app-automate", process.env.BROWSERSTACK_USERNAME, Buffer.from(process.env.BROWSERSTACK_ACCESS_KEY, 'base64').toString('utf-8'));
 
         } catch (e) {
             console.log("Error in beforeSuite:", e);

package/config/setallDatailinBuffer.js

@@ -1,6 +1,6 @@
 const getLoginToken = require("../api/loginapi");
 const exeDetails = require("../api/getexecutionDetails")
-const getintegrationdetails = require("../api/getintegrationDetails");
+//const getintegrationdetails = require("../api/getintegrationDetails");
 const getSuiteDetails = require("../api/getsuiteDetails");
 const getDataById = require("../api/readTestdata");
 
@@ -66,10 +66,6 @@ async function setExecutionDetails() {
   try {
     const getExeDetails = await exeDetails.getExecuitonDetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("LOGIN_TOKEN"), BUFFER.getItem("EXECUTION_ID"));
     BUFFER.setItem("AUTOMATION_SUITE_ID", getExeDetails.automation_suite_id);
-    process.env.DEVICENAME = getExeDetails.device_name
-    process.env.OSVERSION = getExeDetails.version
-    BUFFER.setItem("DEVICE_NAME", getExeDetails.device_name);
-    BUFFER.setItem("VERSION", getExeDetails.version);
 
   } catch (error) {
     //    console.error('Error in main function:', error);
@@ -112,7 +108,7 @@ module.exports = {
   setEnvVariables,
   setLoginToken,
   setExecutionDetails,
-  setIntegrationsDetails,
+  //setIntegrationsDetails,
   setSuiteDetails,
   setTestDataDetails
 };

package/package.json

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