joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add invalid __type check

Browse Source
This commit is contained in:
jim1_lin
2016-02-26 16:39:27 +08:00
committed by Jim Lin
parent bd89338b39
commit d067c0ba61
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spec/ParseObject.spec.js
View File

@@ -335,6 +335,11 @@ describe('Parse.Object testing', () => {
'Item should not be updated with invalid key.'); 'Item should not be updated with invalid key.');
item.save({ "foo^bar": "baz" }).then(fail, done); item.save({ "foo^bar": "baz" }).then(fail, done);
}); });
it("invalid __type", function(done) {
var item = new Parse.Object("Item");
item.save({ "foo": {__type: "IvalidName"} }).then(fail, done);
});
it("simple field deletion", function(done) { it("simple field deletion", function(done) {
var simple = new Parse.Object("SimpleObject"); var simple = new Parse.Object("SimpleObject");

46
src/Schema.js
View File

@@ -626,7 +626,7 @@ Schema.prototype.validateRequiredColumns = function(className, object, query) {
if (!columns || columns.length == 0) { if (!columns || columns.length == 0) {
return Promise.resolve(this); return Promise.resolve(this);
} }
var missingColumns = columns.filter(function(column){ var missingColumns = columns.filter(function(column){
if (query && query.objectId) { if (query && query.objectId) {
if (object[column] && typeof object[column] === "object") { if (object[column] && typeof object[column] === "object") {
@@ -636,15 +636,15 @@ Schema.prototype.validateRequiredColumns = function(className, object, query) {
// Not trying to do anything there // Not trying to do anything there
return false; return false;
} }
return !object[column] return !object[column]
}); });
if (missingColumns.length > 0) { if (missingColumns.length > 0) {
throw new Parse.Error( throw new Parse.Error(
Parse.Error.INCORRECT_TYPE, Parse.Error.INCORRECT_TYPE,
missingColumns[0]+' is required.'); missingColumns[0]+' is required.');
} }
return Promise.resolve(this); return Promise.resolve(this);
} }
@@ -731,19 +731,31 @@ function getObjectType(obj) {
if (obj instanceof Array) { if (obj instanceof Array) {
return 'array'; return 'array';
} }
if (obj.__type === 'Pointer' && obj.className) { if (obj.__type){
return '*' + obj.className; switch(obj.__type) {
} case 'Pointer' :
if (obj.__type === 'File' && obj.name) { if(obj.className) {
return 'file'; return '*' + obj.className;
} }
if (obj.__type === 'Date' && obj.iso) { break;
return 'date'; case 'File' :
} if(obj.url && obj.name) {
if (obj.__type == 'GeoPoint' && return 'file';
obj.latitude != null && }
obj.longitude != null) { break;
return 'geopoint'; case 'Date' :
if(obj.iso) {
return 'date';
}
break;
case 'GeoPoint' :
if(obj.latitude != null && obj.longitude != null) {
return 'geopoint';
}
break;
default :
throw new Parse.Error(Parse.Error.INCORRECT_TYPE, 'invalid type: ' + obj.__type);
}
} }
if (obj['$ne']) { if (obj['$ne']) {
return getObjectType(obj['$ne']); return getObjectType(obj['$ne']);