Skip to content

Commit c866afd

Browse files
committed
Merge pull request #217 from flovilmart/fix-216
Adds proper http request to match parse original implementation
2 parents bf1b886 + 5a37c83 commit c866afd

File tree

2 files changed

+45
-31
lines changed

2 files changed

+45
-31
lines changed

httpRequest.js

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
var request = require("request"),
2+
Parse = require('parse/node').Parse;
3+
4+
module.exports = function(options) {
5+
var promise = new Parse.Promise();
6+
var callbacks = {
7+
success: options.success,
8+
error: options.error
9+
};
10+
delete options.success;
11+
delete options.error;
12+
if (options.uri && !options.url) {
13+
options.uri = options.url;
14+
delete options.url;
15+
}
16+
if (typeof options.body === 'object') {
17+
options.body = JSON.stringify(options.body);
18+
}
19+
request(options, (error, response, body) => {
20+
var httpResponse = {};
21+
httpResponse.status = response.statusCode;
22+
httpResponse.headers = response.headers;
23+
httpResponse.buffer = new Buffer(response.body);
24+
httpResponse.cookies = response.headers["set-cookie"];
25+
httpResponse.text = response.body;
26+
try {
27+
httpResponse.data = JSON.parse(response.body);
28+
} catch (e) {}
29+
// Consider <200 && >= 400 as errors
30+
if (error || httpResponse.status <200 || httpResponse.status >=400) {
31+
if (callbacks.error) {
32+
return callbacks.error(httpResponse);
33+
}
34+
return promise.reject(httpResponse);
35+
} else {
36+
if (callbacks.success) {
37+
return callbacks.success(httpResponse);
38+
}
39+
return promise.resolve(httpResponse);
40+
}
41+
});
42+
return promise;
43+
};

index.js

+2-31
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var batch = require('./batch'),
1111
multer = require('multer'),
1212
Parse = require('parse/node').Parse,
1313
PromiseRouter = require('./PromiseRouter'),
14-
request = require('request');
14+
httpRequest = require('./httpRequest');
1515

1616
// Mutate the Parse object to add the Cloud Code handlers
1717
addParseCloud();
@@ -148,36 +148,7 @@ function addParseCloud() {
148148
var className = getClassName(parseClass);
149149
Parse.Cloud.Triggers.afterDelete[className] = handler;
150150
};
151-
Parse.Cloud.httpRequest = function(options) {
152-
var promise = new Parse.Promise();
153-
var callbacks = {
154-
success: options.success,
155-
error: options.error
156-
};
157-
delete options.success;
158-
delete options.error;
159-
if (options.uri && !options.url) {
160-
options.uri = options.url;
161-
delete options.url;
162-
}
163-
if (typeof options.body === 'object') {
164-
options.body = JSON.stringify(options.body);
165-
}
166-
request(options, (error, response, body) => {
167-
if (error) {
168-
if (callbacks.error) {
169-
return callbacks.error(error);
170-
}
171-
return promise.reject(error);
172-
} else {
173-
if (callbacks.success) {
174-
return callbacks.success(body);
175-
}
176-
return promise.resolve(body);
177-
}
178-
});
179-
return promise;
180-
};
151+
Parse.Cloud.httpRequest = httpRequest;
181152
global.Parse = Parse;
182153
}
183154

0 commit comments

Comments
 (0)