Merge pull request #295 from apinf/feature/ratelimit-field

Feature/ratelimit field

Author: frenchbread

both/collections/backend.js

@@ -78,31 +78,10 @@ ApiBackendsSchema = new SimpleSchema({
     type: String,
     regEx: /^[a-z0-9A-Z_]{3,15}$/
   },
-  duration: {
-    type: Number,
-    optional: true,
-    label: 'Duration'
-  },
-  accuracy:{
-    type: Number,
-    optional: true
-  },
-  limit_by: {
-    type: String,
-    optional: true
-  },
-  limit: {
-    type: Number,
-    optional: true
-  },
   distributed: {
     type: Boolean,
     optional: true
   },
-  response_headers: {
-    type: Boolean,
-    optional: true
-  },
   matcher_type: {
     type: String,
     optional: true
@@ -227,8 +206,43 @@ ApiBackendsSchema = new SimpleSchema({
       'Custom rate limits',
       'Unlimited requests'
     ],
-    label: 'Rate limit'
   },
+
+  custom_rate_limits: {
+    type: [Object],
+    optional: true
+  },
+  "custom_rate_limits.$.duration": {
+    type: String,
+    optional: true
+  },
+  "custom_rate_limits.$.accuracy": {
+    type: Number,
+    optional: true,
+    allowedValues: [
+      'Seconds',
+      'Minutes',
+      'Hours'
+    ]
+  },
+  "custom_rate_limits.$.limit_by": {
+    type: String,
+    optional: true,
+    allowedValues: [
+      'API key',
+      'IP Address'
+    ]
+  },
+  "custom_rate_limits.$.limit": {
+    type: Number,
+    optional: true,
+    label: 'Number of requests',
+  },
+
+  "custom_rate_limits.$.response_headers": {
+    type: Boolean,
+    optional: true
+},
   anonymous_rate_limit_behavior: {
     type: String,
     optional: true

client/views/api_backends/api_backends.html

@@ -46,10 +46,9 @@ <h4>Global Request Settings</h4>
     {{> afQuickField name='pass_api_key_header'}}
     {{> afQuickField name='pass_api_key_query_param'}}
     {{> afQuickField name='rate_limit_mode' options="allowed"}}
-    {{> afQuickField name='duration'}}
-    {{> afQuickField name='accuracy'}}
-    {{> afQuickField name='limit_by'}}
-    {{> afQuickField name='limit'}}
+    {{#if afFieldValueIs name='rate_limit_mode' value="Custom rate limits"}}
+    {{> afQuickField name='custom_rate_limits'}}
+    {{/if}}
     <h4>Sub-URL Request Settings</h4>
     <hr />
     <span class="help-block">Change settings for specific sub-URLs within this API.</span>