Merge from ParsePlatform/master

Author: aneeshd16

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Parse Server Changelog
 
+### 2.1.2 (2/19/2016)
+
+* Change: The S3 file adapter constructor requires a bucket name
+* Fix: Parse Query should throw if improperly encoded
+* Fix: Issue where roles were not used in some requests
+* Fix: serverURL will no longer default to api.parse.com/1
+
 ### 2.1.1 (2/18/2016)
 
 * Experimental: Schemas API support for DELETE operations

bin/dev

@@ -4,14 +4,17 @@ var nodemon = require('nodemon');
 var babel = require("babel-core");
 var gaze = require('gaze'); 
 var fs = require('fs');
+var path = require('path');
 
 // Watch the src and transpile when changed
 gaze('src/**/*', function(err, watcher) {
   if (err) throw err;
-  watcher.on('changed', function(file) {
-    console.log(file + " has changed");
+  watcher.on('changed', function(sourceFile) {
+    console.log(sourceFile + " has changed");
     try {
-      fs.writeFile(file.replace(/\/src\//, "/lib/"), babel.transformFileSync(file).code);
+      targetFile = path.relative(__dirname, sourceFile).replace(/\/src\//, '/lib/');
+      targetFile = path.resolve(__dirname, targetFile);
+      fs.writeFile(targetFile, babel.transformFileSync(sourceFile).code);
     } catch (e) {
       console.error(e.message, e.stack);
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {
@@ -12,6 +12,7 @@
     "apn": "^1.7.5",
     "aws-sdk": "~2.2.33",
     "azure-storage": "^0.8.0",
+    "babel-polyfill": "^6.5.0",
     "babel-runtime": "^6.5.0",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.14.2",

spec/FilesController.spec.js

@@ -0,0 +1,27 @@
+var FilesController = require('../src/Controllers/FilesController').FilesController;
+var Config = require("../src/Config");
+
+// Small additional tests to improve overall coverage
+describe("FilesController",()=>{
+  
+  it("should properly expand objects", (done) => {
+    var config = new Config(Parse.applicationId);
+    var filesController = new FilesController();
+    var result = filesController.expandFilesInObject(config, function(){});
+    
+    expect(result).toBeUndefined();
+    
+    var fullFile = {
+      type: '__type',
+      url: "http://an.url"
+    }
+    
+    var anObject = {
+      aFile: fullFile
+    }
+    filesController.expandFilesInObject(config, anObject);
+    expect(anObject.aFile.url).toEqual("http://an.url");
+    
+    done();
+  }) 
+})

spec/LoggerController.spec.js

@@ -2,53 +2,85 @@ var LoggerController = require('../src/Controllers/LoggerController').LoggerCont
 var FileLoggerAdapter = require('../src/Adapters/Logger/FileLoggerAdapter').FileLoggerAdapter;
 
 describe('LoggerController', () => {
-  it('can check valid master key of request', (done) => {
+  it('can check process a query witout throwing', (done) => {
     // Make mock request
-    var request = {
-      auth: {
-        isMaster: true
-      },
-      query: {}
-    };
+    var query = {};
 
     var loggerController = new LoggerController(new FileLoggerAdapter());
 
     expect(() => {
-      loggerController.handleGET(request);
+      loggerController.getLogs(query).then(function(res) {
+        expect(res.length).toBe(0);
+        done();
+      })
     }).not.toThrow();
+  });
+  
+  it('properly validates dateTimes', (done) => {
+    expect(LoggerController.validDateTime()).toBe(null);
+    expect(LoggerController.validDateTime("String")).toBe(null);
+    expect(LoggerController.validDateTime(123456).getTime()).toBe(123456);
+    expect(LoggerController.validDateTime("2016-01-01Z00:00:00").getTime()).toBe(1451606400000);
     done();
   });
-
-  it('can check invalid construction of controller', (done) => {
+  
+  it('can set the proper default values', (done) => {
+    // Make mock request
+    var result = LoggerController.parseOptions();
+    expect(result.size).toEqual(10);
+    expect(result.order).toEqual('desc');
+    expect(result.level).toEqual('info');
+   
+    done();
+  });
+  
+  it('can process a query witout throwing', (done) => {
     // Make mock request
-    var request = {
-      auth: {
-        isMaster: true
-      },
-      query: {}
+    var query = {
+      from: "2016-01-01Z00:00:00",
+      until: "2016-01-01Z00:00:00",
+      size: 5, 
+      order: 'asc',
+      level: 'error'
     };
 
-    var loggerController = new LoggerController();
+    var result = LoggerController.parseOptions(query);
 
-    expect(() => {
-      loggerController.handleGET(request);
-    }).toThrow();
+    expect(result.from.getTime()).toEqual(1451606400000);
+    expect(result.until.getTime()).toEqual(1451606400000);
+    expect(result.size).toEqual(5);
+    expect(result.order).toEqual('asc');
+    expect(result.level).toEqual('error');
+   
     done();
   });
-
-  it('can check invalid master key of request', (done) => {
+  
+  it('can check process a query witout throwing', (done) => {
     // Make mock request
-    var request = {
-      auth: {
-        isMaster: false
-      },
-      query: {}
+    var query = {
+      from: "2015-01-01",
+      until: "2016-01-01",
+      size: 5, 
+      order: 'desc',
+      level: 'error'
     };
 
     var loggerController = new LoggerController(new FileLoggerAdapter());
 
     expect(() => {
-      loggerController.handleGET(request);
+      loggerController.getLogs(query).then(function(res) {
+        expect(res.length).toBe(0);
+        done();
+      })
+    }).not.toThrow();
+  });
+  
+  it('should throw without an adapter', (done) => {
+
+    var loggerController = new LoggerController();
+
+    expect(() => {
+      loggerController.getLogs();
     }).toThrow();
     done();
   });

spec/LogsRouter.spec.js

@@ -0,0 +1,67 @@
+var LogsRouter = require('../src/Routers/LogsRouter').LogsRouter;
+var LoggerController = require('../src/Controllers/LoggerController').LoggerController;
+var FileLoggerAdapter = require('../src/Adapters/Logger/FileLoggerAdapter').FileLoggerAdapter;
+
+const loggerController = new LoggerController(new FileLoggerAdapter());
+
+describe('LogsRouter', () => {
+  it('can check valid master key of request', (done) => {
+    // Make mock request
+    var request = {
+      auth: {
+        isMaster: true
+      },
+      query: {},
+      config: {
+        loggerController: loggerController
+      }
+    };
+
+    var router = new LogsRouter();
+
+    expect(() => {
+      router.handleGET(request);
+    }).not.toThrow();
+    done();
+  });
+
+  it('can check invalid construction of controller', (done) => {
+    // Make mock request
+    var request = {
+      auth: {
+        isMaster: true
+      },
+      query: {},
+      config: {
+        loggerController: undefined // missing controller
+      }
+    };
+
+    var router = new LogsRouter();
+
+    expect(() => {
+      router.handleGET(request);
+    }).toThrow();
+    done();
+  });
+
+  it('can check invalid master key of request', (done) => {
+    // Make mock request
+    var request = {
+      auth: {
+        isMaster: false
+      },
+      query: {},
+      config: {
+        loggerController: loggerController
+      }
+    };
+
+   var router = new LogsRouter();
+
+    expect(() => {
+      router.handleGET(request);
+    }).toThrow();
+    done();
+  });
+});

spec/ParseObject.spec.js

@@ -1736,4 +1736,33 @@ describe('Parse.Object testing', () => {
     });
   });
 
+
+  it("should create nested keys with _", done => {
+    const object = new Parse.Object("AnObject");
+    object.set("foo", {
+      "_bar": "_",
+      "baz_bar": 1,
+      "__foo_bar": true,
+      "_0": "underscore_zero",
+      "_more": {
+        "_nested": "key"
+      }
+    });
+    object.save().then( res => {
+      ok(res);
+      return res.fetch();
+    }).then( res => {
+      const foo = res.get("foo");
+      expect(foo["_bar"]).toEqual("_");
+      expect(foo["baz_bar"]).toEqual(1);
+      expect(foo["__foo_bar"]).toBe(true);
+      expect(foo["_0"]).toEqual("underscore_zero");
+      expect(foo["_more"]["_nested"]).toEqual("key");
+      done();
+    }).fail( err => {
+      console.error(err);
+      fail("should not fail");
+      done();
+    })
+  })
 });

spec/ParseRole.spec.js

@@ -49,7 +49,7 @@ describe('Parse Role testing', () => {
     }).then((x) => {
       x.set('foo', 'baz');
       // This should fail:
-      return x.save();
+      return x.save({},{sessionToken: ""});
     }).then((x) => {
       fail('Should not have been able to save.');
     }, (e) => {