lint

Author: turtledreams

.eslintrc.js

@@ -83,10 +83,10 @@ module.exports = {
           "always"
       ],
       "no-multi-spaces": [
-          "error"
+          "warn"
       ],
       "no-trailing-spaces": [
-          "error",
+          "warn",
           {
               "ignoreComments": true
           }

lib/countly-bulk.js

@@ -197,7 +197,7 @@ function CountlyBulk(conf) {
                 query.hour = query.hour || date.getHours();
                 query.dow = query.dow || date.getDay();
                 query.tz = query.tz || -date.getTimezoneOffset();
-                cc.log(cc.logLevelEnums.INFO, "CountlyBulk add_bulk_request, adding the request into queue:["+ JSON.stringify(query) + "]");
+                cc.log(cc.logLevelEnums.INFO, `CountlyBulk add_bulk_request, adding the request into queue: [${JSON.stringify(query)}]`);
                 requestQueue.push(query);
             }
             CountlyStorage.storeSet("cly_req_queue", requestQueue);

lib/countly.js

@@ -850,7 +850,7 @@ Countly.Bulk = Bulk;
             user.custom = cc.truncateObject(user.custom, Countly.maxKeyLength, Countly.maxValueSize, Countly.maxSegmentationValues, "user_details");
             var request = { user_details: JSON.stringify(cc.getProperties(user, props)) };
             if (!user.picture && user.picturePath) {
-                cc.log(cc.logLevelEnums.INFO, "user_details, Picture is not set but picturePath is set, will try to upload picture from path.");    
+                cc.log(cc.logLevelEnums.INFO, "user_details, Picture is not set but picturePath is set, will try to upload picture from path.");
                 request.picturePath = user.picturePath;
             }
             toRequestQueue(request);
@@ -1658,16 +1658,22 @@ Countly.Bulk = Bulk;
                     var fileName = path.basename(filePath);
                     var ext = (fileName.split('.').pop() || '').toLowerCase();
                     var contentType = 'application/octet-stream';
-                    if (ext === 'png') contentType = 'image/png';
-                    else if (ext === 'jpg' || ext === 'jpeg') contentType = 'image/jpeg';
-                    else if (ext === 'gif') contentType = 'image/gif';
+                    if (ext === 'png') { 
+                        contentType = 'image/png';
+                    } else if (ext === 'jpg' || ext === 'jpeg') {
+                        contentType = 'image/jpeg';
+                    } else if (ext === 'gif') {
+                        contentType = 'image/gif';
+                    }
 
                     var boundary = 'FormBoundary' + Math.random().toString(16).slice(2);
                     var bodyParts = [];
 
                     for (var p in params) {
                         if (!Object.prototype.hasOwnProperty.call(params, p)) continue;
-                        if (p === 'picturePath') continue;
+                        if (p === 'picturePath') {
+                            continue; 
+                        }
                         var value = params[p];
                         bodyParts.push(Buffer.from(`--${boundary}\r\n`));
                         bodyParts.push(Buffer.from(`Content-Disposition: form-data; name="${p}"\r\n\r\n`));
@@ -1689,7 +1695,7 @@ Countly.Bulk = Bulk;
                     options.method = "POST";
                     options.path = api;
                     options.headers = options.headers || {};
-                    options.headers['Content-Type'] = 'multipart/form-data; boundary=' + boundary;
+                    options.headers['Content-Type'] = `multipart/form-data; boundary=${boundary}`;
                     options.headers['Content-Length'] = data.length;
                 }
                 catch (e) {