Adds promise server authentication

Author: chriswiggins

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chriswiggins/soap",
-  "version": "0.27.4",
+  "version": "0.27.5",
   "description": "A minimal node SOAP client",
   "engines": {
     "node": ">=4.0.0"

src/server.ts

@@ -73,7 +73,7 @@ export class Server extends EventEmitter {
   public services: IServices;
   public log: (type: string, data: any) => any;
   public authorizeConnection: (req: Request, res?: Response) => boolean;
-  public authenticate: (security: IServerAuthenticate, processAuthResult?: (result: boolean) => void, req?: Request, obj?: any) => boolean | void | Promise<void>;
+  public authenticate: (security: IServerAuthenticate, processAuthResult?: (result: boolean) => void, req?: Request, obj?: any) => boolean | void | Promise<boolean>;
 
   private wsdl: WSDL;
   private suppressStack: boolean;
@@ -385,10 +385,27 @@ export class Server extends EventEmitter {
     // Authentication
     if (typeof authenticate === 'function') {
       let authResultProcessed = false;
-      const processAuthResult = (authResult) => {
-        if (!authResultProcessed && (authResult || authResult === false)) {
-          authResultProcessed = true;
-          if (authResult) {
+      const processAuthResult = (authResult: boolean | Error) => {
+        if (authResultProcessed) {
+          return;
+        }
+
+        authResultProcessed = true;
+        // Handle errors
+        if (authResult instanceof Error) {
+          return this._sendError({
+            Code: {
+              Value: 'SOAP-ENV:Server',
+              Subcode: { value: 'InternalServerError' },
+            },
+            Reason: { Text: authResult.toString() },
+            statusCode: 500,
+          }, callback, includeTimestamp);
+        }
+
+        // Handle actual results
+        if (typeof authResult === 'boolean') {
+          if (authResult === true) {
             try {
               process();
             } catch (error) {
@@ -417,7 +434,17 @@ export class Server extends EventEmitter {
         }
       };
 
-      processAuthResult(authenticate(obj.Header && obj.Header.Security, processAuthResult, req, obj));
+      const functionResult = authenticate(obj.Header && obj.Header.Security, processAuthResult, req, obj);
+      if (isPromiseLike<boolean>(functionResult)) {
+        functionResult.then((result: boolean) => {
+          processAuthResult(result);
+        }, (err: any) => {
+          processAuthResult(err);
+        });
+      }
+      if (typeof functionResult === 'boolean') {
+        processAuthResult(functionResult);
+      }
     } else {
       throw new Error('Invalid authenticate function (not a function)');
     }

test/server-authentication-test.js

@@ -103,6 +103,26 @@ describe('SOAP Server', function() {
     });
   });
 
+  it('should succeed on valid promise authentication', function(done) {
+    test.authenticate = function(security) {
+      return new Promise((resolve) => {
+        setTimeout(function delayed() {
+          resolve(true);
+        }, 10);
+      })
+    };
+
+    soap.createClient(test.baseUrl + '/stockquote?wsdl', function(err, client) {
+      assert.ifError(err);
+
+      client.GetLastTradePrice({ tickerSymbol: 'AAPL'}, function(err, result) {
+        assert.ifError(err);
+        assert.equal(19.56, parseFloat(result.price));
+        done();
+      });
+    });
+  });
+
   it('should fail on invalid synchronous authentication', function(done) {
     test.authenticate = function(security, callback) {
       setTimeout(function delayed() {
@@ -145,4 +165,27 @@ describe('SOAP Server', function() {
       });
     });
   });
+
+  it('should fail on invalid promise authentication', function(done) {
+    test.authenticate = function(security) {
+      return new Promise((resolve) => {
+        setTimeout(function delayed() {
+          resolve(false);
+        }, 10);
+      })
+    };
+
+    soap.createClient(test.baseUrl + '/stockquote?wsdl', function(err, client) {
+      assert.ifError(err);
+
+      client.GetLastTradePrice({ tickerSymbol: 'AAPL'}, function (err, result) {
+        assert.ok(err);
+        assert.ok(err.root.Envelope.Body.Fault.Code.Value);
+        assert.equal(err.root.Envelope.Body.Fault.Code.Value, 'SOAP-ENV:Client');
+        assert.ok(err.root.Envelope.Body.Fault.Code.Subcode.value);
+        assert.equal(err.root.Envelope.Body.Fault.Code.Subcode.value, 'AuthenticationFailure');
+        done();
+      });
+    });
+  });
 });