Merge pull request #2961 from Countly/can/feature/new-ui

[vue][app-select] Auth

Author: can-keklik

frontend/express/public/javascripts/countly/countly.auth.js

@@ -168,6 +168,23 @@
         return validateWrite('d', feature, member, app_id);
     };
 
+    /**
+     * validate all types of requests for specific feature on specific app
+     * @param {string} accessType - write process type [c, r, u, d]
+     * @param {string} feature - feature name that required access right
+     * @param {object} member - countly member object
+     * @param {string} app_id - countly application id
+     * @return {boolean} result of permission check
+     */
+    countlyAuth.validate = function(accessType, feature, member, app_id) {
+        if (accessType === "r") {
+            return countlyAuth.validateRead(feature, member, app_id);
+        }
+        else {
+            return validateWrite(accessType, feature, member, app_id);
+        }
+    };
+
     /**
      * Validate is this user global admin or not
      * @returns {boolean} is this user global admin or not?

frontend/express/public/javascripts/countly/vue/components/helpers.js

@@ -1,4 +1,4 @@
-/* global Vue, CV, app, countlyEvent, countlyGlobal*/
+/* global Vue, CV, app, countlyEvent, countlyGlobal, countlyAuth*/
 
 (function(countlyVue) {
 
@@ -447,6 +447,13 @@
                 type: Number,
                 default: 0,
                 required: false
+            },
+            auth: {
+                type: Object,
+                default: function() {
+                    return {};
+                },
+                required: false
             }
         },
         computed: {
@@ -461,6 +468,24 @@
             },
             apps: function() {
                 var apps = countlyGlobal.apps || {};
+
+                if (this.auth && this.auth.feature && this.auth.permission) {
+                    var expectedPermission = this.auth.permission,
+                        targetFeature = this.auth.feature;
+
+                    return Object.keys(apps).reduce(function(acc, key) {
+                        var currentApp = apps[key];
+
+                        if (countlyAuth.validate(expectedPermission, targetFeature, null, currentApp._id)) {
+                            acc.push({
+                                label: currentApp.name,
+                                value: currentApp._id
+                            });
+                        }
+                        return acc;
+                    }, []);
+                }
+
                 return Object.keys(apps).map(function(key) {
                     return {
                         label: apps[key].name,

plugins/vue-example/frontend/public/templates/form.html

@@ -317,7 +317,7 @@ <h3>Checkbox group - plain</h3>
             </cly-section>
             <cly-section title="Helpers (cly-app-select, single)">
                 <div class="example-cell">
-                    <cly-app-select v-model="selectedApp"></cly-app-select>
+                    <cly-app-select v-model="selectedApp" :auth='{"feature": "drill", "permission": "c"}'></cly-app-select>
                     <cly-app-select v-model="selectedApp" allow-all></cly-app-select>
                 </div>
                 <div class="example-cell">