added forceMTOM option and updated the Readme (#1086)

* fixed MTOM removing soap12header

* cleaned code + added test

* added forceMTOM extra request option to send MTOM requests even if no attachement

* Update Readme.md

Readme.md

@@ -500,6 +500,19 @@ The `options` object is optional and is passed to the `request`-module.
 Interesting properties might be:
 * `timeout`: Timeout in milliseconds
 * `forever`: Enables keep-alive connections and pools them
+* `attachments`: array of attachment objects. This converts the request into MTOM: _headers['Content-Type']='multipart/related; type="application/xop+xml"; start= ... '_
+  ```
+  [{
+        mimetype: content mimetype,
+        contentId: part id,
+        name: file name,
+        body: binary data
+   },
+    ...
+  ]
+  ```
+* `forceMTOM`: set to True if you want to send the request as MTOM even if you don't have attachments
+
 
 ### Client.*method*Async(args) - call *method* on the SOAP service.
 

src/http.ts

@@ -68,7 +68,7 @@ export class HttpClient {
     const mergeOptions = ['headers'];
     const attachments: IAttachment[] = exoptions.attachments || [];
 
-    if (typeof data === 'string' && attachments.length === 0) {
+    if (typeof data === 'string' && attachments.length === 0 && !exoptions.forceMTOM) {
       headers['Content-Length'] = Buffer.byteLength(data, 'utf8');
       headers['Content-Type'] = 'application/x-www-form-urlencoded';
     }
@@ -85,7 +85,7 @@ export class HttpClient {
       followAllRedirects: true,
     };
 
-    if (exoptions.alwaysMTOM || attachments.length > 0) {
+    if (exoptions.forceMTOM || attachments.length > 0) {
       const start = uuid();
       let action = null;
       if (headers['Content-Type'].indexOf('action') > -1) {
@@ -105,6 +105,7 @@ export class HttpClient {
         'Content-ID': '<' + start + '>',
         'body': data,
       }];
+
       attachments.forEach((attachment) => {
         multipart.push({
           'Content-Type': attachment.mimetype,
@@ -163,7 +164,6 @@ export class HttpClient {
   ) {
     const options = this.buildRequest(rurl, data, exheaders, exoptions);
     let req: req.Request;
-
     if (exoptions !== undefined && exoptions.hasOwnProperty('ntlm')) {
       // sadly when using ntlm nothing to return
       // Not sure if this can be handled in a cleaner way rather than an if/else,

test/client-test.js

@@ -260,7 +260,6 @@ var fs = require('fs'),
           });
           req.on('end', function () {
             const body = Buffer.concat(bufs).toString().trim();
-            console.log(body);
             const headers = req.headers;
             const boundary = headers['content-type'].match(/boundary="?([^"]*"?)/)[1];
             const parts = body.split(new RegExp('--' + boundary + '-{0,2}'))
@@ -290,6 +289,31 @@ var fs = require('fs'),
         }, baseUrl)
       })
 
+      it('Should send MTOM request even without attachment', function (done) {
+        soap.createClient(__dirname + '/wsdl/attachments.wsdl', _.assign({ forceSoap12Headers: true }, meta.options), function (initError, client) {
+          assert.ifError(initError);
+
+          client.MyOperation({}, function (error, response, body, soapHeader, rawRequest) {
+            assert.ifError(error);
+            const contentType = {};
+            body.contentType.split(/;\s?/).forEach(dir => {
+              const keyValue = dir.match(/(.*)="?([^"]*)?/);
+              if (keyValue && keyValue.length > 2) {
+                contentType[keyValue[1].trim()] = keyValue[2].trim();
+              } else {
+                contentType.rootType = dir;
+              }
+            });
+            assert.equal(contentType.rootType, 'multipart/related');
+            assert.equal(body.parts.length, 1);
+
+            const dataHeaders = body.parts[0];
+            assert(dataHeaders['Content-Type'].indexOf('application/xop+xml') > -1);
+            assert.equal(dataHeaders['Content-ID'], contentType.start);
+            done();
+          }, { forceMTOM: true })
+        }, baseUrl)
+      })
     })
 
     describe('Headers in request and last response', function () {