Merge pull request #313 from apinf/feature/filtering-data-by-api

Feature/filtering data by api

Author: brylie

client/views/dashboard/charts/charts.js

@@ -11,9 +11,6 @@ Template.chartsLayout.rendered = function () {
     index : "api-umbrella-logs-v1-"+currentYearAndMonth,
     type  : "log",
     limit : initialLimit,
-    query : {
-      match_all: {}
-    },
     fields: [
       'request_at',
       'request_ip_country',

client/views/dashboard/charts/filter/filter.js

@@ -23,9 +23,6 @@ Template.chartsLayout.events({
       index : "api-umbrella-logs-v1-"+year+"-"+month,
       type  : "log",
       limit : limit,
-      query : {
-        match_all: {}
-      },
       fields: [
         'request_at',
         'request_ip_country',

server/methods/elasticSearch.js

@@ -1,11 +1,44 @@
 Meteor.methods({
   "getChartData": function (data) {
 
+    // initialise variables
+    var loggedInUser;
+    var apiKey;
+    var query;
+
+    // get user object
+    loggedInUser = Meteor.user();
+
+    // get user role & check user role
+    if (Roles.userIsInRole(loggedInUser, ['admin'])) {
+
+      // if admin - match_all
+      // construct query
+      query = {
+        match_all: {}
+      }
+
+    } else{
+
+      // else - user - match api_key: api_key
+
+      // get user's api_key
+      apiKey  = loggedInUser.profile.apiKey;
+
+      // construct query
+      query   = {
+        "match": {
+          "api_key": apiKey
+        }
+      }
+      
+    }
+
     var newSearch = new ElasticRest(
       data.index,
       data.type,
       data.limit,
-      data.query,
+      query,
       data.fields
     );