Skip to content

Commit 3db0fb6

Browse files
committed
Using serverUrl constant for batch requests.
1 parent 33bebc3 commit 3db0fb6

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
},
3030
"dependencies": {
3131
"babel-runtime": "^5.8.20",
32-
"xmlhttprequest": "^1.7.0"
32+
"xmlhttprequest": "^1.7.0",
33+
"url": "^0.11.0"
3334
},
3435
"devDependencies": {
3536
"babel-jest": "~5.3.0",

src/ParseObject.js

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ import unsavedChildren from './unsavedChildren';
4040
import type { AttributeMap, OpsMap } from './ObjectState';
4141
import type { RequestOptions, FullOptions } from './RESTController';
4242

43+
import url from 'url';
44+
4345
export type Pointer = {
4446
__type: string;
4547
className: string;
@@ -1570,13 +1572,21 @@ var DefaultController = {
15701572
}
15711573
var deleteCompleted = ParsePromise.as();
15721574
var errors = [];
1575+
1576+
var serverUrl = CoreManager.get('SERVER_URL');
1577+
if (serverUrl[serverUrl.length - 1] !== '/') {
1578+
serverUrl += '/';
1579+
}
1580+
1581+
var serverUrlPath = url.parse(serverUrl, true, true).path;
1582+
15731583
batches.forEach((batch) => {
15741584
deleteCompleted = deleteCompleted.then(() => {
15751585
return RESTController.request('POST', 'batch', {
15761586
requests: batch.map((obj) => {
15771587
return {
15781588
method: 'DELETE',
1579-
path: '/1/classes/' + obj.className + '/' + obj._getId(),
1589+
path: serverUrlPath + 'classes/' + obj.className + '/' + obj._getId(),
15801590
body: {}
15811591
};
15821592
})
@@ -1695,12 +1705,19 @@ var DefaultController = {
16951705
batchTasks.push(ObjectState.enqueueTask(obj.className, obj._getStateIdentifier(), task));
16961706
});
16971707

1708+
var serverUrl = CoreManager.get('SERVER_URL');
1709+
if (serverUrl[serverUrl.length - 1] !== '/') {
1710+
serverUrl += '/';
1711+
}
1712+
1713+
var serverUrlPath = url.parse(serverUrl, true, true).path;
1714+
16981715
ParsePromise.when(batchReady).then(() => {
16991716
// Kick off the batch request
17001717
return RESTController.request('POST', 'batch', {
17011718
requests: batch.map((obj) => {
17021719
var params = obj._getSaveParams();
1703-
params.path = '/1/' + params.path;
1720+
params.path = serverUrlPath + params.path;
17041721
return params;
17051722
})
17061723
}, options);

0 commit comments

Comments
 (0)