Skip to content
This repository has been archived by the owner on Jan 20, 2024. It is now read-only.

Call callback even if there is exception #135

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Call callback even if there is exception #135

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
99 changes: 52 additions & 47 deletions lib/fuel-soap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,67 +555,72 @@ FuelSoap.prototype._parseResponse = function(key, body, callback) {
};

parseString(body, parseOptions, function(err, res) {
if(err) {
err.errorPropagatedFrom = 'xml2js.parseString';
callback(err, null);
return;
}
try{
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

try, catch is the only change in this pr

if(err) {
err.errorPropagatedFrom = 'xml2js.parseString';
callback(err, null);
return;
}

var soapError;
var soapBody = res['soap:Envelope']['soap:Body'];
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was getting exception from here when res['soap:Envelope'] is null when res is <h1>596 Service Not Found</h1>


var soapError;
var soapBody = res['soap:Envelope']['soap:Body'];
// Check for SOAP Fault
if(soapBody['soap:Fault']) {
var fault = soapBody['soap:Fault'];
soapError = new Error(fault.faultstring);
soapError.faultstring = fault.faultstring;
soapError.faultCode = fault.faultcode;

// Check for SOAP Fault
if(soapBody['soap:Fault']) {
var fault = soapBody['soap:Fault'];
soapError = new Error(fault.faultstring);
soapError.faultstring = fault.faultstring;
soapError.faultCode = fault.faultcode;
if(fault.detail) {
soapError.detail = fault.detail;
}

if(fault.detail) {
soapError.detail = fault.detail;
soapError.errorPropagatedFrom = 'SOAP Fault';
callback(soapError, null);
return;
}

soapError.errorPropagatedFrom = 'SOAP Fault';
callback(soapError, null);
return;
}
var parsedRes = soapBody[key];

var parsedRes = soapBody[key];
if(key === 'DefinitionResponseMsg') {
// Return empty object if no ObjectDefinition is returned.
parsedRes.ObjectDefinition = parsedRes.ObjectDefinition || {};
callback(null, parsedRes);
return;
}

if(key === 'DefinitionResponseMsg') {
// Return empty object if no ObjectDefinition is returned.
parsedRes.ObjectDefinition = parsedRes.ObjectDefinition || {};
callback(null, parsedRes);
return;
}
// Results should always be an array
parsedRes.Results = Array.isArray(parsedRes.Results) ? parsedRes.Results : isObject(parsedRes.Results) ? [parsedRes.Results] : [];

// Results should always be an array
parsedRes.Results = Array.isArray(parsedRes.Results) ? parsedRes.Results : isObject(parsedRes.Results) ? [parsedRes.Results] : [];
if(key === 'RetrieveResponseMsg') {
if(parsedRes.OverallStatus === 'OK' || parsedRes.OverallStatus === 'MoreDataAvailable') {
callback(null, parsedRes);
} else {
// This is an error
soapError = new Error(parsedRes.OverallStatus.split(':')[1].trim());
soapError.requestId = parsedRes.RequestID;
soapError.errorPropagatedFrom = 'Retrieve Response';
callback(soapError, null);
}
return;
}

if(key === 'RetrieveResponseMsg') {
if(parsedRes.OverallStatus === 'OK' || parsedRes.OverallStatus === 'MoreDataAvailable') {
callback(null, parsedRes);
} else {
// This is an error
soapError = new Error(parsedRes.OverallStatus.split(':')[1].trim());
if(parsedRes.OverallStatus === 'Error' || parsedRes.OverallStatus === 'Has Errors') {
soapError = new Error('Soap Error');
soapError.requestId = parsedRes.RequestID;
soapError.errorPropagatedFrom = 'Retrieve Response';
soapError.results = parsedRes.Results;
soapError.errorPropagatedFrom = key;
callback(soapError, null);
return;
}
return;
}

if(parsedRes.OverallStatus === 'Error' || parsedRes.OverallStatus === 'Has Errors') {
soapError = new Error('Soap Error');
soapError.requestId = parsedRes.RequestID;
soapError.results = parsedRes.Results;
soapError.errorPropagatedFrom = key;
callback(soapError, null);
return;
}

callback(null, parsedRes);
callback(null, parsedRes);
} catch(error){
callback(err, null);
}
}.bind(this));

};

// Methods that need implementations
Expand Down