Skip to content

[Cloud Code][Validation] Pass in request object #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

[Cloud Code][Validation] Pass in request object #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
035fcd2
Added test for proper handling of trying to call a non-existing Cloud…
codegefluester Feb 3, 2016
6adffb0
Merge pull request #2 from codegefluester/cloud_code_validation
codegefluester Feb 3, 2016
4822d2b
Merge branch 'master' into test_for_calling_nonexisting_cf
codegefluester Feb 3, 2016
5420c38
Merge pull request #3 from codegefluester/test_for_calling_nonexistin…
codegefluester Feb 3, 2016
2ccd039
Merge remote-tracking branch 'upstream/master'
codegefluester Feb 6, 2016
ec1bbc8
Merge remote-tracking branch 'upstream/master'
codegefluester Feb 12, 2016
bd0d21a
Merge remote-tracking branch 'upstream/master'
codegefluester Feb 17, 2016
ce1de0a
Cloud Function validation now uses the complete request instead of ju…
codegefluester Feb 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions spec/ParseAPI.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ describe('miscellaneous', function() {
done();
});
});

it('test cloud function query parameters', (done) => {
Parse.Cloud.define('echoParams', (req, res) => {
res.success(req.params);
Expand Down Expand Up @@ -621,8 +621,8 @@ describe('miscellaneous', function() {
// Register a function with validation
Parse.Cloud.define('functionWithParameterValidation', (req, res) => {
res.success('works');
}, (params) => {
return params.success === 100;
}, (request) => {
return request.params.success === 100;
});

Parse.Cloud.run('functionWithParameterValidation', {"success":100}).then((s) => {
Expand All @@ -638,8 +638,8 @@ describe('miscellaneous', function() {
// Register a function with validation
Parse.Cloud.define('functionWithParameterValidationFailure', (req, res) => {
res.success('noway');
}, (params) => {
return params.success === 100;
}, (request) => {
return request.params.success === 100;
});

Parse.Cloud.run('functionWithParameterValidationFailure', {"success":500}).then((s) => {
Expand Down Expand Up @@ -721,4 +721,15 @@ describe('miscellaneous', function() {
});
});

it('fails on invalid function', done => {
Parse.Cloud.run('somethingThatDoesDefinitelyNotExist').then((s) => {
fail('This should have never suceeded');
done();
}, (e) => {
expect(e.code).toEqual(Parse.Error.SCRIPT_FAILED);
expect(e.message).toEqual('Invalid function.');
done();
});
});

});
17 changes: 8 additions & 9 deletions src/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,22 @@ var router = new PromiseRouter();
function handleCloudFunction(req) {
if (Parse.Cloud.Functions[req.params.functionName]) {

const params = Object.assign({}, req.body, req.query);

var request = {
params: Object.assign({}, req.body, req.query),
master: req.auth && req.auth.isMaster,
user: req.auth && req.auth.user,
installationId: req.info.installationId
};

if (Parse.Cloud.Validators[req.params.functionName]) {
var result = Parse.Cloud.Validators[req.params.functionName](params);
var result = Parse.Cloud.Validators[req.params.functionName](request);
if (!result) {
throw new Parse.Error(Parse.Error.SCRIPT_FAILED, 'Validation failed.');
}
}

return new Promise(function (resolve, reject) {
var response = createResponseObject(resolve, reject);
var request = {
params: params,
master: req.auth && req.auth.isMaster,
user: req.auth && req.auth.user,
installationId: req.info.installationId
};
Parse.Cloud.Functions[req.params.functionName](request, response);
});
} else {
Expand Down