revert

Author: dblythy

spec/CloudCode.spec.js

@@ -95,19 +95,13 @@ describe('Cloud Code', () => {
   it('can get and set config', () => {
     let currentConfig = Config.get('test');
     expect(Object.keys(Parse.Server)).toEqual(Object.keys(currentConfig));
-    Parse.Server.setSilent(['abc']);
-    currentConfig = Config.get('test');
-    expect(currentConfig.silent).toEqual(['abc']);
-  });
-
-  it('can set config with two args', () => {
     Parse.Server.set('silent', ['abc']);
-    const currentConfig = Config.get('test');
+    currentConfig = Config.get('test');
     expect(currentConfig.silent).toEqual(['abc']);
   });
 
   it('can throw on invalid config', () => {
-    expect(() => Parse.Server.setFoo()).toThrow('foo is not a valid Parse Server option');
+    expect(() => Parse.Server.set('foo', true)).toThrow('foo is not a valid Parse Server option');
   });
 
   it('show warning on duplicate cloud functions', done => {

src/Config.js

@@ -684,6 +684,15 @@ export class Config {
       ? this.pages.pagesEndpoint
       : 'apps';
   }
+
+  set(key, value) {
+    if (!ParseServerOptions[key]) {
+      throw `${key} is not a valid Parse Server option`;
+    }
+    this[key] = value;
+    Config.put(this);
+    return this;
+  }
 }
 
 export default Config;

src/ParseServer.js

@@ -45,7 +45,6 @@ import { SecurityRouter } from './Routers/SecurityRouter';
 import CheckRunner from './Security/CheckRunner';
 import Deprecator from './Deprecator/Deprecator';
 import { DefinedSchemas } from './SchemaMigrations/DefinedSchemas';
-import { ParseServerOptions as ParseServerDefintions } from './Options/Definitions.js';
 
 // Mutate the Parse object to add the Cloud Code handlers
 addParseCloud();
@@ -442,27 +441,7 @@ function addParseCloud() {
   if (!Parse.Server) {
     Object.defineProperty(Parse, 'Server', {
       get() {
-        const target = Config.get(Parse.applicationId);
-        const handler2 = {
-          get(obj, prop) {
-            if (prop.substring(0, 3) === 'set') {
-              const assignValue = (key, value) => {
-                if (!ParseServerDefintions[key]) {
-                  throw `${key} is not a valid Parse Server option`;
-                }
-                obj[key] = value;
-                Config.put(obj);
-              };
-              if (prop.length === 3) {
-                return assignValue;
-              }
-              const method = `${prop.charAt(3).toLowerCase()}${prop.substring(4, prop.length)}`;
-              return value => assignValue(method, value);
-            }
-            return obj[prop];
-          },
-        };
-        return new Proxy(target, handler2);
+        return Config.get(Parse.applicationId);
       },
     });
   }