froth-webdriverio-framework 1.0.87 → 1.0.89

package/api/getDBdetails.js

@@ -1,11 +1,12 @@
 
 // Function to get data from the API using the Bearer token
+const getLoginToken = require('./loginapi')
 
-async function getDbDetails(frothUrl,token,id) {
+async function getDbDetails(frothUrl, token, id) {
 
     let jsondata = {};
     if (id != 0 || id != null || id != undefined) {
-        const url = `https://${frothUrl}/api/automationsuite-retrieve/${id}/`;
+        const url = `https://${frothUrl}/api/dbconnection-retrieve/${id}/`;
 
         try {
             console.log("URL: " + url)
@@ -19,7 +20,7 @@ async function getDbDetails(frothUrl,token,id) {
             });
             if (response.ok) {
                 jsondata = await response.json();
-
+                console.log("jsondata:" + JSON.stringify(jsondata))
                 return jsondata;
 
             } else if (response.status === 401) { // Unauthorized, token expired

package/api/loginapi.js

@@ -5,6 +5,7 @@
 async function getLoginToken(frothUrl, email, password) {
     try {
         const url = `https://${frothUrl}/api/login/`;
+        console.log("URL: " + url);
         const formData = new FormData();
         formData.append('email_or_username', email);
         formData.append('password', Buffer.from(password, 'base64').toString('utf-8'));

package/commonMethods/Utils.js

@@ -8,7 +8,7 @@ let scrollToRight = null;
 let scrollDownToView = null;
 let scrollRightToView = null;
 let verifyText = null;
-let connectToDB=null;
+let connectToDB = null;
 if (process.env.LOCATION == 'local') {
 
     scrollToEnd = require("./scrollToEnd");
@@ -20,7 +20,7 @@ if (process.env.LOCATION == 'local') {
     scrollDownToView = require('./scrollDownToView');
     scrollRightToView = require('./scrollRightToView');
     verifyText = require('./verifyText');
-    connectToDB=require('./connectToDB');
+    connectToDB = require('./connectToDB');
 } else {
     scrollToEnd = require('froth-webdriverio-framework/commonMethods/scrollToEnd');
     clickIfVisible = require('froth-webdriverio-framework/commonMethods/clickIfVisible');
@@ -31,10 +31,10 @@ if (process.env.LOCATION == 'local') {
     scrollDownToView = require('froth-webdriverio-framework/commonMethods/scrollDownToView');
     scrollRightToView = require('froth-webdriverio-framework/commonMethods/scrollRightToView');
     verifyText = require('froth-webdriverio-framework/commonMethods/verifyText');
-    connectToDB=require('froth-webdriverio-framework/commonMethods/connectToDB');
+    connectToDB = require('froth-webdriverio-framework/commonMethods/connectToDB');
 }
 //export the variabels
-module.exports= {
+module.exports = {
     scrollToEnd,
     clickIfVisible,
     verifyTextInFieldAttribute,
@@ -43,5 +43,6 @@ module.exports= {
     scrollToRight,
     scrollDownToView,
     scrollRightToView,
-    verifyText
+    verifyText, 
+    connectToDB
 };

package/commonMethods/connectToDB.js

@@ -1,11 +1,14 @@
 
 const dbinfo = require('../api/getDBdetails');
 const dbconnect = require('../db/dbconnections');
+const getLoginToken = require('../api/loginapi');
+// const { LocalStorage } = require('node-localstorage');
+// global.BUFFER = new LocalStorage('./storage');
 
 async function connectToDB(id, querytype, query) {
   try {
     const jsondata = await dbinfo.getDbDetails(BUFFER.getItem("ORGANISATION_DOMAIN_URL"), BUFFER.getItem("LOGIN_TOKEN"), id);
-    let connectionpool = await dbtype(jsondata.dbtype, jsondata);
+    let connectionpool = await dbtype(jsondata.database_type, jsondata);
     let result = await executeQuery(querytype, query, connectionpool);
     return result;
   } catch (error) {
@@ -17,8 +20,8 @@ async function dbtype(type, jsondata) {
   let connectionpool;
   try {
     switch (type) {
-      case 'mysql':
-        connectionpool = dbconnect.connectTomysql(jsondata.hostname, jsondata.username, jsondata.password, jsondata.dbname, jsondata.portnumber);
+      case 'MySQL':
+        connectionpool = dbconnect.connectTomysql(jsondata.host, jsondata.username, jsondata.password, jsondata.schema_name, jsondata.port_number);
         break;
 
       default:
@@ -51,4 +54,26 @@ async function executeQuery(querytype, query, connectionpool) {
   } catch (error) { console.error('Error querytype', error); }
 }
 
+// async function main() {
+//   try {
+//     BUFFER.setItem("ORGANISATION_DOMAIN_URL","devapi.frothtestops.com");
+//     //const query = 'SELECT id,EventID,NoPlate FROM store_images limit 2'; 
+//     const token = await getLoginToken("devapi.frothtestops.com", "subhra.subudhi@roboticodigital.com", "V2VsY29tZUAxMjM=");
+//     if (!token) {
+//       throw new Error('Login failed, no token obtained');
+//     }
+//     BUFFER.setItem("LOGIN_TOKEN",token);
+
+//     const result = await connectToDB(3, 'select', 'SELECT id,EventID,NoPlate FROM store_images limit 2');
+//     console.log("results are :" + JSON.stringify(result, null, 2));
+//     const data=JSON.stringify(result, null, 2)
+//     console.log("data is :" + result.totalNumberOfRecords);
+//     console.log("data is :" + result.records[0].id);
+
+//     } catch (err) {
+//     console.log('Error connecting to database:', err.stack);
+//   }
+// }
+
+// main()
 module.exports = connectToDB;

package/config/android.conf.js

@@ -12,7 +12,7 @@ const androidConfig = deepmerge.all([commonmobileconfig, {
         testObservability: true,
        // buildName: "ANDROID BUILD",
        // buildIdentifier: "ANDROID BUILD_" + process.env.BUILD_NUMBER,
-        browserstackLocal: false,
+        browserstackLocal: process.env.BROWSERSTACK_LOCAL || false,
         opts: { 
           forcelocal: false },
         app: process.env.BROWSERSTACK_APP_PATH

package/db/dbconnections.js

@@ -70,17 +70,17 @@ async function fetchDataFromDB(connectionpool, query) {
 
 // write main method to call the functions
 
-async function main() {
-    try {
-        const connection = await connectTomysql('10.0.0.6', 'root', 'password123', 'power_seraya_step', 3406);
-        const query = 'SELECT id,EventID,NoPlate FROM store_images limit 2';
-        await fetchDataFromDB(connection, query);
-    } catch (err) {
-        console.log('Error connecting to database:', err.stack);
-    }
-}
+// async function main() {
+//     try {
+//         const connection = await connectTomysql('10.0.0.6', 'root', 'password123', 'power_seraya_step', 3406);
+//         const query = 'SELECT id,EventID,NoPlate FROM store_images limit 2';
+//         await fetchDataFromDB(connection, query);
+//     } catch (err) {
+//         console.log('Error connecting to database:', err.stack);
+//     }
+// }
 
-main()
+// main()
 module.exports = {
     connectTomysql,
     fetchDataFromDB

package/package.json

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

package/storage/LOGIN_TOKEN

@@ -0,0 +1 @@
+eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzIwNTEyNDMxLCJpYXQiOjE3MjA1MDg4MzEsImp0aSI6ImQ5MTk3NGEzODc3OTQ5MzZiMzk3NGVkNTRhNzhhNDBkIiwidXNlcl9pZCI6OTl9.abE3jatzPNFvxj492YuzDUKwZjZRFOs3cWhxySJBN_k

package/storage/ORGANISATION_DOMAIN_URL

@@ -0,0 +1 @@
+devapi.frothtestops.com