@optimiser/common 1.0.256 → 1.0.259

package/dist/lib/utility.js

@@ -257,8 +257,8 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
                                                         ExtraLookupFields: [
                                                             "UserStatus",
                                                             "IsAppUser"
-                                                        ],
-                                                        OnLinkRender: "if(lookupRecord.IsAppUser==true){isHyperlink=false;}"
+                                                        ]
+                                                        /*,OnLinkRender: "if(lookupRecord.IsAppUser==true){isHyperlink=false;}"*/
                                                     }
                                                 };
                                                 createdDateObj = {
@@ -296,8 +296,8 @@ function GetPageFieldData(pageName, db, mdb, msp_d, next, callback) {
                                                         ExtraLookupFields: [
                                                             "UserStatus",
                                                             "IsAppUser"
-                                                        ],
-                                                        OnLinkRender: "if(lookupRecord.IsAppUser==true){isHyperlink=false;}"
+                                                        ]
+                                                        /*,OnLinkRender: "if(lookupRecord.IsAppUser==true){isHyperlink=false;}"*/
                                                     }
                                                 };
                                                 modDateObj = {
@@ -2614,7 +2614,8 @@ paratemter : {
 */
 function SignoutUserFromAllDevices(options, dbMaster, redisClient) {
     if (dbMaster) {
-        var sessionID_1 = '';
+        //commented by Nidhi on 24-Feb-2022, removing session id for seaching sessions
+        // let sessionID: any = '';
         var updateQuery_1 = { "IsActive": false, "Description": options.Description, "ModifiedBy": options.RemovedBy, "ModifiedDate": new Date() };
         dbMaster.collection('Session').find({ "UserID": options.UserID, "IsActive": true }, { projection: { "_id": 1, "SessionKey": 1, "Platform": 1 } }).toArray(function (err, data) {
             if (err) {
@@ -2622,7 +2623,7 @@ function SignoutUserFromAllDevices(options, dbMaster, redisClient) {
                     options.callback({ message: 'error', error: err });
             }
             if (data) {
-                sessionID_1 = data.map(function (x) { return x._id; });
+                // sessionID = data.map(x => x._id);
                 if (options.Platform) {
                     data = data.filter(function (x) { return (x.Platform == options.Platform); });
                 }
@@ -2635,7 +2636,14 @@ function SignoutUserFromAllDevices(options, dbMaster, redisClient) {
                     }
                 }
             }
-            dbMaster.collection('Session').updateMany({ _id: sessionID_1, "UserID": options.UserID, "IsActive": true }, { $set: updateQuery_1 }, function (err, data) {
+            //added by Nidhi on 24-Feb-2022, searching user session by platform
+            var searchQuery = { "UserID": options.UserID, "IsActive": true };
+            if (options.Platform) {
+                searchQuery["Platform"] = options.Platform;
+            }
+            //commented by Nidhi on 24-Feb-2022, removing session id for seaching sessions
+            //dbMaster.collection('Session').updateMany({ _id: sessionID, "UserID": options.UserID, "IsActive": true }, { $set: updateQuery },
+            dbMaster.collection('Session').updateMany(searchQuery, { $set: updateQuery_1 }, function (err, data) {
                 if (err) {
                     if (options.callback)
                         options.callback({ message: 'error', error: err });
@@ -3461,9 +3469,12 @@ function SyncUserLicenceConsumedCount(msp_d, db, dbMaster) {
                         companyLicencesData_1 = (companySetting.Setting.Licences) ? companySetting.Setting.Licences : {};
                         if (isEmptyObj(companyLicencesData_1) == false) {
                             for (i in companyLicencesData_1) {
-                                companyLicenceType = companyLicencesData_1[i];
-                                for (j in companyLicenceType) {
-                                    companyLicenceType[j].NoOfLicenceConsumed = 0;
+                                /*Added by Chetan on 07-Mar-2022, Not necessary for Domain Licence*/
+                                if (i != "Domain") {
+                                    companyLicenceType = companyLicencesData_1[i];
+                                    for (j in companyLicenceType) {
+                                        companyLicenceType[j].NoOfLicenceConsumed = 0;
+                                    }
                                 }
                             }
                             db.collection('UserLicence').aggregate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.256",
+  "version": "1.0.259",
   "description": "",
   "main": "dist/index.js",
   "scripts": {