Merge pull request #1 from ParsePlatform/master

updating

Author: mehdy

spec/HTTPRequest.spec.js

@@ -216,17 +216,6 @@ describe("httpRequest", () => {
     });
   });
 
-  it('should get a cat image', (done) => {
-    httpRequest({
-      url: 'http://thecatapi.com/api/images/get?format=src&type=jpg',
-      followRedirects: true
-    }).then((res) => {
-      expect(res.buffer).not.toBe(null);
-      expect(res.text).not.toBe(null);
-      done();
-    })
-  })
-
   it("should params object to query string", (done) => {
     httpRequest({
       url: httpRequestServer+"/qs",

spec/MongoTransform.spec.js

@@ -23,11 +23,13 @@ var dummySchema = {
 };
 
 
-describe('parseObjectToMongoObject', () => {
+describe('parseObjectToMongoObjectForCreate', () => {
 
   it('a basic number', (done) => {
     var input = {five: 5};
-    var output = transform.parseObjectToMongoObject(dummySchema, null, input);
+    var output = transform.parseObjectToMongoObjectForCreate(dummySchema, null, input, {
+      fields: {five: {type: 'Number'}}
+    });
     jequal(input, output);
     done();
   });
@@ -37,7 +39,7 @@ describe('parseObjectToMongoObject', () => {
       createdAt: "2015-10-06T21:24:50.332Z",
       updatedAt: "2015-10-06T21:24:50.332Z"
     };
-    var output = transform.parseObjectToMongoObject(dummySchema, null, input);
+    var output = transform.parseObjectToMongoObjectForCreate(dummySchema, null, input);
     expect(output._created_at instanceof Date).toBe(true);
     expect(output._updated_at instanceof Date).toBe(true);
     done();
@@ -49,43 +51,53 @@ describe('parseObjectToMongoObject', () => {
       objectId: 'myId',
       className: 'Blah',
     };
-    var out = transform.parseObjectToMongoObject(dummySchema, null, {pointers: [pointer]});
+    var out = transform.parseObjectToMongoObjectForCreate(dummySchema, null, {pointers: [pointer]},{
+      fields: {pointers: {type: 'Array'}}
+    });
     jequal([pointer], out.pointers);
     done();
   });
 
-  it('a delete op', (done) => {
+  //TODO: object creation requests shouldn't be seeing __op delete, it makes no sense to
+  //have __op delete in a new object. Figure out what this should actually be testing.
+  notWorking('a delete op', (done) => {
     var input = {deleteMe: {__op: 'Delete'}};
-    var output = transform.parseObjectToMongoObject(dummySchema, null, input);
+    var output = transform.parseObjectToMongoObjectForCreate(dummySchema, null, input);
     jequal(output, {});
     done();
   });
 
   it('basic ACL', (done) => {
     var input = {ACL: {'0123': {'read': true, 'write': true}}};
-    var output = transform.parseObjectToMongoObject(dummySchema, null, input);
+    var output = transform.parseObjectToMongoObjectForCreate(dummySchema, null, input);
     // This just checks that it doesn't crash, but it should check format.
     done();
   });
 
   describe('GeoPoints', () => {
     it('plain', (done) => {
       var geoPoint = {__type: 'GeoPoint', longitude: 180, latitude: -180};
-      var out = transform.parseObjectToMongoObject(dummySchema, null, {location: geoPoint});
+      var out = transform.parseObjectToMongoObjectForCreate(dummySchema, null, {location: geoPoint},{
+        fields: {location: {type: 'GeoPoint'}}
+      });
       expect(out.location).toEqual([180, -180]);
       done();
     });
 
     it('in array', (done) => {
       var geoPoint = {__type: 'GeoPoint', longitude: 180, latitude: -180};
-      var out = transform.parseObjectToMongoObject(dummySchema, null, {locations: [geoPoint, geoPoint]});
+      var out = transform.parseObjectToMongoObjectForCreate(dummySchema, null, {locations: [geoPoint, geoPoint]},{
+        fields: {locations: {type: 'Array'}}
+      });
       expect(out.locations).toEqual([geoPoint, geoPoint]);
       done();
     });
 
     it('in sub-object', (done) => {
       var geoPoint = {__type: 'GeoPoint', longitude: 180, latitude: -180};
-      var out = transform.parseObjectToMongoObject(dummySchema, null, { locations: { start: geoPoint }});
+      var out = transform.parseObjectToMongoObjectForCreate(dummySchema, null, { locations: { start: geoPoint }},{
+        fields: {locations: {type: 'Object'}}
+      });
       expect(out).toEqual({ locations: { start: geoPoint } });
       done();
     });
@@ -196,7 +208,9 @@ describe('transform schema key changes', () => {
     var input = {
       somePointer: {__type: 'Pointer', className: 'Micro', objectId: 'oft'}
     };
-    var output = transform.parseObjectToMongoObject(dummySchema, null, input);
+    var output = transform.parseObjectToMongoObjectForCreate(dummySchema, null, input, {
+      fields: {somePointer: {type: 'Pointer'}}
+    });
     expect(typeof output._p_somePointer).toEqual('string');
     expect(output._p_somePointer).toEqual('Micro$oft');
     done();
@@ -206,7 +220,9 @@ describe('transform schema key changes', () => {
     var input = {
       userPointer: {__type: 'Pointer', className: '_User', objectId: 'qwerty'}
     };
-    var output = transform.parseObjectToMongoObject(dummySchema, null, input);
+    var output = transform.parseObjectToMongoObjectForCreate(dummySchema, null, input, {
+      fields: {userPointer: {type: 'Pointer'}}
+    });
     expect(typeof output._p_userPointer).toEqual('string');
     expect(output._p_userPointer).toEqual('_User$qwerty');
     done();
@@ -219,7 +235,7 @@ describe('transform schema key changes', () => {
         "Kevin": { "write": true }
       }
     };
-    var output = transform.parseObjectToMongoObject(dummySchema, null, input);
+    var output = transform.parseObjectToMongoObjectForCreate(dummySchema, null, input);
     expect(typeof output._rperm).toEqual('object');
     expect(typeof output._wperm).toEqual('object');
     expect(output.ACL).toBeUndefined();

spec/Parse.Push.spec.js

@@ -1,5 +1,6 @@
 'use strict';
 
+let request = require('request');
 
 describe('Parse.Push', () => {
 
@@ -89,4 +90,57 @@ describe('Parse.Push', () => {
       done();
     });
   });
+
+  it('should not allow clients to query _PushStatus', done => {
+    setup()
+    .then(() => Parse.Push.send({
+      where: {
+        deviceType: 'ios'
+      },
+      data: {
+        badge: 'increment',
+        alert: 'Hello world!'
+      }
+    }, {useMasterKey: true}))
+    .then(() => {
+      request.get({
+        url: 'http://localhost:8378/1/classes/_PushStatus',
+        json: true,
+        headers: {
+          'X-Parse-Application-Id': 'test',
+        },
+      }, (error, response, body) => {
+        expect(body.results.length).toEqual(0);
+        done();
+      });
+    });
+  });
+
+  it('should allow master key to query _PushStatus', done => {
+    setup()
+    .then(() => Parse.Push.send({
+      where: {
+        deviceType: 'ios'
+      },
+      data: {
+        badge: 'increment',
+        alert: 'Hello world!'
+      }
+    }, {useMasterKey: true}))
+    .then(() => {
+      request.get({
+        url: 'http://localhost:8378/1/classes/_PushStatus',
+        json: true,
+        headers: {
+          'X-Parse-Application-Id': 'test',
+          'X-Parse-Master-Key': 'test',
+        },
+      }, (error, response, body) => {
+        expect(body.results.length).toEqual(1);
+        expect(body.results[0].query).toEqual('{"deviceType":"ios"}');
+        expect(body.results[0].payload).toEqual('{"badge":"increment","alert":"Hello world!"}');
+        done();
+      });
+    });
+  });
 });

spec/ParseAPI.spec.js

@@ -1298,6 +1298,52 @@ describe('miscellaneous', function() {
         done();
       });
     })
+  });
+  
+  it('properly returns incremented values (#1554)', (done) => {
+      let headers = {
+        'Content-Type': 'application/json',
+        'X-Parse-Application-Id': 'test',
+        'X-Parse-REST-API-Key': 'rest'
+      };
+      let requestOptions = {
+        headers: headers,
+        url: 'http://localhost:8378/1/classes/AnObject',
+        json: true
+      };
+     let object = new Parse.Object('AnObject');;
+     
+     function runIncrement(amount) {
+       let options = Object.assign({}, requestOptions, {
+         body: {
+           "key": {
+            __op: 'Increment', 
+            amount: amount
+           }
+          },
+         url: 'http://localhost:8378/1/classes/AnObject/'+object.id
+       })
+       return new Promise((resolve, reject) => {
+         request.put(options, (err, res, body)  => {
+           if (err) {
+             reject(err);
+           } else {
+             resolve(body);
+           }
+         });
+       })
+     }
+     
+     object.save().then(() => {
+       return runIncrement(1);
+     }).then((res) => {
+       expect(res.key).toBe(1);
+       return runIncrement(-1);
+     }).then((res) => {
+       console.log(res);
+       expect(res.key).toBe(0);
+       done();
+     })
   })
 
 });

spec/ParseUser.spec.js

@@ -1028,6 +1028,23 @@ describe('Parse.User testing', () => {
     });
   });
 
+  it('returns authData when authed and logged in with provider (regression test for #1498)', done => {
+    Parse.Object.enableSingleInstance();
+    let provider = getMockFacebookProvider();
+    Parse.User._registerAuthenticationProvider(provider);
+    Parse.User._logInWith('facebook', {
+      success: user => {
+        let userQuery = new Parse.Query(Parse.User);
+        userQuery.get(user.id)
+        .then(user => {
+          expect(user.get('authData')).not.toBeUndefined();
+          Parse.Object.disableSingleInstance();
+          done();
+        });
+      }
+    });
+  });
+
   it('log in with provider with files', done => {
     let provider = getMockFacebookProvider();
     Parse.User._registerAuthenticationProvider(provider);
@@ -2273,4 +2290,61 @@ describe('Parse.User testing', () => {
     });
   });
 
+  it('should not create extraneous session tokens', (done) => {
+    let config = new Config(Parse.applicationId);
+    config.database.loadSchema().then((s) => {
+      // Lock down the _User class for creation
+      return s.addClassIfNotExists('_User', {}, {create: {}})
+    }).then((res) => {
+      let user  = new Parse.User();
+      return user.save({'username': 'user', 'password': 'pass'});
+    }).then(() => {
+      fail('should not be able to save the user');
+    }, (err) => {
+      return Promise.resolve();
+    }).then(() => {
+      let q = new Parse.Query('_Session');
+      return q.find({useMasterKey: true})
+    }).then((res) => {
+      // We should have no session created
+      expect(res.length).toBe(0);
+      done();
+    }, (err) => {
+      fail('should not fail');
+      done();
+    });
+  });
+
+  it('should not overwrite username when unlinking facebook user (regression test for #1532)', done => {
+    Parse.Object.disableSingleInstance();
+    var provider = getMockFacebookProvider();
+    Parse.User._registerAuthenticationProvider(provider);
+    var user = new Parse.User();
+    user.set("username", "testLinkWithProvider");
+    user.set("password", "mypass");
+    user.signUp()
+    .then(user => user._linkWith("facebook", {
+      success: user => {
+        expect(user.get('username')).toEqual('testLinkWithProvider');
+        expect(Parse.FacebookUtils.isLinked(user)).toBeTruthy();
+        return user._unlinkFrom('facebook')
+        .then(() => user.fetch())
+        .then(user => {
+          expect(user.get('username')).toEqual('testLinkWithProvider');
+          expect(Parse.FacebookUtils.isLinked(user)).toBeFalsy();
+          done();
+        });
+      },
+      error: e => {
+        fail('Unexpected failure testing linking');
+        fail(error);
+        done();
+      }
+    }))
+    .catch(error => {
+      fail('Unexpected failure testing in unlink user test');
+      fail(error);
+      done();
+    });
+  });
 });