Merge branch 'master' into dependabot/npm_and_yarn/cookie-parser-1.4.7

Author: ar2rsawseen

api/parts/mgmt/app_users.js

@@ -764,6 +764,7 @@ usersApi.merge = function(app_id, newAppUser, new_id, old_id, new_device_id, old
 var deleteMyExport = function(exportID) { //tries to delete packed file, exported folder and saved export in gridfs
     //normally there should be only export in gridfs. Cleaning all to be sure.
     //rejects only if there stays any saved data for export
+    log.d("deleteMyExport:" + exportID);
     return new Promise(function(resolve, reject) {
         //remove archive
         var errors = [];
@@ -775,7 +776,6 @@ var deleteMyExport = function(exportID) { //tries to delete packed file, exporte
                 errors.push(err);
             }
         }
-
         countlyFs.gridfs.deleteFile("appUsers", path.resolve(__dirname, './../../../export/AppUser/' + exportID + '.tar.gz'), {id: exportID + '.tar.gz'}, function(error) {
             if (error && error.message && error.message.substring(0, 12) !== "FileNotFound" && error.message.substring(0, 14) !== 'File not found') {
                 log.e(error.message.substring(0, 14));
@@ -806,6 +806,18 @@ var deleteMyExport = function(exportID) { //tries to delete packed file, exporte
             }
         });
 
+
+    }).then(function() {
+        return new Promise(function(resolve, reject) {
+            common.db.collection("exports").remove({"_eid": exportID}, function(err0) {
+                if (err0) {
+                    reject(err0);
+                }
+                else {
+                    resolve();
+                }
+            });
+        });
     });
 };
 
@@ -822,46 +834,42 @@ usersApi.deleteExport = function(filename, params, callback) {
             //remove archive
             deleteMyExport(base_name[0]).then(
                 function() {
-                    common.db.collection("exports").remove({"_eid": base_name[0]}, function(err0) {
-                        if (err0) {
-                            log.e(err0);
-                        }
-                        if (name_parts.length === 3 && name_parts[2] !== 'HASH') {
-                            //update user info
-                            common.db.collection('app_users' + name_parts[1]).update({"uid": name_parts[2]}, {$unset: {"appUserExport": ""}}, {upsert: false, multi: true}, function(err) {
-                                if (err) {
-                                    callback(err, "");
-                                }
-                                else {
-                                    plugins.dispatch("/systemlogs", {
-                                        params: params,
-                                        action: "export_app_user_deleted",
-                                        data: {
-                                            result: "ok",
-                                            uids: name_parts[2],
-                                            id: base_name[0],
-                                            app_id: name_parts[1],
-                                            info: "Exported data deleted"
-                                        }
-                                    });
-                                    callback(null, "Export deleted");
-                                }
-                            });
-                        }
-                        else {
-                            plugins.dispatch("/systemlogs", {
-                                params: params,
-                                action: "export_app_user_deleted",
-                                data: {
-                                    result: "ok",
-                                    id: base_name[0],
-                                    app_id: name_parts[1],
-                                    info: "Exported data deleted"
-                                }
-                            });
-                            callback(null, "Export deleted");
-                        }
-                    });
+                    if (name_parts.length === 3 && name_parts[2] !== 'HASH') {
+                        //update user info
+                        common.db.collection('app_users' + name_parts[1]).update({"uid": name_parts[2]}, {$unset: {"appUserExport": ""}}, {upsert: false, multi: true}, function(err) {
+                            if (err) {
+                                callback(err, "");
+                            }
+                            else {
+                                plugins.dispatch("/systemlogs", {
+                                    params: params,
+                                    action: "export_app_user_deleted",
+                                    data: {
+                                        result: "ok",
+                                        uids: name_parts[2],
+                                        id: base_name[0],
+                                        app_id: name_parts[1],
+                                        info: "Exported data deleted"
+                                    }
+                                });
+                                callback(null, "Export deleted");
+                            }
+                        });
+                    }
+                    else {
+                        plugins.dispatch("/systemlogs", {
+                            params: params,
+                            action: "export_app_user_deleted",
+                            data: {
+                                result: "ok",
+                                id: base_name[0],
+                                app_id: name_parts[1],
+                                info: "Exported data deleted"
+                            }
+                        });
+                        callback(null, "Export deleted");
+                    }
+
                 },
                 function(err) {
                     console.log(err);
@@ -1073,12 +1081,20 @@ usersApi.export = function(app_id, query, params, callback) {
             // else {
             // resolve();
             // }
-            new Promise(function(resolve) {
-                log.d("collection marked");
-                //export data from metric_changes
 
-                export_safely({projection: {"appUserExport": 0}, export_id: export_id, app_id: app_id, args: [...dbargs, "--collection", "metric_changes" + app_id, "-q", '{"uid":{"$in": ["' + res[0].uid.join('","') + '"]}}', "--out", export_folder + "/metric_changes" + app_id + ".json"]}).finally(function() {
-                    resolve();
+            //try deleting old export
+            deleteMyExport(export_id).then(function(err) {
+                if (err) {
+                    log.e(err);
+                }
+                log.d("old export deleted");
+                return new Promise(function(resolve) {
+                    log.d("collection marked");
+                    //export data from metric_changes
+
+                    export_safely({projection: {"appUserExport": 0}, export_id: export_id, app_id: app_id, args: [...dbargs, "--collection", "metric_changes" + app_id, "-q", '{"uid":{"$in": ["' + res[0].uid.join('","') + '"]}}', "--out", export_folder + "/metric_changes" + app_id + ".json"]}).finally(function() {
+                        resolve();
+                    });
                 });
             }).then(function() {
                 log.d("metric_changes exported");

api/utils/countlyFs.js

@@ -601,13 +601,19 @@ countlyFs.gridfs = {};
     *   console.log("Finished", err);
     * });
     */
-    ob.deleteFileById = function(category, id, callback) {
+    ob.deleteFileById = async function(category, id, callback) {
         var bucket = new GridFSBucket(db, { bucketName: category });
-        bucket.delete(id, function(error) {
+        try {
+            await bucket.delete(id);
             if (callback) {
-                callback(error);
+                callback(null);
             }
-        });
+        }
+        catch (ee) {
+            if (callback) {
+                callback(ee);
+            }
+        }
     };
 
     /**

plugins/push/api/send/platforms/a.js

@@ -18,7 +18,7 @@ const key = 'a';
  *  - has its own compilation part;
  *  - has its own sending part;
  *  - has no distinct representation in UI, therefore it's virtual.
- * 
+ *
  * Huawei push is only available on select Android devices, therefore it doesn't deserve a separate checkbox in UI from users perspective.
  * Yet notification payload, provider communication and a few other things are different, therefore it's a virtual platform. You can send to huawei directly using
  * API, but whenever you send to Android you'll also send to huawei if Huawei credentials are set.
@@ -27,20 +27,20 @@ const virtuals = ['h'];
 
 /**
  * Extract token & field from token_session request
- * 
+ *
  * @param {object} qstring request params
  * @returns {string[]|undefined} array of [platform, field, token] if qstring has platform-specific token data, undefined otherwise
  */
 function extractor(qstring) {
     if (qstring.android_token !== undefined && (!qstring.token_provider || qstring.token_provider === 'FCM')) {
         const token = qstring.android_token === 'BLACKLISTED' ? '' : qstring.android_token;
-        return [key, FIELDS['0'], token, util.hashInt(token)];
+        return [key, FIELDS['0'], token, util.hash(token)];
     }
 }
 
 /**
  * Make an estimated guess about request platform
- * 
+ *
  * @param {string} userAgent user-agent header
  * @returns {string} platform key if it looks like request made by this platform
  */
@@ -56,7 +56,7 @@ class FCM extends Splitter {
      * Standard constructor
      * @param {string} log logger name
      * @param {string} type type of connection: ap, at, id, ia, ip, ht, hp
-     * @param {Credentials} creds FCM credentials 
+     * @param {Credentials} creds FCM credentials
      * @param {Object[]} messages initial array of messages to send
      * @param {Object} options standard stream options
      * @param {number} options.pool.pushes number of notifications which can be processed concurrently, this parameter is strictly set to 500
@@ -90,8 +90,8 @@ class FCM extends Splitter {
     }
 
     /**
-     * Compile & send messages 
-     * 
+     * Compile & send messages
+     *
      * @param {Object[]} data pushes to send, no more than 500 per function call as enforced by stream writableHighWaterMark
      * @param {integer} length number of bytes in data
      * @returns {Promise} sending promise
@@ -217,7 +217,7 @@ class FCM extends Splitter {
 
 /**
  * Create new empty payload for the note object given
- * 
+ *
  * @param {Message} msg NMessageote object
  * @returns {object} empty payload object
  */
@@ -227,7 +227,7 @@ function empty(msg) {
 
 /**
  * Finish data object after setting all the properties
- * 
+ *
  * @param {object} data platform-specific data to finalize
  * @return {object} resulting object
  */
@@ -256,7 +256,7 @@ const fields = [
  */
 const map = {
     /**
-     * Sends sound 
+     * Sends sound
      * @param {Template} t template
      * @param {string} sound sound string
      */
@@ -267,7 +267,7 @@ const map = {
     },
 
     /**
-     * Sends badge 
+     * Sends badge
      * @param {Template} t template
      * @param {number} badge badge (0..N)
      */
@@ -278,7 +278,7 @@ const map = {
     /**
      * Sends buttons
      * !NOTE! buttons & messagePerLocale are inter-dependent as buttons urls/titles are locale-specific
-     * 
+     *
      * @param {Template} t template
      * @param {number} buttons buttons (1..2)
      */
@@ -290,7 +290,7 @@ const map = {
 
     /**
      * Set title string
-     * 
+     *
      * @param {Template} t template
      * @param {String} title title string
      */
@@ -300,7 +300,7 @@ const map = {
 
     /**
      * Set message string
-     * 
+     *
      * @param {Template} t template
      * @param {String} message message string
      */
@@ -310,7 +310,7 @@ const map = {
 
     /**
      * Send collapse_key.
-     * 
+     *
      * @param {Template} template template
      * @param {boolean} ck collapseKey of the Content
      */
@@ -322,7 +322,7 @@ const map = {
 
     /**
      * Send timeToLive.
-     * 
+     *
      * @param {Template} template template
      * @param {boolean} ttl timeToLive of the Content
      */
@@ -334,7 +334,7 @@ const map = {
 
     /**
      * Send notification-tap url
-     * 
+     *
      * @param {Template} template template
      * @param {string} url on-tap url
      */
@@ -345,7 +345,7 @@ const map = {
     /**
      * Send media (picture, video, gif, etc) along with the message.
      * Sets mutable-content in order for iOS extension to be run.
-     * 
+     *
      * @param {Template} template template
      * @param {string} media attached media url
      */
@@ -355,7 +355,7 @@ const map = {
 
     /**
      * Sends custom data along with the message
-     * 
+     *
      * @param {Template} template template
      * @param {Object} data data to be sent
      */
@@ -365,7 +365,7 @@ const map = {
 
     /**
      * Sends user props along with the message
-     * 
+     *
      * @param {Template} template template
      * @param {[string]} extras extra user props to be sent
      * @param {Object} data personalization
@@ -381,7 +381,7 @@ const map = {
 
     /**
      * Sends platform specific fields
-     * 
+     *
      * @param {Template} template template
      * @param {object} specific platform specific props to be sent
      */
@@ -417,7 +417,7 @@ const CREDS = {
     'fcm': class FCMCreds extends Creds {
         /**
          * Validation scheme of this class
-         * 
+         *
          * @returns {object} validateArgs scheme
          */
         static get scheme() {
@@ -429,7 +429,7 @@ const CREDS = {
 
         /**
          * Check credentials for correctness, throw PushError otherwise
-         * 
+         *
          * @throws PushError in case the check fails
          * @returns {undefined}
          */
@@ -469,7 +469,7 @@ const CREDS = {
 
         /**
          * "View" json, that is some truncated/simplified version of credentials that is "ok" to display
-         * 
+         *
          * @returns {object} json without sensitive information
          */
         get view() {