Merge branch 'master' into dependabot/npm_and_yarn/sharp-0.34.4

Author: ar2rsawseen

bin/scripts/expire-data/delete_custom_events.js

@@ -22,7 +22,7 @@ Promise.all([pluginManager.dbConnection("countly"), pluginManager.dbConnection("
     common.drillDb = drillDb;
     //GET APP
     try {
-        const app = await countlyDb.collection("apps").findOne({_id: ObjectId(APP_ID)}, {_id: 1, name: 1});
+        const app = await countlyDb.collection("apps").findOne({_id: new ObjectId(APP_ID)}, {_id: 1, name: 1});
         console.log("App:", app.name);
         //GET EVENTS
         let events = EVENTS;

package-lock.json

@@ -63,7 +63,7 @@
     "express-session": "1.18.2",
     "form-data": "^4.0.0",
     "formidable": "2.1.3",
-    "fs-extra": "11.3.1",
+    "fs-extra": "11.3.2",
     "geoip-lite": "1.4.10",
     "get-random-values": "^4.0.0",
     "grunt": "1.6.1",