wip

Author: dblythy

spec/RateLimit.spec.js

@@ -447,7 +447,7 @@ describe('rate limit', () => {
       validateRateLimit({
         rateLimit: [{ requestPath: 'a', requestTimeWindow: 1000, requestCount: 3, zone: 'abc' }],
       })
-    ).toThrow('rateLimit.zone must be one of global, session, user or ip');
+    ).toThrow('rateLimit.zone must be one of global, session, user, or ip');
     expect(() =>
       validateRateLimit({
         rateLimit: [

src/Config.js

@@ -18,6 +18,7 @@ import {
   SchemaOptions,
   SecurityOptions,
 } from './Options/Definitions';
+import ParseServer from './cloud-code/Parse.Server';
 
 function removeTrailingSlash(str) {
   if (!str) {
@@ -599,8 +600,10 @@ export class Config {
       if (option.errorResponseMessage && typeof option.errorResponseMessage !== 'string') {
         throw `rateLimit.errorResponseMessage must be a string`;
       }
-      if (option.zone && !['global', 'session', 'user', 'ip'].includes(option.zone)) {
-        throw `rateLimit.zone must be one of global, session, user or ip`;
+      const options = Object.keys(ParseServer.RateLimitZone);
+      if (option.zone && !options.includes(option.zone)) {
+        const formatter = new Intl.ListFormat('en', { style: 'short', type: 'disjunction' });
+        throw `rateLimit.zone must be one of ${formatter.format(options)}`;
       }
     }
   }