Merge pull request #3 from strongloop/server-test-fixes

Fixed soapHeader addition for both server and client

Author: rashmihunt

src/base.js

@@ -2,6 +2,7 @@ var EventEmitter = require('events').EventEmitter;
 var NamespaceContext = require('./parser/nscontext');
 var SOAPElement = require('./soapModel').SOAPElement;
 var xmlBuilder = require('xmlbuilder');
+var XMLHandler = require('./parser/xmlHandler');
 
 class Base extends EventEmitter {
   constructor(wsdl, options) {
@@ -122,6 +123,24 @@ class Base extends EventEmitter {
     return nsContext;
   }
 
+  addSoapHeadersToEnvelope(soapHeaderElement, xmlHandler) {
+    for (let i = 0, n = this.soapHeaders.length; i < n; i++) {
+      let soapHeader = this.soapHeaders[i];
+      let elementDescriptor;
+      if (typeof soapHeader.value === 'object') {
+        if (soapHeader.qname && soapHeader.qname.nsURI) {
+            let element = this.findElement(soapHeader.qname.nsURI, soapHeader.qname.name);
+            elementDescriptor =
+              element && element.describe(this.wsdl.definitions);
+        }
+        xmlHandler.jsonToXml(soapHeaderElement, null, elementDescriptor,
+          soapHeader.value);
+      } else { //soapHeader has XML value
+        XMLHandler.parseXml(soapHeaderElement, soapHeader.xml);
+      }
+    }
+  }
+
 }
 
 module.exports = Base;

src/client.js

@@ -158,18 +158,8 @@ class Client extends Base {
 
     var soapHeaderElement = envelope.header;
     var soapBodyElement = envelope.body;
-
-    for (let i = 0, n = this.soapHeaders.length; i < n; i++) {
-      let soapHeader = this.soapHeaders[i];
-      if (soapHeader.qname.nsURI === null || soapHeader.qname.nsURI === undefined) {
-        continue;
-      }
-      let element = this.findElement(soapHeader.qname.nsURI, soapHeader.qname.name);
-      let elementDescriptor =
-        element && element.describe(this.wsdl.definitions);
-      xmlHandler.jsonToXml(soapHeaderElement, nsContext, elementDescriptor,
-        soapHeader.value);
-    }
+    //add soapHeaders to envelope. Header can be xml, or JSON object which may or may not be described in WSDL/XSD.
+    this.addSoapHeadersToEnvelope(soapHeaderElement, this.xmlHandler);
 
     if (self.security && self.security.addSoapHeaders) {
       xml = self.security.addSoapHeaders(envelope.header);
@@ -229,7 +219,7 @@ class Client extends Base {
 
         var outputEnvDescriptor = operationDescriptor.outputEnvelope;
         try {
-          obj = xmlHandler.xmlToJson(nsContext, body, outputBodyDescriptor);
+          obj = xmlHandler.xmlToJson(nsContext, body, outputEnvDescriptor);
         } catch (error) {
           //  When the output element cannot be looked up in the wsdl and the body is JSON
           //  instead of sending the error, we pass the body in the response.

src/server.js

@@ -356,13 +356,9 @@ class Server extends Base {
       this._addWSSecurityHeader(env.header);
     }
 
-    if (this.soapHeaders) {
-      for (var i = 0, n = this.soapHeaders.length; i < n; i++) {
-        var header = this.soapHeaders[i];
-        env.header.element(header);
-      }
-    }
-
+    var soapHeaderElement = env.header;
+    //add soapHeaders to envelope. Header can be xml, or JSON object which may or may not be described in WSDL/XSD.
+    this.addSoapHeadersToEnvelope(soapHeaderElement, this.xmlHandler);
     return env;
   };
 

src/soapModel.js

@@ -15,13 +15,6 @@ class SOAPElement {
     }
   }
 
-  addTo(parent, nsContext, xmlHandler) {
-    if (this.xml) {
-      xmlHandler.parseXml(parent, xml);
-    } else {
-      xmlHandler.jsonToXml(parent, nsContext, null, this.qname, this.value);
-    }
-  }
 }
 
 /**