froth-webdriverio-framework 2.0.37 → 2.0.39

package/commonMethods/apicall.js

@@ -1,37 +1,52 @@
 
-async function callapi(method,api_url, queryParams, payloaddetails,authentication,headers,attachments) {
+async function callapi(method, api_url, queryParams, payloaddetails, authentication, headers, attachments) {
     let response;
-        if (queryParams && Object.keys(queryParams).length > 0) {
-            const queryParams = new URLSearchParams(queryParams).toString();
-            api_url += `?${queryParams}`;
-        }
-        console.log("URL: " + api_url);
-        const formData = new FormData();
-    
-        if (payloaddetails && Object.keys(payloaddetails).length > 0) {
-            Object.entries(payloaddetails).forEach(([key, value]) => formData.append(key, value));
-        }
-    
-        try {
-            // Send the request with axios and form-data
-            response = await fetch(api_url, {
-                method: method,
-                headers: await formheaders(authentication,headers),
-                body: formData     // Optional: handle large payloads
-            });
-        }
-        catch (error) {
-            console.error('Error during API call:', error.response ? error.response.data : error.message);
+    if (queryParams && Object.keys(queryParams).length > 0) {
+        const queryString = new URLSearchParams(queryParams).toString();
+        api_url += `?${queryString}`;
+    }
+    console.log("URL: " + api_url);
+    const formData = new FormData();
+
+    if (payloaddetails && Object.keys(payloaddetails).length > 0) {
+        Object.entries(payloaddetails).forEach(([key, value]) => formData.append(key, value));
+    }
+
+    try {
+        // Prepare fetch options
+        const options = {
+            method: method,
+            headers: await formheaders(authentication, headers)
+        };
+        console.log("options:", JSON.stringify(options, null, 2));
+        // Only add the body if the method is not GET or HEAD
+        if (method !== 'GET' && method !== 'HEAD') {
+            options.body = formData;
         }
-        return response;
+
+        // Send the request
+        response = await fetch(api_url, options);
+
     }
-    
-    
-    // Function to form headers
-    async function formheaders(authentication,headers) {
-        if (authentication !== "") {
-            headers.Authorization = `Bearer ${authentication}`;
+    catch (error) {
+        console.error('Error during API call in call api menthod:', error);
+    }
+    return response;
+}
+
+
+// Function to form headers
+async function formheaders(authentication, headers = {}) {
+    // Add authentication headers based on the type
+    if (authentication && authentication.auth_type) {
+        if (authentication.auth_type === 'Bearer') {
+            headers.Authorization = `Bearer ${authentication.token}`;
+        } else if (authentication.auth_type === 'Basic') {
+            headers.Authorization = `Basic ${btoa(`${authentication.username}:${authentication.password}`)}`;
         }
     }
-    
-    module.exports = { callapi };
+    return headers;
+
+}
+
+module.exports = { callapi };

package/config/android.conf.js

@@ -27,7 +27,11 @@ const androidConfig = deepmerge.all([commonmobileconfig, {
       platformName: 'android',
       interactiveDebugging: true,
       buildName: process.env.BROWSERSTACK_BUILD_NAME || 'Android_Build',
-
+      enableCameraImageInjection : "true",
+      deviceOrientation: 
+      (process.env.DEVICENAME || 'Samsung Galaxy S23 Ultra').toLowerCase().includes('tab')
+        ? 'landscape' 
+        : 'portrait',
     }
   }],
   before: function (capabilities, specs) {

package/config/ios.conf.js

@@ -25,6 +25,7 @@ const iosconfig = deepmerge.all([commonmobileconfig, {
       platformName: 'iOS',
       interactiveDebugging: true,
       buildName: process.env.BROWSERSTACK_BUILD_NAME || 'IOS_Build',
+      enableCameraImageInjection : "true",
 
     }
   }],

package/package.json

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