froth-webdriverio-framework 3.0.119 → 3.0.121

package/froth_common_actions/apicall.js

@@ -1,41 +1,43 @@
 const amendToBrowserstack = require("../froth_api_calls/browsersatckSessionInfo").amend2Browserstack;
 
-async function callapi(method, api_url, queryParams, payloaddetails, authentication, headers, attachments) {
+async function callapi(methodtype, api_url, queryParams, payloaddetails, body_type, authentication, headersdetails, attachments) {
     let response;
     if (queryParams && Object.keys(queryParams).length > 0) {
         const queryString = new URLSearchParams(queryParams).toString();
         api_url += `?${queryString}`;
     }
-    console.log("URL: " + api_url);
-    let formData = new FormData();
-    // console.log("Payload Details: before if loop", JSON.stringify(payloaddetails));
-
-    if (payloaddetails && Object.keys(payloaddetails).length > 0) {
-        console.log("Payload Details:", JSON.stringify(payloaddetails));
-        formData = await jsonToFormData(payloaddetails);
-        console.log("FormData:", JSON.stringify(formData));
-        // Object.entries(payloaddetails).forEach(([key, value]) => formData.append(key, value));
-    }
+    console.log("Final API URL:", api_url);
+
 
     try {
-        // Prepare fetch options
-        let options = {
-            method: method,
-            headers: await formheaders(authentication, headers)
-        };
-        // Only add the body if the method is not GET or HEAD
-        if (method !== 'GET' && method !== 'HEAD') {
-            console.log("inside if loop if its POST or PUT");
-            options.body = formData;
+
+        let method = methodtype;
+        let headers = await formheaders(authentication, headersdetails, body_type);
+        let body = null;
+        console.log("Body Type:", body_type);
+        if (body_type === "raw" && payloaddetails && Object.keys(payloaddetails).length > 0) {
+            console.log("Payload (JSON):", JSON.stringify(payloaddetails));
+            body = JSON.stringify(payloaddetails);
+            console.log("Payload (raw):", body);
+        } else if (body_type === "formdata" && payloaddetails) {
+            body = await jsonToFormData(payloaddetails);
+            console.log("Payload (FormData):", body);
+            for (let [key, value] of body.entries()) {
+                console.log(`FormData Key: ${key}, Value: ${value}`);
+            }
+        } else {
+            console.log("No body sent (body_type not provided or empty payload).");
         }
-        console.log("options:", JSON.stringify(options, null, 2));
+
+        // console.log("options:", JSON.stringify(options, null, 2));
         // Send the request
-        response = await fetch(api_url, options);
+        const response = await fetch(api_url, {method,headers, body});
+        
+        console.log("Response Data:", response);
 
     } catch (error) {
         console.error('Error during API call in call api menthod:', error);
         let annotationMessage = 'Error during API call:' + error.response ? error.response.data : error.message;
-        // if (process.env.BROWSERSTACK)
         await amendToBrowserstack(annotationMessage, "error");
         throw error;
     }
@@ -57,14 +59,19 @@ async function jsonToFormData(json) {
     }
 
     appendFormData(json);
-    console.log("FormData in json to formdata:",formData);
-    console.log("FormData in json to formdata:", JSON.stringify(formData));
+    console.log("FormData in json to formdata:", formData);
     return formData;
 }
 
 // Function to form headers
-async function formheaders(authentication, headers) {
+async function formheaders(authentication, headers, body_type) {
     try {
+        if (!headers || typeof headers !== "object") {
+            headers = {};
+        }
+        if (body_type === "formdata") {
+            headers['Content-Type'] = 'multipart/form-data';
+        }
         // Add authentication headers based on the type
         if (authentication && authentication.auth_type) {
             if (authentication.auth_type?.toLowerCase() === 'bearer') {
@@ -78,27 +85,27 @@ async function formheaders(authentication, headers) {
     } catch (e) {
 
         console.error('Error in formheaders:', e);
-        let annotationMessage = 'Error during API call:' + error.response ? error.response.data : error.message;
-
+        let annotationMessage = `Error during API call: ${error.response?.data || error.message}`;
+        await amendToBrowserstack(annotationMessage, "error");
     }
     return headers;
 
 }
 async function validate(attribute_name, attribute, actionname, buffer, buffername_value, datatype) {
 
-        if (actionname.toLowerCase() == "verify") {
-            await validateAttributeData(attribute_name, attribute, buffer, buffername_value, datatype);
-        } else if (actionname.toLowerCase() == "setbuffer") {
-            BUFFER.setItem(buffername_value, attribute);
-            let annotationMessage = `The vlaue has been stored in the buffer : ${buffername_value}.`;
-            await amendToBrowserstack(annotationMessage, "info");
+    if (actionname.toLowerCase() == "verify") {
+        await validateAttributeData(attribute_name, attribute, buffer, buffername_value, datatype);
+    } else if (actionname.toLowerCase() == "setbuffer") {
+        BUFFER.setItem(buffername_value, attribute);
+        let annotationMessage = `The vlaue has been stored in the buffer : ${buffername_value}.`;
+        await amendToBrowserstack(annotationMessage, "info");
 
-        } else if (actionname.toLowerCase() == "getbuffer") {
-            let annotationMessage = `The vlaue has been retrived from the buffer : ${buffername_value}.`;
-            await amendToBrowserstack(annotationMessage, "info");
-            return BUFFER.getItem(buffername_value);
+    } else if (actionname.toLowerCase() == "getbuffer") {
+        let annotationMessage = `The vlaue has been retrived from the buffer : ${buffername_value}.`;
+        await amendToBrowserstack(annotationMessage, "info");
+        return BUFFER.getItem(buffername_value);
 
-        }
+    }
     // } catch (e) {
     //     console.error('Error in validate method:', e);
     //     throw e;
@@ -109,7 +116,7 @@ async function validateAttributeData(attribute_name, attribute, buffer, bufferna
     let assertionStatus = false; // Initialize status
     let valueToVerify;
 
-   try {
+    try {
         //if buffer is true, get the value from buffer
         buffer ? valueToVerify = BUFFER.getItem(buffername_value) : valueToVerify = buffername_value;
 
@@ -117,11 +124,11 @@ async function validateAttributeData(attribute_name, attribute, buffer, bufferna
             valueToVerify = Number(valueToVerify);
         } else if (datatype.toLowerCase() == "boolean") {
             valueToVerify = Boolean(valueToVerify);
-        }else if (datatype.toLowerCase() == "float") {
+        } else if (datatype.toLowerCase() == "float") {
             valueToVerify = parseFloat(valueToVerify);
-        }else if (datatype.toLowerCase() == "double") {
+        } else if (datatype.toLowerCase() == "double") {
             valueToVerify = parseFloat(valueToVerify);
-        }else if (datatype.toLowerCase() == "string") {
+        } else if (datatype.toLowerCase() == "string") {
             valueToVerify = valueToVerify.toString();
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "froth-webdriverio-framework",
-  "version": "3.0.119",
+  "version": "3.0.121",
 
   "readme": "WebdriverIO Integration",
   "description": "WebdriverIO and BrowserStack App Automate",