tango-app-api-client 3.4.0-beta.4 → 3.4.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.4.0-beta.4",
+    "version": "3.4.0-beta.5",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -14,6 +14,7 @@
     "license": "ISC",
     "dependencies": {
         "aws-sdk": "^2.1560.0",
+        "cors": "^2.8.5",
         "dotenv": "^16.4.4",
         "express": "^4.18.2",
         "express-fileupload": "^1.4.3",

package/src/controllers/client.controllers.js

@@ -1281,23 +1281,23 @@ export async function domainDetailsConfiguration( req, res ) {
 
 
     // Map and rename keys from previous client info for UI display and logging
-    const oldData = {
-      DomainName: getPreData?.domainConfig?.ssoLogin?.domainName,
-      IsEnable: getPreData?.domainConfig?.ssoLogin?.isEnable ==true ? 'Enable': 'Disable',
-      IPWhitelist: getPreData?.domainConfig?.ipWhitelisting?.enableWhitelisting ==true ? 'Enable': 'Disable',
-      WhitelistedIps: ( getPreData?.domainConfig?.ipWhitelisting?.allowedIps ).join( ', ' ),
-      TwoFactorAuthentication: getPreData?.domainConfig?.enableOtp ==true ? 'Enable': 'Disable',
+    // const oldData = {
+    //   DomainName: getPreData?.domainConfig?.ssoLogin?.domainName,
+    //   IsEnable: getPreData?.domainConfig?.ssoLogin?.isEnable ==true ? 'Enable': 'Disable',
+    //   IPWhitelist: getPreData?.domainConfig?.ipWhitelisting?.enableWhitelisting ==true ? 'Enable': 'Disable',
+    //   WhitelistedIps: ( getPreData?.domainConfig?.ipWhitelisting?.allowedIps )?.join( ', ' ),
+    //   TwoFactorAuthentication: getPreData?.domainConfig?.enableOtp ==true ? 'Enable': 'Disable',
 
-    };
+    // };
 
     // Map and rename keys from current client info for UI display and logging
-    const newData ={
-      DomainName: getPostData?.domainConfig?.ssoLogin?.domainName,
-      IsEnable: getPostData?.domainConfig?.ssoLogin?.isEnable ==true ? 'Enable': 'Disable',
-      IPWhitelist: getPostData?.domainConfig?.ipWhitelisting?.enableWhitelisting ==true ? 'Enable': 'Disable',
-      WhitelistedIps: ( getPostData?.domainConfig?.ipWhitelisting?.allowedIps ).join( ', ' ),
-      TwoFactorAuthentication: getPostData?.domainConfig?.enableOtp ==true ? 'Enable': 'Disable',
-    };
+    // const newData ={
+    //   DomainName: getPostData?.domainConfig?.ssoLogin?.domainName,
+    //   IsEnable: getPostData?.domainConfig?.ssoLogin?.isEnable ==true ? 'Enable': 'Disable',
+    //   IPWhitelist: getPostData?.domainConfig?.ipWhitelisting?.enableWhitelisting ==true ? 'Enable': 'Disable',
+    //   WhitelistedIps: ( getPostData?.domainConfig?.ipWhitelisting?.allowedIps ).join( ', ' ),
+    //   TwoFactorAuthentication: getPostData?.domainConfig?.enableOtp ==true ? 'Enable': 'Disable',
+    // };
 
 
     // Prepare activity log object with all relevant details for OpenSearch logging
@@ -1313,8 +1313,8 @@ export async function domainDetailsConfiguration( req, res ) {
       showTo: [ 'client', 'tango' ], // Visibility of the log (who can see this log)
       previous: getPreData, // Previous (old) client information before update based on DB keys (for internal reference and comparison).
       current: getPostData, // Current (new) client information after update based on DB keys (for internal reference and comparison).
-      oldData: oldData, // Previous (old) client information before update (used for showing detailed changes in the UI).
-      newData: newData, // Current (new) client information after update (used for showing detailed changes in the UI).
+      // oldData: oldData, // Previous (old) client information before update (used for showing detailed changes in the UI).
+      // newData: newData, // Current (new) client information after update (used for showing detailed changes in the UI).
     };
 
     // Insert activity log into OpenSearch if there are fields that were updated
@@ -2276,7 +2276,7 @@ export async function detailedClientCount( req, res ) {
   }
 }
 
-export async function getActivityLogs1( req, res ) {
+export async function getActivityLogs( req, res ) {
   try {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
@@ -2285,8 +2285,7 @@ export async function getActivityLogs1( req, res ) {
         $match: {
           $and: [
             {
-              clientId: { $in: inputData },
-            },
+              clientId: { $in: [ inputData?.clientId ] } },
           ],
         },
       },
@@ -2310,31 +2309,17 @@ export async function getActivityLogs1( req, res ) {
     const query = {
       '_source': [
         'userId', 'userName', 'email', 'date', 'logType', 'logSubType',
-        'changes', 'eventType', 'previous', 'current',
+        'changes', 'eventType', 'previous', 'current', 'oldData', 'newData',
       ],
       'query': {
         'bool': {
-          // 'must': [
-          //   {
-          //     'terms': {
-          //       'clientId.keyword': [ req.body.clientId ],
-          //     },
-          //   },
-          // ],
-
-          'should': [
-            {
-              'terms': {
-                'clientId.keyword': [ inputData.clientId ],
-              },
-            },
+          'must': [
             {
               'terms': {
-                'clientName.keyword': [ getClientName[0].clientName ], // Add clientName condition
+                'clientId.keyword': [ req.body.clientId ],
               },
             },
           ],
-          'minimum_should_match': 1, // Ensures at least one condition must match
         },
       },
       'from': ( req.body.offset - 1 ) * req.body.limit,
@@ -2388,12 +2373,16 @@ export async function getActivityLogs1( req, res ) {
         let respo ={};
         hit._source.logSubType = hit._source.logSubType === 'documentUpload'? 'documentsUpload': hit._source.logSubType === 'domainDetails'? 'securityFeatures': hit?._source?.logSubType;
         if ( ( ( hit?._source?.eventType ).match( /update/ ) || ( hit?._source?.eventType ).match( /edit/ ) )&& hit?._source?.previous ) {
-          const previous = hit?._source?.previous;
-          const current=hit?._source?.current;
+          const previous = hit?._source?.logType == 'cameras'?hit?._source?.oldData: hit?._source?.previous;
+          const current=hit?._source?.logType == 'cameras'? hit?._source?.newData:hit?._source?.current;
           const logType =hit?._source?.logType;
-
           const logSubType =hit?._source?.logSubType;
-          respo = findDifferences1( previous, current, logType, logSubType );
+          if ( previous && current && hit?._source?.logType == 'cameras' ) {
+            respo = findDifferences( previous, current );
+          } else {
+            respo = findDifferences1( previous, current, logType, logSubType );
+          }
+
           hit._source.updatedValue = respo;
           temp.push( hit?._source );
           hit._source.changes =logSubType === 'ticketConfig'? Object.keys( respo ).map( ( item ) => item ) : hit._source.changes;
@@ -2547,7 +2536,7 @@ function getUserFriendlyKey( keyPath, mapping ) {
   return typeof value === 'string' ? value : keyPath; // Return mapped value or original key
 }
 
-export async function getActivityLogs( req, res ) {
+export async function getActivityLogs1( req, res ) {
   try {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );