Merge remote-tracking branch 'upstream/master'

functions.js

@@ -8,7 +8,6 @@ var express = require('express'),
 var router = new PromiseRouter();
 
 function handleCloudFunction(req) {
-  // TODO: set user from req.auth
   if (Parse.Cloud.Functions[req.params.functionName]) {
     // Run the validator for this function first
     if (Parse.Cloud.Validators[req.params.functionName]) {
@@ -21,7 +20,9 @@ function handleCloudFunction(req) {
     return new Promise(function (resolve, reject) {
       var response = createResponseObject(resolve, reject);
       var request = {
-        params: req.body || {}
+        params: req.body || {},
+        master: req.auth && req.auth.isMaster,
+        user: req.auth && req.auth.user,
       };
       Parse.Cloud.Functions[req.params.functionName](request, response);
     });