Skip to content

fix (nodejs-ajax) error for not escaped urls #30

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

Merged
Valodya merged 1 commit into from
Apr 26, 2016
Merged

fix (nodejs-ajax) error for not escaped urls #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 12 additions & 18 deletions libs/backendless.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,26 +380,25 @@

Backendless._ajax_for_nodejs = function(config) {
config.data = config.data || "";
config.asyncHandler = config.asyncHandler || {};
config.isAsync = (typeof config.isAsync == 'boolean') ? config.isAsync : false;

if (!config.isAsync) {
throw new Error('Use Async type of request using Backendless with NodeJS. Add Backendless.Async(successCallback, errorCallback) as last argument');
}

if (typeof config.data !== "string") {
config.data = JSON.stringify(config.data);
}

config.asyncHandler = config.asyncHandler || {};
config.isAsync = (typeof config.isAsync == 'boolean') ? config.isAsync : false;

var protocol = config.url.substr(0, config.url.indexOf('/', 8)).substr(0, config.url.indexOf(":"));
var https = protocol === 'https';

var uri = config.url.substr(0, config.url.indexOf('/', 8)).substr(config.url.indexOf("/") + 2),
host = uri.substr(0, (uri.indexOf(":") == -1 ? uri.length : uri.indexOf(":"))),
port = uri.indexOf(":") != -1 ? parseInt(uri.substr(uri.indexOf(":") + 1)) : (https ? 443 : 80);
var u = require('url').parse(config.url);
var https = u.protocol === 'https:';

var options = {
host : host,
port : port,
host : u.host,
port : u.port || https ? 443 : 80,
method : config.method || "GET",
path : config.url.substr(config.url.indexOf('/', 8)),
path : u.path,
headers: {
"Content-Length" : config.data ? Buffer.byteLength(config.data) : 0,
"Content-Type" : config.data ? 'application/json' : 'application/x-www-form-urlencoded',
Expand All @@ -413,10 +412,6 @@
options.headers["user-token"] = currentUser["user-token"];
}

if (!config.isAsync) {
throw new Error('Use Async type of request using Backendless with NodeJS. Add Backendless.Async(successCallback, errorCallback) as last argument');
}

var buffer;
var httpx = require(https ? 'https' : 'http');
var req = httpx.request(options, function(res) {
Expand All @@ -440,8 +435,7 @@
});

req.on('error', function(e) {
config.asyncHandler.fault || (config.asyncHandler.fault = function() {});
config.asyncHandler.fault(e);
config.asyncHandler.fault && config.asyncHandler.fault(e);
});

req.write(config.data);
Expand Down