Skip to content
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

Soap 1.1 Fault fix & enabled rest of the tests in wsdl-test.js #12

Merged
merged 3 commits into from
Sep 16, 2016
+90 −61
Merged

Soap 1.1 Fault fix & enabled rest of the tests in wsdl-test.js #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c28cea
check soap version for fault processing
rashmihunt Sep 14, 2016
2f64d67
ignoring .DS_Store file
rashmihunt Sep 14, 2016
b37d8b9
Fixed soap 1.1 Fault path & enabled rest of the tests in wsdl-test.js
rashmihunt Sep 16, 2016
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -5,4 +5,6 @@ lib
.idea
*.iml
.vscode
.eslintrc
.eslintrc
.DS_Store

58 changes: 34 additions & 24 deletions src/parser/wsdl/operation.js
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ class Operation extends WSDLElement {
//there can be multiple faults defined in the operation. They all will have same type name 'fault'
//what differentiates them from each other is, the element/s which will get added under fault <detail> during runtime.
this.faults = [];
this.soapVersion;
}

addChild(child) {
@@ -37,6 +38,14 @@ class Operation extends WSDLElement {
case 'operation': // soap:operation
this.soapAction = child.$soapAction || '';
this.style = child.$style || '';
//figure out from the binding operation soap version 1.1 or 1.2
if (child.$soapAction !== undefined){
if(child.nsURI === 'http://schemas.xmlsoap.org/wsdl/soap/'){
this.soapVersion ='1.1';
} else if(child.nsURI === 'http://schemas.xmlsoap.org/wsdl/soap12/') {
this.soapVersion ='1.2';
}
}
break;
}
}
@@ -187,6 +196,7 @@ class Operation extends WSDLElement {
name: this.$name,
style: this.mode,
soapAction: this.soapAction,
soapVersion: this.soapVersion,
input: {
body: input,
headers: inputHeaders
@@ -204,12 +214,12 @@ class Operation extends WSDLElement {
this.descriptor.outputEnvelope =
Operation.createEnvelopeDescriptor(this.descriptor.output, true);
this.descriptor.faultEnvelope =
Operation.createEnvelopeDescriptor(this.descriptor.faults, true);
Operation.createEnvelopeDescriptor(this.descriptor.faults, true, this.soapVersion);

return this.descriptor;
}

static createEnvelopeDescriptor(parameterDescriptor, isOutput, prefix, nsURI) {
static createEnvelopeDescriptor(parameterDescriptor, isOutput, soapVersion, prefix, nsURI) {
prefix = prefix || 'soap';
nsURI = nsURI || 'http://schemas.xmlsoap.org/soap/envelope/';
var descriptor = new TypeDescriptor();
@@ -237,41 +247,41 @@ class Operation extends WSDLElement {
bodyDescriptor.add(parameterDescriptor.headers);
}

//process faults. An example of resulting structure of the <Body> element with <Fault> element descriptor:
//process faults. An example of resulting structure of the <Body> element with soap 1.1 <Fault> element descriptor:
/*
<Body>
<Fault>
<faultcode> </faultcode>
<faultstring> </faultstring>
<faultactor> </faultactor>
<detail>
<myMethodFault1>
<errorMessage1> </errorMessage1>
<value1> </value1>
</myMethodFault1>
</detail>
<soap:Body>
<soap:Fault>
<faultcode>sampleFaultCode</faultcode>
<faultstring>sampleFaultString</faultstring>
<detail>
<myMethodFault2>
<errorMessage2> </errorMessage2>
<value2> </value2>
</myMethodFault2>
<ns1:myMethodFault1 xmlns:ns1="http://example.com/doc_literal_wrapped_test.wsdl">
<errorMessage1>MyMethod Business Exception message</errorMessage1>
<value1>10</value1>
</ns1:myMethodFault1>
</detail>
</Fault>
</Body>
</soap:Fault>
</soap:Body>
*/
if (isOutput && parameterDescriptor && parameterDescriptor.body.Fault) {
let xsdStr = new QName(helper.namespaces.xsd, 'string', 'xsd');
var form;
if (soapVersion === '1.1') {
form = 'unqualified';
} else if (soapVersion === '1.2') {
form = 'qualified';
}

let faultDescriptor = new ElementDescriptor(
new QName(nsURI, 'Fault', prefix), null, 'qualified', false);
bodyDescriptor.add(faultDescriptor);
faultDescriptor.add(
new ElementDescriptor(new QName(nsURI, 'faultcode', prefix), null, 'qualified', false));
new ElementDescriptor(new QName(nsURI, 'faultcode', prefix), null, form, false));
faultDescriptor.add(
new ElementDescriptor(new QName(nsURI, 'faultstring', prefix), null, 'qualified', false));
new ElementDescriptor(new QName(nsURI, 'faultstring', prefix), null, form, false));
faultDescriptor.add(
new ElementDescriptor(new QName(nsURI, 'faultactor', prefix), null, 'qualified', false));
new ElementDescriptor(new QName(nsURI, 'faultactor', prefix), null, form, false));
let detailDescriptor =
new ElementDescriptor(new QName(nsURI, 'detail', prefix), null, 'qualified', false);
new ElementDescriptor(new QName(nsURI, 'detail', prefix), null, form, false);

//multiple faults may be defined in wsdl for this operation. Go though every Fault and add it under <detail> element.
for (var f in parameterDescriptor.body.Fault.faults) {
41 changes: 22 additions & 19 deletions test/wsdl-test.js
View file

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions test/wsdl/typeref/request.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"itemRq": {
"ecomRq": {
"rqUID": "001"
},
"item": {
"qty": 100,
"itemId": "item01"
},
"backupItem": {
"qty": 50,
"itemId": "item02"
"orderRq": {
"itemRq": {
"ecomRq": {
"rqUID": "001"
},
"item": {
"qty": 100,
"itemId": "item01"
},
"backupItem": {
"qty": 50,
"itemId": "item02"
}
}
}
}
24 changes: 18 additions & 6 deletions test/wsdl/typeref/request.xml.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
module.exports = '<ns1:orderRq xmlns:ns1="http://example.org/ns1" xmlns="http://example.org/ns1">' +
'<ns1:itemRq><ns1:ecomRq><ns2:rqUID xmlns:ns2="http://example.org/ns2">001</ns2:rqUID>' +
'</ns1:ecomRq><ns1:item><qty>100</qty>' +
'<ns2:itemId xmlns:ns2="http://example.org/ns2">item01</ns2:itemId></ns1:item>' +
'<ns2:backupItem xmlns:ns2="http://example.org/ns2"><qty>50</qty>' +
'<ns2:itemId>item02</ns2:itemId></ns2:backupItem></ns1:itemRq></ns1:orderRq>';
module.exports =
'<soap:Body>\n '+
'<ns2:orderRq xmlns:ns2=\"http://example.org/ns1\">\n '+
'<ns2:itemRq>\n '+
'<ns2:ecomRq>\n '+
'<ns3:rqUID xmlns:ns3=\"http://example.org/ns2\">001</ns3:rqUID>\n '+
'</ns2:ecomRq>\n '+
'<ns2:item>\n '+
'<qty>100</qty>\n '+
'<ns3:itemId xmlns:ns3=\"http://example.org/ns2\">item01</ns3:itemId>\n '+
'</ns2:item>\n '+
'<ns3:backupItem xmlns:ns3=\"http://example.org/ns2\">\n '+
'<qty>50</qty>\n '+
'<ns3:itemId>item02</ns3:itemId>\n '+
'</ns3:backupItem>\n '+
'</ns2:itemRq>\n '+
'</ns2:orderRq>\n'+
'</soap:Body>\n';