Merge pull request #4861 from Countly/ar2rsawseen/master

[account-settings] allow generating new api key

Author: ar2rsawseen

plugins/plugins/frontend/public/javascripts/countly.views.js

@@ -997,6 +997,15 @@
                         this.components[allComponents[i]._id] = allComponents[i];
                     }
                 }
+            },
+            //generate API key which is a random string 32 chars long
+            generateAPIKey: function() {
+                var text = "";
+                var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+                for (var i = 0; i < 32; i++) {
+                    text += possible.charAt(Math.floor(Math.random() * possible.length));
+                }
+                return text;
             }
         }
     });
@@ -1191,7 +1200,25 @@
     };
     if (countlyAuth.validateGlobalAdmin()) {
         if (countlyGlobal.plugins.indexOf("drill") !== -1) {
-            showInAppManagment.drill = {"big_list_limit": true, "record_big_list": true, "cache_threshold": true, "correct_estimation": true, "custom_property_limit": true, "list_limit": true, "projection_limit": true, "record_actions": true, "record_crashes": true, "record_meta": true, "record_pushes": true, "record_sessions": true, "record_star_rating": true, "record_apm": true, "record_views": true};
+            showInAppManagment.drill = {
+                "big_list_limit": true,
+                "record_big_list": true,
+                "cache_threshold": true,
+                "correct_estimation": true,
+                "custom_property_limit": true,
+                "list_limit": true,
+                "projection_limit": true,
+                "record_actions": true,
+                "record_crashes": true,
+                "record_meta": true,
+                "record_pushes": true,
+                "record_pushes_sent": true,
+                "record_sessions": true,
+                "record_star_rating": true,
+                "record_apm": true,
+                "record_consent": true,
+                "record_views": true
+            };
         }
         if (countlyGlobal.plugins.includes("logger")) {
             showInAppManagment.logger = {"state": true, "limit": true};

plugins/plugins/frontend/public/localization/plugins.properties

@@ -50,6 +50,7 @@ configs.changed = Settings changed
 configs.saved = Changes were successfully saved
 configs.frontend = Frontend
 configs.api = API
+configs.regenerate = Regenerate
 configs.logger = Incoming Data Logs
 configs.apps = Apps
 configs.logs = Logs

plugins/plugins/frontend/public/stylesheets/main.scss

@@ -72,3 +72,9 @@
         }
     }
 }
+
+.apikey {
+    .el-input {
+        width: 320px;
+    }
+}

plugins/plugins/frontend/public/templates/account-settings.html

@@ -21,8 +21,9 @@ <h3 class="bu-mb-4"> {{i18n('plugins.user-configs')}} &nbsp;</h3>
                                         <cly-inline-form-field rules="required" :label="i18n('management-users.full-name')" prop="full_name">
                                             <el-input :placeholder="i18n('management-users.full-name')" v-model="formScope.editedObject.full_name" @input="nameChanged"></el-input>
                                         </cly-inline-form-field>
-                                        <cly-inline-form-field rules="required" :label="i18n('user-settings.api-key')" prop="api_key">
-                                            <el-input :placeholder="i18n('user-settings.api-key')" v-model="formScope.editedObject.api_key"></el-input>
+                                        <cly-inline-form-field rules="required" :label="i18n('user-settings.api-key')" prop="api_key" class="apikey">
+                                            <el-input :placeholder="i18n('user-settings.api-key')" v-model="formScope.editedObject.api_key" readonly></el-input>
+                                            <el-button @click="formScope.editedObject.api_key = generateAPIKey()">{{i18n('configs.regenerate')}}</el-button>
                                         </cly-inline-form-field>
                                         <cly-inline-form-field :label="i18n('management-users.password')">
                                             <el-button @click="changePassword.showDialog = true">{{i18n('user-settings.change-password')}}</el-button>

plugins/push/api/jobs/util/resultor.js

@@ -514,14 +514,15 @@ class Resultor extends DoFinish {
 
                         this.log.d('Recording %d [CLY]_push_sent\'s: %j', sent, params);
                         require('../../../../../api/parts/data/events').processEvents(params);
+                        //plugins.dispatch("/plugins/drill", {params: params, dbAppUser: params.app_user, events: params.qstring.events});
 
-                        /*try {
+                        try {
                             this.log.d('Recording %d data points', sent);
                             require('../../../../server-stats/api/parts/stats').updateDataPoints(common.writeBatcher, app._id, 0, {"p": sent});
                         }
                         catch (e) {
                             this.log.d('Error during dp recording', e);
-                        }*/
+                        }
                         this.sentUsers[aid][mid][p] = 0;
                     }
                 });