CVE-2025-46572

@@ -0,0 +1,2 @@
+test
+examples
\ No newline at end of file

@@ -0,0 +1,53 @@
+{
+  "env": {
+    "node": true,
+    "es6": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 2022
+  },
+  "rules": {
+    "no-var": 2,
+    "no-bitwise": 2,
+    "curly": ["error", "all"],
+    "eqeqeq": 2,
+    "wrap-iife": [
+      2,
+      "any"
+    ],
+    "indent": [
+      2,
+      2,
+      {
+        "SwitchCase": 1
+      }
+    ],
+    "no-use-before-define": 2,
+    "new-cap": 2,
+    "no-caller": 2,
+    "quotes": [
+      2,
+      "single",
+      "avoid-escape"
+    ],
+    "no-undef": 2,
+    "strict": 0,
+    "no-unused-expressions": 2,
+    "no-eval": 2,
+    "dot-notation": 0,
+    "no-unused-vars": 2,
+    "comma-style": [
+      2,
+      "last"
+    ],
+    "no-useless-escape": "off",
+    "security/detect-non-literal-fs-filename": "off",
+    "security/detect-object-injection": "off",
+    "security/detect-unsafe-regex": "off",
+    "camelcase": 1
+  },
+  "extends": [
+    "eslint:recommended"
+  ]
+}
\ No newline at end of file

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [18.x, 20.x, 22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

@@ -1,39 +0,0 @@
-{
-  "camelcase": false,
-  "curly": false,
-
-  "node": true,
-  "esnext": true,
-  "bitwise": true,
-  "eqeqeq": true,
-  "immed": true,
-  "indent": 2,
-  "latedef": false,
-  "newcap": true,
-  "noarg": true,
-  "regexp": true,
-  "undef": true,
-  "strict": false,
-  "smarttabs": true,
-  "expr": true,
-
-  "evil": true,
-  "browser": true,
-  "regexdash": true,
-  "wsh": true,
-  "trailing": true,
-  "sub": true,
-  "unused": true,
-  "laxcomma": true,
-  "nonbsp": true,
-
-  "globals": {
-    "after": false,
-    "before": false,
-    "afterEach": false,
-    "beforeEach": false,
-    "describe": false,
-    "it": false,
-    "escape": false
-  }
-}

@@ -0,0 +1,13 @@
+function SamlRequestParserError (message, detail, status) {
+    var err = Error.call(this, message);
+    err.name = 'SamlRequestParserError';
+    err.message = message || 'Error parsing SAMLRequest';
+    err.detail = detail;
+    err.status = status || 400;
+    return err;
+}
+
+SamlRequestParserError.prototype = Object.create(Error.prototype);
+SamlRequestParserError.prototype.constructor = SamlRequestParserError;
+
+module.exports = SamlRequestParserError;
\ No newline at end of file

@@ -1,429 +1,463 @@
-// credits to: https://github.com/bergie/passport-saml
-
-var crypto    = require('crypto');
-var xpath     = require('xpath');
-var xmlCrypto = require('xml-crypto');
-var EventEmitter = require('events');
+const crypto    = require('crypto');
+const xpath     = require('xpath');
+const xmlCrypto = require('xml-crypto');
+const EventEmitter = require('events');
 const forge = require('node-forge');
 const utils = require('./utils');
+const xmldom = require('@xmldom/xmldom');
 
-var ELEMENT_NODE = 1;
+const ELEMENT_NODE = 1;
 
-var SAML = function (options) {
-  this.options = options || {};
+const domParser = new xmldom.DOMParser();
 
-  if (this.options.thumbprint) {
-    this.options.thumbprints = (this.options.thumbprints || []).concat([this.options.thumbprint]);
+const getAuthContext20 = (samlAssertion) => {
+  const authnContext = xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='AuthnStatement']/*[local-name(.)='AuthnContext']/*[local-name(.)='AuthnContextClassRef']", samlAssertion);
+  if (authnContext.length === 0) {
+    return;
   }
+  return authnContext[0].textContent;
+};
 
-  if (!this.options.cert && (!this.options.thumbprints || this.options.thumbprints.length === 0)) {
-    throw new Error('You should set either a base64 encoded certificate or the thumbprints of the signing certificates');
+const getAttributeValues = (attribute) => {
+  if (!attribute || attribute.childNodes.length === 0) {
+    return;
+  }
+  const attributeValues = [];
+  for (let i = 0; i < attribute.childNodes.length; i++) {
+    if (attribute.childNodes[i].nodeType !== ELEMENT_NODE) {
+      continue;
+    }
+    attributeValues.push(attribute.childNodes[i].textContent);
   }
 
-  this.options.checkExpiration = (typeof this.options.checkExpiration !== 'undefined') ? this.options.checkExpiration : true;
-  // Note! It would be best to set this to true. But it's defaulting to false so as not to break login for expired certs.
-  this.options.checkCertExpiration = (typeof this.options.checkCertExpiration !== 'undefined') ? this.options.checkCertExpiration : false;
-  //clockskew in minutes
-  this.options.clockSkew = (typeof this.options.clockSkew === 'number' && this.options.clockSkew >= 0) ? this.options.clockSkew : 3;
-  this.options.checkAudience = (typeof this.options.checkAudience !== 'undefined') ? this.options.checkAudience : true;
-  this.options.checkRecipient = (typeof this.options.checkRecipient !== 'undefined') ? this.options.checkRecipient : true;
-  this.options.checkNameQualifier = (typeof this.options.checkNameQualifier !== 'undefined') ? this.options.checkNameQualifier : true;
-  this.options.checkSPNameQualifier = (typeof this.options.checkSPNameQualifier !== 'undefined') ? this.options.checkSPNameQualifier : true;
-  this.eventEmitter = this.options.eventEmitter || new EventEmitter();
+  if (attributeValues.length === 1) {
+    return attributeValues[0];
+  }
+
+  return attributeValues;
 };
 
-SAML.prototype.validateSignature = function (xml, options, callback) {
-  var self = this;
-  xml = utils.parseSamlResponse(xml);
+const getSessionIndex = (samlAssertion) => {
+  const authnStatement = xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='AuthnStatement']", samlAssertion);
+  const sessionIndex = authnStatement.length > 0 && authnStatement[0].attributes.length > 0 ?
+      authnStatement[0].getAttribute('SessionIndex') : undefined;
+  return sessionIndex || undefined;
+};
 
-  var signaturePath = this.options.signaturePath || options.signaturePath;
-  var signatures = xpath.select(signaturePath, xml);
-  if (signatures.length === 0) {
-    return callback(new Error('Signature is missing (xpath: ' + signaturePath + ')'));
-  } else if (signatures.length > 1) {
-    return callback(new Error('Signature was found more than one time (xpath: ' + signaturePath + ')'));
-  }
-  var signature = signatures[0];
-
-  var sig = new xmlCrypto.SignedXml(null, { idAttribute: 'AssertionID' });
-  sig.keyInfoProvider = {
-    getKeyInfo: function (key) {
-      return "<X509Data></X509Data>";
-    },
-    getKey: function (keyInfo) {
-
-      //If there's no embedded signing cert, use the configured cert through options
-      if(!keyInfo || keyInfo.length===0){
-        if(!options.cert) throw new Error('options.cert must be specified for SAMLResponses with no embedded signing certificate');
-        return utils.certToPEM(options.cert);
-      }
+const getAttributes = (samlAssertion) => {
+  return xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='AttributeStatement']/*[local-name(.)='Attribute']", samlAssertion);
+};
 
-      //If there's an embedded signature and thumprints are provided check that
-      if (options.thumbprints && options.thumbprints.length > 0)  {
-        var embeddedSignature = keyInfo[0].getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
-        if (embeddedSignature.length > 0) {
-          var base64cer = embeddedSignature[0].firstChild.toString();
-          var shasum = crypto.createHash('sha1');
-          var der = new Buffer(base64cer, 'base64').toString('binary');
-          shasum.update(der, 'latin1');
-          self.calculatedThumbprint = shasum.digest('hex');
-
-          // using embedded cert, so options.cert is not used anymore
-          delete options.cert;
-          return utils.certToPEM(base64cer);
-        }
-      }
+const getNameID11 = (samlAssertion) => {
+  let nameId = xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='AuthenticationStatement']/*[local-name(.)='Subject']/*[local-name(.)='NameIdentifier']", samlAssertion);
 
-      // If there's an embedded signature, but no thumprints are supplied, use options.cert
-      // either options.cert or options.thumbprints must be specified so at this point there
-      // must be an options.cert
-      return utils.certToPEM(options.cert);
+  if (nameId.length === 0) {
+    // only for backward compatibility with adfs
+    nameId = xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='AttributeStatement']/*[local-name(.)='Subject']/*[local-name(.)='NameIdentifier']", samlAssertion);
+    if (nameId.length === 0) {
+      return;
     }
-  };
+  }
 
-  var valid;
+  return nameId[0].textContent;
+};
 
-  try {
-    sig.loadSignature(signature);
-    valid = sig.checkSignature(xml.toString());
+const getNameID20 = (samlAssertion) => {
+  const nameId = xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='Subject']/*[local-name(.)='NameID']", samlAssertion);
+  if (nameId.length === 0) {
+    return;
+  }
+  const element = nameId[0];
+  const result = {
+    value: element.textContent,
+  };
 
-    if (!self.extractAndValidateCertExpiration(xml, options.cert) && self.options.checkCertExpiration) {
-      return callback(new Error('The signing certificate is not currently valid.'), null);
-    }
-  } catch (e) {
-    if (e.message === 'PEM_read_bio_PUBKEY failed') {
-      return callback(new Error('The signing certificate is invalid (' + e.message + ')'));
+  [
+    'NameQualifier',
+    'SPNameQualifier',
+    'Format',
+    'SPProvidedID'
+  ].forEach(function(key) {
+    const value = element.getAttribute(key);
+    if (!value) {
+      return;
     }
-    if (e.opensslErrorStack !== undefined) {
-      const err = new Error(`The signing certificate is invalid (${e.opensslErrorStack.join(', ')})`);
-      err.originalError = e;
+    result[key] = element.getAttribute(key);
+  });
 
-      return callback(err);
-    }
+  return result;
+};
 
-    return callback(e);
-  }
+function getKeyFn(options) {
+  return function (keyInfo) {
+    //If there's no embedded signing cert, use the configured cert through options
+    if (!keyInfo || keyInfo.length === 0 ){
+      if (!options.cert) {
+        throw new Error('options.cert must be specified for SAMLResponses with no embedded signing certificate');
+      }
+      return utils.certToPEM(options.cert);
+    }
 
-  if (!valid) {
-    return callback(new Error('Signature check errors: ' + sig.validationErrors));
-  }
+    //If there's an embedded signature and thumbprints are provided check that
+    if (options.thumbprints && options.thumbprints.length > 0)  {
+      const embeddedSignature = keyInfo.getElementsByTagNameNS('http://www.w3.org/2000/09/xmldsig#', 'X509Certificate');
+      if (embeddedSignature.length > 0) {
+        const base64cer = embeddedSignature[0].firstChild.toString();
+        const shasum = crypto.createHash('sha1');
+        const der = new Buffer(base64cer, 'base64').toString('binary');
+        shasum.update(der, 'latin1');
+        const calculatedThumbprint = shasum.digest('hex').toUpperCase();
+        const validThumbprint = options.thumbprints.some(function (thumbprint) {
+          return calculatedThumbprint === thumbprint.toUpperCase();
+        });
+
+        if (!validThumbprint) {
+          throw new Error('Invalid thumbprint (configured: ' + options.thumbprints.join(', ').toUpperCase() + '. calculated: ' + calculatedThumbprint + ')' );
+        }
+        // using embedded cert, so options.cert is not used anymore
+        delete options.cert;
+        return utils.certToPEM(base64cer);
+      }
+    }
 
-  if (options.cert) {
-    return callback();
+    // If there's an embedded signature, but no thumbprints are supplied, use options.cert
+    // either options.cert or options.thumbprints must be specified so at this point there
+    // must be an options.cert
+    return utils.certToPEM(options.cert);
   }
+}
 
-  if (options.thumbprints) {
+class SAML {
+  constructor(options) {
+    this.options = options || {};
 
-    var valid_thumbprint = options.thumbprints.some(function (thumbprint) {
-      return self.calculatedThumbprint.toUpperCase() === thumbprint.toUpperCase();
-    });
+    if (this.options.thumbprint) {
+      this.options.thumbprints = (this.options.thumbprints || []).concat([this.options.thumbprint]);
+    }
 
-    if (!valid_thumbprint) {
-      return callback(new Error('Invalid thumbprint (configured: ' + options.thumbprints.join(', ').toUpperCase() + '. calculated: ' + this.calculatedThumbprint.toUpperCase() + ')' ));
+    if (!this.options.cert && (!this.options.thumbprints || this.options.thumbprints.length === 0)) {
+      throw new Error('You should set either a base64 encoded certificate or the thumbprints of the signing certificates');
     }
 
-    return callback();
+    this.options.checkExpiration = (typeof this.options.checkExpiration !== 'undefined') ? this.options.checkExpiration : true;
+    // Note! It would be best to set this to true. But it's defaulting to false so as not to break login for expired certs.
+    this.options.checkCertExpiration = (typeof this.options.checkCertExpiration !== 'undefined') ? this.options.checkCertExpiration : false;
+    // clockskew in minutes
+    this.options.clockSkew = (typeof this.options.clockSkew === 'number' && this.options.clockSkew >= 0) ? this.options.clockSkew : 3;
+    this.options.checkAudience = (typeof this.options.checkAudience !== 'undefined') ? this.options.checkAudience : true;
+    this.options.checkRecipient = (typeof this.options.checkRecipient !== 'undefined') ? this.options.checkRecipient : true;
+    this.options.checkNameQualifier = (typeof this.options.checkNameQualifier !== 'undefined') ? this.options.checkNameQualifier : true;
+    this.options.checkSPNameQualifier = (typeof this.options.checkSPNameQualifier !== 'undefined') ? this.options.checkSPNameQualifier : true;
+    this.eventEmitter = this.options.eventEmitter || new EventEmitter();
+    this.getUseTextContentDigestValue = options.getUseTextContentDigestValue;
+
+    this.parser = domParser;
   }
-};
 
-SAML.prototype.extractAndValidateCertExpiration = function (validatedSamlAssertion, optionsCert) {
-  // This accepts a validated SAML assertion and checks current time against the valid cert dates
-  const certNodes = validatedSamlAssertion.getElementsByTagName("X509Certificate");
+  buildSignatureValidator (options) {
+    const sig = new xmlCrypto.SignedXml({ idAttribute: 'AssertionID', getCertFromKeyInfo: getKeyFn(options) });
+    return sig;
+  }
 
-  const cert = certNodes.length > 0 ? certNodes[0].textContent : optionsCert;
+  validateSignature (str, options, callback) {
+    const xml = utils.parseSamlResponse(str, this.parser);
 
-  if (!cert) { return false; }
+    const signaturePath = this.options.signaturePath || options.signaturePath;
+    const signatures = xpath.select(signaturePath, xml);
+    if (signatures.length === 0) {
+      return callback(new Error('Signature is missing (xpath: ' + signaturePath + ')'));
+    } else if (signatures.length > 1) {
+      return callback(new Error('Signature was found more than one time (xpath: ' + signaturePath + ')'));
+    }
+    const signature = signatures[0];
+
+    let valid;
+    const opts = Object.assign({}, options, { cert: this.options.cert, thumbprints: this.options.thumbprints });
+    const sig = this.buildSignatureValidator(opts);
+    try {
+      sig.loadSignature(signature);
+      valid = sig.checkSignature(utils.crlf2lf(str));
+
+      // TODO: this shouldn't be done until we have determined its completely valid, it should happen in `parseAssertion`
+      if (!this.extractAndValidateCertExpiration(xml, this.options.cert) && this.options.checkCertExpiration) {
+        return callback(new Error('The signing certificate is not currently valid.'), null);
+      }
+    } catch (e) {
+      if (e.message === 'PEM_read_bio_PUBKEY failed') {
+        return callback(new Error('The signing certificate is invalid (' + e.message + ')'));
+      }
+      if (e.opensslErrorStack !== undefined) {
+        const err = new Error(`The signing certificate is invalid (${e.opensslErrorStack.join(', ')})`);
+        err.originalError = e;
 
-  const parsedCert = forge.pki.certificateFromPem(utils.certToPEM(cert));
+        return callback(err);
+      }
 
-  const nowDate = new Date();
+      return callback(e);
+    }
 
-  // true if current date is before expiry AND after cert start date
-  if ( ! (nowDate > parsedCert.validity.notBefore && nowDate < parsedCert.validity.notAfter)) {
-    this.eventEmitter.emit('certificateExpirationValidationFailed', {});
-    return false;
-  }
+    if (!valid) {
+      return callback(new Error('Signature check errors: ' + sig.references[0].validationError.message));
+    }
 
-  return true;
-};
+    if (!sig.getSignedReferences().length) {
+      return callback(new Error('Could not validate Signature(s)'));
+    }
 
-SAML.prototype.validateExpiration = function (samlAssertion, version) {
-  var self = this;
-  var conditions = xpath.select(".//*[local-name(.)='Conditions']", samlAssertion);
-  if (!conditions || conditions.length === 0) return true;
+    return callback(null, sig.getSignedReferences()[0]);
+  }
 
-  var notBefore = new Date(conditions[0].getAttribute('NotBefore'));
-  notBefore = notBefore.setMinutes(notBefore.getMinutes() - self.options.clockSkew);
+  extractAndValidateCertExpiration (validatedSamlAssertion, optionsCert) {
+    // This accepts a validated SAML assertion and checks current time against the valid cert dates
+    const certNodes = validatedSamlAssertion.getElementsByTagNameNS('http://www.w3.org/2000/09/xmldsig#', 'X509Certificate');
 
-  var notOnOrAfter = new Date(conditions[0].getAttribute('NotOnOrAfter'));
-  notOnOrAfter = notOnOrAfter.setMinutes(notOnOrAfter.getMinutes() + self.options.clockSkew);
-  var now = new Date();
+    const cert = certNodes.length > 0 ? certNodes[0].textContent : optionsCert;
 
-  if (now < notBefore || now > notOnOrAfter)
-    return false;
+    if (!cert) { return false; }
 
-  return true;
-};
+    const parsedCert = forge.pki.certificateFromPem(utils.certToPEM(cert));
 
-SAML.prototype.validateAudience = function (samlAssertion, realm, version) {
-  var audience;
-  if (version === '2.0') {
-    audience = xpath.select(".//*[local-name(.)='Conditions']/*[local-name(.)='AudienceRestriction']/*[local-name(.)='Audience']", samlAssertion);
-  } else {
-    audience = xpath.select(".//*[local-name(.)='Conditions']/*[local-name(.)='AudienceRestrictionCondition']/*[local-name(.)='Audience']", samlAssertion);
-  }
+    const nowDate = new Date();
 
-  if (!audience || audience.length === 0) return false;
-  return utils.stringCompare(audience[0].textContent, realm);
-};
+    // true if current date is before expiry AND after cert start date
+    if ( ! (nowDate > parsedCert.validity.notBefore && nowDate < parsedCert.validity.notAfter)) {
+      this.eventEmitter.emit('certificateExpirationValidationFailed', {});
+      return false;
+    }
 
-SAML.prototype.validateNameQualifier = function (samlAssertion, issuer) {
-  var nameID = getNameID20(samlAssertion);
-  // NameQualifier is optional. Only validate if exists
-  if (!nameID || !nameID.Format || !nameID.NameQualifier) return true;
+    return true;
+  }
 
-  if ([
-    'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
-    'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
-    ].indexOf(nameID.Format) == -1){
-      // Ignore validation if the format is not persistent or transient
+  validateExpiration (samlAssertion) {
+    const conditions = xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='Conditions']", samlAssertion);
+    if (!conditions || conditions.length === 0) {
       return true;
-  }
+    }
 
-  return nameID.NameQualifier === issuer
-};
+    const condition = conditions[0];
+    const notBefore = condition.getAttribute('NotBefore');
+    const notOnOrAfter = condition.getAttribute('NotOnOrAfter');
 
-SAML.prototype.validateSPNameQualifier = function (samlAssertion, audience) {
-  var nameID = getNameID20(samlAssertion);
-  // SPNameQualifier is optional. Only validate if exists
-  if (!nameID || !nameID.Format || !nameID.SPNameQualifier) return true;
+    // no expiration defined.
+    if (!notBefore && !notOnOrAfter) {
+      return true
+    }
 
-  if ([
-    'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
-    'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
-    ].indexOf(nameID.Format) == -1){
-      // Ignore validation if the format is not persistent or transient
-      return true;
-  }
+    const now = new Date();
 
-  return nameID.SPNameQualifier === audience
-};
+    if (notBefore) {
+      const notBeforeDate = new Date(notBefore);
+      notBeforeDate.setMinutes(notBeforeDate.getMinutes() - this.options.clockSkew);
+      if (now < notBefore) {
+        return false;
+      }
+    }
+
+    if (notOnOrAfter) {
+      const notOnOrAfterDate = new Date(notOnOrAfter);
+      notOnOrAfterDate.setMinutes(notOnOrAfterDate.getMinutes() + this.options.clockSkew);
+      if (now > notOnOrAfterDate) {
+        return false;
+      }
+    }
 
-// https://www.oasis-open.org/committees/download.php/35711/sstc-saml-core-errata-2.0-wd-06-diff.pdf
-// Page 19 of 91
-// Recipient [Optional]
-// A URI specifying the entity or location to which an attesting entity can present the assertion. For
-// example, this attribute might indicate that the assertion must be delivered to a particular network
-// endpoint in order to prevent an intermediary from redirecting it someplace else.
-SAML.prototype.validateRecipient = function(samlAssertion, recipientUrl){
-  var subjectConfirmationData = xpath.select(".//*[local-name(.)='Subject']/*[local-name(.)='SubjectConfirmation']/*[local-name(.)='SubjectConfirmationData']", samlAssertion);
-
-  // subjectConfirmationData is optional in the spec. Only validate if the assertion contains a recipient
-  if (!subjectConfirmationData || subjectConfirmationData.length === 0){
     return true;
   }
 
-  var recipient = subjectConfirmationData[0].getAttribute('Recipient');
-
-  var valid = !recipient || recipient === recipientUrl;
+  validateAudience (samlAssertion, realm, version) {
+    let audience;
+    if (version === '2.0') {
+      audience = xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='Conditions']/*[local-name(.)='AudienceRestriction']/*[local-name(.)='Audience']", samlAssertion);
+    } else {
+      audience = xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='Conditions']/*[local-name(.)='AudienceRestrictionCondition']/*[local-name(.)='Audience']", samlAssertion);
+    }
 
-  if (!valid){
-    this.eventEmitter.emit('recipientValidationFailed', {
-       configuredRecipient: recipientUrl,
-       assertionRecipient: recipient
-     });
+    if (!audience || audience.length === 0) {return false;}
+    return utils.stringCompare(audience[0].textContent, realm);
   }
 
-  return valid;
-};
+  validateNameQualifier (samlAssertion, issuer) {
+    const nameID = getNameID20(samlAssertion);
+    // NameQualifier is optional. Only validate if exists
+    if (!nameID || !nameID.Format || !nameID.NameQualifier) {
+      return true;
+    }
 
-SAML.prototype.parseAttributes = function (samlAssertion, version) {
-  function getAttributes(samlAssertion) {
-    var attributes = xpath.select(".//*[local-name(.)='AttributeStatement']/*[local-name(.)='Attribute']", samlAssertion);
-    return attributes;
-  }
+    if ([
+      'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
+      'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
+    ].indexOf(nameID.Format) === -1){
+      // Ignore validation if the format is not persistent or transient
+      return true;
+    }
 
-  function getSessionIndex(samlAssertion) {
-    var authnStatement = xpath.select(".//*[local-name(.)='AuthnStatement']", samlAssertion);
-    var sessionIndex = authnStatement.length > 0 && authnStatement[0].attributes.length > 0 ?
-                    authnStatement[0].getAttribute('SessionIndex') : undefined;
-    return sessionIndex || undefined;
+    return nameID.NameQualifier === issuer;
   }
 
-  function getNameID11(samlAssertion) {
-    var nameId = xpath.select(".//*[local-name(.)='AuthenticationStatement']/*[local-name(.)='Subject']/*[local-name(.)='NameIdentifier']", samlAssertion);
+  validateSPNameQualifier (samlAssertion, audience) {
+    const nameID = getNameID20(samlAssertion);
+    // SPNameQualifier is optional. Only validate if exists
+    if (!nameID || !nameID.Format || !nameID.SPNameQualifier) {return true;}
 
-    if (nameId.length === 0) {
-      // only for backward compatibility with adfs
-      nameId = xpath.select(".//*[local-name(.)='AttributeStatement']/*[local-name(.)='Subject']/*[local-name(.)='NameIdentifier']", samlAssertion);
-      if (nameId.length === 0) return;
+    if ([
+      'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent',
+      'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
+    ].indexOf(nameID.Format) === -1){
+      // Ignore validation if the format is not persistent or transient
+      return true;
     }
 
-    return nameId[0].textContent;
+    return nameID.SPNameQualifier === audience;
   }
 
-  function getAttributeValues(attribute) {
-    if (!attribute || attribute.childNodes.length === 0) return;
-    var attributeValues = [];
-    for (var i = 0; i<attribute.childNodes.length; i++) {
-      if (attribute.childNodes[i].nodeType !== ELEMENT_NODE) continue;
-      attributeValues.push(attribute.childNodes[i].textContent);
+  // https://www.oasis-open.org/committees/download.php/35711/sstc-saml-core-errata-2.0-wd-06-diff.pdf
+  // Page 19 of 91
+  // Recipient [Optional]
+  // A URI specifying the entity or location to which an attesting entity can present the assertion. For
+  // example, this attribute might indicate that the assertion must be delivered to a particular network
+  // endpoint in order to prevent an intermediary from redirecting it someplace else.
+  validateRecipient (samlAssertion, recipientUrl){
+    const subjectConfirmationData = xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='Subject']/*[local-name(.)='SubjectConfirmation']/*[local-name(.)='SubjectConfirmationData']", samlAssertion);
+
+    // subjectConfirmationData is optional in the spec. Only validate if the assertion contains a recipient
+    if (!subjectConfirmationData || subjectConfirmationData.length === 0){
+      return true;
     }
 
-    if (attributeValues.length === 1) return attributeValues[0];
+    const recipient = subjectConfirmationData[0].getAttribute('Recipient');
 
-    return attributeValues;
-  }
+    const valid = !recipient || recipient === recipientUrl;
+
+    if (!valid){
+      this.eventEmitter.emit('recipientValidationFailed', {
+        configuredRecipient: recipientUrl,
+        assertionRecipient: recipient
+      });
+    }
 
-  function getAuthContext20(samlAssertion) {
-    var authnContext = xpath.select(".//*[local-name(.)='AuthnStatement']/*[local-name(.)='AuthnContext']/*[local-name(.)='AuthnContextClassRef']", samlAssertion);
-    if (authnContext.length === 0) return;
-    return authnContext[0].textContent;
+    return valid;
   }
 
-  var profile = {};
-  var nameId;
-  var authContext;
-  var attributes = getAttributes(samlAssertion);
-  profile.sessionIndex = getSessionIndex(samlAssertion);
-  if (version === '2.0') {
-    for (var index in attributes) {
-      var attribute = attributes[index];
-      var value = getAttributeValues(attribute);
-      profile[attribute.getAttribute('Name')] = value;
-    }
+  parseAttributes (samlAssertion, version) {
+    const profile = {};
+    const attributes = getAttributes(samlAssertion);
+    profile.sessionIndex = getSessionIndex(samlAssertion);
+    if (version === '2.0') {
+      for (let index in attributes) {
+        const attribute = attributes[index];
+        profile[attribute.getAttribute('Name')] = getAttributeValues(attribute);
+      }
 
-    nameId = getNameID20(samlAssertion);
+      const nameId = getNameID20(samlAssertion);
 
-    if (nameId) {
-      profile['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier'] = nameId.value;
-      if(Object.keys(nameId).length > 1) {
-        profile['nameIdAttributes'] = nameId;
+      if (nameId) {
+        profile['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier'] = nameId.value;
+        if(Object.keys(nameId).length > 1) {
+          profile['nameIdAttributes'] = nameId;
+        }
       }
-    }
 
-    authContext = getAuthContext20(samlAssertion);
-    if (authContext) {
-      profile['http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod'] = authContext;
-    }
+      const authContext = getAuthContext20(samlAssertion);
+      if (authContext) {
+        profile['http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod'] = authContext;
+      }
+    } else {
+      if (attributes) {
+        for (let index in attributes) {
+          const attribute = attributes[index];
+          profile[attribute.getAttribute('AttributeNamespace') + '/' + attribute.getAttribute('AttributeName')] = getAttributeValues(attribute);
+        }
+      }
 
-  } else {
-    if (attributes) {
-      for (var index2 in attributes) {
-        var attribute2 = attributes[index2];
-        var value2 = getAttributeValues(attribute2);
-        profile[attribute2.getAttribute('AttributeNamespace') + '/' + attribute2.getAttribute('AttributeName')] = value2;
+      const nameId = getNameID11(samlAssertion);
+      if (nameId) {
+        profile['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier'] = typeof nameId === 'string' ? nameId : nameId['#'];
       }
     }
 
-    nameId = getNameID11(samlAssertion);
-    if (nameId) {
-      profile['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier'] = typeof nameId === 'string' ? nameId : nameId['#'];
-    }
+    return profile;
   }
 
-  return profile;
-};
-
-SAML.prototype.validateSamlAssertion = function (samlAssertion, callback) {
-  var self = this;
-
-  samlAssertion = utils.parseSamlResponse(samlAssertion);
-
-  self.validateSignature(samlAssertion.toString(), {
-    cert: self.options.cert,
-    thumbprints: self.options.thumbprints,
-    signaturePath: "/*[local-name(.)='Assertion']/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']" }, function(err) {
-    if (err) return callback(err);
-
-    self.parseAssertion(samlAssertion, callback);
-  });
-};
+  validateSamlAssertion (samlAssertionStr, options, callback) {
+    this.validateSignature(samlAssertionStr, {
+      meta: options.meta,
+      signaturePath: "//*[local-name(.)='Assertion'][1]/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']" }, (err, signed) => {
+      if (err) {return callback(err);}
 
-SAML.prototype.parseAssertion = function(samlAssertion, callback) {
-  var self = this;
-  if (self.options.extractSAMLAssertion){
-    samlAssertion = self.options.extractSAMLAssertion(samlAssertion);
+      this.parseAssertion(signed, callback);
+    });
   }
 
-  samlAssertion = utils.parseSamlResponse(samlAssertion);
+  parseAssertion (samlAssertion, callback) {
+    if (this.options.extractSAMLAssertion){
+      samlAssertion = this.options.extractSAMLAssertion(samlAssertion);
+    }
 
-  if (!samlAssertion.getAttribute)
-    samlAssertion = samlAssertion.documentElement;
+    samlAssertion = utils.parseSamlAssertion(samlAssertion, this.parser);
 
-  const version = utils.getSamlAssertionVersion(samlAssertion);
-  if (!version){
-    // Note that this assumes any version returned by getSamlAssertionVersion is supported.
-    return callback(new Error('SAML Assertion version not supported, or not defined'), null);
-  }
+    if (!samlAssertion.getAttribute) {
+      samlAssertion = samlAssertion.documentElement;
+    }
 
-  if (self.options.checkExpiration && !self.validateExpiration(samlAssertion, version)) {
-    return callback(new Error('assertion has expired.'), null);
-  }
+    if (samlAssertion.localName !== 'Assertion') {
+      return callback(new Error('saml response does not contain an Assertion element'));
+    }
 
-  if (self.options.checkAudience && !self.validateAudience(samlAssertion, self.options.realm, version)) {
-    return callback(new Error('Audience is invalid. Configured: ' + self.options.realm), null);
-  }
+    const version = utils.getSamlAssertionVersion(samlAssertion);
+    if (!version){
+      // Note that this assumes any version returned by getSamlAssertionVersion is supported.
+      return callback(new Error('SAML Assertion version not supported, or not defined'), null);
+    }
 
-  if (!self.validateRecipient(samlAssertion, self.options.recipientUrl)) {
-    if (self.options.checkRecipient){
-      return callback(new Error('Recipient is invalid. Configured: ' + self.options.recipientUrl), null);
+    if (this.options.checkExpiration && !this.validateExpiration(samlAssertion, version)) {
+      return callback(new Error('assertion has expired.'), null);
     }
-  }
 
-  var profile = self.parseAttributes(samlAssertion, version);
+    if (this.options.checkAudience && !this.validateAudience(samlAssertion, this.options.realm, version)) {
+      return callback(new Error('Audience is invalid. Configured: ' + this.options.realm), null);
+    }
 
-  var issuer;
-  if (version === '2.0') {
-    var issuerNode = xpath.select(".//*[local-name(.)='Issuer']", samlAssertion);
-    if (issuerNode.length > 0) issuer = issuerNode[0].textContent;
-  } else {
-    issuer = samlAssertion.getAttribute('Issuer');
-  }
+    if (!this.validateRecipient(samlAssertion, this.options.recipientUrl)) {
+      if (this.options.checkRecipient){
+        return callback(new Error('Recipient is invalid. Configured: ' + this.options.recipientUrl), null);
+      }
+    }
 
+    const profile = this.parseAttributes(samlAssertion, version);
 
-  this.eventEmitter.emit('parseAssertion', {
+    let issuer;
+    if (version === '2.0') {
+      const issuerNode = xpath.select("//*[local-name(.)='Assertion'][1]/*[local-name(.)='Issuer']", samlAssertion);
+      if (issuerNode.length > 0) {
+        issuer = issuerNode[0].textContent;
+      }
+    } else {
+      issuer = samlAssertion.getAttribute('Issuer');
+    }
+
+    this.eventEmitter.emit('parseAssertion', {
       issuer: issuer,
       version: version,
     });
 
-  profile.issuer = issuer;
-
-  // Validate the name qualifier in the NameID element if found with the audience
-  if (self.options.checkNameQualifier && !self.validateNameQualifier(samlAssertion, issuer)){
-    return callback(new Error('NameQualifier attribute in the NameID element does not match ' + issuer), null);
-  }
-
-  // Validate the SP name qualifier in the NameID element if found with the issuer
-  if (self.options.checkSPNameQualifier && !self.validateSPNameQualifier(samlAssertion, self.options.realm)){
-    return callback(new Error('SPNameQualifier attribute in the NameID element does not match ' + self.options.realm), null);
-  }
-
-  if (!profile.email && profile['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress']) {
-    profile.email = profile['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'];
-  }
+    profile.issuer = issuer;
 
-  callback(null, profile);
-};
+    // Validate the name qualifier in the NameID element if found with the audience
+    if (this.options.checkNameQualifier && !this.validateNameQualifier(samlAssertion, issuer)) {
+      return callback(new Error('NameQualifier attribute in the NameID element does not match ' + issuer), null);
+    }
 
-function getNameID20(samlAssertion) {
-  var nameId = xpath.select(".//*[local-name(.)='Subject']/*[local-name(.)='NameID']", samlAssertion);
-  if (nameId.length === 0) return;
-  var element = nameId[0];
-  var result = {
-    value: element.textContent,
-  };
+    // Validate the SP name qualifier in the NameID element if found with the issuer
+    if (this.options.checkSPNameQualifier && !this.validateSPNameQualifier(samlAssertion, this.options.realm)){
+      return callback(new Error('SPNameQualifier attribute in the NameID element does not match ' + this.options.realm), null);
+    }
 
-  ['NameQualifier',
-    'SPNameQualifier',
-    'Format',
-    'SPProvidedID'].forEach(function(key) {
-    var value = element.getAttribute(key);
-    if (!value) return;
-    result[key] = element.getAttribute(key);
-  });
+    if (!profile.email && profile['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress']) {
+      profile.email = profile['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'];
+    }
 
-  return result;
+    return callback(null, profile);
+  }
 }
 
-exports.SAML = SAML;
+exports.SAML = SAML;
\ No newline at end of file

@@ -1,101 +1,81 @@
-var xpath       = require('xpath');
-var qs          = require('querystring');
-var zlib        = require('zlib');
-var xtend       = require('xtend');
-var url         = require('url');
-var xmlenc      = require('xml-encryption');
-var crypto      = require('crypto');
-var querystring = require('querystring');
-var SignedXml   = require('xml-crypto').SignedXml;
-var templates   = require('./templates');
-var EventEmitter = require('events');
-var validUrl     = require('valid-url');
-
-var utils                     = require('./utils');
-var AuthenticationFailedError = require('./errors/AuthenticationFailedError');
-
-var BINDINGS = {
+const xpath       = require('xpath');
+const qs          = require('querystring');
+const zlib        = require('zlib');
+const xtend       = require('xtend');
+const url         = require('url');
+const xmlenc      = require('xml-encryption');
+const crypto      = require('crypto');
+const querystring = require('querystring');
+const xmlCrypto   = require('xml-crypto');
+const templates   = require('./templates');
+const EventEmitter = require('events');
+const validUrl     = require('valid-url');
+const xmldom = require('@xmldom/xmldom');
+
+const domParser = new xmldom.DOMParser();
+const utils                     = require('./utils');
+const AuthenticationFailedError = require('./errors/AuthenticationFailedError');
+
+const saml2Namespace = 'urn:oasis:names:tc:SAML:2.0:assertion';
+
+const BINDINGS = {
   HTTP_POST:      'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
   HTTP_REDIRECT:  'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
 };
 
-var ErrorMessages = {
+const ErrorMessages = {
   'urn:oasis:names:tc:SAML:2.0:status:VersionMismatch': 'The SAML responder could not process the request because the version of the request message was incorrect.',
   'urn:oasis:names:tc:SAML:2.0:status:Requester' : 'The request could not be performed due to an error on the part of the requester',
   'urn:oasis:names:tc:SAML:2.0:status:Responder' : 'The request could not be performed due to an error on the part of the SAML responder or SAML authority',
   'urn:oasis:names:tc:SAML:2.0:status:AuthnFailed' : 'The responding provider was unable to successfully authenticate the principal'
 };
 
-function ignoreValidationFunction(samlResponseID, done){
-  return done();
-}
-
-var encodingMappings = {
+const encodingMappings = {
   'ISO-8859-1': 'binary',
   'UTF-8': 'utf8'
 };
 
-var Samlp = module.exports = function Samlp (options, saml) {
-  this.options = options || {};
-
-  if (this.options.thumbprint) {
-    this.options.thumbprints = (this.options.thumbprints || []).concat([this.options.thumbprint]);
-  }
-
-  if (typeof options.deflate === 'undefined') {
-    this.options.deflate = true;
-  }
-
-  this.options.checkDestination = (typeof this.options.checkDestination !== 'undefined') ? this.options.checkDestination : true;
-  this.options.checkResponseID = (typeof this.options.checkResponseID !== 'undefined') ? this.options.checkResponseID : true;
-  this.options.checkInResponseTo = (typeof this.options.checkInResponseTo !== 'undefined') ? this.options.checkInResponseTo : true;
-
-  this.eventEmitter = this.options.eventEmitter || new EventEmitter();
-  this._saml = saml;
-
-  this.isValidResponseID = this.options.isValidResponseID || ignoreValidationFunction;
-  this.isValidInResponseTo = this.options.isValidInResponseTo || ignoreValidationFunction;
-
-  this.default_encoding = encodingMappings[this.options.default_encoding] ||  'utf8';
-};
+function ignoreValidationFunction(samlResponseID, done){
+  return done();
+}
 
 function getProp(obj, path) {
   return path.split('.').reduce(function (prev, curr) {
     return prev[curr];
   }, obj);
 }
 
-var supplant = function (tmpl, o) {
+const supplant = function (tmpl, o) {
   return tmpl.replace(/\@\@([^\@]*)\@\@/g,
-    function (a, b) {
-      var r = getProp(o, b);
-      return typeof r === 'string' || typeof r === 'number' ? r : a;
-    }
+      function (a, b) {
+        const r = getProp(o, b);
+        return typeof r === 'string' || typeof r === 'number' ? r : a;
+      }
   );
 };
 
-var trimXml = function (xml) {
+const trimXml = function (xml) {
   return xml.replace(/\r\n/g, '')
       .replace(/\n/g,'')
       .replace(/>(\s*)</g, '><') //unindent
       .trim();
 };
 
-var removeHeaders = function  (cert) {
-  var pem = /-----BEGIN (\w*)-----([^-]*)-----END (\w*)-----/g.exec(cert.toString());
+const removeHeaders = function (cert) {
+  const pem = /-----BEGIN (\w*)-----([^-]*)-----END (\w*)-----/g.exec(cert.toString());
   if (pem && pem.length > 0) {
     return pem[2].replace(/[\n|\r\n]/g, '');
   }
   return null;
 };
 
-var sign = function (content, key, algorithm) {
-  var signer = crypto.createSign(algorithm.toUpperCase());
+const sign = function (content, key, algorithm) {
+  const signer = crypto.createSign(algorithm.toUpperCase());
   signer.update(content, 'latin1');
   return signer.sign(key, 'base64');
 };
 
-var algorithms = {
+const algorithms = {
   signature: {
     'rsa-sha256': 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256',
     'rsa-sha1':  'http://www.w3.org/2000/09/xmldsig#rsa-sha1'
@@ -113,10 +93,10 @@ function collectAncestorNamespaces(node, nameSpaces = [], maxDeep = 5){
 
   const parent = node.parentNode;
 
-  if(parent.attributes && parent.attributes.length > 0){
+  if (parent.attributes && parent.attributes.length > 0){
     for(let i=0;i<parent.attributes.length;i++){
       const attr = parent.attributes[i];
-      if(attr && attr.nodeName && attr.nodeName.search(/^xmlns:/) !== -1){
+      if (attr && attr.nodeName && attr.nodeName.search(/^xmlns:/) !== -1){
         nameSpaces.push({key: attr.nodeName, value: attr.nodeValue});
       }
     }
@@ -125,24 +105,55 @@ function collectAncestorNamespaces(node, nameSpaces = [], maxDeep = 5){
   return collectAncestorNamespaces(parent, nameSpaces, maxDeep - 1);
 }
 
-Samlp.prototype = {
-  getSamlRequestParams: function (opts, callback) {
-    var options = xtend(opts || {}, this.options);
+function generateInstant() {
+  const date = new Date();
+  return date.getUTCFullYear() + '-' + ('0' + (date.getUTCMonth()+1)).slice(-2) + '-' + ('0' + date.getUTCDate()).slice(-2) + 'T' + ('0' + date.getUTCHours()).slice(-2) + ':' + ('0' + date.getUTCMinutes()).slice(-2) + ':' + ('0' + date.getUTCSeconds()).slice(-2) + 'Z';
+}
 
-    var idpUrl = options.identityProviderUrl;
+function stripQueryAndFragmentFromURL(url) {
+  return url.split('#')[0].split('?')[0];
+}
+
+class Samlp {
+  constructor(options, saml) {
+    this.options = options || {};
+
+    if (typeof options.deflate === 'undefined') {
+      this.options.deflate = true;
+    }
+
+    this.options.checkDestination = (typeof this.options.checkDestination !== 'undefined') ? this.options.checkDestination : true;
+    this.options.checkResponseID = (typeof this.options.checkResponseID !== 'undefined') ? this.options.checkResponseID : true;
+    this.options.checkInResponseTo = (typeof this.options.checkInResponseTo !== 'undefined') ? this.options.checkInResponseTo : true;
+
+    this.eventEmitter = this.options.eventEmitter || new EventEmitter();
+    this._saml = saml;
+
+    this.isValidResponseID = this.options.isValidResponseID || ignoreValidationFunction;
+    this.isValidInResponseTo = this.options.isValidInResponseTo || ignoreValidationFunction;
+
+    this.defaultEncoding = encodingMappings[this.options.default_encoding] || 'utf8';
+
+    this.parser = domParser;
+  }
+
+  getSamlRequestParams (opts, callback) {
+    const options = xtend(opts || {}, this.options);
+
+    const idpUrl = options.identityProviderUrl;
     if (typeof idpUrl !== 'string' || !validUrl.isWebUri(idpUrl)) {
       return callback(new Error(`Invalid identity provider URL: ${JSON.stringify(idpUrl)}`));
     }
 
-    var signatureAlgorithm = options.signatureAlgorithm || 'rsa-sha256';
-    var digestAlgorithm = options.digestAlgorithm || 'sha256';
+    const signatureAlgorithm = options.signatureAlgorithm || 'rsa-sha256';
+    const digestAlgorithm = options.digestAlgorithm || 'sha256';
 
-    var assert_and_destination = templates.assert_and_destination({
+    const assert_and_destination = templates.assert_and_destination({
       Destination: idpUrl,
       AssertionConsumerServiceURL: options.callback
     });
 
-    var model = {
+    let model = {
       ID:               options.request_id,
       IssueInstant:     generateInstant(),
       Issuer:           options.realm,
@@ -159,23 +170,23 @@ Samlp.prototype = {
       model = xtend(model, options.requestContext);
     }
 
-    var SAMLRequest;
-    var rawRequest;
+    let SAMLRequest;
+    let rawRequest;
 
     if (options.requestTemplate) {
       try {
-        rawRequest = supplant(options.requestTemplate, model)
+        rawRequest = supplant(options.requestTemplate, model);
       } catch (e) {
-        return callback(new Error('Malformed template passed. Could not parse.'))
+        return callback(new Error('Malformed template passed. Could not parse.'));
       }
     } else {
       rawRequest = templates.samlrequest(model);
     }
 
     SAMLRequest = trimXml(rawRequest);
 
-    var parsedUrl = url.parse(idpUrl, true);
-    var params = {
+    const parsedUrl = url.parse(idpUrl, true);
+    const params = {
       SAMLRequest: null,
       RelayState: options.RelayState || (parsedUrl.query && parsedUrl.query.RelayState) || ''
     };
@@ -184,20 +195,23 @@ Samlp.prototype = {
       // HTTP-POST or HTTP-Redirect without deflate encoding
       if (options.signingKey) {
         // xml with embedded Signature
-        var sig = new SignedXml(null, { signatureAlgorithm: algorithms.signature[signatureAlgorithm] });
-        sig.addReference(
-          "//*[local-name(.)='AuthnRequest' and namespace-uri(.)='urn:oasis:names:tc:SAML:2.0:protocol']",
-          ["http://www.w3.org/2000/09/xmldsig#enveloped-signature", "http://www.w3.org/2001/10/xml-exc-c14n#"],
-          algorithms.digest[digestAlgorithm]);
-
-        sig.keyInfoProvider = {
-          getKeyInfo: function () {
-            return '<X509Data><X509Certificate>' + removeHeaders(options.signingKey.cert) + '</X509Certificate></X509Data>';
-          }
-        };
 
-        sig.signingKey = options.signingKey.key;
+        const sig = new xmlCrypto.SignedXml({
+          privateKey: options.signingKey.key,
+          signatureAlgorithm: algorithms.signature[signatureAlgorithm],
+          canonicalizationAlgorithm: 'http://www.w3.org/2001/10/xml-exc-c14n#',
+          getKeyInfoContent: () => {
+            return `<X509Data><X509Certificate>${removeHeaders(options.signingKey.cert)}</X509Certificate></X509Data>`;
+          },
+        });
+        sig.addReference({
+          xpath: "//*[local-name(.)='AuthnRequest' and namespace-uri(.)='urn:oasis:names:tc:SAML:2.0:protocol']",
+          transforms: ['http://www.w3.org/2000/09/xmldsig#enveloped-signature', 'http://www.w3.org/2001/10/xml-exc-c14n#'],
+          digestAlgorithm: algorithms.digest[digestAlgorithm]
+        });
         try {
+          // we are not converting SAMLRequest into a DOM before sending to xml-crypto because at the current time we allow the following test:
+          // invalid CDATA xml that does not cause an error. This probably *should* cause an error, but it doesn't.
           sig.computeSignature(SAMLRequest, { location: { reference: "//*[local-name(.)='Issuer']", action: 'after' } }); // Signature element must be located after Issuer
         } catch (e) {
           return callback(new Error('fail to compute signature'));
@@ -212,7 +226,7 @@ Samlp.prototype = {
 
     // HTTP-Redirect with deflate encoding (http://docs.oasis-open.org/security/saml/v2.0/saml-bindings-2.0-os.pdf - section 3.4.4.1)
     zlib.deflateRaw(new Buffer(SAMLRequest), function (err, buffer) {
-      if (err) return callback(err);
+      if (err) {return callback(err);}
 
       params.SAMLRequest = buffer.toString('base64');
 
@@ -236,165 +250,173 @@ Samlp.prototype = {
 
       callback(null, params);
     });
-  },
+  }
 
-  getSamlRequestUrl: function (opts, callback) {
-    var options = xtend(opts || {}, this.options);
+  getSamlRequestUrl (opts, callback) {
+    const options = xtend(opts || {}, this.options);
 
     this.getSamlRequestParams(options, function (err, params) {
-      if (err) return callback(err);
+      if (err) {return callback(err);}
 
-      var parsedUrl = url.parse(options.identityProviderUrl, true);
-      var samlRequestUrl = stripQueryAndFragmentFromURL(options.identityProviderUrl) + '?' + qs.encode(xtend(parsedUrl.query, params));
+      let parsedUrl = url.parse(options.identityProviderUrl, true);
+      let samlRequestUrl = stripQueryAndFragmentFromURL(options.identityProviderUrl) + '?' + qs.encode(xtend(parsedUrl.query, params));
       if (parsedUrl.hash !== null) {
         samlRequestUrl += parsedUrl.hash;
       }
       return callback(null, samlRequestUrl);
     });
-  },
+  }
 
-  getSamlRequestForm: function (opts, callback) {
-    var options = xtend(opts || {}, this.options);
+  getSamlRequestForm (opts, callback) {
+    const options = xtend(opts || {}, this.options);
 
     this.getSamlRequestParams(options, function (err, params) {
-      if (err) return callback(err);
+      if (err) {return callback(err);}
 
       return callback(null, templates.form({
         postUrl:      options.identityProviderUrl,
         RelayState:   params.RelayState,
         SAMLRequest:  params.SAMLRequest
       }));
     });
-  },
+  }
 
-  decodeResponse: function(req) {
-    var decoded = new Buffer(req.body['SAMLResponse'], 'base64').toString(this.default_encoding);
+  decodeResponse (req) {
+    let decoded = new Buffer(req.body['SAMLResponse'], 'base64').toString(this.defaultEncoding);
 
     const encoding = utils.getEncoding(decoded);
-    if (encoding && encodingMappings[encoding] && encodingMappings[encoding] !== this.default_encoding){
+    if (encoding && encodingMappings[encoding] && encodingMappings[encoding] !== this.defaultEncoding){
       // Encoding defers from the one configured, decode again with the correct value
       decoded = new Buffer(req.body['SAMLResponse'], 'base64').toString(encodingMappings[encoding]);
     }
 
     return decoded;
-  },
-
-  extractAssertion: function(samlpResponse, callback) {
-    samlpResponse = utils.parseSamlResponse(samlpResponse);
-    const saml2Namespace = 'urn:oasis:names:tc:SAML:2.0:assertion';
-
-    function done(err, assertion) {
-      if (err) {
-        return callback(err);
-      }
-
-      assertion = utils.parseSamlAssertion(assertion);
-
-      // copy all ancestor namespaces see https://github.com/auth0/xml-crypto/blob/d36a1bc0af40a5a3eec9c0c7b6b3f87bb0a0bca1/lib/signed-xml.js#L390-L392
-      // When we extract the assertion for later usage, this assertion wont include all name spaces. All namespaces from parents
-      // nodes are used to calculate the digest.
-      collectAncestorNamespaces(assertion)
-        .filter((attr) => !assertion.getAttribute(attr.key))
-        .forEach((attr) => assertion.setAttribute(attr.key, attr.value));
-
-      callback(null, assertion);
-    }
+  }
 
-    var foundAssertions = xpath.select("//*[local-name(.)='Assertion']", samlpResponse);
+  // samlpResponse may be both a string or a DOM depending on the caller.
+  // if the assertion is encrypted returns:
+  //    Document|DOM of the embedded encrypted assertion,
+  //    boolean saying there was decryption
+  //    str of the original XML of the encrypted assertion
+  // else:
+  //    Node|DOM of the assertion included in the original XML
+  //    boolean saying there was no decryption
+  extractAssertion (samlpResponse, callback) {
+    samlpResponse = utils.parseSamlResponse(samlpResponse, this.parser);
+
+    const foundAssertions = xpath.select("//*[local-name(.)='Assertion']", samlpResponse);
     if (foundAssertions.length > 1) {
-      return done(new Error('A SAMLResponse can contain only one Assertion element.'));
+      return callback(new Error('A SAMLResponse can contain only one Assertion element.'));
     }
 
     // After being sure no more "Assertion" elements are found, we extract it from the expected place
-    var assertions = xpath.select("/*[local-name(.)='Response']/*[local-name(.)='Assertion' and namespace-uri(.)='" + saml2Namespace + "']", samlpResponse);
-    var token = assertions[0];
+    const assertions = xpath.select("/*[local-name(.)='Response'][1]/*[local-name(.)='Assertion' and namespace-uri(.)='" + saml2Namespace + "']", samlpResponse);
+    const token = assertions[0];
 
     if (!token) {
       // check for encrypted assertion
-      var encryptedAssertionPath = "/*[local-name(.)='Response']/*[local-name(.)='EncryptedAssertion' and namespace-uri(.)='" + saml2Namespace + "']";
-      var encryptedAssertion = xpath.select(encryptedAssertionPath, samlpResponse);
+      const encryptedAssertionPath = "/*[local-name(.)='Response'][1]/*[local-name(.)='EncryptedAssertion' and namespace-uri(.)='" + saml2Namespace + "']";
+      const encryptedAssertion = xpath.select(encryptedAssertionPath, samlpResponse);
       if (encryptedAssertion.length > 1) {
-        return done(new Error('A SAMLResponse can contain only one EncryptedAssertion element.'));
+        return callback(new Error('A SAMLResponse can contain only one EncryptedAssertion element.'));
       }
 
-      var encryptedToken = encryptedAssertion[0];
+      const encryptedToken = encryptedAssertion[0];
       if (encryptedToken) {
-        var encryptedData = encryptedToken.getElementsByTagNameNS('http://www.w3.org/2001/04/xmlenc#', 'EncryptedData')[0];
+        const encryptedData = encryptedToken.getElementsByTagNameNS('http://www.w3.org/2001/04/xmlenc#', 'EncryptedData')[0];
         if (!encryptedData) {
-          return done(new Error('EncryptedData not found.'));
+          return callback(new Error('EncryptedData not found.'));
         }
 
         if (!this.options.decryptionKey) {
-          return done(new Error('Assertion is encrypted. Please set options.decryptionKey with your decryption private key.'));
+          return callback(new Error('Assertion is encrypted. Please set options.decryptionKey with your decryption private key.'));
         }
 
-        return xmlenc.decrypt(encryptedData, { 
-          key: this.options.decryptionKey, 
+        return xmlenc.decrypt(encryptedData, {
+          key: this.options.decryptionKey,
           autopadding: this.options.autopadding,
           disallowDecryptionWithInsecureAlgorithm: false,
           warnInsecureAlgorithm: false
-        }, done);
+        }, (err, decryptedAssertion) => {
+          if (err) {
+            return callback(err)
+          }
+          const assertion = utils.parseSamlAssertion(decryptedAssertion, this.parser);
+          const foundAssertions = xpath.select("//*[local-name(.)='Assertion']", assertion);
+          if (foundAssertions.length > 1) {
+            return callback(new Error('A EncryptedAssertion can contain only one Assertion element.'));
+          }
+          // After being sure no more "Assertion" elements are found, we extract it from the expected place
+          const assertions = xpath.select("/*[local-name(.)='Assertion' and namespace-uri(.)='" + saml2Namespace + "']", assertion);
+          // if there are 0 matches, let the caller handle it
+          return callback(null, assertions[0], true, decryptedAssertion);
+        });
       }
     }
 
-    done(null, token);
-  },
+    callback(null, token, false);
+  }
 
-  getSamlStatus: function (samlResponse) {
-    var status = {};
+  getSamlStatus (samlResponse) {
+    let status = {};
 
-    samlResponse = utils.parseSamlResponse(samlResponse);
+    samlResponse = utils.parseSamlResponse(samlResponse, this.parser);
 
     // status code
-    var statusCodeXml = xpath.select("//*[local-name(.)='Status']/*[local-name(.)='StatusCode']", samlResponse)[0];
+    const statusCodeXml = xpath.select("/*[local-name(.)='Response'][1]/*[local-name(.)='Status']/*[local-name(.)='StatusCode']", samlResponse)[0];
     if (statusCodeXml) {
       status.code = statusCodeXml.getAttribute('Value');
       // status sub code
-      var statusSubCodeXml = xpath.select("//*[local-name(.)='Status']/*[local-name(.)='StatusCode']/*[local-name(.)='StatusCode']", samlResponse)[0];
+      const statusSubCodeXml = xpath.select("/*[local-name(.)='Response'][1]/*[local-name(.)='Status']/*[local-name(.)='StatusCode']/*[local-name(.)='StatusCode']", samlResponse)[0];
       if (statusSubCodeXml) {
         status.subCode = statusSubCodeXml.getAttribute('Value');
       }
     }
 
     // status message
-    var samlStatusMsgXml = xpath.select("//*[local-name(.)='Status']/*[local-name(.)='StatusMessage']", samlResponse)[0];
+    const samlStatusMsgXml = xpath.select("/*[local-name(.)='Response'][1]/*[local-name(.)='Status']/*[local-name(.)='StatusMessage']", samlResponse)[0];
     if (samlStatusMsgXml) {
       status.message = samlStatusMsgXml.textContent;
     }
 
     // status detail
-    var samlStatusDetailXml = xpath.select("//*[local-name(.)='Status']/*[local-name(.)='StatusDetail']", samlResponse)[0];
+    const samlStatusDetailXml = xpath.select("/*[local-name(.)='Response'][1]/*[local-name(.)='Status']/*[local-name(.)='StatusDetail']", samlResponse)[0];
     if (samlStatusDetailXml) {
       status.detail = samlStatusDetailXml.textContent;
     }
 
     return status;
-  },
-
-  validateSamlResponse: function (samlResponse, callback) {
-    var self = this;
+  }
 
-    samlResponse = utils.parseSamlResponse(samlResponse);
+  validateSamlResponse (samlResponseStr, meta, callback) {
+    if (typeof samlResponseStr !== 'string') {
+      throw new Error('samlResponse must be a string');
+    }
+    const samlResponse = utils.parseSamlResponse(samlResponseStr, this.parser);
 
-    // Check that the saml Resopnse actually has a Response object
-    var responseXMLs = xpath.select("//*[local-name(.)='Response']", samlResponse);
+    // Check that the saml Response actually has a Response object
+    const responseXMLs = xpath.select("//*[local-name(.)='Response']", samlResponse);
     if (responseXMLs.length === 0) {
       return callback(new Error('XML is not a valid saml response'));
     }
     if (responseXMLs.length > 1) {
       return callback(new Error('SAMLResponse should be unique'));
     }
-    var responseXML = responseXMLs[0];
+    const responseXML = responseXMLs[0];
 
-    self.isValidResponseID(responseXML.getAttribute('ID'), function(err){
-      if (err && self.options.checkResponseID) { return callback(err); }
+    this.isValidResponseID(responseXML.getAttribute('ID'), (err) => {
+      if (err && this.options.checkResponseID) {
+        return callback(err);
+      }
 
-      var inResponseTo = responseXML.getAttribute('InResponseTo');
+      const inResponseTo = responseXML.getAttribute('InResponseTo');
 
-      self.isValidInResponseTo(inResponseTo, function(err){
-        if (err && self.options.checkInResponseTo) { return callback(err); }
+      this.isValidInResponseTo(inResponseTo, (err) => {
+        if (err && this.options.checkInResponseTo) {
+          return callback(err);
+        }
 
-        var destination = responseXML.getAttribute('Destination');
+        const destination = responseXML.getAttribute('Destination');
 
         // https://www.oasis-open.org/committees/download.php/35711/sstc-saml-core-errata-2.0-wd-06-diff.pdf
         // Page 36 of 91
@@ -404,42 +426,46 @@ Samlp.prototype = {
         // protocol bindings. If it is present, the actual recipient MUST check that the URI reference identifies the
         // location at which the message was received. If it does not, the request MUST be discarded. Some
         // protocol bindings may require the use of this attribute (see [SAMLBind]).
-        if (destination && destination !== self.options.destinationUrl){
-          self.eventEmitter.emit('destinationValidationFailed', {
-            configuredDestination: self.options.destinationUrl,
+        if (destination && destination !== this.options.destinationUrl) {
+          this.eventEmitter.emit('destinationValidationFailed', {
+            configuredDestination: this.options.destinationUrl,
             assertionDestination: destination
           });
 
-          if (self.options.checkDestination){
-            return callback(new Error('Destination endpoint ' + destination + ' did not match ' + self.options.destinationUrl));
+          if (this.options.checkDestination) {
+            return callback(new Error('Destination endpoint ' + destination + ' did not match ' + this.options.destinationUrl));
           }
         }
 
         // check status
-        var samlStatus = self.getSamlStatus(samlResponse);
+        const samlStatus = this.getSamlStatus(responseXML);
 
         // Check if this is a known error
-        var errorMessage = ErrorMessages[samlStatus.subCode] ||
-                          ErrorMessages[samlStatus.code];
+        const errorMessage = ErrorMessages[samlStatus.subCode] ||
+            ErrorMessages[samlStatus.code];
 
         if (errorMessage) {
           // Return auth failed with the actual message or a friendly message
           return callback (new AuthenticationFailedError(samlStatus.message || errorMessage, samlStatus.detail));
         }
 
         // extract assertion
-        self.extractAssertion(samlResponse, function (err, assertion) {
+        this.extractAssertion(responseXML, (err, assertionDom, encrypted, assertionStr) => {
           if (err) { return callback(err); }
-          if (!assertion) {
+          if (!assertionDom) {
             return callback(new Error('saml response does not contain an Assertion element (Status: ' + samlStatus.code + ')'));
           }
 
-          var samlResponseSignaturePath = "/*[local-name(.)='Response']/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']";
-          var isResponseSigned = xpath.select(samlResponseSignaturePath, samlResponse).length > 0;
-          var samlAssertionSignaturePath = ".//*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']";
-          var isAssertionSigned =  xpath.select(samlAssertionSignaturePath, assertion).length > 0;
+          const samlResponseSignaturePath = "/*[local-name(.)='Response'][1]/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']";
+          const isResponseSigned = xpath.select(samlResponseSignaturePath, responseXML).length > 0;
 
-          self.eventEmitter.emit('SAMLResponse:signatures', {
+          const samlAssertionSignaturePath = encrypted ?
+              "/*[local-name(.)='Assertion'][1]/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']" :
+              "/*[local-name(.)='Response'][1]/*[local-name(.)='Assertion'][1]/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']";
+
+          const isAssertionSigned =  xpath.select(samlAssertionSignaturePath, assertionDom).length > 0;
+
+          this.eventEmitter.emit('SAMLResponse:signatures', {
             isResponseSigned: isResponseSigned,
             isAssertionSigned: isAssertionSigned
           });
@@ -448,63 +474,60 @@ Samlp.prototype = {
             return callback(new Error('neither the response nor the assertion are signed'));
           }
 
-         if (isAssertionSigned) {
-            var assertionSignature = xpath.select(samlAssertionSignaturePath, assertion)[0];
-            if (assertionSignature.prefix) {
-              try {
-                var dsigNamespace = assertionSignature.lookupNamespaceURI(assertionSignature.prefix);
-                if (dsigNamespace && !assertionSignature.getAttribute('xmlns:' + assertionSignature.prefix)) {
-                  // saml assertion signature has a prefix but namespace is defined on parent, copy it to assertion
-                  assertionSignature.setAttribute('xmlns:' + assertionSignature.prefix, dsigNamespace);
-                }
-              } catch(e) {}
-            }
+          if (isAssertionSigned) {
+            const assertionSignature = xpath.select(samlAssertionSignaturePath, assertionDom)[0];
 
-            // If we find that a namespace was defined in resopnse and is used in assertion, we copy it to the assertion element
+            // If we find that a namespace was defined in response and is used in assertion, we copy it to the assertion element
             if (responseXML.attributes) {
-              var length = responseXML.attributes.length;
-              for (var i = 0; i < length; ++i) {
-                var attr = responseXML.attributes[i];
-                // If attribute is a namespace, and is the signature prefix and is used in Assertion, cpy it to assertion
-                if (attr.name.indexOf("xmlns") === 0 &&
-                  attr.name.indexOf('xmlns:' + assertionSignature.prefix) === -1 &&
-                  xpath.select("//*[local-name(.)='Assertion']//*[namespace-uri(.)='" + attr.value + "'] or //*[local-name(.)='Assertion']//@*[namespace-uri(.)='" + attr.value + "']", samlResponse)) {
-                  assertion.setAttribute(attr.name, attr.value);
+              const length = responseXML.attributes.length;
+              for (let i = 0; i < length; ++i) {
+                const attr = responseXML.attributes[i];
+                // If attribute is a namespace, and is the signature prefix and is used in Assertion, copy it to assertion
+                // Don't set attributes that already exist (xmldom may copy them depending on the version)
+                if (!assertionDom.getAttribute(attr.name)) {
+                  continue
+                }
+                const select = encrypted ?
+                    "/*[local-name(.)='Assertion'][1]//*[namespace-uri(.)='" + attr.value + "'] or /*[local-name(.)='Assertion'][1]//@*[namespace-uri(.)='" + attr.value + "']" :
+                    "/*[local-name(.)='Response'][1]/*[local-name(.)='Assertion'][1]//*[namespace-uri(.)='" + attr.value + "'] or /*[local-name(.)='Response'][1]/*[local-name(.)='Assertion'][1]//@*[namespace-uri(.)='" + attr.value + "']";
+                if (attr.name.indexOf('xmlns') === 0 &&
+                    attr.name.indexOf('xmlns:' + assertionSignature.prefix) === -1 &&
+                    xpath.select(select, responseXML)) {
+                  assertionDom.setAttribute(attr.name, attr.value);
                 }
               }
             }
           }
 
           if (isResponseSigned) {
-            self._saml.validateSignature(samlResponse, {
-              cert: self.options.cert,
-              thumbprints: self.options.thumbprints,
+            this._saml.validateSignature(samlResponseStr, {
+              meta: meta,
               signaturePath: samlResponseSignaturePath
-            },
-            function (err) {
+            }, (err, signed) => {
               if (err) { return callback(err); }
 
-              if (!isAssertionSigned) {
-                return self._saml.parseAssertion(assertion, callback);
-              }
-
-              return self._saml.validateSamlAssertion(assertion, callback);
+              this.extractAssertion(signed,  (err, assertion) => {
+                if (err) {
+                  // shouldn't happen
+                  return callback(err);
+                }
+                if (!assertion) {
+                  return callback(new Error('saml response does not contain an Assertion element (Status: ' + samlStatus.code + ')'));
+                }
+                // no need to validate the assertion once again due:
+                // In parseAssertion, it decrypts the EncryptedAssertion from solely the signed string. Since the encrypted cipher text is signed via the response element, i.e. a subset, it's integrity is also protected.
+                //Even if the underlying Encrypted Assertion post-decryption has a Signature, we don't need to verify it, because the cipher text was already protected
+                return this._saml.parseAssertion(assertion, callback);
+              });
             });
           }
           else if (isAssertionSigned) {
-            return self._saml.validateSamlAssertion(assertion, callback);
+            return this._saml.validateSamlAssertion(assertionStr || samlResponseStr, { meta }, callback);
           }
         });
       });
     });
   }
-};
-
-function generateInstant() {
-  var date = new Date();
-  return date.getUTCFullYear() + '-' + ('0' + (date.getUTCMonth()+1)).slice(-2) + '-' + ('0' + date.getUTCDate()).slice(-2) + 'T' + ('0' + date.getUTCHours()).slice(-2) + ":" + ('0' + date.getUTCMinutes()).slice(-2) + ":" + ('0' + date.getUTCSeconds()).slice(-2) + "Z";
 }
 
-function stripQueryAndFragmentFromURL(url) {
-  return url.split("#")[0].split("?")[0];
-}
+module.exports = Samlp;
\ No newline at end of file

@@ -1,4 +1,4 @@
-var uid = require('uid2');
+const uid = require('uid2');
 
 /**
  * Creates an instance of `SessionStore`.
@@ -38,11 +38,15 @@ function SessionStore(options) {
 SessionStore.prototype.store = function(req, callback) {
   if (!req.session) { return callback(new Error('Authentication requires session support when using state. Did you forget to use express-session middleware?')); }
 
-  var key = this._key;
-  var state = uid(24);
-  if (!req.session[key]) { req.session[key] = {}; }
-  req.session[key].state = state;
-  callback(null, state);
+  const key = this._key;
+  uid(24, (err, state) => {
+    if (err) {
+      return callback(err);
+    }
+    if (!req.session[key]) { req.session[key] = {}; }
+    req.session[key].state = state;
+    callback(null, state);
+  });
 };
 
 /**
@@ -59,12 +63,12 @@ SessionStore.prototype.store = function(req, callback) {
 SessionStore.prototype.verify = function(req, providedState, callback) {
   if (!req.session) { return callback(new Error('Authentication requires session support when using state. Did you forget to use express-session middleware?')); }
 
-  var key = this._key;
+  const key = this._key;
   if (!req.session[key]) {
     return callback(null, false, { message: 'Unable to verify authorization request state.' });
   }
 
-  var state = req.session[key].state;
+  const state = req.session[key].state;
   if (!state) {
     return callback(null, false, { message: 'Unable to verify authorization request state.' });
   }
@@ -82,4 +86,4 @@ SessionStore.prototype.verify = function(req, providedState, callback) {
 };
 
 // Expose constructor.
-module.exports = SessionStore;
+module.exports = SessionStore;
\ No newline at end of file

@@ -1,17 +1,15 @@
-var util      = require('util');
-var url       = require('url');
-var jwt       = require('jsonwebtoken');
-var Strategy  = require('passport-strategy');
-var saml      = require('./saml');
-var wsfed     = require('./wsfederation');
-var samlp     = require('./samlp');
-var getReqUrl = require('./utils').getReqUrl;
-var EventEmitter = require('events');
-var utils     = require('./utils');
-
-var utils             = require('./utils');
-var NullStateStore    = require('./state/null');
-var SessionStateStore = require('./state/session');
+const util      = require('util');
+const url       = require('url');
+const jwt       = require('jsonwebtoken');
+const Strategy  = require('passport-strategy');
+const saml      = require('./saml');
+const wsfed     = require('./wsfederation');
+const samlp     = require('./samlp');
+const getReqUrl = require('./utils').getReqUrl;
+const EventEmitter = require('events');
+const utils             = require('./utils');
+const NullStateStore    = require('./state/null');
+const SessionStateStore = require('./state/session');
 
 function WsFedSaml2Strategy (options, verify) {
   if (typeof options === 'function') {
@@ -36,7 +34,7 @@ function WsFedSaml2Strategy (options, verify) {
 
   if (!this.options.jwt) {
     this._saml = new saml.SAML(this.options);
-    this._samlp =  new samlp(this.options, this._saml);
+    this._samlp = new samlp(this.options, this._saml);
   } else {
     this._jwt = this.options.jwt;
   }
@@ -63,12 +61,12 @@ util.inherits(WsFedSaml2Strategy, Strategy);
 WsFedSaml2Strategy.prototype._authenticate_saml = function (req, state) {
   var self = this;
 
-  self._wsfed.retrieveToken(req, function(err, token) {
+  self._wsfed.retrieveToken(req, function(err, wResult) {
     if (err) return self.fail(err, err.status || 400);
 
     self.options.recipientUrl = self.options.recipientUrl || getReqUrl(req);
 
-    self._saml.validateSamlAssertion(token, function (err, profile) {
+    self._saml.validateSamlAssertion(wResult, { meta: { req } }, function (err, profile) {
       if (err) {
         return self.error(err);
       }
@@ -94,7 +92,6 @@ WsFedSaml2Strategy.prototype._authenticate_saml = function (req, state) {
       }
     })
   });
-
 };
 
 WsFedSaml2Strategy.prototype._authenticate_jwt = function (req, state) {
@@ -213,15 +210,13 @@ WsFedSaml2Strategy.prototype.authenticate = function (req, opts) {
           return self.fail('SAMLResponse should be a valid xml', 400);
         }
 
-        var samlResponseDom = utils.parseSamlResponse(samlResponse);
-
         // If options are not set, we set the expected value from the request object
         var req_full_url = getReqUrl(req);
         self.options.destinationUrl = self.options.destinationUrl || req_full_url;
         self.options.recipientUrl = self.options.recipientUrl || req_full_url;
 
 
-        self._samlp.validateSamlResponse(samlResponseDom, function (err, profile) {
+        self._samlp.validateSamlResponse(samlResponse, { meta: { req } }, function (err, profile) {
           if (err) return self.fail(err, err.status || 400);
 
           var verified = function (err, user, info) {
@@ -282,19 +277,19 @@ WsFedSaml2Strategy.prototype.authenticate = function (req, opts) {
   }
 
   switch (protocol) {
-  case 'wsfed':
-    executeWsfed(req, this.options);
-    break;
-  case 'samlp':
-    executeSamlp(req, this.options);
-    break;
-  default:
-    throw new Error('not supported protocol: ' + protocol);
+    case 'wsfed':
+      executeWsfed(req, this.options);
+      break;
+    case 'samlp':
+      executeSamlp(req, this.options);
+      break;
+    default:
+      throw new Error('not supported protocol: ' + protocol);
   }
 };
 
 WsFedSaml2Strategy.prototype.authorizationParams = function(options) {
   return options;
 };
 
-module.exports = WsFedSaml2Strategy;
+module.exports = WsFedSaml2Strategy;
\ No newline at end of file

@@ -1,20 +1,29 @@
-var xmldom = require('@auth0/xmldom');
-var crypto = require('crypto');
+const xmldom = require('@xmldom/xmldom');
 
-var SamlAssertionParserError = require('./errors/SamlAssertionParserError');
-var SamlResponseParserError = require('./errors/SamlResponseParserError');
-var WSFederationResultParserError = require('./errors/WSFederationResultParserError');
+const crypto = require('crypto');
 
-const CERT_START = "-----BEGIN CERTIFICATE-----\n";
-const CERT_END = "\n-----END CERTIFICATE-----\n";
+const SamlAssertionParserError = require('./errors/SamlAssertionParserError');
+const SamlResponseParserError = require('./errors/SamlResponseParserError');
+const SamlRequestParserError = require('./errors/SamlRequestParserError');
+const WSFederationResultParserError = require('./errors/WSFederationResultParserError');
+
+const CERT_START = '-----BEGIN CERTIFICATE-----\n';
+const CERT_END = '\n-----END CERTIFICATE-----\n';
 
 exports.certToPEM = (cert) => CERT_START + cert.match(/.{1,64}/g).join('\n') + CERT_END;
 
 // convert from \r\n -> \n this should be done by the xml parser, but is ignoring this.
-function crlf2lf(string) {
+exports.crlf2lf = function crlf2lf(string) {
   return string.replace(/\r\n?/g, '\n');
 }
 
+exports.parseXmlString = function(xml, parser = new xmldom.DOMParser()) {
+  const normalizedString = exports.crlf2lf(xml);
+  // to avoid a breaking change for customers, return the original result.
+  return parser.parseFromString(normalizedString, 'text/xml');
+}
+
+
 exports.getSamlAssertionVersion = function(samlAssertion){
   if (samlAssertion.getAttribute('MajorVersion') === '1') {
     return '1.1';
@@ -24,13 +33,13 @@ exports.getSamlAssertionVersion = function(samlAssertion){
     // In this case the version is undefined, or we weren't able to determine it.
     return undefined;
   }
-
 };
 
-exports.parseSamlAssertion = function(xml) {
+
+exports.parseSamlAssertion = function(xml, parser) {
   if (typeof xml === 'string') {
     try {
-      return new xmldom.DOMParser().parseFromString(crlf2lf(xml));
+      return exports.parseXmlString(xml, parser);
     } catch (e) {
       throw new SamlAssertionParserError('SAML Assertion should be a valid xml', e);
     }
@@ -39,10 +48,10 @@ exports.parseSamlAssertion = function(xml) {
   return xml;
 };
 
-exports.parseSamlResponse = function(xml) {
+exports.parseSamlResponse = function(xml, parser) {
   if (typeof xml === 'string') {
     try {
-      return new xmldom.DOMParser().parseFromString(crlf2lf(xml));
+      return exports.parseXmlString(xml, parser);
     } catch (e) {
       throw new SamlResponseParserError('SAMLResponse should be a valid xml', e);
     }
@@ -51,10 +60,23 @@ exports.parseSamlResponse = function(xml) {
   return xml;
 };
 
-exports.parseWsFedResponse = function(xml) {
+
+exports.parseSamlRequest = function(xml, parser) {
   if (typeof xml === 'string') {
     try {
-      return new xmldom.DOMParser().parseFromString(crlf2lf(xml));
+      return exports.parseXmlString(xml, parser);
+    } catch (e) {
+      throw new SamlRequestParserError('SAMLRequest should be a valid xml', e);
+    }
+  }
+
+  return xml;
+};
+
+exports.parseWsFedResponse = function(xml, parser) {
+  if (typeof xml === 'string') {
+    try {
+      return exports.parseXmlString(xml, parser);
     } catch (e) {
       throw new WSFederationResultParserError('wresult should be a valid xml', e);
     }
@@ -68,15 +90,15 @@ exports.getReqUrl = function(req){
 };
 
 exports.generateUniqueID = function() {
-  var uniqueID = crypto.randomBytes(16);
+  const uniqueID = crypto.randomBytes(16);
   return uniqueID.toString('hex');
 };
 
 exports.getEncoding = function(xml){
-  try{
-    const response = new xmldom.DOMParser().parseFromString(crlf2lf(xml));
+  try {
+    const response = exports.parseXmlString(xml);
     // <?xml version="1.0" encoding="XXXX"?> -> read encoding
-    if (response.firstChild && response.firstChild.tagName == 'xml'){
+    if (response.firstChild && response.firstChild.nodeName === 'xml'){
       const regex = /(?:encoding=\")([^\"]*)(?:\")/g;
       const match = regex.exec(response.firstChild.nodeValue);
       // [0] the complete match
@@ -110,4 +132,4 @@ exports.stringCompare = function(a,b) {
   }
 
   return a === b;
-};
+};
\ No newline at end of file

@@ -1,20 +1,25 @@
-var xtend = require('xtend');
-var qs = require('querystring');
-var xpath = require('xpath');
+const xtend = require('xtend');
+const qs = require('querystring');
+const xpath = require('xpath');
+const xmldom = require('@xmldom/xmldom');
 
-var utils = require('./utils');
-var AuthenticationFailedError = require('./errors/AuthenticationFailedError');
+const domParser = new xmldom.DOMParser();
 
-var WsFederation = module.exports = function WsFederation (realm, homerealm, identityProviderUrl, wreply) {
+const utils = require('./utils');
+const AuthenticationFailedError = require('./errors/AuthenticationFailedError');
+
+
+const WsFederation = module.exports = function WsFederation (realm, homerealm, identityProviderUrl, wreply) {
   this.realm = realm;
   this.homerealm = homerealm;
   this.identityProviderUrl = identityProviderUrl;
   this.wreply = wreply;
+  this.parser = domParser;
 };
 
 WsFederation.prototype = {
   getRequestSecurityTokenUrl: function (options) {
-    var query = xtend(options || {}, {
+    const query = xtend(options || {}, {
       wtrealm: this.realm,
       wa:      'wsignin1.0'
     });
@@ -31,13 +36,13 @@ WsFederation.prototype = {
   },
 
   extractToken: function(req) {
-    var doc = utils.parseWsFedResponse(req.body['wresult']);
+    const doc = utils.parseWsFedResponse(req.body['wresult'], this.parser);
 
     // //Probe WS-Trust 1.2 namespace (http://schemas.xmlsoap.org/ws/2005/02/trust)
-    var token = doc.getElementsByTagNameNS('http://schemas.xmlsoap.org/ws/2005/02/trust', 'RequestedSecurityToken')[0];
+    let token = doc.getElementsByTagNameNS('http://schemas.xmlsoap.org/ws/2005/02/trust', 'RequestedSecurityToken')[0];
 
     // //Probe WS-Trust 1.3 namespace (http://docs.oasis-open.org/ws-sx/ws-trust/200512)
-    if(!token){
+    if (!token) {
       token = doc.getElementsByTagNameNS('http://docs.oasis-open.org/ws-sx/ws-trust/200512', 'RequestedSecurityToken')[0];
     }
 
@@ -48,51 +53,55 @@ WsFederation.prototype = {
     if (req.body.wresult.indexOf('<') === -1) {
       return callback(new Error('wresult should be a valid xml'));
     }
-
-    var fault = this.extractFault(req);
+    const fault = this.extractFault(req);
     if (fault) {
       return callback(new AuthenticationFailedError(fault.message, fault.detail));
     }
 
-    var token = this.extractToken(req);
+    const token = this.extractToken(req);
     if (!token) {
       return callback(new Error('missing RequestedSecurityToken element'));
     }
 
     // Check for more than one Assertions to conform with spec
-    var foundAssertions = xpath.select("//*[local-name(.)='Assertion']", token);
+    const foundAssertions = xpath.select("//*[local-name(.)='Assertion']", token);
     if (foundAssertions.length > 1) {
       return callback(new Error('A RequestedSecurityToken can contain only one Assertion element.'));
     }
 
-    callback(null, token);
+    callback(null, req.body.wresult);
   },
 
   extractFault: function(req) {
-    var fault = {};
-    var doc = utils.parseWsFedResponse(req.body['wresult']);
+    const fault = {};
+    let doc;
+    try {
+       doc = utils.parseWsFedResponse(req.body['wresult'], this.parser);
+    } catch (err) {
+      return err;
+    }
 
-    var isFault = xpath.select("//*[local-name(.)='Fault']", doc)[0];
+    const isFault = xpath.select("//*[local-name(.)='Fault']", doc)[0];
     if (!isFault) {
       return null;
     }
 
-    var codeXml = xpath.select("//*[local-name(.)='Fault']/*[local-name(.)='Code']/*[local-name(.)='Value']", doc)[0];
+    const codeXml = xpath.select("//*[local-name(.)='Fault']/*[local-name(.)='Code']/*[local-name(.)='Value']", doc)[0];
     if (codeXml) {
       fault.code = codeXml.textContent;
     }
 
-    var subCodeXml = xpath.select("//*[local-name(.)='Fault']/*[local-name(.)='Code']/*[local-name(.)='Subcode']/*[local-name(.)='Value']", doc)[0];
+    const subCodeXml = xpath.select("//*[local-name(.)='Fault']/*[local-name(.)='Code']/*[local-name(.)='Subcode']/*[local-name(.)='Value']", doc)[0];
     if (subCodeXml) {
       fault.subCode = subCodeXml.textContent;
     }
 
-    var messageXml = xpath.select("//*[local-name(.)='Fault']/*[local-name(.)='Reason']/*[local-name(.)='Text']", doc)[0];
+    const messageXml = xpath.select("//*[local-name(.)='Fault']/*[local-name(.)='Reason']/*[local-name(.)='Text']", doc)[0];
     if (messageXml) {
       fault.message = messageXml.textContent;
     }
 
-    var detailXml = xpath.select("//*[local-name(.)='Fault']/*[local-name(.)='Detail']", doc)[0];
+    const detailXml = xpath.select("//*[local-name(.)='Fault']/*[local-name(.)='Detail']", doc)[0];
     if (detailXml) {
       fault.detail = detailXml.textContent;
     }
@@ -117,4 +126,4 @@ Object.defineProperty(WsFederation, 'identityProviderUrl', {
   get: function () {
     return this.identityProviderUrl;
   }
-});
+});
\ No newline at end of file

@@ -1,6 +1,6 @@
 {
   "name": "passport-wsfed-saml2",
-  "version": "4.6.3",
+  "version": "4.6.4",
   "description": "SAML2 Protocol and WS-Fed library",
   "scripts": {
     "test": "./node_modules/.bin/mocha --recursive",
@@ -21,16 +21,16 @@
   },
   "main": "./lib/passport-wsfed-saml2",
   "dependencies": {
-    "@auth0/xmldom": "0.1.22",
-    "ejs": "2.5.5",
+    "@xmldom/xmldom": "^0.9.8",
+    "ejs": "^3.1.10",
     "jsonwebtoken": "~9.0.0",
-    "node-forge": "^0.10.0",
+    "node-forge": "^1.3.1",
     "passport-strategy": "^1.0.0",
-    "uid2": "0.0.x",
+    "uid2": "^1.0.0",
     "valid-url": "^1.0.9",
-    "xml-crypto": "auth0/xml-crypto#v1.4.1-auth0.2",
+    "xml-crypto": "^6.1.0",
     "xml-encryption": "^2.0.0",
-    "xpath": "0.0.5",
+    "xpath": "^0.0.33",
     "xtend": "~2.0.3"
   },
   "devDependencies": {
@@ -47,7 +47,7 @@
     "wsfed": "~0.3.5"
   },
   "engines": {
-    "node": ">= 12"
+    "node": ">= 18"
   },
   "licenses": [
     {

@@ -8,425 +8,437 @@ var path = require('path');
 var passport = require('passport');
 var Strategy = require('../../lib/passport-wsfed-saml2').Strategy;
 
-var identityProviderUrl = 'http://localhost:5051/samlp';
+const PORT = 3000 + Math.floor(Math.random() * 7000);
+const BASE_URL = `http://localhost:${PORT}`;
+var identityProviderUrl = `${BASE_URL}/samlp`;
 var relayState = 'somestate';
 
+passport.serializeUser(function(user, done) {
+    done(null, user);
+});
+
+passport.deserializeUser(function(user, done) {
+    done(null, user);
+});
+
 passport.use('samlp', new Strategy({
-    path: '/callback',
-    realm: 'https://auth0-dev-ed.my.salesforce.com',
-    identityProviderUrl: identityProviderUrl,
-    thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-    recipientUrl: 'https://auth0-dev-ed.my.salesforce.com',
-    destinationUrl: 'https://auth0-dev-ed.my.salesforce.com'
-  }, function(profile, done) {
-    return done(null, profile);
-  })
+        path: '/callback',
+        realm: 'https://auth0-dev-ed.my.salesforce.com',
+        identityProviderUrl: identityProviderUrl,
+        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+        recipientUrl: 'https://auth0-dev-ed.my.salesforce.com',
+        destinationUrl: 'https://auth0-dev-ed.my.salesforce.com'
+    }, function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-http-post', new Strategy({
-    protocolBinding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-    path: '/callback',
-    realm: 'https://auth0-dev-ed.my.salesforce.com',
-    identityProviderUrl: identityProviderUrl,
-    thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309']
-  }, function(profile, done) {
-    return done(null, profile);
-  })
+        protocolBinding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
+        path: '/callback',
+        realm: 'https://auth0-dev-ed.my.salesforce.com',
+        identityProviderUrl: identityProviderUrl,
+        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309']
+    }, function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-custom-request-template', new Strategy({
-    path: '/callback',
-    realm: 'https://auth0-dev-ed.my.salesforce.com',
-    identityProviderUrl: identityProviderUrl,
-    thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-    requestTemplate: '<AuthnRequest Issuertico="@@Issuer@@" Version="3.0" Protocol="@@ProtocolBinding@@" Foo="@@Foo.Test@@"></AuthnRequest>',
-    requestContext: {
-      Foo: {
-        Test: 123
-      }
-    }
-  }, function(profile, done) {
-    return done(null, profile);
-  })
+        path: '/callback',
+        realm: 'https://auth0-dev-ed.my.salesforce.com',
+        identityProviderUrl: identityProviderUrl,
+        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+        requestTemplate: '<AuthnRequest Issuertico="@@Issuer@@" Version="3.0" Protocol="@@ProtocolBinding@@" Foo="@@Foo.Test@@"></AuthnRequest>',
+        requestContext: {
+            Foo: {
+                Test: 123
+            }
+        }
+    }, function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-idpurl-with-querystring', new Strategy(
-  {
-    path: '/callback',
-    realm: 'https://auth0-dev-ed.my.salesforce.com',
-    identityProviderUrl: identityProviderUrl + '?foo=bar',
-    thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309']
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        realm: 'https://auth0-dev-ed.my.salesforce.com',
+        identityProviderUrl: identityProviderUrl + '?foo=bar',
+        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309']
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-signedrequest-without-deflate', new Strategy({
-    path: '/callback',
-    realm: 'https://auth0-dev-ed.my.salesforce.com',
-    identityProviderUrl: identityProviderUrl,
-    thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-    signingKey: {
-      key: fs.readFileSync(path.join(__dirname, '../test-auth0.key')),
-      cert: fs.readFileSync(path.join(__dirname, '../test-auth0.pem')),
-    },
-    deflate: false
-  }, function(profile, done) {
-    return done(null, profile);
-  })
+        path: '/callback',
+        realm: 'https://auth0-dev-ed.my.salesforce.com',
+        identityProviderUrl: identityProviderUrl,
+        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+        signingKey: {
+            key: fs.readFileSync(path.join(__dirname, '../test-auth0.key')),
+            cert: fs.readFileSync(path.join(__dirname, '../test-auth0.pem')),
+        },
+        deflate: false
+    }, function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-signedrequest-with-deflate', new Strategy({
-    path: '/callback',
-    realm: 'https://auth0-dev-ed.my.salesforce.com',
-    identityProviderUrl: identityProviderUrl,
-    thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-    signingKey: {
-      key: fs.readFileSync(path.join(__dirname, '../test-auth0.key')),
-      cert: fs.readFileSync(path.join(__dirname, '../test-auth0.pem')),
-    },
-    deflate: true
-  }, function(profile, done) {
-    return done(null, profile);
-  })
+        path: '/callback',
+        realm: 'https://auth0-dev-ed.my.salesforce.com',
+        identityProviderUrl: identityProviderUrl,
+        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+        signingKey: {
+            key: fs.readFileSync(path.join(__dirname, '../test-auth0.key')),
+            cert: fs.readFileSync(path.join(__dirname, '../test-auth0.pem')),
+        },
+        deflate: true
+    }, function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-signedrequest-post', new Strategy({
-    protocolBinding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-    path: '/callback',
-    realm: 'https://auth0-dev-ed.my.salesforce.com',
-    identityProviderUrl: identityProviderUrl,
-    thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-    signingKey: {
-      key: fs.readFileSync(path.join(__dirname, '../test-auth0.key')),
-      cert: fs.readFileSync(path.join(__dirname, '../test-auth0.pem')),
-    },
-    deflate: false
-  }, function(profile, done) {
-    return done(null, profile);
-  })
+        protocolBinding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
+        path: '/callback',
+        realm: 'https://auth0-dev-ed.my.salesforce.com',
+        identityProviderUrl: identityProviderUrl,
+        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+        signingKey: {
+            key: fs.readFileSync(path.join(__dirname, '../test-auth0.key')),
+            cert: fs.readFileSync(path.join(__dirname, '../test-auth0.pem')),
+        },
+        deflate: false
+    }, function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 
 passport.use('samlp-signedresponse', new Strategy(
-  {
-    path: '/callback',
-    realm: 'https://auth0-dev-ed.my.salesforce.com',
-    identityProviderUrl: identityProviderUrl,
-    thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-    recipientUrl: 'https://auth0-dev-ed.my.salesforce.com',
-    destinationUrl: 'https://auth0-dev-ed.my.salesforce.com'
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        realm: 'https://auth0-dev-ed.my.salesforce.com',
+        identityProviderUrl: identityProviderUrl,
+        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+        recipientUrl: 'https://auth0-dev-ed.my.salesforce.com',
+        destinationUrl: 'https://auth0-dev-ed.my.salesforce.com'
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-signedresponse-invalidcert', new Strategy(
-  {
-    path: '/callback',
-    realm: 'urn:fixture-test',
-    identityProviderUrl: identityProviderUrl,
-    thumbprints: ['11111111111111111a5b93a43572eb2376fed309'],
-    recipientUrl: 'https://auth0-dev-ed.my.salesforce.com',
-    destinationUrl: 'https://auth0-dev-ed.my.salesforce.com'
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        realm: 'urn:fixture-test',
+        identityProviderUrl: identityProviderUrl,
+        thumbprints: ['11111111111111111a5b93a43572eb2376fed309'],
+        recipientUrl: 'https://auth0-dev-ed.my.salesforce.com',
+        destinationUrl: 'https://auth0-dev-ed.my.salesforce.com'
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-invalidcert', new Strategy(
-  {
-    path: '/callback',
-    realm: 'urn:fixture-test',
-    identityProviderUrl: identityProviderUrl,
-    thumbprints: ['11111111111111111a5b93a43572eb2376fed309']
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        realm: 'urn:fixture-test',
+        identityProviderUrl: identityProviderUrl,
+        thumbprints: ['11111111111111111a5b93a43572eb2376fed309']
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-signedresponse-signedassertion', new Strategy(
-  {
-    path: '/callback',
-    realm: 'urn:auth0:login-dev3',
-    thumbprints: ['C9ED4DFB07CAF13FC21E0FEC1572047EB8A7A4CB'],
-    destinationUrl: 'https://login-dev3.auth0.com:3000/login/callback',
-    recipientUrl: 'https://login-dev3.auth0.com:3000/login/callback',
-    checkExpiration: false // we are using a precomputed assertion generated from a sample idp feide
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        realm: 'urn:auth0:login-dev3',
+        thumbprints: ['C9ED4DFB07CAF13FC21E0FEC1572047EB8A7A4CB'],
+        destinationUrl: 'https://login-dev3.auth0.com:3000/login/callback',
+        recipientUrl: 'https://login-dev3.auth0.com:3000/login/callback',
+        checkExpiration: false // we are using a precomputed assertion generated from a sample idp feide
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-ping', new Strategy(
-  {
-    path: '/callback',
-    realm: 'urn:auth0:login-dev3',
-    thumbprints: ['44340220770a348444be34970939cff8a2d74f08'],
-    destinationUrl: 'https://login-dev3.auth0.com:3000/login/callback',
-    recipientUrl: 'https://login-dev3.auth0.com:3000/login/callback',
-    checkExpiration: false // we are using a precomputed assertion generated from a sample idp feide
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        realm: 'urn:auth0:login-dev3',
+        thumbprints: ['44340220770a348444be34970939cff8a2d74f08'],
+        destinationUrl: 'https://login-dev3.auth0.com:3000/login/callback',
+        recipientUrl: 'https://login-dev3.auth0.com:3000/login/callback',
+        checkExpiration: false // we are using a precomputed assertion generated from a sample idp feide
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-okta', new Strategy(
-  {
-    path: '/callback',
-    realm: 'https://auth0145.auth0.com',
-    thumbprints: ['a0c7dbb790e3476d3c5dd236f9f2060b1fd6e253'],
-    destinationUrl: 'https://auth0145.auth0.com',
-    recipientUrl: 'https://auth0145.auth0.com',
-    checkExpiration: false // we are using a precomputed assertion generated from a sample idp feide
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        realm: 'https://auth0145.auth0.com',
+        thumbprints: ['a0c7dbb790e3476d3c5dd236f9f2060b1fd6e253'],
+        destinationUrl: 'https://auth0145.auth0.com',
+        recipientUrl: 'https://auth0145.auth0.com',
+        checkExpiration: false // we are using a precomputed assertion generated from a sample idp feide
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 function pemToCert(pem) {
-  // if certificate doesn't have ---- begin cert --- just return the pem
-  if (!/-----BEGIN CERTIFICATE-----/.test(pem.toString())) {
-    return pem.toString();
-  }
+    // if certificate doesn't have ---- begin cert --- just return the pem
+    if (!/-----BEGIN CERTIFICATE-----/.test(pem.toString())) {
+        return pem.toString();
+    }
 
-  var cert = /-----BEGIN CERTIFICATE-----([^-]*)-----END CERTIFICATE-----/g.exec(pem.toString());
-  if (cert.length > 0) {
-    return cert[1].replace(/[\n|\r\n]/g, '');
-  }
+    var cert = /-----BEGIN CERTIFICATE-----([^-]*)-----END CERTIFICATE-----/g.exec(pem.toString());
+    if (cert.length > 0) {
+        return cert[1].replace(/[\n|\r\n]/g, '');
+    }
 
-  return null;
+    return null;
 }
 
 passport.use('samlp-with-utf8', new Strategy(
-  {
-    path: '/callback',
-    thumbprints: ['119B9E027959CDB7C662CFD075D9E2EF384E445F'],
-    decryptionKey: fs.readFileSync(path.join(__dirname, '../test-auth0.key')),
-    recipientUrl: 'https://login0.myauth0.com/login/callback',
-    destinationUrl: 'https://login0.myauth0.com/login/callback',
-    checkExpiration: false, // we are using a precomputed assertion generated from a sample idp feide
-    checkSPNameQualifier: false,
-    checkAudience: false
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        thumbprints: ['119B9E027959CDB7C662CFD075D9E2EF384E445F'],
+        decryptionKey: fs.readFileSync(path.join(__dirname, '../test-auth0.key')),
+        recipientUrl: 'https://login0.myauth0.com/login/callback',
+        destinationUrl: 'https://login0.myauth0.com/login/callback',
+        checkExpiration: false, // we are using a precomputed assertion generated from a sample idp feide
+        checkSPNameQualifier: false,
+        checkAudience: false
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-with-ISO', new Strategy(
-  {
-    path: '/callback',
-    cert: pemToCert(fs.readFileSync(path.join(__dirname, '../test-auth0.pem'))),
-    checkExpiration: false, // we are using a precomputed assertion generated from a sample idp feide
-    checkAudience: false,
-    checkDestination: false,
-    checkRecipient: false
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        cert: pemToCert(fs.readFileSync(path.join(__dirname, '../test-auth0.pem'))),
+        checkExpiration: false, // we are using a precomputed assertion generated from a sample idp feide
+        checkAudience: false,
+        checkDestination: false,
+        checkRecipient: false
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-with-ISO-explicit', new Strategy(
-  {
-    path: '/callback',
-    cert: pemToCert(fs.readFileSync(path.join(__dirname, '../test-auth0.pem'))),
-    checkExpiration: false, // we are using a precomputed assertion generated from a sample idp feide
-    checkAudience: false,
-    default_encoding: 'ISO-8859-1',
-    checkDestination: false,
-    checkRecipient: false
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        cert: pemToCert(fs.readFileSync(path.join(__dirname, '../test-auth0.pem'))),
+        checkExpiration: false, // we are using a precomputed assertion generated from a sample idp feide
+        checkAudience: false,
+        default_encoding: 'ISO-8859-1',
+        checkDestination: false,
+        checkRecipient: false
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 passport.use('samlp-with-dsig-at-root', new Strategy(
-  {
-    path: '/callback',
-    checkExpiration: false, // we are using a precomputed assertion generated from a sample idp
-    checkAudience: false,
-    checkDestination: false,
-    cert: pemToCert(fs.readFileSync(path.join(__dirname, '../test-auth0.pem')))
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+        path: '/callback',
+        checkExpiration: false, // we are using a precomputed assertion generated from a sample idp
+        checkAudience: false,
+        checkDestination: false,
+        cert: pemToCert(fs.readFileSync(path.join(__dirname, '../test-auth0.pem')))
+    },
+    function(profile, done) {
+        return done(null, profile);
+    })
 );
 
 
 var fakeUser = {
-  id: '12345678',
-  displayName: 'John Foo',
-  name: {
-    familyName: 'Foo',
-    givenName: 'John'
-  },
-  emails: [
-    {
-      type: 'work',
-      value: 'jfoo@gmail.com'
-    }
-  ]
+    id: '12345678',
+    displayName: 'John Foo',
+    name: {
+        familyName: 'Foo',
+        givenName: 'John'
+    },
+    emails: [
+        {
+            type: 'work',
+            value: 'jfoo@gmail.com'
+        }
+    ]
 };
 
 var credentials = {
-  cert:     fs.readFileSync(path.join(__dirname, '../test-auth0.pem')),
-  key:      fs.readFileSync(path.join(__dirname, '../test-auth0.key'))
+    cert:     fs.readFileSync(path.join(__dirname, '../test-auth0.pem')),
+    key:      fs.readFileSync(path.join(__dirname, '../test-auth0.key'))
 };
 
 module.exports.options = {};
 
 module.exports.start = function(options, callback){
-  module.exports.options = options;
-  if (typeof options === 'function') {
-    callback = options;
-    module.exports.options = {};
-  }
-
-  var app = express();
-
-  app.configure(function(){
-    this.use(express.bodyParser());
-    this.use(passport.initialize());
-    this.use(passport.session());
-    this.use(function(req,res,next){
-      req.user = fakeUser;
-      next();
-    });
-  });
-
-  function getPostURL (audience, samlRequestDom, req, callback) {
-    callback(null, 'http://localhost:5051/callback');
-  }
-
-  //configure samlp middleware
-  app.get('/samlp', function(req, res, next) {
-    samlp.auth(xtend({}, {
-        issuer:             'urn:fixture-test',
-        getPostURL:         getPostURL,
-        cert:               credentials.cert,
-        key:                credentials.key,
-        recipient:          'https://auth0-dev-ed.my.salesforce.com'
-      }, module.exports.options))(req, res);
-  });
-
-  app.get('/login', passport.authenticate('samlp', { protocol: 'samlp', RelayState: relayState }));
-  app.get('/login-http-post', passport.authenticate('samlp-http-post', { protocol: 'samlp', RelayState: relayState }));
-  app.get('/login-idp-with-querystring', passport.authenticate('samlp-idpurl-with-querystring', { protocol: 'samlp', RelayState: relayState }));
-
-  app.get('/login-signed-request-without-deflate', passport.authenticate('samlp-signedrequest-without-deflate', { protocol: 'samlp', RelayState: relayState }));
-  app.get('/login-signed-request-post', passport.authenticate('samlp-signedrequest-post', { protocol: 'samlp', RelayState: relayState }));
-  app.get('/login-signed-request-with-deflate', passport.authenticate('samlp-signedrequest-with-deflate', { protocol: 'samlp', RelayState: relayState }));
-
-  app.get('/login-custom-request-template',
-      passport.authenticate('samlp-custom-request-template', { protocol: 'samlp', RelayState: relayState }));
-
-  app.post('/callback',
-    function(req, res, next) {
-      next();
-    },
-    passport.authenticate('samlp', { protocol: 'samlp' }),
-    function(req, res) {
-      res.json(req.user);
+    module.exports.options = options;
+    if (typeof options === 'function') {
+        callback = options;
+        module.exports.options = {};
     }
-  );
 
-  app.post('/callback/samlp-signedresponse',
-    passport.authenticate('samlp-signedresponse', { protocol: 'samlp' }),
-    function(req, res) {
-      res.json(req.user);
-    }
-  );
-
-  app.post('/callback/samlp-signedresponse-invalidcert',
-    passport.authenticate('samlp-signedresponse-invalidcert', { protocol: 'samlp' }),
-    function(req, res) {
-      res.json(req.user);
-    }
-  );
-
-  app.post('/callback/samlp-invalidcert',
-    passport.authenticate('samlp-invalidcert', { protocol: 'samlp' }),
-    function(req, res) {
-      res.json(req.user);
-    }
-  );
-
-  app.post('/callback/samlp-signedresponse-signedassertion',
-    passport.authenticate('samlp-signedresponse-signedassertion', { protocol: 'samlp' }),
-    function(req, res) {
-      res.json(req.user);
-    }
-  );
+    var app = express();
 
-  app.post('/callback/samlp-ping',
-    passport.authenticate('samlp-ping', { protocol: 'samlp' }),
-    function(req, res) {
-      res.json(req.user);
-    }
-  );
-
-  app.post('/callback/samlp-okta',
-    passport.authenticate('samlp-okta', { protocol: 'samlp' }),
-    function(req, res) {
-      res.json(req.user);
-    }
-  );
-
-  app.post('/callback/samlp-with-utf8',
-    passport.authenticate('samlp-with-utf8', { protocol: 'samlp' }),
-    function(req, res) {
-      res.json(req.user);
-    }
-  );
-
-  app.post('/callback/samlp-with-ISO',
-    passport.authenticate('samlp-with-ISO', { protocol: 'samlp' }),
-    function(req, res) {
-      res.json(req.user);
-    }
-  );
-
-  app.post('/callback/samlp-with-ISO-explicit',
-  passport.authenticate('samlp-with-ISO-explicit', { protocol: 'samlp' }),
-  function(req, res) {
-    res.json(req.user);
-  }
-);
+    app.configure(function(){
+        this.use(express.bodyParser());
+        this.use(passport.initialize());
+        this.use(passport.session());
+        this.use(function(req,res,next){
+            req.user = fakeUser;
+            next();
+        });
+    });
 
-  app.post('/callback/samlp-with-invalid-xml',
-    function (req, res, next) {
-      passport.authenticate('samlp-with-utf8', { protocol: 'samlp' }, function(err, user, info) {
-        res.send(400, { message: err.message });
-      })(req, res, next);
-    },
-    function(req, res) {
-      res.json(req.user);
+    function getPostURL (audience, samlRequestDom, req, callback) {
+        callback(null, `${BASE_URL}/callback`);
     }
-  );
 
-  app.post('/callback/samlp-with-dsig-at-root',
-    passport.authenticate('samlp-with-dsig-at-root', { protocol: 'samlp' }),
-    function(req, res) {
-      res.json(req.user);
-    }
-  );
+    //configure samlp middleware
+    app.get('/samlp', function(req, res, next) {
+        samlp.auth(xtend({}, {
+            issuer:             'urn:fixture-test',
+            getPostURL:         getPostURL,
+            cert:               credentials.cert,
+            key:                credentials.key,
+            recipient:          'https://auth0-dev-ed.my.salesforce.com'
+        }, module.exports.options))(req, res);
+    });
 
-  var server = http.createServer(app).listen(5051, callback);
-  module.exports.close = server.close.bind(server);
+    app.get('/login', passport.authenticate('samlp', { protocol: 'samlp', RelayState: relayState }));
+    app.get('/login-http-post', passport.authenticate('samlp-http-post', { protocol: 'samlp', RelayState: relayState }));
+    app.get('/login-idp-with-querystring', passport.authenticate('samlp-idpurl-with-querystring', { protocol: 'samlp', RelayState: relayState }));
+
+    app.get('/login-signed-request-without-deflate', passport.authenticate('samlp-signedrequest-without-deflate', { protocol: 'samlp', RelayState: relayState }));
+    app.get('/login-signed-request-post', passport.authenticate('samlp-signedrequest-post', { protocol: 'samlp', RelayState: relayState }));
+    app.get('/login-signed-request-with-deflate', passport.authenticate('samlp-signedrequest-with-deflate', { protocol: 'samlp', RelayState: relayState }));
+
+    app.get('/login-custom-request-template',
+        passport.authenticate('samlp-custom-request-template', { protocol: 'samlp', RelayState: relayState }));
+
+    app.post('/callback',
+        function(req, res, next) {
+            next();
+        },
+        passport.authenticate('samlp', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-signedresponse',
+        passport.authenticate('samlp-signedresponse', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-signedresponse-invalidcert',
+        passport.authenticate('samlp-signedresponse-invalidcert', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-invalidcert',
+        passport.authenticate('samlp-invalidcert', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-signedresponse-signedassertion',
+        passport.authenticate('samlp-signedresponse-signedassertion', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-ping',
+        passport.authenticate('samlp-ping', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-okta',
+        passport.authenticate('samlp-okta', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-with-utf8',
+        passport.authenticate('samlp-with-utf8', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-with-ISO',
+        passport.authenticate('samlp-with-ISO', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-with-ISO-explicit',
+        passport.authenticate('samlp-with-ISO-explicit', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-with-invalid-xml',
+        function (req, res, next) {
+            passport.authenticate('samlp-with-utf8', { protocol: 'samlp' }, function(err, user, info) {
+                res.send(400, { message: err.message });
+            })(req, res, next);
+        },
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    app.post('/callback/samlp-with-dsig-at-root',
+        passport.authenticate('samlp-with-dsig-at-root', { protocol: 'samlp' }),
+        function(req, res) {
+            res.json(req.user);
+        }
+    );
+
+    var server = http.createServer(app).listen(PORT, callback);
+    module.exports.close = server.close.bind(server);
 };
 
 module.exports.relayState = relayState;
 module.exports.identityProviderUrl = identityProviderUrl;
 module.exports.fakeUser = fakeUser;
 module.exports.credentials = credentials;
+module.exports.BASE_URL = BASE_URL;
+module.exports.PORT = PORT;
\ No newline at end of file

@@ -8,16 +8,20 @@ var path = require('path');
 var passport = require('passport');
 var Strategy = require('../../lib/passport-wsfed-saml2').Strategy;
 
+
+const PORT = 3000 + Math.floor(Math.random() * 7000);
+const BASE_URL = `http://localhost:${PORT}`;
+
 passport.use(new Strategy(
-  {
-    path: '/callback',
-    realm: 'urn:fixture-test',
-    identityProviderUrl: 'http://localhost:5050/login',
-    thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309']
-  },
-  function(profile, done) {
-    return done(null, profile);
-  })
+    {
+      path: '/callback',
+      realm: 'urn:fixture-test',
+      identityProviderUrl: `${BASE_URL}/login`,
+      thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309']
+    },
+    function(profile, done) {
+      return done(null, profile);
+    })
 );
 
 var fakeUser = {
@@ -70,37 +74,39 @@ module.exports.start = function(options, callback){
   });
 
   function getPostURL (wtrealm, wreply, req, callback) {
-    callback(null, 'http://localhost:5050/callback');
+    callback(null, `${BASE_URL}/callback`);
   }
 
   app.get('/login',
-    wsfed.auth(xtend({}, {
-      issuer:             'fixture-test',
-      getPostURL:         getPostURL,
-      cert:               credentials.cert,
-      key:                credentials.key
-  }, options)));
+      wsfed.auth(xtend({}, {
+        issuer:             'fixture-test',
+        getPostURL:         getPostURL,
+        cert:               credentials.cert,
+        key:                credentials.key
+      }, options)));
 
   app.post('/callback/wresult-with-invalid-xml',
-    function (req, res, next) {
-      passport.authenticate('wsfed-saml2', function(err, user, info) {
-        res.send(400, { message: err.message });
-      })(req, res, next);
-    },
-    function(req, res) {
-      res.json(req.user);
-    }
+      function (req, res, next) {
+        passport.authenticate('wsfed-saml2', function(err, user, info, status) {
+          res.send(400, { message: info.detail.message });
+        })(req, res, next);
+      },
+      function(req, res) {
+        res.json(req.user);
+      }
   );
 
   app.post('/callback',
-    passport.authenticate('wsfed-saml2'),
-    function(req, res) {
-      res.json(req.user);
-    });
+      passport.authenticate('wsfed-saml2'),
+      function(req, res) {
+        res.json(req.user);
+      });
 
-  var server = http.createServer(app).listen(5050, callback);
+  var server = http.createServer(app).listen(PORT, callback);
   module.exports.close = server.close.bind(server);
 };
 
 module.exports.fakeUser = fakeUser;
 module.exports.credentials = credentials;
+module.exports.BASE_URL = BASE_URL;
+module.exports.PORT = PORT;
\ No newline at end of file

@@ -1,65 +1,57 @@
-var xmlCrypto = require('xml-crypto'),
-    crypto = require('crypto'),
-    xmldom = require('@auth0/xmldom');
+const xmlCrypto = require('xml-crypto');
+const xmldom = require('@xmldom/xmldom');
+const xpath = require('xpath');
 
 exports.isValidSignature = function(assertion, cert) {
-  var doc = new xmldom.DOMParser().parseFromString(assertion);
-  var signature = xmlCrypto.xpath(doc, "/*/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']")[0];
-  var sig = new xmlCrypto.SignedXml(null, { idAttribute: 'AssertionID' });
-  sig.keyInfoProvider = {
-    getKeyInfo: function (key) {
-      return "<X509Data></X509Data>";
-    },
-    getKey: function (keyInfo) {
-      return cert;
-    }
-  };
+  var doc = new xmldom.DOMParser().parseFromString(assertion, 'text/xml');
+  var signature = xpath.select("/*/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']", doc)[0];
+  var sig = new xmlCrypto.SignedXml({ publicCert: cert, getCertFromKeyInfo: () => null, idAttribute: 'AssertionID' });
   sig.loadSignature(signature.toString());
   return sig.checkSignature(assertion);
 };
 
 exports.getIssuer = function(assertion) {
-  var doc = new xmldom.DOMParser().parseFromString(assertion);
+  var doc = new xmldom.DOMParser().parseFromString(assertion, 'text/xml');
   return doc.documentElement.getAttribute('Issuer');
 };
 
 exports.getAssertionID = function(assertion) {
-  var doc = new xmldom.DOMParser().parseFromString(assertion);
+  var doc = new xmldom.DOMParser().parseFromString(assertion, 'text/xml');
   return doc.documentElement.getAttribute('AssertionID');
 };
 
 exports.getIssueInstant = function(assertion) {
-  var doc = new xmldom.DOMParser().parseFromString(assertion);
+  var doc = new xmldom.DOMParser().parseFromString(assertion, 'text/xml');
   return doc.documentElement.getAttribute('IssueInstant');
 };
 
 exports.getConditions = function(assertion) {
-  var doc = new xmldom.DOMParser().parseFromString(assertion);
+  var doc = new xmldom.DOMParser().parseFromString(assertion, 'text/xml');
   return doc.documentElement.getElementsByTagName('saml:Conditions');
 };
 
 exports.getAudiences = function(assertion) {
-  var doc = new xmldom.DOMParser().parseFromString(assertion);
+  var doc = new xmldom.DOMParser().parseFromString(assertion, 'text/xml');
   return doc.documentElement
-            .getElementsByTagName('saml:Conditions')[0]
-            .getElementsByTagName('saml:AudienceRestrictionCondition')[0]
-            .getElementsByTagName('saml:Audience');
+      .getElementsByTagName('saml:Conditions')[0]
+      .getElementsByTagName('saml:AudienceRestrictionCondition')[0]
+      .getElementsByTagName('saml:Audience');
 };
 
 exports.getAuthenticationStatement = function(assertion) {
-  var doc = new xmldom.DOMParser().parseFromString(assertion);
+  var doc = new xmldom.DOMParser().parseFromString(assertion, 'text/xml');
   return doc.documentElement
-            .getElementsByTagName('saml:AuthenticationStatement')[0];
+      .getElementsByTagName('saml:AuthenticationStatement')[0];
 };
 
 exports.getAttributes = function(assertion) {
-  var doc = new xmldom.DOMParser().parseFromString(assertion);
+  var doc = new xmldom.DOMParser().parseFromString(assertion, 'text/xml');
   return doc.documentElement
-            .getElementsByTagName('saml:Attribute');
+      .getElementsByTagName('saml:Attribute');
 };
 
 exports.getNameIdentifier = function(assertion) {
-  var doc = new xmldom.DOMParser().parseFromString(assertion);
+  var doc = new xmldom.DOMParser().parseFromString(assertion, 'text/xml');
   return doc.documentElement
-            .getElementsByTagName('saml:NameIdentifier')[0];
-};
+      .getElementsByTagName('saml:NameIdentifier')[0];
+};
\ No newline at end of file

@@ -23,9 +23,9 @@ describe('interop', function () {
     var signedAssertion = '<Assertion ID="_1b1ffaef-86ef-42e1-92cf-cf8c9d9a4ce0" IssueInstant="2013-04-02T18:50:24.000Z" Version="2.0" xmlns="urn:oasis:names:tc:SAML:2.0:assertion"><Issuer>https://sts.windows.net/75696069-df44-4310-9bcf-08b45e3007c9/</Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><ds:Reference URI="#_1b1ffaef-86ef-42e1-92cf-cf8c9d9a4ce0"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><ds:DigestValue>TzJmLs0BTPgpaPLsA7L2Kd9l1k4IBOmwIM/znV2iOPU=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>OHJCAffCNPRkwsE3RqnVPoCRSqsPrio8prABauzu2pqF418Y1QJuJehhzztY8A6kwnBUkBVE7BIyLe7kgCnBoNZWElYki1xtaLksc/Afc0TjlZvv9IJ9fQHIBiL1JA9KcySq1tu9dv/NauykBODXuljPuVTk6I4xLLWcg20o26Ov57axp42uWPpcJHtasomLmmmnAXEh6P7aB/1Vlm/MAJhWXToxacauJzFao3F9JNEuucKY6y3RPDp1Qq3vL0gq98RKuiaejayu6RjyyU2+8vCBzURul8b7ZXPUHfIOME6Q5LvbKqLhe/mzqRc+9GUg22X3B5SYjdnXjwHbBTbihA==</ds:SignatureValue><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIIDPjCCAiqgAwIBAgIQVWmXY/+9RqFA/OG9kFulHDAJBgUrDgMCHQUAMC0xKzApBgNVBAMTImFjY291bnRzLmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwHhcNMTIwNjA3MDcwMDAwWhcNMTQwNjA3MDcwMDAwWjAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArCz8Sn3GGXmikH2MdTeGY1D711EORX/lVXpr+ecGgqfUWF8MPB07XkYuJ54DAuYT318+2XrzMjOtqkT94VkXmxv6dFGhG8YZ8vNMPd4tdj9c0lpvWQdqXtL1TlFRpD/P6UMEigfN0c9oWDg9U7Ilymgei0UXtf1gtcQbc5sSQU0S4vr9YJp2gLFIGK11Iqg4XSGdcI0QWLLkkC6cBukhVnd6BCYbLjTYy3fNs4DzNdemJlxGl8sLexFytBF6YApvSdus3nFXaMCtBGx16HzkK9ne3lobAwL2o79bP4imEGqg+ibvyNmbrwFGnQrBc1jTF9LyQX9q+louxVfHs6ZiVwIDAQABo2IwYDBeBgNVHQEEVzBVgBCxDDsLd8xkfOLKm4Q/SzjtoS8wLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldIIQVWmXY/+9RqFA/OG9kFulHDAJBgUrDgMCHQUAA4IBAQAkJtxxm/ErgySlNk69+1odTMP8Oy6L0H17z7XGG3w4TqvTUSWaxD4hSFJ0e7mHLQLQD7oV/erACXwSZn2pMoZ89MBDjOMQA+e6QzGB7jmSzPTNmQgMLA8fWCfqPrz6zgH+1F1gNp8hJY57kfeVPBiyjuBmlTEBsBlzolY9dd/55qqfQk6cgSeCbHCy/RU/iep0+UsRMlSgPNNmqhj5gmN2AFVCN96zF694LwuPae5CeR2ZcVknexOWHYjFM0MgUSw0ubnGl0h9AJgGyhvNGcjQqu9vd1xkupFgaN+f7P3p3EVN5csBg5H94jEcQZT7EKeTiZ6bTrpDAnrr8tDCy8ng</X509Certificate></X509Data></KeyInfo></ds:Signature><Subject><NameID>10030000838D23AF@MicrosoftOnline.com</NameID><SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer" /></Subject><Conditions NotBefore="2013-04-02T18:50:23.969Z" NotOnOrAfter="2013-04-03T06:50:23.969Z"><AudienceRestriction><Audience>spn:408153f4-5960-43dc-9d4f-6b717d772c8d</Audience></AudienceRestriction></Conditions><AttributeStatement><Attribute Name="http://schemas.microsoft.com/identity/claims/tenantid"><AttributeValue>75696069-df44-4310-9bcf-08b45e3007c9</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"><AttributeValue>Matias</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><AttributeValue>matias@auth0.onmicrosoft.com</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"><AttributeValue>Woloski</AttributeValue></Attribute><Attribute Name="http://schemas.microsoft.com/identity/claims/identityprovider"><AttributeValue>https://sts.windows.net/75696069-df44-4310-9bcf-08b45e3007c9/</AttributeValue></Attribute></AttributeStatement><AuthnStatement AuthnInstant="2013-04-02T18:50:16.000Z"><AuthnContext><AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</AuthnContextClassRef></AuthnContext></AuthnStatement></Assertion>';
 
     var saml_passport = new SamlPassport({thumbprints: ['3464c5bdd2be7f2b6112e2f08e9c0024e33d9fe0'],
-                                          realm: 'spn:408153f4-5960-43dc-9d4f-6b717d772c8d',
-                                          checkExpiration: false, checkRecipient: false}); // dont check expiration since we are harcoding the token
-    var profile = saml_passport.validateSamlAssertion(signedAssertion, function(err, profile) {
+      realm: 'spn:408153f4-5960-43dc-9d4f-6b717d772c8d',
+      checkExpiration: false, checkRecipient: false}); // dont check expiration since we are harcoding the token
+    var profile = saml_passport.validateSamlAssertion(signedAssertion, {}, function(err, profile) {
       if (err) return done(err);
       assert.ok(profile);
       done();
@@ -40,7 +40,7 @@ describe('interop', function () {
     before(function (done) {
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback/samlp-signedresponse-signedassertion',
+        uri: `${server.BASE_URL}/callback/samlp-signedresponse-signedassertion`,
         form: { SAMLResponse: '<samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" ID="_f138d2e531d4624fcafd88beacf7ec39034f2a374d" Version="2.0" IssueInstant="2013-07-07T11:55:18Z" Destination="https://login-dev3.auth0.com:3000/login/callback" InResponseTo="_fd0677a1fdf154cbfdd0"><saml:Issuer>https://openidp.feide.no</saml:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
  <ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
    <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
  <ds:Reference URI="#_f138d2e531d4624fcafd88beacf7ec39034f2a374d"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>UrGQDCHaty4c76jMnhZfYoOjCTE=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>nHfKP4smybLt1E7p5VI2KmRvm/tX0JUESFaCzz383TC1jSSbZ86JIRXIWLEyuY2B92A4wft/3hxjWfA53VPWla/wS0Dr+Qo51Sk/O6MzMmmtWjLvYVaL8oCyYPVGH9rYvxrygUqrVFCeVaKu9cUpUjOuvSc35uJ/8BEeFuq7A2o=</ds:SignatureValue>
<ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIICizCCAfQCCQCY8tKaMc0BMjANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTEQMA4GA1UEChMHVU5JTkVUVDEOMAwGA1UECxMFRmVpZGUxGTAXBgNVBAMTEG9wZW5pZHAuZmVpZGUubm8xKTAnBgkqhkiG9w0BCQEWGmFuZHJlYXMuc29sYmVyZ0B1bmluZXR0Lm5vMB4XDTA4MDUwODA5MjI0OFoXDTM1MDkyMzA5MjI0OFowgYkxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxDjAMBgNVBAsTBUZlaWRlMRkwFwYDVQQDExBvcGVuaWRwLmZlaWRlLm5vMSkwJwYJKoZIhvcNAQkBFhphbmRyZWFzLnNvbGJlcmdAdW5pbmV0dC5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAt8jLoqI1VTlxAZ2axiDIThWcAOXdu8KkVUWaN/SooO9O0QQ7KRUjSGKN9JK65AFRDXQkWPAu4HlnO4noYlFSLnYyDxI66LCr71x4lgFJjqLeAvB/GqBqFfIZ3YK/NrhnUqFwZu63nLrZjcUZxNaPjOOSRSDaXpv1kb5k3jOiSGECAwEAATANBgkqhkiG9w0BAQUFAAOBgQBQYj4cAafWaYfjBU2zi1ElwStIaJ5nyp/s/8B8SAPK2T79McMyccP3wSW13LHkmM1jwKe3ACFXBvqGQN0IbcH49hu0FKhYFM/GPDJcIHFBsiyMBXChpye9vBaTNEBCtU3KjjyG0hRT2mAQ9h+bkPmOvlEo/aH0xR68Z9hw4PF13w==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><samlp:Status><samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></samlp:Status><saml:Assertion xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" ID="_ec3534c7f666327e6af15437be7b899958d30df975" Version="2.0" IssueInstant="2013-07-07T11:55:18Z"><saml:Issuer>https://openidp.feide.no</saml:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
  <ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
    <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
  <ds:Reference URI="#_ec3534c7f666327e6af15437be7b899958d30df975"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>VOYSUBVYICoMbpnNH4EBDxAQkJM=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>EmkGWhqVogno5hckMTporHqpOK3T6igbQUp6fi1sZoqqlww1IKfstD1mKw5c3mIrWr61g98xLS1/0g1naQiiOC3l9zcH7AAH9WFYnIz7FyA8vie+0qLMCnz8qUigmGX3QlGbCT3PuT413QiYJoCOeW0NsaJZYCH5ANZzkIBltog=</ds:SignatureValue>
<ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIICizCCAfQCCQCY8tKaMc0BMjANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTEQMA4GA1UEChMHVU5JTkVUVDEOMAwGA1UECxMFRmVpZGUxGTAXBgNVBAMTEG9wZW5pZHAuZmVpZGUubm8xKTAnBgkqhkiG9w0BCQEWGmFuZHJlYXMuc29sYmVyZ0B1bmluZXR0Lm5vMB4XDTA4MDUwODA5MjI0OFoXDTM1MDkyMzA5MjI0OFowgYkxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxDjAMBgNVBAsTBUZlaWRlMRkwFwYDVQQDExBvcGVuaWRwLmZlaWRlLm5vMSkwJwYJKoZIhvcNAQkBFhphbmRyZWFzLnNvbGJlcmdAdW5pbmV0dC5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAt8jLoqI1VTlxAZ2axiDIThWcAOXdu8KkVUWaN/SooO9O0QQ7KRUjSGKN9JK65AFRDXQkWPAu4HlnO4noYlFSLnYyDxI66LCr71x4lgFJjqLeAvB/GqBqFfIZ3YK/NrhnUqFwZu63nLrZjcUZxNaPjOOSRSDaXpv1kb5k3jOiSGECAwEAATANBgkqhkiG9w0BAQUFAAOBgQBQYj4cAafWaYfjBU2zi1ElwStIaJ5nyp/s/8B8SAPK2T79McMyccP3wSW13LHkmM1jwKe3ACFXBvqGQN0IbcH49hu0FKhYFM/GPDJcIHFBsiyMBXChpye9vBaTNEBCtU3KjjyG0hRT2mAQ9h+bkPmOvlEo/aH0xR68Z9hw4PF13w==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml:Subject><saml:NameID SPNameQualifier="urn:auth0:login-dev3" Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient">_95da8af482686a0cecd64cb7caf8e871b7ac11dae1</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2013-07-07T12:00:18Z" Recipient="https://login-dev3.auth0.com:3000/login/callback" InResponseTo="_fd0677a1fdf154cbfdd0"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2013-07-07T11:54:48Z" NotOnOrAfter="2013-07-07T12:00:18Z"><saml:AudienceRestriction><saml:Audience>urn:auth0:login-dev3</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AuthnStatement AuthnInstant="2013-07-07T11:11:41Z" SessionNotOnOrAfter="2013-07-07T19:55:18Z" SessionIndex="_5d0606a0b1fd9798d2a2872193e39a907a3c0ba415"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement><saml:AttributeStatement><saml:Attribute Name="uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">woloski</saml:AttributeValue></saml:Attribute><saml:Attribute Name="givenName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">Matias</saml:AttributeValue></saml:Attribute><saml:Attribute Name="sn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">Woloski</saml:AttributeValue></saml:Attribute><saml:Attribute Name="cn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">Matias Woloski</saml:AttributeValue></saml:Attribute><saml:Attribute Name="mail" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">matiasw@gmail.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="eduPersonPrincipalName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">woloski@rnd.feide.no</saml:AttributeValue></saml:Attribute><saml:Attribute Name="eduPersonTargetedID" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">1b1246d728197bb47d09342aa4f6c3f47f4e92ae</saml:AttributeValue></saml:Attribute><saml:Attribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">woloski</saml:AttributeValue></saml:Attribute><saml:Attribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">Matias</saml:AttributeValue></saml:Attribute><saml:Attribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">Woloski</saml:AttributeValue></saml:Attribute><saml:Attribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">Matias Woloski</saml:AttributeValue></saml:Attribute><saml:Attribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">matiasw@gmail.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">woloski@rnd.feide.no</saml:AttributeValue></saml:Attribute><saml:Attribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml:AttributeValue xsi:type="xs:string">1b1246d728197bb47d09342aa4f6c3f47f4e92ae</saml:AttributeValue></saml:Attribute></saml:AttributeStatement></saml:Assertion></samlp:Response>' }
       }, function(err, response, body) {
         if(err) return done(err);
@@ -53,7 +53,7 @@ describe('interop', function () {
 
     it('should validate response and not signature', function(){
       expect(r.statusCode)
-            .to.equal(200);
+          .to.equal(200);
     });
 
     it('should return a valid user', function(){
@@ -95,7 +95,7 @@ describe('interop', function () {
     before(function (done) {
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback/samlp-okta',
+        uri: `${server.BASE_URL}/callback/samlp-okta`,
         form: { SAMLResponse: 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c2FtbDJwOlJlc3BvbnNlIHhtbG5zOnNhbWwycD0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOnByb3RvY29sIiBEZXN0aW5hdGlvbj0iaHR0cHM6Ly9hdXRoMDE0NS5hdXRoMC5jb20iIElEPSJpZDgxMzIzMDI4Njg0Njg5ODM4OTkzODY4MzEiIElzc3VlSW5zdGFudD0iMjAxMy0wOC0wM1QyMTo1NDo0My45NDJaIiBWZXJzaW9uPSIyLjAiPjxzYW1sMjpJc3N1ZXIgeG1sbnM6c2FtbDI9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphc3NlcnRpb24iIEZvcm1hdD0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOm5hbWVpZC1mb3JtYXQ6ZW50aXR5Ij5odHRwOi8vd3d3Lm9rdGEuY29tL2s3eGtocTBqVUhVUFFBWFZNVUFOPC9zYW1sMjpJc3N1ZXI+PHNhbWwycDpTdGF0dXMgeG1sbnM6c2FtbDJwPSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6cHJvdG9jb2wiPjxzYW1sMnA6U3RhdHVzQ29kZSBWYWx1ZT0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOnN0YXR1czpTdWNjZXNzIi8+PC9zYW1sMnA6U3RhdHVzPjxzYW1sMjpBc3NlcnRpb24geG1sbnM6c2FtbDI9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphc3NlcnRpb24iIElEPSJpZDgxMzIzMDI4Njg1NDEwMTk3NTU0MTQxMjEiIElzc3VlSW5zdGFudD0iMjAxMy0wOC0wM1QyMTo1NDo0My45NDJaIiBWZXJzaW9uPSIyLjAiIHhtbG5zOnhzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSI+PHNhbWwyOklzc3VlciBGb3JtYXQ9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDpuYW1laWQtZm9ybWF0OmVudGl0eSIgeG1sbnM6c2FtbDI9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphc3NlcnRpb24iPmh0dHA6Ly93d3cub2t0YS5jb20vazd4a2hxMGpVSFVQUUFYVk1VQU48L3NhbWwyOklzc3Vlcj48ZHM6U2lnbmF0dXJlIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIj48ZHM6U2lnbmVkSW5mbz48ZHM6Q2Fub25pY2FsaXphdGlvbk1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIvPjxkczpTaWduYXR1cmVNZXRob2QgQWxnb3JpdGhtPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjcnNhLXNoYTEiLz48ZHM6UmVmZXJlbmNlIFVSST0iI2lkODEzMjMwMjg2ODU0MTAxOTc1NTQxNDEyMSI+PGRzOlRyYW5zZm9ybXM+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNlbnZlbG9wZWQtc2lnbmF0dXJlIi8+PGRzOlRyYW5zZm9ybSBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyI+PGVjOkluY2x1c2l2ZU5hbWVzcGFjZXMgeG1sbnM6ZWM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvMTAveG1sLWV4Yy1jMTRuIyIgUHJlZml4TGlzdD0ieHMiLz48L2RzOlRyYW5zZm9ybT48L2RzOlRyYW5zZm9ybXM+PGRzOkRpZ2VzdE1ldGhvZCBBbGdvcml0aG09Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvMDkveG1sZHNpZyNzaGExIi8+PGRzOkRpZ2VzdFZhbHVlPjRHK3V2ZUttdGlCMUVrWTVCQXQrOGxtUXdqST08L2RzOkRpZ2VzdFZhbHVlPjwvZHM6UmVmZXJlbmNlPjwvZHM6U2lnbmVkSW5mbz48ZHM6U2lnbmF0dXJlVmFsdWU+UTgwTjZGVXI1L1lQdEV6UmxSZE1vUHUrYkwwTXNzRHhOVVkreXh5a3pibXhzSTBqb0VvL1NtbVNnWnJEWVFLVGxsWmsvS2Z6Qk1QRlY5eUJINCttRXpDVTVFM3h1Q3M5OWpaemFmY3czSzhtSU1USnkxWUh4amMzNTlkMjdSNXM1MGk5dzVQSHN1c1JvdjBNalFJb0oydzQ4R3k0RW5ZYVZpcUJSM1VWRXFFPTwvZHM6U2lnbmF0dXJlVmFsdWU+PGRzOktleUluZm8+PGRzOlg1MDlEYXRhPjxkczpYNTA5Q2VydGlmaWNhdGU+TUlJQ25UQ0NBZ2FnQXdJQkFnSUdBVUJHSHhxVU1BMEdDU3FHU0liM0RRRUJCUVVBTUlHUk1Rc3dDUVlEVlFRR0V3SlZVekVUTUJFRwpBMVVFQ0F3S1EyRnNhV1p2Y201cFlURVdNQlFHQTFVRUJ3d05VMkZ1SUVaeVlXNWphWE5qYnpFTk1Bc0dBMVVFQ2d3RVQydDBZVEVVCk1CSUdBMVVFQ3d3TFUxTlBVSEp2ZG1sa1pYSXhFakFRQmdOVkJBTU1DV3RzZFdkc1lXSnpNakVjTUJvR0NTcUdTSWIzRFFFSkFSWU4KYVc1bWIwQnZhM1JoTG1OdmJUQWVGdzB4TXpBNE1ETXlNVE00TXpoYUZ3MDBNekE0TURNeU1UTTVNemhhTUlHUk1Rc3dDUVlEVlFRRwpFd0pWVXpFVE1CRUdBMVVFQ0F3S1EyRnNhV1p2Y201cFlURVdNQlFHQTFVRUJ3d05VMkZ1SUVaeVlXNWphWE5qYnpFTk1Bc0dBMVVFCkNnd0VUMnQwWVRFVU1CSUdBMVVFQ3d3TFUxTlBVSEp2ZG1sa1pYSXhFakFRQmdOVkJBTU1DV3RzZFdkc1lXSnpNakVjTUJvR0NTcUcKU0liM0RRRUpBUllOYVc1bWIwQnZhM1JoTG1OdmJUQ0JuekFOQmdrcWhraUc5dzBCQVFFRkFBT0JqUUF3Z1lrQ2dZRUFzQ0I5bEpUSApxQjd2ZE01amVPSDg0Y1c4dTdJSFl2NC9PQVBZRjBmQlllOXdKeTE5Q2d5TTJPZ2lBU3VBY0l0bkg0V2hCK2lvMlpQd2IvWHdsN1V1CjRYbVVFMGwrbWtDTnVEWXA1ZlhUWnh3djVHNkh2a0F4WFppbzBSazlUMFZFVENyb3hncFM1THhRL28vb3dqUjM5Uzd4elJuajZkZFgKM01xMnlHakt5QmNDQXdFQUFUQU5CZ2txaGtpRzl3MEJBUVVGQUFPQmdRQUIxcUdOcVNOTExXcStSUGNQK3dPYVd0WXBKT0o4L01iWgpFV1dtOS9LS0hLWE02Si96Z1VVSVhaaTNjek1lTytZK1gxNFBSOGxHWG9BSGY1Yi9KYXZHOUZtRnZSbjRmR2E0NVZUVm8yR2ZNTjZLCmFJS0Ywb2JlQ2JZaS9RVWY4QitYaTF0U0lKbTFWQ0tSRTdubmxpUS9UekdhTnVsZ1dleVRiVmtHMC9YOExRPT08L2RzOlg1MDlDZXJ0aWZpY2F0ZT48L2RzOlg1MDlEYXRhPjwvZHM6S2V5SW5mbz48L2RzOlNpZ25hdHVyZT48c2FtbDI6U3ViamVjdCB4bWxuczpzYW1sMj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFzc2VydGlvbiI+PHNhbWwyOk5hbWVJRCBGb3JtYXQ9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjEuMTpuYW1laWQtZm9ybWF0OmVtYWlsQWRkcmVzcyI+YWRtaW5Aa2x1Z2xhYnMuY29tPC9zYW1sMjpOYW1lSUQ+PHNhbWwyOlN1YmplY3RDb25maXJtYXRpb24gTWV0aG9kPSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6Y206YmVhcmVyIj48c2FtbDI6U3ViamVjdENvbmZpcm1hdGlvbkRhdGEgTm90T25PckFmdGVyPSIyMDEzLTA4LTAzVDIxOjU5OjQzLjk0MloiIFJlY2lwaWVudD0iaHR0cHM6Ly9hdXRoMDE0NS5hdXRoMC5jb20iLz48L3NhbWwyOlN1YmplY3RDb25maXJtYXRpb24+PC9zYW1sMjpTdWJqZWN0PjxzYW1sMjpDb25kaXRpb25zIE5vdEJlZm9yZT0iMjAxMy0wOC0wM1QyMTo0OTo0My45NDNaIiBOb3RPbk9yQWZ0ZXI9IjIwMTMtMDgtMDNUMjE6NTk6NDMuOTQyWiIgeG1sbnM6c2FtbDI9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphc3NlcnRpb24iPjxzYW1sMjpBdWRpZW5jZVJlc3RyaWN0aW9uPjxzYW1sMjpBdWRpZW5jZT5odHRwczovL2F1dGgwMTQ1LmF1dGgwLmNvbTwvc2FtbDI6QXVkaWVuY2U+PC9zYW1sMjpBdWRpZW5jZVJlc3RyaWN0aW9uPjwvc2FtbDI6Q29uZGl0aW9ucz48c2FtbDI6QXV0aG5TdGF0ZW1lbnQgQXV0aG5JbnN0YW50PSIyMDEzLTA4LTAzVDIxOjU0OjQzLjk0MloiIFNlc3Npb25JbmRleD0iaWQxMzc1NTY2ODgzOTQyLjY4NzYxMDQzNyIgeG1sbnM6c2FtbDI9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphc3NlcnRpb24iPjxzYW1sMjpBdXRobkNvbnRleHQ+PHNhbWwyOkF1dGhuQ29udGV4dENsYXNzUmVmPnVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphYzpjbGFzc2VzOlBhc3N3b3JkUHJvdGVjdGVkVHJhbnNwb3J0PC9zYW1sMjpBdXRobkNvbnRleHRDbGFzc1JlZj48L3NhbWwyOkF1dGhuQ29udGV4dD48L3NhbWwyOkF1dGhuU3RhdGVtZW50PjxzYW1sMjpBdHRyaWJ1dGVTdGF0ZW1lbnQgeG1sbnM6c2FtbDI9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphc3NlcnRpb24iPjxzYW1sMjpBdHRyaWJ1dGUgTmFtZT0iUm9sZSIgTmFtZUZvcm1hdD0ibnMiPjxzYW1sMjpBdHRyaWJ1dGVWYWx1ZSB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiIHhzaTp0eXBlPSJ4czpzdHJpbmciPkFkbWluPC9zYW1sMjpBdHRyaWJ1dGVWYWx1ZT48L3NhbWwyOkF0dHJpYnV0ZT48L3NhbWwyOkF0dHJpYnV0ZVN0YXRlbWVudD48L3NhbWwyOkFzc2VydGlvbj48L3NhbWwycDpSZXNwb25zZT4=' }
       }, function(err, response, body) {
         if(err) return done(err);
@@ -108,7 +108,7 @@ describe('interop', function () {
 
     it('should validate response and not signature', function(){
       expect(r.statusCode)
-            .to.equal(200);
+          .to.equal(200);
     });
 
     it('should return a valid user', function(){
@@ -124,7 +124,7 @@ describe('interop', function () {
     before(function (done) {
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback/samlp-okta',
+        uri: `${server.BASE_URL}/callback/samlp-okta`,
         form: { SAMLResponse: '<?xml version="1.0" encoding="UTF-8"?><saml2p:Response xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol" Destination="https://auth0145.auth0.com" ID="id8132302868468983899386831" IssueInstant="2013-08-03T21:54:43.942Z" Version="2.0"><saml2:Issuer xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://www.okta.com/k7xkhq0jUHUPQAXVMUAN</saml2:Issuer><saml2p:Status xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol"><saml2p:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></saml2p:Status><saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" ID="EVIL" IssueInstant="2013-08-03T21:54:43.942Z" Version="2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"><saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">http://www.okta.com/k7xkhq0jUHUPQAXVMUAN</saml2:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ds:Reference URI="#id8132302868541019755414121"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" PrefixList="xs"/></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>4G+uveKmtiB1EkY5BAt+8lmQwjI=</ds:DigestValue></ds:Reference></ds:SignedInfo><saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" ID="id8132302868541019755414121" IssueInstant="2013-08-03T21:54:43.942Z" Version="2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"><saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">http://www.okta.com/k7xkhq0jUHUPQAXVMUAN</saml2:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ds:Reference URI="#id8132302868541019755414121"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" PrefixList="xs"/></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>4G+uveKmtiB1EkY5BAt+8lmQwjI=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>Q80N6FUr5/YPtEzRlRdMoPu+bL0MssDxNUY+yxykzbmxsI0joEo/SmmSgZrDYQKTllZk/KfzBMPFV9yBH4+mEzCU5E3xuCs99jZzafcw3K8mIMTJy1YHxjc359d27R5s50i9w5PHsusRov0MjQIoJ2w48Gy4EnYaViqBR3UVEqE=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIICnTCCAgagAwIBAgIGAUBGHxqUMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYDVQQGEwJVUzETMBEG
A1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwET2t0YTEU
MBIGA1UECwwLU1NPUHJvdmlkZXIxEjAQBgNVBAMMCWtsdWdsYWJzMjEcMBoGCSqGSIb3DQEJARYN
aW5mb0Bva3RhLmNvbTAeFw0xMzA4MDMyMTM4MzhaFw00MzA4MDMyMTM5MzhaMIGRMQswCQYDVQQG
EwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UE
CgwET2t0YTEUMBIGA1UECwwLU1NPUHJvdmlkZXIxEjAQBgNVBAMMCWtsdWdsYWJzMjEcMBoGCSqG
SIb3DQEJARYNaW5mb0Bva3RhLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsCB9lJTH
qB7vdM5jeOH84cW8u7IHYv4/OAPYF0fBYe9wJy19CgyM2OgiASuAcItnH4WhB+io2ZPwb/Xwl7Uu
4XmUE0l+mkCNuDYp5fXTZxwv5G6HvkAxXZio0Rk9T0VETCroxgpS5LxQ/o/owjR39S7xzRnj6ddX
3Mq2yGjKyBcCAwEAATANBgkqhkiG9w0BAQUFAAOBgQAB1qGNqSNLLWq+RPcP+wOaWtYpJOJ8/MbZ
EWWm9/KKHKXM6J/zgUUIXZi3czMeO+Y+X14PR8lGXoAHf5b/JavG9FmFvRn4fGa45VTVo2GfMN6K
aIKF0obeCbYi/QUf8B+Xi1tSIJm1VCKRE7nnliQ/TzGaNulgWeyTbVkG0/X8LQ==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml2:Subject xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress">admin@kluglabs.com</saml2:NameID><saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml2:SubjectConfirmationData NotOnOrAfter="2013-08-03T21:59:43.942Z" Recipient="https://auth0145.auth0.com"/></saml2:SubjectConfirmation></saml2:Subject><saml2:Conditions NotBefore="2013-08-03T21:49:43.943Z" NotOnOrAfter="2013-08-03T21:59:43.942Z" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:AudienceRestriction><saml2:Audience>https://auth0145.auth0.com</saml2:Audience></saml2:AudienceRestriction></saml2:Conditions><saml2:AuthnStatement AuthnInstant="2013-08-03T21:54:43.942Z" SessionIndex="id1375566883942.687610437" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:AuthnContext><saml2:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml2:AuthnContextClassRef></saml2:AuthnContext></saml2:AuthnStatement><saml2:AttributeStatement xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:Attribute Name="Role" NameFormat="ns"><saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">Admin</saml2:AttributeValue></saml2:Attribute></saml2:AttributeStatement></saml2:Assertion><ds:SignatureValue>Q80N6FUr5/YPtEzRlRdMoPu+bL0MssDxNUY+yxykzbmxsI0joEo/SmmSgZrDYQKTllZk/KfzBMPFV9yBH4+mEzCU5E3xuCs99jZzafcw3K8mIMTJy1YHxjc359d27R5s50i9w5PHsusRov0MjQIoJ2w48Gy4EnYaViqBR3UVEqE=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIICnTCCAgagAwIBAgIGAUBGHxqUMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYDVQQGEwJVUzETMBEG
A1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwET2t0YTEU
MBIGA1UECwwLU1NPUHJvdmlkZXIxEjAQBgNVBAMMCWtsdWdsYWJzMjEcMBoGCSqGSIb3DQEJARYN
aW5mb0Bva3RhLmNvbTAeFw0xMzA4MDMyMTM4MzhaFw00MzA4MDMyMTM5MzhaMIGRMQswCQYDVQQG
EwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UE
CgwET2t0YTEUMBIGA1UECwwLU1NPUHJvdmlkZXIxEjAQBgNVBAMMCWtsdWdsYWJzMjEcMBoGCSqG
SIb3DQEJARYNaW5mb0Bva3RhLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsCB9lJTH
qB7vdM5jeOH84cW8u7IHYv4/OAPYF0fBYe9wJy19CgyM2OgiASuAcItnH4WhB+io2ZPwb/Xwl7Uu
4XmUE0l+mkCNuDYp5fXTZxwv5G6HvkAxXZio0Rk9T0VETCroxgpS5LxQ/o/owjR39S7xzRnj6ddX
3Mq2yGjKyBcCAwEAATANBgkqhkiG9w0BAQUFAAOBgQAB1qGNqSNLLWq+RPcP+wOaWtYpJOJ8/MbZ
EWWm9/KKHKXM6J/zgUUIXZi3czMeO+Y+X14PR8lGXoAHf5b/JavG9FmFvRn4fGa45VTVo2GfMN6K
aIKF0obeCbYi/QUf8B+Xi1tSIJm1VCKRE7nnliQ/TzGaNulgWeyTbVkG0/X8LQ==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml2:Subject xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress">admin@kluglabs.com</saml2:NameID><saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml2:SubjectConfirmationData NotOnOrAfter="2013-08-03T21:59:43.942Z" Recipient="https://auth0145.auth0.com"/></saml2:SubjectConfirmation></saml2:Subject><saml2:Conditions NotBefore="2013-08-03T21:49:43.943Z" NotOnOrAfter="2013-08-03T21:59:43.942Z" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:AudienceRestriction><saml2:Audience>https://auth0145.auth0.com</saml2:Audience></saml2:AudienceRestriction></saml2:Conditions><saml2:AuthnStatement AuthnInstant="2013-08-03T21:54:43.942Z" SessionIndex="id1375566883942.687610437" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:AuthnContext><saml2:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml2:AuthnContextClassRef></saml2:AuthnContext></saml2:AuthnStatement><saml2:AttributeStatement xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:Attribute Name="Role" NameFormat="ns"><saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">EVIL</saml2:AttributeValue></saml2:Attribute></saml2:AttributeStatement></saml2:Assertion></saml2p:Response>' }
       }, function(err, response) {
         if(err) return done(err);
@@ -135,7 +135,7 @@ describe('interop', function () {
 
     it('should return error', function(){
       expect(r.statusCode)
-            .to.equal(400);
+          .to.equal(400);
     });
   });
 
@@ -146,7 +146,7 @@ describe('interop', function () {
     before(function (done) {
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback',
+        uri: `${server.BASE_URL}/callback`,
         form: { SAMLResponse: SAMLResponse }
       }, function(err, response) {
         if(err) return done(err);
@@ -156,9 +156,8 @@ describe('interop', function () {
     });
 
     it('should return error', function(){
-      console.log({ body: r.body });
       expect(r.statusCode)
-            .to.equal(400);
+          .to.equal(400);
     });
   });
 
@@ -169,7 +168,7 @@ describe('interop', function () {
     before(function (done) {
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback/samlp-ping',
+        uri: `${server.BASE_URL}/callback/samlp-ping`,
         form: { SAMLResponse: '<samlp:Response Destination="https://login-dev3.auth0.com:3000/login/callback" InResponseTo="_4a4323136ca0ad4578cb" IssueInstant="2013-07-08T19:40:25.521Z" ID="ID30e636972c81bcd7a530d1bd6782c8bcbe56ce8610d34d2c02" Version="2.0" xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"><saml:Issuer xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">PingConnect</saml:Issuer><samlp:Status><samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></samlp:Status><saml:Assertion Version="2.0" IssueInstant="2013-07-08T19:40:25.521Z" ID="ID77535e676b34d427031c7539896789c19538e7e6df569ad802" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"><saml:Issuer>PingConnect</saml:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:SignedInfo>
<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<ds:Reference URI="#ID77535e676b34d427031c7539896789c19538e7e6df569ad802">
<ds:Transforms>
<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</ds:Transforms>
<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
<ds:DigestValue>zTYtCVMZAP2XdaID37VS2gS+LL0=</ds:DigestValue>
</ds:Reference>
</ds:SignedInfo>
<ds:SignatureValue>
QCZDkL1tsg1HH3mAWwP2saiQTSeu0lM7fusBBil/tCtjdSleex+kRDLZocjuK+Up1/7JhKCNUQ6H
NqWtqfGURiqJZ+29QZ1w6bmOwausg1bRBFoEmRGtpDxu0p4sWziNw2tyO5oVVH60hAffYGN70yH4
E1wkuzeaEXNXXFhAJxsNTj5JGDfcewU9R4/UmrNUXY7kvBQWpQrb5TNS63k/HahGl7zO72ekQU+N
SATSA2ohISOhmPSmErAUZBB6gARCk+OlVFWtU/MRqE2Z9QaW6wdbPgVH4wbXnp8bG1u44Ty9mACX
b+8WOAw4pXNLWc5Y+gJiQriGrozzoJPh5F/qCg==
</ds:SignatureValue>
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>
MIIFxjCCBK6gAwIBAgIQaqbnSXNICAdfTZ8JoiqOUjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTIwMzAyMDAwMDAwWhcNMTQwODI4
MjM1OTU5WjCBzzELMAkGA1UEBhMCVVMxDjAMBgNVBBETBTgwMjAyMQswCQYDVQQIEwJDTzEPMA0G
A1UEBxMGRGVudmVyMRIwEAYDVQQJEwlTdWl0ZSAxMDAxGTAXBgNVBAkTEDEwMDEgMTd0aCBTdHJl
ZXQxIjAgBgNVBAoTGVBpbmcgSWRlbnRpdHkgQ29ycG9yYXRpb24xGDAWBgNVBAsTD1NlY3VyZSBM
aW5rIFNTTDElMCMGA1UEAxMcc3NvLmNvbm5lY3QucGluZ2lkZW50aXR5LmNvbTCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBAJf1uRvdI2Htrm4SKQ6IwLmJOLyrYt3ovRGiBcz5h/7f3pjC
xR3XjiuvUsf4wOJUX00G3aqzo+Z7TeHFBO9p5RpOZQp+MmD1FZJ8fSTAVcL8TdvJF1JYCZdKwl+L
MLKFmZvQ0YcGCNpEf/SQFR5VRTg3fzEwygL2IlDZXmrzFIANM8GBFPSkgrhf+Zwyl6v5MZ6THPze
JZs2FgzM925deCad501fI9klvtrESz4+keLHLCwLU6t+Jano32gxvKc3KgerZRdgjDpb51ZcDMtY
8u6A1uUPjgJgOLy/TWy5JWhN/BipBCFXAWE6BD7JoyfPBSN9QhNuqdvXs75XrFlf5I8CAwEAAaOC
AggwggIEMB8GA1UdIwQYMBaAFDxB4o8ICKlMJYmNbcU40PyFjGIXMB0GA1UdDgQWBBTQtsHYM0SE
+BpPgTqAnt8moNBxzzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
BgEFBQcDAQYIKwYBBQUHAwIwawYDVR0gBGQwYjBgBgwrBgEEAYYOAQIBAwEwUDBOBggrBgEFBQcC
ARZCaHR0cDovL3d3dy5uZXR3b3Jrc29sdXRpb25zLmNvbS9sZWdhbC9TU0wtbGVnYWwtcmVwb3Np
dG9yeS1jcHMuanNwMHoGA1UdHwRzMHEwNqA0oDKGMGh0dHA6Ly9jcmwubmV0c29sc3NsLmNvbS9O
ZXR3b3JrU29sdXRpb25zX0NBLmNybDA3oDWgM4YxaHR0cDovL2NybDIubmV0c29sc3NsLmNvbS9O
ZXR3b3JrU29sdXRpb25zX0NBLmNybDBzBggrBgEFBQcBAQRnMGUwPAYIKwYBBQUHMAKGMGh0dHA6
Ly93d3cubmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zX0NBLmNydDAlBggrBgEFBQcwAYYZ
aHR0cDovL29jc3AubmV0c29sc3NsLmNvbTAnBgNVHREEIDAeghxzc28uY29ubmVjdC5waW5naWRl
bnRpdHkuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQCHuzSDhx4RGy7RbCAI0mfidvmtzfaLVoKiB3TZ
JUf6jkyqy6cwn09n41umduJYDu8+jv81JeLWtjZmlXfhsovaBTIEWxiI1NQK6V9F97d37lqysvIm
kIIbhUJhBoInYRWK3WqawzWoyV8vxP1h7Mjo5sPNgqfNsUVnb9PI804lX7PFYHrqKKnurqoOdLro
zFSjAyE44IE5gGYej7NRlNDcUQpFwb7z2BjMRmCtQy06VTcHUed7Mqg9XsMTp8YyCmonZAeLjWa9
fqCqQIg6oOpS78JysxleE3v/QkXwKftl3dabOgp/XC31zUmLD8jO6KbdiO8kCPuLQHPIvsFoatCI
</ds:X509Certificate>
</ds:X509Data>
<ds:KeyValue>
<ds:RSAKeyValue>
<ds:Modulus>
l/W5G90jYe2ubhIpDojAuYk4vKti3ei9EaIFzPmH/t/emMLFHdeOK69Sx/jA4lRfTQbdqrOj5ntN
4cUE72nlGk5lCn4yYPUVknx9JMBVwvxN28kXUlgJl0rCX4swsoWZm9DRhwYI2kR/9JAVHlVFODd/
MTDKAvYiUNleavMUgA0zwYEU9KSCuF/5nDKXq/kxnpMc/N4lmzYWDMz3bl14Jp3nTV8j2SW+2sRL
Pj6R4scsLAtTq34lqejfaDG8pzcqB6tlF2CMOlvnVlwMy1jy7oDW5Q+OAmA4vL9NbLklaE38GKkE
IVcBYToEPsmjJ88FI31CE26p29ezvlesWV/kjw==
</ds:Modulus>
<ds:Exponent>AQAB</ds:Exponent>
</ds:RSAKeyValue>
</ds:KeyValue>
</ds:KeyInfo>
</ds:Signature><saml:Subject><saml:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress">testuser1@testidp.connect.pingidentity.com</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData InResponseTo="_4a4323136ca0ad4578cb" NotOnOrAfter="2013-07-08T20:10:25.521Z" Recipient="https://login-dev3.auth0.com:3000/login/callback"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotOnOrAfter="2013-07-08T20:10:25.521Z" NotBefore="2013-07-08T19:30:25.521Z"><saml:AudienceRestriction><saml:Audience>urn:auth0:login-dev3</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AuthnStatement AuthnInstant="2013-07-08T19:40:25.522Z" SessionIndex="lLbSbXifaODLwOhBgP2fNOuW9Fj"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</saml:AuthnContextClassRef><saml:AuthenticatingAuthority>testidp.connect.pingidentity.com</saml:AuthenticatingAuthority></saml:AuthnContext></saml:AuthnStatement><saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema"><saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" Name="PingOne.idpid"><saml:AttributeValue xsi:type="xs:string" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">b14eb0b6-a33a-414d-9c77-0131e324a5b7</saml:AttributeValue></saml:Attribute><saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" Name="nameid"><saml:AttributeValue xsi:type="xs:string" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">test_nameid</saml:AttributeValue></saml:Attribute><saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" Name="PingOne.AuthenticatingAuthority"><saml:AttributeValue xsi:type="xs:string" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">testidp.connect.pingidentity.com</saml:AttributeValue></saml:Attribute></saml:AttributeStatement></saml:Assertion></samlp:Response>' }
       }, function(err, response, body) {
         if(err) return done(err);
@@ -182,7 +181,7 @@ describe('interop', function () {
 
     it('should validate response and not signature', function(){
       expect(r.statusCode)
-            .to.equal(200);
+          .to.equal(200);
     });
 
     it('should return a valid user', function(){
@@ -195,10 +194,10 @@ describe('interop', function () {
     var signedAssertion = '<saml:Assertion MajorVersion="1" MinorVersion="1" AssertionID="_8c8a1b2e-7ed4-4b32-82ce-83c6d72bb297" Issuer="https://test-adfs.auth0.com" IssueInstant="2013-07-11T12:32:02.990Z" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"><saml:Conditions NotBefore="2013-07-11T12:32:02.985Z" NotOnOrAfter="2013-07-11T13:32:02.985Z"><saml:AudienceRestrictionCondition><saml:Audience>urn:auth0:auth0</saml:Audience></saml:AudienceRestrictionCondition></saml:Conditions><saml:AttributeStatement><saml:Subject><saml:NameIdentifier>john@fabrikam.com</saml:NameIdentifier><saml:SubjectConfirmation><saml:ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:bearer</saml:ConfirmationMethod></saml:SubjectConfirmation></saml:Subject><saml:Attribute AttributeName="emailaddress" AttributeNamespace="http://schemas.xmlsoap.org/ws/2005/05/identity/claims"><saml:AttributeValue>john@fabrikam.com</saml:AttributeValue></saml:Attribute><saml:Attribute AttributeName="name" AttributeNamespace="http://schemas.xmlsoap.org/ws/2005/05/identity/claims"><saml:AttributeValue>John Fabrikam</saml:AttributeValue></saml:Attribute><saml:Attribute AttributeName="givenname" AttributeNamespace="http://schemas.xmlsoap.org/ws/2005/05/identity/claims"><saml:AttributeValue>John</saml:AttributeValue></saml:Attribute><saml:Attribute AttributeName="surname" AttributeNamespace="http://schemas.xmlsoap.org/ws/2005/05/identity/claims"><saml:AttributeValue>Fabrikam</saml:AttributeValue></saml:Attribute></saml:AttributeStatement><saml:AuthenticationStatement AuthenticationMethod="urn:oasis:names:tc:SAML:1.0:am:password" AuthenticationInstant="2013-07-11T12:32:02.881Z"><saml:Subject><saml:NameIdentifier>john@fabrikam.com</saml:NameIdentifier><saml:SubjectConfirmation><saml:ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:bearer</saml:ConfirmationMethod></saml:SubjectConfirmation></saml:Subject></saml:AuthenticationStatement><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"></ds:CanonicalizationMethod><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></ds:SignatureMethod><ds:Reference URI="#_8c8a1b2e-7ed4-4b32-82ce-83c6d72bb297"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"></ds:Transform><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></ds:DigestMethod><ds:DigestValue>8Yi8+vbZagbCsopdmXFjeFvexHlkHYAViSf9w3yFbWo=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>SzQaNU4uo4IPJTsK3DZkYNx1FzpAoIxXyWiOMJyuUScYbvUHMjxoPsh6KJrkLwUIGnv07TpTFKrhjA/tGzLCwPMOWlpGp66N/U9wWe3vshHyW34/oAq14EwptjmXEPpHjR2P+giJAUJ0VTXIvbTsGNLuDVV/px43CoIX2D6jc8yt8VffAMX4R+WzI2a6QRMqglTbxzFEfcJC1yK9jT/UzjRIKe9bMS2T8kupDaGOWYj4XMh9BkIVXV40jJakss+cF4wjO/LWfpbwZwMzfOXBQV+W6O5X/HfTod/4zzmdFKjArx6vXQl7vCRr9AXUGgbPWdtSVK7HSMCyjZiAOGcr0Q==</ds:SignatureValue><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIIC5DCCAcygAwIBAgIQGmfE0ae34q1IXJvpfhwYVDANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNBREZTIFNpZ25pbmcgLSB0ZXN0LWFkZnMuYXV0aDEwLmNvbTAeFw0xMzAyMTIwMzU3MzlaFw0xNDAyMTIwMzU3MzlaMC4xLDAqBgNVBAMTI0FERlMgU2lnbmluZyAtIHRlc3QtYWRmcy5hdXRoMTAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNaTwlMjKeXVabhVQJjmjousrLuYi5hxELIQX80ZT3/kTsRUQaP6AoCMEYjofcV6QnxQeHxHJgzcy5t4bmHozIsLYlroH7PaDNqXLnX+6ivAX1nFa9IOeaw3X206oGmCSo6pJxbW8LwXjYC7BYrINitm/mgcOrypbasADvO1j+fyjkBTFPuF2+La4ehwGCKdrvZZF0lDKiHPbCI8xqH7HOgX+QLtnhK2WclDIpcPd2eeaVq1fB8XBwTXNOv2ZdaEi2i3mDXQoa8wZVozqs5h6OKVXl7hNQH2/qUDAZc15kZcR9Zcxyo5v0GtqYS3J70Q+8HkuQfYTBGR+Cum9S+bfQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAVf930SJfJquM/4A3vibsmjRuCytHeEXLrEyt0j/NBDnyLqFMoL7qILfqtK3oSmQNb6PRQiLLFJlIz7fnkj6k3hm4qpJJvjyqcxYDeW6SK8yP7zKNGMeyIMs/humVgXWALkTF6PoFIfFo2lfnHAzHqPE06WN+hcYHRBjuR5/T+58l2LH9vJjPHuceGkWXyQCB/Hd2riNElXODIBEKzzKL923rm3oPaH/Un8TYnpyRRVKLd40DiptbY/E7YpzWrOsUppjsm0pUhdvBYjihLc6PhALzoUC3GwMjUK0T70gqRoGzsiqRIjIEC35QBGKavzhya2DLTZK3Pf70eJpkp1bGL</X509Certificate></X509Data></KeyInfo></ds:Signature></saml:Assertion>';
 
     var saml_passport = new SamlPassport({thumbprints: ['C9018666E764613366C20BC011D947B39BED236B'],
-                                          realm: 'urn:auth0:auth0',
-                                          checkExpiration: false,
-                                          checkRecipient: false}); // dont check expiration since we are harcoding the token
-    var profile = saml_passport.validateSamlAssertion(signedAssertion, function(err, profile) {
+      realm: 'urn:auth0:auth0',
+      checkExpiration: false,
+      checkRecipient: false}); // dont check expiration since we are harcoding the token
+    var profile = saml_passport.validateSamlAssertion(signedAssertion, {}, function(err, profile) {
       if (err) return done(err);
       assert.ok(profile);
       done();
@@ -210,10 +209,10 @@ describe('interop', function () {
     var signedAssertion = '<saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xs="http://www.w3.org/2001/XMLSchema" ID="_071de65ecb79185206fcb0789e9afd90" IssueInstant="2014-04-06T22:27:04.997Z" Version="2.0"><saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">https://aai-logon.ethz.ch/idp/shibboleth</saml2:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"></ds:CanonicalizationMethod><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"></ds:SignatureMethod><ds:Reference URI="#_071de65ecb79185206fcb0789e9afd90"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"></ds:Transform><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" PrefixList="xs"></ec:InclusiveNamespaces></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></ds:DigestMethod><ds:DigestValue>jVMwKZ5O3hXfOf6tkVan2hnPW2w=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>nq5nJangoli5J6uBF/sEeYyKL7+xepbsDmjT6mpggLmba6yR+lQaZmAGnti8nhZUPyXwZfZS3d9oH4upbRg56jdVVcPaZUhYOPW2T2etm7lxxaDlHDJo/E40KnBtGMn6Oxz23hXUrc6p6K4FFLCQwmsE3ZZlP/u8DcqKNl5X/D5udcCV75mjxnVKWuXu34Xw4uQEQBb+6UfGjDN1/91M6U3ZZ0iOSRsBC7+SYLVMbDZqGveioKjZMPBuHmoBwQxsCixu1var3LNyCFVRo0LV9qA5DhA5lyH209+kFsN9vqzHKkiOF+Wua+Ngh2oR/48CWfTOjDuvRpje1bICIwwCQg==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIFjzCCBHegAwIBAgIUZ+QtvaEucMtOcruHlzQrEDH92FMwDQYJKoZIhvcNAQEFBQAwazELMAkG\nA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAdBgNVBAsTFnd3dy5xdW92YWRp\nc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBMB4XDTEzMDQxNzA4\nMDYwNFoXDTE1MDQxNzA4MDYwNFowYzELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAO\nBgNVBAcTB1p1ZXJpY2gxFDASBgNVBAoTC0VUSCBadWVyaWNoMRowGAYDVQQDExFhYWktbG9nb24u\nZXRoei5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOJWLI4vWx5HnqUvkBDm5Egp\nUg8yOlL3HbS0Y62/k77R2W9wxNczcR79wUBl2cNDCF/LxzdY1ml2u2skbZy4tqtmcvHVrwM5RVDb\n3jpjUhzBlD5rkpxgut2zFmNsahXzceD9dzsTvq7MUq6YgW6iRY3wNbes7ZgRtdkCz+vbiB52iTES\nZ2lo6fBn69eiqywUhQ5t/K4jGqpSUf1DITz//lMWRveagVyUq342JONxo93nt6x6ewGg+Qo8yCuC\nj4VehpncHYV0oNI2sSncKPm23Z4TNxPDalSaq8R5nKhueG+FHX7Ks8hWYSf42m2rrZLTumv2Ry8H\nFrPFkI7kuSFwVRECAwEAAaOCAjEwggItMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0\ncDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1c3QucXVv\ndmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDCBtQYDVR0RBIGtMIGqghFhYWktbG9nb24uZXRo\nei5jaIIPdmNpcGhlci5ldGh6LmNogg92Y2Flc2FyLmV0aHouY2iCD3ZjdXJ0ZXIuZXRoei5jaIIP\ndmNvcHBlci5ldGh6LmNogg92Y2Vuc29yLmV0aHouY2iCEmxkYXBzLWluZm8uZXRoei5jaIIPbGlu\ndGVzdC5ldGh6LmNogRt2bGFkaXNsYXYubmVzcG9yQGlkLmV0aHouY2gwUQYDVR0gBEowSDBGBgwr\nBgEEAb5YAAJkAQEwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20v\ncmVwb3NpdG9yeTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC\nMB8GA1UdIwQYMBaAFDJNoU/q8K6Ztu6bByyECBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6\nLy9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNybDAdBgNVHQ4EFgQUUrfY5AJdnN5W\n9TTyrVObbQEoH/cwDQYJKoZIhvcNAQEFBQADggEBAJHQIjLbalw9LF9wIjhhOsEsaf/Bd8dSKcb2\nICLC16TyetuTTJfqHqHr3QiAcrSNKOxqoFBX51t7oNyd3n1BGxJeYmpoyKHKmViUF9mJWBKxSvfW\njmYA7M/LptNX+aUz0fPntCokjH5pPAk3n5YYf2gTFOmRbZDdvNxQ0+o5EkRKkxLDAYM7HlJshWfK\nyY8ZKiPSx28ebXORGzW/VC5VunURFPmhvy5hUFo2qFhGhkQZD1Tg5uN+vd7KywgXLiQKWFDweOxY\nkFuTatM9peWNaapAuaYL8D6q/pn6q76cDKiMjTLp1siQsVVzFAZNjywOve5tdqB/Qo7zwX7TggF1\nmrQ=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml2:Subject><saml2:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" NameQualifier="https://aai-logon.ethz.ch/idp/shibboleth">_e132eb870c4a912c56e1bafeb5257b35</saml2:NameID><saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml2:SubjectConfirmationData Address="80.218.183.64" InResponseTo="_e8cda4c13682e111e66d" NotOnOrAfter="2014-04-06T22:32:04.997Z" Recipient="https://fmi-test.auth0.com/login/callback"></saml2:SubjectConfirmationData></saml2:SubjectConfirmation></saml2:Subject><saml2:Conditions NotBefore="2014-04-06T22:27:04.997Z" NotOnOrAfter="2014-04-06T22:32:04.997Z"><saml2:AudienceRestriction><saml2:Audience>urn:auth0:fmi-test</saml2:Audience></saml2:AudienceRestriction></saml2:Conditions><saml2:AuthnStatement AuthnInstant="2014-04-06T22:27:04.858Z" SessionIndex="_ff0e0b5d9d6706bc22561c49c7eac971"><saml2:SubjectLocality Address="80.218.183.64"></saml2:SubjectLocality><saml2:AuthnContext><saml2:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml2:AuthnContextClassRef></saml2:AuthnContext></saml2:AuthnStatement><saml2:AttributeStatement><saml2:Attribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">member</saml2:AttributeValue><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">staff</saml2:AttributeValue><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">student</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">Gn&#x00FC;gge</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">Robert</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">ethz.ch</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="swissEduPersonUniqueID" Name="urn:oid:2.16.756.1.2.5.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">187624@ethz.ch</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">university</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue><saml2:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" NameQualifier="https://aai-logon.ethz.ch/idp/shibboleth" SPNameQualifier="urn:auth0:fmi-test">37J7PjSu8hkThPDMZOfZLtca0Ag=</saml2:NameID></saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">robert.gnuegge@bsse.ethz.ch</saml2:AttributeValue></saml2:Attribute></saml2:AttributeStatement></saml2:Assertion>';
 
     var saml_passport = new SamlPassport({thumbprints: ['42FA24A83E107F6842E05D2A2CA0A0A0CA8A2031'],
-                                          realm: 'urn:auth0:fmi-test',
-                                          recipientUrl: 'https://fmi-test.auth0.com/login/callback',
-                                          checkExpiration: false}); // dont check expiration since we are harcoding the token
-    var profile = saml_passport.validateSamlAssertion(signedAssertion, function(err, profile) {
+      realm: 'urn:auth0:fmi-test',
+      recipientUrl: 'https://fmi-test.auth0.com/login/callback',
+      checkExpiration: false}); // dont check expiration since we are harcoding the token
+    var profile = saml_passport.validateSamlAssertion(signedAssertion, {}, function(err, profile) {
       if (err) return done(err);
       assert.ok(profile);
       done();
@@ -240,7 +239,7 @@ describe('interop', function () {
     var saml_passport = new SamlPassport(samlOptions);
     var sp = new samlp(samlpOptions, saml_passport);
 
-    sp.validateSamlResponse(signedResponse, function(err, profile) {
+    sp.validateSamlResponse(signedResponse, {}, function(err, profile) {
       if (err) return done(err);
       assert.ok(profile);
       expect(profile).to.have.property('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier', 'kchen七味@shichimitogarashi.org');
@@ -265,13 +264,13 @@ describe('interop', function () {
     var sm = new SamlPassport(samlOptions);
     var sp = new samlp(samlpOptions, sm);
 
-    sp.validateSamlResponse(new Buffer(response, 'base64').toString(),
-      function(err, profile){
-        if (err) return done(err);
-        assert.ok(profile);
-        expect(profile['fname']).to.equal('Pushp');
-        done();
-      });
+    sp.validateSamlResponse(new Buffer(response, 'base64').toString(), {},
+        function(err, profile){
+          if (err) return done(err);
+          assert.ok(profile);
+          expect(profile['fname']).to.equal('Pushp');
+          done();
+        });
 
   });
 
@@ -291,14 +290,14 @@ describe('interop', function () {
     var sm = new SamlPassport(samlOptions);
     var sp = new samlp(samlpOptions, sm);
 
-    sp.validateSamlResponse(new Buffer(response, 'base64').toString(),
-      function(err, profile){
-        if (err) {
-          assert.ok(err);
-          return done();
-        }
-        done('error expected');
-      });
+    sp.validateSamlResponse(new Buffer(response, 'base64').toString(), {},
+        function(err, profile){
+          if (err) {
+            assert.ok(err);
+            return done();
+          }
+          done('error expected');
+        });
   });
 
   it('should validate an assertion from RSA IDM with no embedded signature and supplying a cert', function (done) {
@@ -321,13 +320,13 @@ describe('interop', function () {
     var sm = new SamlPassport(samlOptions);
     var sp = new samlp(samlpOptions, sm);
 
-    sp.validateSamlResponse(new Buffer(response, 'base64').toString(),
-      function(err, profile){
-        if (err) return done(err);
-        assert.ok(profile);
-        expect(profile['email']).to.equal('ricky.brown@emc.com');
-        done();
-      });
+    sp.validateSamlResponse(new Buffer(response, 'base64').toString(), {},
+        function(err, profile){
+          if (err) return done(err);
+          assert.ok(profile);
+          expect(profile['email']).to.equal('ricky.brown@emc.com');
+          done();
+        });
 
     function pemToCert(pem) {
       var cert = /-----BEGIN CERTIFICATE-----([^-]*)-----END CERTIFICATE-----/g.exec(pem.toString());
@@ -358,7 +357,7 @@ describe('interop', function () {
     var sm = new SamlPassport(samlOptions);
     var sp = new samlp(samlpOptions, sm);
 
-    sp.validateSamlResponse(new Buffer(response, 'base64').toString(), function (err){
+    sp.validateSamlResponse(new Buffer(response, 'base64').toString(), {}, function (err){
       assert.ok(err);
       expect(err.toString()).to.equal('Error: Invalid thumbprint (configured: ANOTHER_THUMB. calculated: CD78CA598A6FB28A4D70EF6846C1141666A24240)');
       done();
@@ -461,40 +460,4 @@ describe('interop', function () {
       s._authenticate_saml(req);
     });
   });
-
-
-  // it('should validate a saml response from datapower', function (done) {
-  //   var SAMLResponse = '<samlp2:Response xmlns:samlp2="urn:oasis:names:tc:SAML:2.0:protocol" Version="2.0" ID="SAML-309e11f6-3b9e-4452-9db6-d3cf6cf99d9f" IssueInstant="2013-05-08T21:55:08Z" Destination="http://epolicy.azurewebsites.net/"><saml2:Issuer xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">www.axa-equitable.com</saml2:Issuer><samlp2:Status><samlp2:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></samlp2:Status><saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="SAML-02cd7eb4-0117-4dee-bee9-31bf076e709e" IssueInstant="2013-05-08T21:55:08Z"><saml2:Issuer>www.axa-equitable.com</saml2:Issuer><saml2:Subject><saml2:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified">Christopher.Owen@axa-advisors.com.datastage</saml2:NameID><saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml2:SubjectConfirmationData NotOnOrAfter="2013-05-08T22:55:08Z" Recipient="http://epolicy.azurewebsites.net/"/></saml2:SubjectConfirmation></saml2:Subject><saml2:Conditions NotBefore="2013-05-08T21:55:08Z" NotOnOrAfter="2013-05-08T22:55:08Z"/><saml2:AuthnStatement AuthnInstant="2013-05-08T21:55:08Z" SessionNotOnOrAfter="2013-05-08T22:55:08Z"><saml2:SubjectLocality Address="10.74.68.219"/><saml2:AuthnContext><saml2:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml2:AuthnContextClassRef></saml2:AuthnContext></saml2:AuthnStatement><saml2:AttributeStatement><saml2:Attribute Name="userid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified"><saml2:AttributeValue>3338532</saml2:AttributeValue></saml2:Attribute><saml2:Attribute Name="firstName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified"><saml2:AttributeValue>Christopher</saml2:AttributeValue></saml2:Attribute><saml2:Attribute Name="lastName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified"><saml2:AttributeValue>Owen</saml2:AttributeValue></saml2:Attribute><saml2:Attribute Name="emailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified"><saml2:AttributeValue>Christopher.Owen@axa-advisors.com.datastage</saml2:AttributeValue></saml2:Attribute></saml2:AttributeStatement></saml2:Assertion><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><Reference URI="#SAML-309e11f6-3b9e-4452-9db6-d3cf6cf99d9f"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><DigestValue>7mSr1qvkKTrrV2bV+HFVJKpKaCI=</DigestValue></Reference></SignedInfo><SignatureValue>BQTRkGg8M/g2LpkgvW3MQG/B0cDxsz0zHa2wejIN2010r+hS4BCj7YcIH319R+Y4oZTmlxmJIT/4wlR9rxHQWxX95jdB1DfeoUMLAlk2JfAT+ByZ14F+N4B7lDILuNUTrDBNa9GLDIo8MyAK8SBUdeyqDtNFqb44/gGg6B0h2qEbDNLHY7WlAxvz4TfndKqk5v/VP96xiCS4d1AjYPvUL8EzR5kS83ABHX0jg2bYxdtctdiKOilcHQOHEIKosWw86b9uDQPjIrSt1JzW8SSSeA6M3nJ7HJ/5EsSYEMvt/FshBnKP2LI4HMGktlzw/9gOnmxR/CQykMmN2vvCwPsnXA==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIFQTCCBCmgAwIBAgIETB7lIzANBgkqhkiG9w0BAQUFADCBsTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9ycGEgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDkgRW50cnVzdCwgSW5jLjEuMCwGA1UEAxMlRW50cnVzdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEwxQzAeFw0xMzAxMzExNTM2MjBaFw0xNTAzMzAxOTA2MTJaMIGGMQswCQYDVQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMS0wKwYDVQQKEyRBWEEgRXF1aXRhYmxlIExpZmUgSW5zdXJhbmNlIENvbXBhbnkxIjAgBgNVBAMTGXJ0aWdpbnQuYXhhLWVxdWl0YWJsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCn6cGpvyzVSQ2c1oK7LzuxUXW4sxBOTGLVCqo4FWcta7QAU7RU5i3ATWxyo9HFmD8Qcyj6YuIQYtljJFAx/JcZigtXNRVudtl0uuvCUTGfsR67+gGRWe7hNg/9gIWLXZGkikRT4g9yBqutMzHeuX0ecignFHJxw5S7p1rtxJmuXQR/8uOeAse+48PkZcCHFdzBp6u3Z+pzite12LA2F8C0K5nv9FgkHVEQjqgtgAjKin2QmWqI1gj6mIe0oMxWB4l3j7dsEXVO4zPU1ujIylY0y2QnK4PbNdGu+W1GElwvUhSaz+jmIUFWklJtsFyhFVGcgFRE5iXXmrlnK4GZv3/FAgMBAAGjggGIMIIBhDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwuZW50cnVzdC5uZXQvbGV2ZWwxYy5jcmwwZAYIKwYBBQUHAQEEWDBWMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5lbnRydXN0Lm5ldDAvBggrBgEFBQcwAoYjaHR0cDovL2FpYS5lbnRydXN0Lm5ldC8yMDQ4LWwxYy5jZXIwSgYDVR0gBEMwQTA1BgkqhkiG9n0HSwIwKDAmBggrBgEFBQcCARYaaHR0cDovL3d3dy5lbnRydXN0Lm5ldC9ycGEwCAYGZ4EMAQICMCQGA1UdEQQdMBuCGXJ0aWdpbnQuYXhhLWVxdWl0YWJsZS5jb20wHwYDVR0jBBgwFoAUHvGriQb4SQ8BM3fuFHruGXyTKE0wHQYDVR0OBBYEFJSL34z5hLkS08mEdEodVmeUrUC5MAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEFBQADggEBAFCpXB2HagR+B4C5XKbtBPNZ3F94zJoFlCb+7/5Q9HWMGew1XiRx7GFhV4FCIsr6Gp9EYFLlVO+afdSMvNC7RauZ6nw7ylK8yRyuvbpJWC+XAfP4nVKroYYFPmKJdkELIBLIwt1Nsr3KsY0JIykokuQR/
... [truncated]

@@ -1,196 +1,198 @@
 var assert = require("assert"),
-  fs = require("fs"),
-  helpers = require("./helpers"),
-  saml11 = require("saml").Saml11,
-  SamlPassport = require("../lib/passport-wsfed-saml2/saml").SAML;
+    fs = require("fs"),
+    helpers = require("./helpers"),
+    saml11 = require("saml").Saml11,
+    SamlPassport = require("../lib/passport-wsfed-saml2/saml").SAML;
 
 describe("saml 1.1 assertion", function () {
-  it("should parse attributes", function (done) {
-    // cert created with:
-    // openssl req -x509 -new -newkey rsa:2048 -nodes -subj '/CN=auth0.auth0.com/O=Auth0 LLC/C=US/ST=Washington/L=Redmond' -keyout auth0.key -out auth0.pem
-
-    var options = {
-      cert: fs.readFileSync(__dirname + "/test-auth0.pem"),
-      key: fs.readFileSync(__dirname + "/test-auth0.key"),
-      issuer: "urn:issuer",
-      lifetimeInSeconds: 600,
-      audiences: "urn:myapp",
-      attributes: {
-        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress":
-          "foo@bar.com",
-        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name": "Foo Bar",
-      },
-      nameIdentifier: "foo",
-      nameIdentifierFormat:
-        "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
-    };
-
-    var signedAssertion = saml11.create(options);
-
-    var publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    var saml_passport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-    });
-    saml_passport.validateSamlAssertion(
-      signedAssertion,
-      function (error, profile) {
-        assert.ok(profile);
-        assert.equal(
-          "foo",
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
-          ]
-        );
-        assert.equal(
-          "Foo Bar",
-          profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"]
+    it("should parse attributes", function (done) {
+        // cert created with:
+        // openssl req -x509 -new -newkey rsa:2048 -nodes -subj '/CN=auth0.auth0.com/O=Auth0 LLC/C=US/ST=Washington/L=Redmond' -keyout auth0.key -out auth0.pem
+
+        var options = {
+            cert: fs.readFileSync(__dirname + "/test-auth0.pem"),
+            key: fs.readFileSync(__dirname + "/test-auth0.key"),
+            issuer: "urn:issuer",
+            lifetimeInSeconds: 600,
+            audiences: "urn:myapp",
+            attributes: {
+                "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress":
+                    "foo@bar.com",
+                "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name": "Foo Bar",
+            },
+            nameIdentifier: "foo",
+            nameIdentifierFormat:
+                "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
+        };
+
+        var signedAssertion = saml11.create(options);
+
+        var publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        var saml_passport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+        });
+        saml_passport.validateSamlAssertion(
+            signedAssertion, {},
+            function (error, profile) {
+                assert.ok(profile);
+                assert.equal(
+                    "foo",
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
+                        ]
+                );
+                assert.equal(
+                    "Foo Bar",
+                    profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"]
+                );
+                assert.equal(
+                    "foo@bar.com",
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+                        ]
+                );
+                assert.equal("foo@bar.com", profile["email"]);
+                assert.equal("urn:issuer", profile["issuer"]);
+                done();
+            }
         );
-        assert.equal(
-          "foo@bar.com",
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-          ]
-        );
-        assert.equal("foo@bar.com", profile["email"]);
-        assert.equal("urn:issuer", profile["issuer"]);
-        done();
-      }
-    );
-  });
-
-  it("should handle unicode", function (done) {
-    var options = {
-      cert: fs.readFileSync(__dirname + "/test-auth0.pem"),
-      key: fs.readFileSync(__dirname + "/test-auth0.key"),
-      issuer: "urn:issuer",
-      lifetimeInSeconds: 600,
-      audiences: "urn:myapp",
-      attributes: {
-        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress":
-          "сообщить@bar.com",
-        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name":
-          "сообщить вКонтакте",
-      },
-      nameIdentifier: "вКонтакте",
-      nameIdentifierFormat:
-        "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
-    };
-
-    var signedAssertion = saml11.create(options);
-
-    var publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    var saml_passport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
     });
-    var profile = saml_passport.validateSamlAssertion(
-      signedAssertion,
-      function (error, profile) {
-        if (error) return done(error);
-
-        assert.ok(profile);
-        assert.equal(
-          "вКонтакте",
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
-          ]
-        );
-        assert.equal(
-          "сообщить вКонтакте",
-          profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"]
-        );
-        assert.equal(
-          "сообщить@bar.com",
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-          ]
-        );
-        done();
-      }
-    );
-  });
-
-  it("should validate an assertion from office365", function (done) {
-    var signedAssertion =
-      '<Assertion ID="_1b1ffaef-86ef-42e1-92cf-cf8c9d9a4ce0" IssueInstant="2013-04-02T18:50:24.000Z" Version="2.0" xmlns="urn:oasis:names:tc:SAML:2.0:assertion"><Issuer>https://sts.windows.net/75696069-df44-4310-9bcf-08b45e3007c9/</Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><ds:Reference URI="#_1b1ffaef-86ef-42e1-92cf-cf8c9d9a4ce0"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><ds:DigestValue>TzJmLs0BTPgpaPLsA7L2Kd9l1k4IBOmwIM/znV2iOPU=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>OHJCAffCNPRkwsE3RqnVPoCRSqsPrio8prABauzu2pqF418Y1QJuJehhzztY8A6kwnBUkBVE7BIyLe7kgCnBoNZWElYki1xtaLksc/Afc0TjlZvv9IJ9fQHIBiL1JA9KcySq1tu9dv/NauykBODXuljPuVTk6I4xLLWcg20o26Ov57axp42uWPpcJHtasomLmmmnAXEh6P7aB/1Vlm/MAJhWXToxacauJzFao3F9JNEuucKY6y3RPDp1Qq3vL0gq98RKuiaejayu6RjyyU2+8vCBzURul8b7ZXPUHfIOME6Q5LvbKqLhe/mzqRc+9GUg22X3B5SYjdnXjwHbBTbihA==</ds:SignatureValue><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIIDPjCCAiqgAwIBAgIQVWmXY/+9RqFA/OG9kFulHDAJBgUrDgMCHQUAMC0xKzApBgNVBAMTImFjY291bnRzLmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwHhcNMTIwNjA3MDcwMDAwWhcNMTQwNjA3MDcwMDAwWjAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArCz8Sn3GGXmikH2MdTeGY1D711EORX/lVXpr+ecGgqfUWF8MPB07XkYuJ54DAuYT318+2XrzMjOtqkT94VkXmxv6dFGhG8YZ8vNMPd4tdj9c0lpvWQdqXtL1TlFRpD/P6UMEigfN0c9oWDg9U7Ilymgei0UXtf1gtcQbc5sSQU0S4vr9YJp2gLFIGK11Iqg4XSGdcI0QWLLkkC6cBukhVnd6BCYbLjTYy3fNs4DzNdemJlxGl8sLexFytBF6YApvSdus3nFXaMCtBGx16HzkK9ne3lobAwL2o79bP4imEGqg+ibvyNmbrwFGnQrBc1jTF9LyQX9q+louxVfHs6ZiVwIDAQABo2IwYDBeBgNVHQEEVzBVgBCxDDsLd8xkfOLKm4Q/SzjtoS8wLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldIIQVWmXY/+9RqFA/OG9kFulHDAJBgUrDgMCHQUAA4IBAQAkJtxxm/ErgySlNk69+1odTMP8Oy6L0H17z7XGG3w4TqvTUSWaxD4hSFJ0e7mHLQLQD7oV/erACXwSZn2pMoZ89MBDjOMQA+e6QzGB7jmSzPTNmQgMLA8fWCfqPrz6zgH+1F1gNp8hJY57kfeVPBiyjuBmlTEBsBlzolY9dd/55qqfQk6cgSeCbHCy/RU/iep0+UsRMlSgPNNmqhj5gmN2AFVCN96zF694LwuPae5CeR2ZcVknexOWHYjFM0MgUSw0ubnGl0h9AJgGyhvNGcjQqu9vd1xkupFgaN+f7P3p3EVN5csBg5H94jEcQZT7EKeTiZ6bTrpDAnrr8tDCy8ng</X509Certificate></X509Data></KeyInfo></ds:Signature><Subject><NameID>10030000838D23AF@MicrosoftOnline.com</NameID><SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer" /></Subject><Conditions NotBefore="2013-04-02T18:50:23.969Z" NotOnOrAfter="2013-04-03T06:50:23.969Z"><AudienceRestriction><Audience>spn:408153f4-5960-43dc-9d4f-6b717d772c8d</Audience></AudienceRestriction></Conditions><AttributeStatement><Attribute Name="http://schemas.microsoft.com/identity/claims/tenantid"><AttributeValue>75696069-df44-4310-9bcf-08b45e3007c9</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"><AttributeValue>Matias</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><AttributeValue>matias@auth0.onmicrosoft.com</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"><AttributeValue>Woloski</AttributeValue></Attribute><Attribute Name="http://schemas.microsoft.com/identity/claims/identityprovider"><AttributeValue>https://sts.windows.net/75696069-df44-4310-9bcf-08b45e3007c9/</AttributeValue></Attribute></AttributeStatement><AuthnStatement AuthnInstant="2013-04-02T18:50:16.000Z"><AuthnContext><AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</AuthnContextClassRef></AuthnContext></AuthnStatement></Assertion>';
-
-    var saml_passport = new SamlPassport({
-      thumbprints: ["3464c5bdd2be7f2b6112e2f08e9c0024e33d9fe0"],
-      realm: "spn:408153f4-5960-43dc-9d4f-6b717d772c8d",
-      checkRecipient: false,
-      checkExpiration: false,
-    }); // dont check expiration since we are harcoding the token
-    var profile = saml_passport.validateSamlAssertion(
-      signedAssertion,
-      function (error, profile) {
-        assert.ok(profile);
-        done();
-      }
-    );
-  });
-
-  it("should return error if validation fails", function (done) {
-    var signedAssertion =
-      '<Assertion ID="_1b1ffaef-86ef-42e1-92cf-cf8c9d9a4ce0" IssueInstant="2013-04-02T18:50:24.000Z" Version="2.0" xmlns="urn:oasis:names:tc:SAML:2.0:assertion"><Issuer>https://sts.windows.net/75696069-df44-4310-9bcf-08b45e3007c9/</Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><ds:Reference URI="#_1b1ffaef-86ef-42e1-92cf-cf8c9d9a4ce0"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><ds:DigestValue>TzJmLs0BTPgpaPLsA7L2Kd9l1k4IBOmwIM/znV2iOPU=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>OHJCAffCNPRkwsE3RqnVPoCRSqsPrio8prABauzu2pqF418Y1QJuJehhzztY8A6kwnBUkBVE7BIyLe7kgCnBoNZWElYki1xtaLksc/Afc0TjlZvv9IJ9fQHIBiL1JA9KcySq1tu9dv/NauykBODXuljPuVTk6I4xLLWcg20o26Ov57axp42uWPpcJHtasomLmmmnAXEh6P7aB/1Vlm/MAJhWXToxacauJzFao3F9JNEuucKY6y3RPDp1Qq3vL0gq98RKuiaejayu6RjyyU2+8vCBzURul8b7ZXPUHfIOME6Q5LvbKqLhe/mzqRc+9GUg22X3B5SYjdnXjwHbBTbihA==</ds:SignatureValue><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIIDPjCCAiqgAwIBAgIQVWmXY/+9RqFA/OG9kFulHDAJBgUrDgMCHQUAMC0xKzApBgNVBAMTImFjY291bnRzLmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwHhcNMTIwNjA3MDcwMDAwWhcNMTQwNjA3MDcwMDAwWjAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArCz8Sn3GGXmikH2MdTeGY1D711EORX/lVXpr+ecGgqfUWF8MPB07XkYuJ54DAuYT318+2XrzMjOtqkT94VkXmxv6dFGhG8YZ8vNMPd4tdj9c0lpvWQdqXtL1TlFRpD/P6UMEigfN0c9oWDg9U7Ilymgei0UXtf1gtcQbc5sSQU0S4vr9YJp2gLFIGK11Iqg4XSGdcI0QWLLkkC6cBukhVnd6BCYbLjTYy3fNs4DzNdemJlxGl8sLexFytBF6YApvSdus3nFXaMCtBGx16HzkK9ne3lobAwL2o79bP4imEGqg+ibvyNmbrwFGnQrBc1jTF9LyQX9q+louxVfHs6ZiVwIDAQABo2IwYDBeBgNVHQEEVzBVgBCxDDsLd8xkfOLKm4Q/SzjtoS8wLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldIIQVWmXY/+9RqFA/OG9kFulHDAJBgUrDgMCHQUAA4IBAQAkJtxxm/ErgySlNk69+1odTMP8Oy6L0H17z7XGG3w4TqvTUSWaxD4hSFJ0e7mHLQLQD7oV/erACXwSZn2pMoZ89MBDjOMQA+e6QzGB7jmSzPTNmQgMLA8fWCfqPrz6zgH+1F1gNp8hJY57kfeVPBiyjuBmlTEBsBlzolY9dd/55qqfQk6cgSeCbHCy/RU/iep0+UsRMlSgPNNmqhj5gmN2AFVCN96zF694LwuPae5CeR2ZcVknexOWHYjFM0MgUSw0ubnGl0h9AJgGyhvNGcjQqu9vd1xkupFgaN+f7P3p3EVN5csBg5H94jEcQZT7EKeTiZ6bTrpDAnrr8tDCy8ng</X509Certificate></X509Data></KeyInfo></ds:Signature><Subject><NameID>10030000838D23AF@MicrosoftOnline.com</NameID><SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer" /></Subject><Conditions NotBefore="2013-04-02T18:50:23.969Z" NotOnOrAfter="2013-04-03T06:50:23.969Z"><AudienceRestriction><Audience>spn:408153f4-5960-43dc-9d4f-6b717d772c8d</Audience></AudienceRestriction></Conditions><AttributeStatement><Attribute Name="http://schemas.microsoft.com/identity/claims/tenantid"><AttributeValue>75696069-df44-4310-9bcf-08b45e3007c9</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"><AttributeValue>Matias</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><AttributeValue>matias@auth0.onmicrosoft.com</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"><AttributeValue>Woloski</AttributeValue></Attribute><Attribute Name="http://schemas.microsoft.com/identity/claims/identityprovider"><AttributeValue>https://sts.windows.net/75696069-df44-4310-9bcf-08b45e3007c9/</AttributeValue></Attribute></AttributeStatement><AuthnStatement AuthnInstant="2013-04-02T18:50:16.000Z"><AuthnContext><AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</AuthnContextClassRef></AuthnContext></AuthnStatement></Assertion>';
-
-    var saml_passport = new SamlPassport({
-      thumbprints: [
-        "3464c5bdd2be7f2b6112e2f08e9c0024e33d9fe1",
-        "3464c5bdd2be7f2b6112e2f08e9c0024e33d9fe2",
-      ], // WRONG thumbprints
-      realm: "spn:408153f4-5960-43dc-9d4f-6b717d772c8d",
-      checkRecipient: false,
-      checkExpiration: false,
-    }); // dont check expiration since we are harcoding the token
-    var profile = saml_passport.validateSamlAssertion(
-      signedAssertion,
-      function (error, profile) {
-        assert.equal(
-          "Invalid thumbprint (configured: 3464C5BDD2BE7F2B6112E2F08E9C0024E33D9FE1, 3464C5BDD2BE7F2B6112E2F08E9C0024E33D9FE2. calculated: 3464C5BDD2BE7F2B6112E2F08E9C0024E33D9FE0)",
-          error.message
+
+    it("should handle unicode", function (done) {
+        var options = {
+            cert: fs.readFileSync(__dirname + "/test-auth0.pem"),
+            key: fs.readFileSync(__dirname + "/test-auth0.key"),
+            issuer: "urn:issuer",
+            lifetimeInSeconds: 600,
+            audiences: "urn:myapp",
+            attributes: {
+                "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress":
+                    "сообщить@bar.com",
+                "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name":
+                    "сообщить вКонтакте",
+            },
+            nameIdentifier: "вКонтакте",
+            nameIdentifierFormat:
+                "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
+        };
+
+        var signedAssertion = saml11.create(options);
+
+        var publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        var saml_passport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+        });
+        var profile = saml_passport.validateSamlAssertion(
+            signedAssertion, {},
+            function (error, profile) {
+                if (error) return done(error);
+
+                assert.ok(profile);
+                assert.equal(
+                    "вКонтакте",
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
+                        ]
+                );
+                assert.equal(
+                    "сообщить вКонтакте",
+                    profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"]
+                );
+                assert.equal(
+                    "сообщить@bar.com",
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+                        ]
+                );
+                done();
+            }
         );
-        done();
-      }
-    );
-  });
-
-  it("should fail when the X509Certificate is invalid", function (done) {
-    const signedAssertion = fs
-      .readFileSync(
-        __dirname + "/samples/plain/samlresponse_saml11_invalid_cert.txt"
-      )
-      .toString();
-    const options = {
-      checkDestination: false,
-      thumbprint: "119B9E027959CDB7C662CFD075D9E2EF384E445F",
-    };
-
-    const saml_passport = new SamlPassport(options);
-    saml_passport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        const errorMessages = [
-          "The signing certificate is invalid (PEM_read_bio_PUBKEY failed)",
-          "The signing certificate is invalid (error:0906700D:PEM routines:PEM_ASN1_read_bio:ASN1 lib, error:0D07803A:asn1 encoding routines:ASN1_ITEM_EX_D2I:nested asn1 error, error:0D068066:asn1 encoding routines:ASN1_CHECK_TLEN:bad object header)",
-          "The signing certificate is invalid (error:0D07803A:asn1 encoding routines:asn1_item_embed_d2i:nested asn1 error, error:0D068066:asn1 encoding routines:asn1_check_tlen:bad object header)",
-          "The signing certificate is invalid (error:0688010A:asn1 encoding routines::nested asn1 error, error:06800066:asn1 encoding routines::bad object header)",
-        ];
-
-        assert.ok(err, "The signing certificate was unexpectedly valid");
-        assert.ok(
-          /signing certificate is invalid/.test(err.message),
-          "Error message is not the default invalid message"
+    });
+
+    it("should validate an assertion from office365", function (done) {
+        var signedAssertion =
+            '<Assertion ID="_1b1ffaef-86ef-42e1-92cf-cf8c9d9a4ce0" IssueInstant="2013-04-02T18:50:24.000Z" Version="2.0" xmlns="urn:oasis:names:tc:SAML:2.0:assertion"><Issuer>https://sts.windows.net/75696069-df44-4310-9bcf-08b45e3007c9/</Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><ds:Reference URI="#_1b1ffaef-86ef-42e1-92cf-cf8c9d9a4ce0"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><ds:DigestValue>TzJmLs0BTPgpaPLsA7L2Kd9l1k4IBOmwIM/znV2iOPU=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>OHJCAffCNPRkwsE3RqnVPoCRSqsPrio8prABauzu2pqF418Y1QJuJehhzztY8A6kwnBUkBVE7BIyLe7kgCnBoNZWElYki1xtaLksc/Afc0TjlZvv9IJ9fQHIBiL1JA9KcySq1tu9dv/NauykBODXuljPuVTk6I4xLLWcg20o26Ov57axp42uWPpcJHtasomLmmmnAXEh6P7aB/1Vlm/MAJhWXToxacauJzFao3F9JNEuucKY6y3RPDp1Qq3vL0gq98RKuiaejayu6RjyyU2+8vCBzURul8b7ZXPUHfIOME6Q5LvbKqLhe/mzqRc+9GUg22X3B5SYjdnXjwHbBTbihA==</ds:SignatureValue><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIIDPjCCAiqgAwIBAgIQVWmXY/+9RqFA/OG9kFulHDAJBgUrDgMCHQUAMC0xKzApBgNVBAMTImFjY291bnRzLmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwHhcNMTIwNjA3MDcwMDAwWhcNMTQwNjA3MDcwMDAwWjAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArCz8Sn3GGXmikH2MdTeGY1D711EORX/lVXpr+ecGgqfUWF8MPB07XkYuJ54DAuYT318+2XrzMjOtqkT94VkXmxv6dFGhG8YZ8vNMPd4tdj9c0lpvWQdqXtL1TlFRpD/P6UMEigfN0c9oWDg9U7Ilymgei0UXtf1gtcQbc5sSQU0S4vr9YJp2gLFIGK11Iqg4XSGdcI0QWLLkkC6cBukhVnd6BCYbLjTYy3fNs4DzNdemJlxGl8sLexFytBF6YApvSdus3nFXaMCtBGx16HzkK9ne3lobAwL2o79bP4imEGqg+ibvyNmbrwFGnQrBc1jTF9LyQX9q+louxVfHs6ZiVwIDAQABo2IwYDBeBgNVHQEEVzBVgBCxDDsLd8xkfOLKm4Q/SzjtoS8wLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldIIQVWmXY/+9RqFA/OG9kFulHDAJBgUrDgMCHQUAA4IBAQAkJtxxm/ErgySlNk69+1odTMP8Oy6L0H17z7XGG3w4TqvTUSWaxD4hSFJ0e7mHLQLQD7oV/erACXwSZn2pMoZ89MBDjOMQA+e6QzGB7jmSzPTNmQgMLA8fWCfqPrz6zgH+1F1gNp8hJY57kfeVPBiyjuBmlTEBsBlzolY9dd/55qqfQk6cgSeCbHCy/RU/iep0+UsRMlSgPNNmqhj5gmN2AFVCN96zF694LwuPae5CeR2ZcVknexOWHYjFM0MgUSw0ubnGl0h9AJgGyhvNGcjQqu9vd1xkupFgaN+f7P3p3EVN5csBg5H94jEcQZT7EKeTiZ6bTrpDAnrr8tDCy8ng</X509Certificate></X509Data></KeyInfo></ds:Signature><Subject><NameID>10030000838D23AF@MicrosoftOnline.com</NameID><SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer" /></Subject><Conditions NotBefore="2013-04-02T18:50:23.969Z" NotOnOrAfter="2013-04-03T06:50:23.969Z"><AudienceRestriction><Audience>spn:408153f4-5960-43dc-9d4f-6b717d772c8d</Audience></AudienceRestriction></Conditions><AttributeStatement><Attribute Name="http://schemas.microsoft.com/identity/claims/tenantid"><AttributeValue>75696069-df44-4310-9bcf-08b45e3007c9</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"><AttributeValue>Matias</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><AttributeValue>matias@auth0.onmicrosoft.com</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"><AttributeValue>Woloski</AttributeValue></Attribute><Attribute Name="http://schemas.microsoft.com/identity/claims/identityprovider"><AttributeValue>https://sts.windows.net/75696069-df44-4310-9bcf-08b45e3007c9/</AttributeValue></Attribute></AttributeStatement><AuthnStatement AuthnInstant="2013-04-02T18:50:16.000Z"><AuthnContext><AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</AuthnContextClassRef></AuthnContext></AuthnStatement></Assertion>';
+
+        var saml_passport = new SamlPassport({
+            thumbprints: ["3464c5bdd2be7f2b6112e2f08e9c0024e33d9fe0"],
+            realm: "spn:408153f4-5960-43dc-9d4f-6b717d772c8d",
+            checkRecipient: false,
+            checkExpiration: false,
+        }); // dont check expiration since we are harcoding the token
+        var profile = saml_passport.validateSamlAssertion(
+            signedAssertion, {},
+            function (error, profile) {
+                assert.ok(profile);
+                done();
+            }
         );
-        assert.ok(
-          errorMessages.includes(err.message),
-          "Error message for invalid certificate is incorrect"
+    });
+
+    it("should return error if validation fails", function (done) {
+        var signedAssertion =
+            '<Assertion ID="_1b1ffaef-86ef-42e1-92cf-cf8c9d9a4ce0" IssueInstant="2013-04-02T18:50:24.000Z" Version="2.0" xmlns="urn:oasis:names:tc:SAML:2.0:assertion"><Issuer>https://sts.windows.net/75696069-df44-4310-9bcf-08b45e3007c9/</Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><ds:Reference URI="#_1b1ffaef-86ef-42e1-92cf-cf8c9d9a4ce0"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><ds:DigestValue>TzJmLs0BTPgpaPLsA7L2Kd9l1k4IBOmwIM/znV2iOPU=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>OHJCAffCNPRkwsE3RqnVPoCRSqsPrio8prABauzu2pqF418Y1QJuJehhzztY8A6kwnBUkBVE7BIyLe7kgCnBoNZWElYki1xtaLksc/Afc0TjlZvv9IJ9fQHIBiL1JA9KcySq1tu9dv/NauykBODXuljPuVTk6I4xLLWcg20o26Ov57axp42uWPpcJHtasomLmmmnAXEh6P7aB/1Vlm/MAJhWXToxacauJzFao3F9JNEuucKY6y3RPDp1Qq3vL0gq98RKuiaejayu6RjyyU2+8vCBzURul8b7ZXPUHfIOME6Q5LvbKqLhe/mzqRc+9GUg22X3B5SYjdnXjwHbBTbihA==</ds:SignatureValue><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIIDPjCCAiqgAwIBAgIQVWmXY/+9RqFA/OG9kFulHDAJBgUrDgMCHQUAMC0xKzApBgNVBAMTImFjY291bnRzLmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwHhcNMTIwNjA3MDcwMDAwWhcNMTQwNjA3MDcwMDAwWjAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArCz8Sn3GGXmikH2MdTeGY1D711EORX/lVXpr+ecGgqfUWF8MPB07XkYuJ54DAuYT318+2XrzMjOtqkT94VkXmxv6dFGhG8YZ8vNMPd4tdj9c0lpvWQdqXtL1TlFRpD/P6UMEigfN0c9oWDg9U7Ilymgei0UXtf1gtcQbc5sSQU0S4vr9YJp2gLFIGK11Iqg4XSGdcI0QWLLkkC6cBukhVnd6BCYbLjTYy3fNs4DzNdemJlxGl8sLexFytBF6YApvSdus3nFXaMCtBGx16HzkK9ne3lobAwL2o79bP4imEGqg+ibvyNmbrwFGnQrBc1jTF9LyQX9q+louxVfHs6ZiVwIDAQABo2IwYDBeBgNVHQEEVzBVgBCxDDsLd8xkfOLKm4Q/SzjtoS8wLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldIIQVWmXY/+9RqFA/OG9kFulHDAJBgUrDgMCHQUAA4IBAQAkJtxxm/ErgySlNk69+1odTMP8Oy6L0H17z7XGG3w4TqvTUSWaxD4hSFJ0e7mHLQLQD7oV/erACXwSZn2pMoZ89MBDjOMQA+e6QzGB7jmSzPTNmQgMLA8fWCfqPrz6zgH+1F1gNp8hJY57kfeVPBiyjuBmlTEBsBlzolY9dd/55qqfQk6cgSeCbHCy/RU/iep0+UsRMlSgPNNmqhj5gmN2AFVCN96zF694LwuPae5CeR2ZcVknexOWHYjFM0MgUSw0ubnGl0h9AJgGyhvNGcjQqu9vd1xkupFgaN+f7P3p3EVN5csBg5H94jEcQZT7EKeTiZ6bTrpDAnrr8tDCy8ng</X509Certificate></X509Data></KeyInfo></ds:Signature><Subject><NameID>10030000838D23AF@MicrosoftOnline.com</NameID><SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer" /></Subject><Conditions NotBefore="2013-04-02T18:50:23.969Z" NotOnOrAfter="2013-04-03T06:50:23.969Z"><AudienceRestriction><Audience>spn:408153f4-5960-43dc-9d4f-6b717d772c8d</Audience></AudienceRestriction></Conditions><AttributeStatement><Attribute Name="http://schemas.microsoft.com/identity/claims/tenantid"><AttributeValue>75696069-df44-4310-9bcf-08b45e3007c9</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"><AttributeValue>Matias</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><AttributeValue>matias@auth0.onmicrosoft.com</AttributeValue></Attribute><Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"><AttributeValue>Woloski</AttributeValue></Attribute><Attribute Name="http://schemas.microsoft.com/identity/claims/identityprovider"><AttributeValue>https://sts.windows.net/75696069-df44-4310-9bcf-08b45e3007c9/</AttributeValue></Attribute></AttributeStatement><AuthnStatement AuthnInstant="2013-04-02T18:50:16.000Z"><AuthnContext><AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</AuthnContextClassRef></AuthnContext></AuthnStatement></Assertion>';
+
+        var saml_passport = new SamlPassport({
+            thumbprints: [
+                "3464c5bdd2be7f2b6112e2f08e9c0024e33d9fe1",
+                "3464c5bdd2be7f2b6112e2f08e9c0024e33d9fe2",
+            ], // WRONG thumbprints
+            realm: "spn:408153f4-5960-43dc-9d4f-6b717d772c8d",
+            checkRecipient: false,
+            checkExpiration: false,
+        }); // dont check expiration since we are harcoding the token
+        var profile = saml_passport.validateSamlAssertion(
+            signedAssertion, {},
+            function (error, profile) {
+                assert.equal(
+                    "Invalid thumbprint (configured: 3464C5BDD2BE7F2B6112E2F08E9C0024E33D9FE1, 3464C5BDD2BE7F2B6112E2F08E9C0024E33D9FE2. calculated: 3464C5BDD2BE7F2B6112E2F08E9C0024E33D9FE0)",
+                    error.message
+                );
+                done();
+            }
         );
+    });
 
-        done();
-      }
-    );
-  });
-});
+    it("should fail when the X509Certificate is invalid", function (done) {
+        const signedAssertion = fs
+            .readFileSync(
+                __dirname + "/samples/plain/samlresponse_saml11_invalid_cert.txt"
+            )
+            .toString();
+        const options = {
+            checkDestination: false,
+            thumbprint: "CDADA32647511D5F0E4676DE2DD8EE3FAD1F6D2D",
+        };
+
+        const saml_passport = new SamlPassport(options);
+        saml_passport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                const errorMessages = [
+                    "The signing certificate is invalid (PEM_read_bio_PUBKEY failed)",
+                    "The signing certificate is invalid (error:0906700D:PEM routines:PEM_ASN1_read_bio:ASN1 lib, error:0D07803A:asn1 encoding routines:ASN1_ITEM_EX_D2I:nested asn1 error, error:0D068066:asn1 encoding routines:ASN1_CHECK_TLEN:bad object header)",
+                    "The signing certificate is invalid (error:0D07803A:asn1 encoding routines:asn1_item_embed_d2i:nested asn1 error, error:0D068066:asn1 encoding routines:asn1_check_tlen:bad object header)",
+                    "The signing certificate is invalid (error:0688010A:asn1 encoding routines::nested asn1 error, error:06800066:asn1 encoding routines::bad object header)",
+                    // This is required for Node version 22
+                    "The signing certificate is invalid (error:1E08010C:DECODER routines::unsupported, error:0688010A:asn1 encoding routines::nested asn1 error, error:06800066:asn1 encoding routines::bad object header, error:0680009B:asn1 encoding routines::too long)",
+                ];
+
+                assert.ok(err, "The signing certificate was unexpectedly valid");
+                assert.ok(
+                    /signing certificate is invalid/.test(err.message),
+                    "Error message is not the default invalid message"
+                );
+                assert.ok(
+                    errorMessages.includes(err.message),
+                    "Error message for invalid certificate is incorrect"
+                );
+
+                done();
+            }
+        );
+    });
+});
\ No newline at end of file

@@ -6,496 +6,549 @@ const utils = require("../lib/passport-wsfed-saml2/utils");
 const SamlPassport = require("../lib/passport-wsfed-saml2/saml").SAML;
 
 describe("saml 2.0 assertion", function () {
-  // cert created with:
-  // openssl req -x509 -new -newkey rsa:2048 -nodes -subj '/CN=auth0.auth0.com/O=Auth0 LLC/C=US/ST=Washington/L=Redmond' -keyout auth0.key -out auth0.pem
-
-  const options = {
-    cert: fs.readFileSync(__dirname + "/test-auth0.pem"),
-    key: fs.readFileSync(__dirname + "/test-auth0.key"),
-    issuer: "urn:issuer",
-    lifetimeInSeconds: 600,
-    audiences: "urn:myapp",
-    attributes: {
-      "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress":
-        "foo@bar.com",
-      "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name": "Foo Bar",
-    },
-    nameIdentifier: "foo",
-    nameIdentifierFormat:
-      "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
-  };
-
-  it("should parse attributes", function (done) {
-    const signedAssertion = saml20.create(options);
-
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-    });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        if (err) return done(err);
+    // cert created with:
+    // openssl req -x509 -new -newkey rsa:2048 -nodes -subj '/CN=auth0.auth0.com/O=Auth0 LLC/C=US/ST=Washington/L=Redmond' -keyout auth0.key -out auth0.pem
 
-        assert.ok(profile);
-        assert.equal(
-          "foo",
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
-          ]
-        );
-        assert.equal(
-          "Foo Bar",
-          profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"]
-        );
-        assert.equal(
-          "foo@bar.com",
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-          ]
+    const options = {
+        cert: fs.readFileSync(__dirname + "/test-auth0.pem"),
+        key: fs.readFileSync(__dirname + "/test-auth0.key"),
+        issuer: "urn:issuer",
+        lifetimeInSeconds: 600,
+        audiences: "urn:myapp",
+        attributes: {
+            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress":
+                "foo@bar.com",
+            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name": "Foo Bar",
+        },
+        nameIdentifier: "foo",
+        nameIdentifierFormat:
+            "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
+    };
+
+    it("should parse attributes", function (done) {
+        const signedAssertion = saml20.create(options);
+
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                if (err) return done(err);
+
+                assert.ok(profile);
+                assert.equal(
+                    "foo",
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
+                        ]
+                );
+                assert.equal(
+                    "Foo Bar",
+                    profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"]
+                );
+                assert.equal(
+                    "foo@bar.com",
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+                        ]
+                );
+                assert.equal("foo@bar.com", profile["email"]);
+                assert.equal("urn:issuer", profile["issuer"]);
+                done();
+            }
         );
-        assert.equal("foo@bar.com", profile["email"]);
-        assert.equal("urn:issuer", profile["issuer"]);
-        done();
-      }
-    );
-  });
-
-  it('should ignore the NameQualifier validation when nameid format is "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"', function (done) {
-    const signedAssertion =
-      '<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="_ne0Z8R1z9xdbekXeWrAAg7srNB78exsb" IssueInstant="2016-08-02T21:54:04.971Z"><saml:Issuer>urn:issuer</saml:Issuer><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><Reference URI="#_ne0Z8R1z9xdbekXeWrAAg7srNB78exsb"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><DigestValue>p7iHnIt5xJZNimGNxh4d9R2J7DML8WNrMwMxmZ1WwSU=</DigestValue></Reference></SignedInfo><SignatureValue>pb1Wp/LFbigEj+TNm7gkAwlfIc17LNwUXVTgM8RQnMvYJfIPZbl1yo5xMCh6ObMFwCs1T+gKI5C7jMloX2QhWD/XUffBKiDfkZUg7NI/Jyt5m+Bdst12SNhHBVsNilL9ZCuf+QtQD7301gUhVHP6Ramf4y+XNod9AfzhFLYNfl6fhf/5KA/KkjiOwYW5Ps/43OMXXSeVaeQ7JRU8XqyKbwlB+YXGseFLnyZopv8Cw9Bb2935ADLX111oFBkiRhnMUJW0LMbSWM6UVJ4V0qoW9h+f3isN5+R87RECNeAQP3WSBiddnEuSdhgQYQVnb6s0mThpvs7uvIOlog0FqeSrvQ==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIEDzCCAvegAwIBAgIJALr9HwgrQ7GeMA0GCSqGSIb3DQEBBQUAMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDAeFw0xMjEyMjkxNTMwNDdaFw0xMzAxMjgxNTMwNDdaMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZiVmNHiXLldrgbS50ONNOH7pJ2zg6OcSMkYZGDZJbOZ/TqwauC6JOnI7+xtkPJsQHZSFJs4U0srjZKzDCmaz2jLAJDShP2jaXlrki16nDLPE//IGAg3BJguSmBCWpDbSm92V9hSsE+Mhx6bDaJiw8yQ+Q8iSm0aTQZtp6O4ICMu00ESdh9NJqIECELvP31ADV1Xhj7IbyyVPDFxMv3ol5BySE9wwwOFUq/wv7Xz9LRiUjUzPO+Lq3OM3o/uCDbk7jD7XrGUuOydALD8ULsXp4EuDO+nFbeXB/iKndZynuVKokirywl2nD2IP0/yncdLQZ8ByIyqP3G82fq/l8p7AsCAwEAAaOBxzCBxDAdBgNVHQ4EFgQUHI2rUXeBjTv1zAllaPGrHFcEK0YwgZQGA1UdIwSBjDCBiYAUHI2rUXeBjTv1zAllaPGrHFcEK0ahZqRkMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZIIJALr9HwgrQ7GeMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFrXIhCy4T4eGrikb0R2wHv/uS548r3pZyBV0CDbcRwAtbnpJMvkGFqKVp4pmyoIDSVNK/j+sLEshB20XftezHZyRJbCUbtKvXQ6FsxoeZMlN0ITYKTaoBZKhUxxj90otAhNC58qwGUPqt2LewJhHyLucKkGJ1mQ3b5xKZ532ToufouH9VLhig3H1KnxWo/zMD6Ke8cCk6qO9htuhI06s3GQGS1QWQtAmm17C6TfKgDwQFZwhqHUUZnwKRH8gU6OgZsvhgV1B7H5mjZcu57KMiDBekU9MEY0DCVTN3WkmcTII668zLsJrkNX6PEfck1AMBbVE6pEUKcWwq3uaLvlAUo=</X509Certificate></X509Data></KeyInfo></Signature><saml:Subject><saml:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" NameQualifier="name-qualifier">foo</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2016-08-02T22:04:04.971Z"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2016-08-02T21:54:04.971Z" NotOnOrAfter="2016-08-02T22:04:04.971Z"><saml:AudienceRestriction><saml:Audience>urn:myapp</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"><saml:AttributeValue xsi:type="xs:anyType">foo@bar.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><saml:AttributeValue xsi:type="xs:anyType">Foo Bar</saml:AttributeValue></saml:Attribute></saml:AttributeStatement><saml:AuthnStatement AuthnInstant="2016-08-02T21:54:04.971Z"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement></saml:Assertion>';
-
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-      checkExpiration: false,
     });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        if (err) return done(err);
 
-        assert.ok(profile);
-        assert.equal(
-          "foo",
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
-          ]
+    it('should ignore the NameQualifier validation when nameid format is "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"', function (done) {
+        const signedAssertion =
+            '<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="_ne0Z8R1z9xdbekXeWrAAg7srNB78exsb" IssueInstant="2016-08-02T21:54:04.971Z"><saml:Issuer>urn:issuer</saml:Issuer><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><Reference URI="#_ne0Z8R1z9xdbekXeWrAAg7srNB78exsb"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><DigestValue>p7iHnIt5xJZNimGNxh4d9R2J7DML8WNrMwMxmZ1WwSU=</DigestValue></Reference></SignedInfo><SignatureValue>pb1Wp/LFbigEj+TNm7gkAwlfIc17LNwUXVTgM8RQnMvYJfIPZbl1yo5xMCh6ObMFwCs1T+gKI5C7jMloX2QhWD/XUffBKiDfkZUg7NI/Jyt5m+Bdst12SNhHBVsNilL9ZCuf+QtQD7301gUhVHP6Ramf4y+XNod9AfzhFLYNfl6fhf/5KA/KkjiOwYW5Ps/43OMXXSeVaeQ7JRU8XqyKbwlB+YXGseFLnyZopv8Cw9Bb2935ADLX111oFBkiRhnMUJW0LMbSWM6UVJ4V0qoW9h+f3isN5+R87RECNeAQP3WSBiddnEuSdhgQYQVnb6s0mThpvs7uvIOlog0FqeSrvQ==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIEDzCCAvegAwIBAgIJALr9HwgrQ7GeMA0GCSqGSIb3DQEBBQUAMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDAeFw0xMjEyMjkxNTMwNDdaFw0xMzAxMjgxNTMwNDdaMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZiVmNHiXLldrgbS50ONNOH7pJ2zg6OcSMkYZGDZJbOZ/TqwauC6JOnI7+xtkPJsQHZSFJs4U0srjZKzDCmaz2jLAJDShP2jaXlrki16nDLPE//IGAg3BJguSmBCWpDbSm92V9hSsE+Mhx6bDaJiw8yQ+Q8iSm0aTQZtp6O4ICMu00ESdh9NJqIECELvP31ADV1Xhj7IbyyVPDFxMv3ol5BySE9wwwOFUq/wv7Xz9LRiUjUzPO+Lq3OM3o/uCDbk7jD7XrGUuOydALD8ULsXp4EuDO+nFbeXB/iKndZynuVKokirywl2nD2IP0/yncdLQZ8ByIyqP3G82fq/l8p7AsCAwEAAaOBxzCBxDAdBgNVHQ4EFgQUHI2rUXeBjTv1zAllaPGrHFcEK0YwgZQGA1UdIwSBjDCBiYAUHI2rUXeBjTv1zAllaPGrHFcEK0ahZqRkMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZIIJALr9HwgrQ7GeMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFrXIhCy4T4eGrikb0R2wHv/uS548r3pZyBV0CDbcRwAtbnpJMvkGFqKVp4pmyoIDSVNK/j+sLEshB20XftezHZyRJbCUbtKvXQ6FsxoeZMlN0ITYKTaoBZKhUxxj90otAhNC58qwGUPqt2LewJhHyLucKkGJ1mQ3b5xKZ532ToufouH9VLhig3H1KnxWo/zMD6Ke8cCk6qO9htuhI06s3GQGS1QWQtAmm17C6TfKgDwQFZwhqHUUZnwKRH8gU6OgZsvhgV1B7H5mjZcu57KMiDBekU9MEY0DCVTN3WkmcTII668zLsJrkNX6PEfck1AMBbVE6pEUKcWwq3uaLvlAUo=</X509Certificate></X509Data></KeyInfo></Signature><saml:Subject><saml:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" NameQualifier="name-qualifier">foo</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2016-08-02T22:04:04.971Z"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2016-08-02T21:54:04.971Z" NotOnOrAfter="2016-08-02T22:04:04.971Z"><saml:AudienceRestriction><saml:Audience>urn:myapp</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"><saml:AttributeValue xsi:type="xs:anyType">foo@bar.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><saml:AttributeValue xsi:type="xs:anyType">Foo Bar</saml:AttributeValue></saml:Attribute></saml:AttributeStatement><saml:AuthnStatement AuthnInstant="2016-08-02T21:54:04.971Z"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement></saml:Assertion>';
+
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+            checkExpiration: false,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                if (err) return done(err);
+
+                assert.ok(profile);
+                assert.equal(
+                    "foo",
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
+                        ]
+                );
+                assert.equal(
+                    "Foo Bar",
+                    profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"]
+                );
+                assert.equal(
+                    "foo@bar.com",
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+                        ]
+                );
+                assert.equal("foo@bar.com", profile["email"]);
+                assert.equal("urn:issuer", profile["issuer"]);
+                done();
+            }
         );
-        assert.equal(
-          "Foo Bar",
-          profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"]
-        );
-        assert.equal(
-          "foo@bar.com",
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-          ]
-        );
-        assert.equal("foo@bar.com", profile["email"]);
-        assert.equal("urn:issuer", profile["issuer"]);
-        done();
-      }
-    );
-  });
-
-  it('should ignore the SPNameQualifier validation when the nameid format is "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"', function (done) {
-    const signedAssertion =
-      '<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="_nPmKm9IskDCo61hUea4DX7o3POLbLcUK" IssueInstant="2016-08-02T21:59:48.654Z"><saml:Issuer>urn:issuer</saml:Issuer><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><Reference URI="#_nPmKm9IskDCo61hUea4DX7o3POLbLcUK"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><DigestValue>UYsy9NacnRqnSTbidM8WBBgS+Op0G05iBJTX0T1WlUk=</DigestValue></Reference></SignedInfo><SignatureValue>VzRQaMR5Qk1P+g1tqJRKroq4JJx00FZ0rZxO4vG2gGkBXJ8262B4VUHOkxyPHNH1l/DuxSnNsL8AAbZfn8EdxMdToPvm2hkqygyA5W20o6g6eSC41rDOavTzesOKoXn3Uq9DOiUXve5ieYYCt5bQcoSCVT6uhVEKMhdcLhaB507qj9Gzcfp0E4F57ezRTTnVVEF/wCJ5j0QTMA2Wh09fxNkGijlE8KHzDJZapN4tDCzmK8qY7211gKuTfKYJGXYA4hSxw9fiQGDEPKRYA6tWf0HO5Vd8edRg2ZHr7AgjuCPp5Fj8VOP+KppA1YFBbq4Eqqt6KHg91KJlGs3ivpmwPw==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIEDzCCAvegAwIBAgIJALr9HwgrQ7GeMA0GCSqGSIb3DQEBBQUAMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDAeFw0xMjEyMjkxNTMwNDdaFw0xMzAxMjgxNTMwNDdaMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZiVmNHiXLldrgbS50ONNOH7pJ2zg6OcSMkYZGDZJbOZ/TqwauC6JOnI7+xtkPJsQHZSFJs4U0srjZKzDCmaz2jLAJDShP2jaXlrki16nDLPE//IGAg3BJguSmBCWpDbSm92V9hSsE+Mhx6bDaJiw8yQ+Q8iSm0aTQZtp6O4ICMu00ESdh9NJqIECELvP31ADV1Xhj7IbyyVPDFxMv3ol5BySE9wwwOFUq/wv7Xz9LRiUjUzPO+Lq3OM3o/uCDbk7jD7XrGUuOydALD8ULsXp4EuDO+nFbeXB/iKndZynuVKokirywl2nD2IP0/yncdLQZ8ByIyqP3G82fq/l8p7AsCAwEAAaOBxzCBxDAdBgNVHQ4EFgQUHI2rUXeBjTv1zAllaPGrHFcEK0YwgZQGA1UdIwSBjDCBiYAUHI2rUXeBjTv1zAllaPGrHFcEK0ahZqRkMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZIIJALr9HwgrQ7GeMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFrXIhCy4T4eGrikb0R2wHv/uS548r3pZyBV0CDbcRwAtbnpJMvkGFqKVp4pmyoIDSVNK/j+sLEshB20XftezHZyRJbCUbtKvXQ6FsxoeZMlN0ITYKTaoBZKhUxxj90otAhNC58qwGUPqt2LewJhHyLucKkGJ1mQ3b5xKZ532ToufouH9VLhig3H1KnxWo/zMD6Ke8cCk6qO9htuhI06s3GQGS1QWQtAmm17C6TfKgDwQFZwhqHUUZnwKRH8gU6OgZsvhgV1B7H5mjZcu57KMiDBekU9MEY0DCVTN3WkmcTII668zLsJrkNX6PEfck1AMBbVE6pEUKcWwq3uaLvlAUo=</X509Certificate></X509Data></KeyInfo></Signature><saml:Subject><saml:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" SPNameQualifier="other-qualifier">foo</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2016-08-02T22:09:48.654Z"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2016-08-02T21:59:48.654Z" NotOnOrAfter="2016-08-02T22:09:48.654Z"><saml:AudienceRestriction><saml:Audience>urn:myapp</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"><saml:AttributeValue xsi:type="xs:anyType">foo@bar.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><saml:AttributeValue xsi:type="xs:anyType">Foo Bar</saml:AttributeValue></saml:Attribute></saml:AttributeStatement><saml:AuthnStatement AuthnInstant="2016-08-02T21:59:48.654Z"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement></saml:Assertion>';
-
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-      checkExpiration: false,
     });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        if (err) return done(err);
 
-        assert.ok(profile);
-        assert.equal(
-          "foo",
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
-          ]
-        );
-        assert.equal(
-          "Foo Bar",
-          profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"]
-        );
-        assert.equal(
-          "foo@bar.com",
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
-          ]
+    it('should ignore the SPNameQualifier validation when the nameid format is "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"', function (done) {
+        const signedAssertion =
+            '<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="_nPmKm9IskDCo61hUea4DX7o3POLbLcUK" IssueInstant="2016-08-02T21:59:48.654Z"><saml:Issuer>urn:issuer</saml:Issuer><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><Reference URI="#_nPmKm9IskDCo61hUea4DX7o3POLbLcUK"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><DigestValue>UYsy9NacnRqnSTbidM8WBBgS+Op0G05iBJTX0T1WlUk=</DigestValue></Reference></SignedInfo><SignatureValue>VzRQaMR5Qk1P+g1tqJRKroq4JJx00FZ0rZxO4vG2gGkBXJ8262B4VUHOkxyPHNH1l/DuxSnNsL8AAbZfn8EdxMdToPvm2hkqygyA5W20o6g6eSC41rDOavTzesOKoXn3Uq9DOiUXve5ieYYCt5bQcoSCVT6uhVEKMhdcLhaB507qj9Gzcfp0E4F57ezRTTnVVEF/wCJ5j0QTMA2Wh09fxNkGijlE8KHzDJZapN4tDCzmK8qY7211gKuTfKYJGXYA4hSxw9fiQGDEPKRYA6tWf0HO5Vd8edRg2ZHr7AgjuCPp5Fj8VOP+KppA1YFBbq4Eqqt6KHg91KJlGs3ivpmwPw==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIEDzCCAvegAwIBAgIJALr9HwgrQ7GeMA0GCSqGSIb3DQEBBQUAMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDAeFw0xMjEyMjkxNTMwNDdaFw0xMzAxMjgxNTMwNDdaMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZiVmNHiXLldrgbS50ONNOH7pJ2zg6OcSMkYZGDZJbOZ/TqwauC6JOnI7+xtkPJsQHZSFJs4U0srjZKzDCmaz2jLAJDShP2jaXlrki16nDLPE//IGAg3BJguSmBCWpDbSm92V9hSsE+Mhx6bDaJiw8yQ+Q8iSm0aTQZtp6O4ICMu00ESdh9NJqIECELvP31ADV1Xhj7IbyyVPDFxMv3ol5BySE9wwwOFUq/wv7Xz9LRiUjUzPO+Lq3OM3o/uCDbk7jD7XrGUuOydALD8ULsXp4EuDO+nFbeXB/iKndZynuVKokirywl2nD2IP0/yncdLQZ8ByIyqP3G82fq/l8p7AsCAwEAAaOBxzCBxDAdBgNVHQ4EFgQUHI2rUXeBjTv1zAllaPGrHFcEK0YwgZQGA1UdIwSBjDCBiYAUHI2rUXeBjTv1zAllaPGrHFcEK0ahZqRkMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZIIJALr9HwgrQ7GeMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFrXIhCy4T4eGrikb0R2wHv/uS548r3pZyBV0CDbcRwAtbnpJMvkGFqKVp4pmyoIDSVNK/j+sLEshB20XftezHZyRJbCUbtKvXQ6FsxoeZMlN0ITYKTaoBZKhUxxj90otAhNC58qwGUPqt2LewJhHyLucKkGJ1mQ3b5xKZ532ToufouH9VLhig3H1KnxWo/zMD6Ke8cCk6qO9htuhI06s3GQGS1QWQtAmm17C6TfKgDwQFZwhqHUUZnwKRH8gU6OgZsvhgV1B7H5mjZcu57KMiDBekU9MEY0DCVTN3WkmcTII668zLsJrkNX6PEfck1AMBbVE6pEUKcWwq3uaLvlAUo=</X509Certificate></X509Data></KeyInfo></Signature><saml:Subject><saml:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified" SPNameQualifier="other-qualifier">foo</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2016-08-02T22:09:48.654Z"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2016-08-02T21:59:48.654Z" NotOnOrAfter="2016-08-02T22:09:48.654Z"><saml:AudienceRestriction><saml:Audience>urn:myapp</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"><saml:AttributeValue xsi:type="xs:anyType">foo@bar.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><saml:AttributeValue xsi:type="xs:anyType">Foo Bar</saml:AttributeValue></saml:Attribute></saml:AttributeStatement><saml:AuthnStatement AuthnInstant="2016-08-02T21:59:48.654Z"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement></saml:Assertion>';
+
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+            checkExpiration: false,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                if (err) return done(err);
+
+                assert.ok(profile);
+                assert.equal(
+                    "foo",
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
+                        ]
+                );
+                assert.equal(
+                    "Foo Bar",
+                    profile["http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"]
+                );
+                assert.equal(
+                    "foo@bar.com",
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+                        ]
+                );
+                assert.equal("foo@bar.com", profile["email"]);
+                assert.equal("urn:issuer", profile["issuer"]);
+                done();
+            }
         );
-        assert.equal("foo@bar.com", profile["email"]);
-        assert.equal("urn:issuer", profile["issuer"]);
-        done();
-      }
-    );
-  });
-
-  it('should validate the NameQualifier when nameid format is "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent"', function (done) {
-    const signedAssertion =
-      '<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="_dZZwXmRpwYcaIdFA5l0qSCCuu0if9UNo" IssueInstant="2016-09-29T12:34:13.488Z"><saml:Issuer>urn:issuer</saml:Issuer><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><Reference URI="#_dZZwXmRpwYcaIdFA5l0qSCCuu0if9UNo"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><DigestValue>ndqj65JwACeDERG2aZF6k0IF85KshkhgILzxhbKRyiw=</DigestValue></Reference></SignedInfo><SignatureValue>LPcIU9W9HmX1QM+baMPLTj9StBFRksnDoFn/HVd8uLJgdH8Xeiv9TOQGElmSaBLypjCeN6ILq6pcZ0mxMC9zfd9X3WKmYtcrGI1BugATeNsqUm63x+Msau8pNuZrNNbfIQvLooMhF4T92ym2ADSm+zCQVNwBH7/v0rVIE6MEy8AYqqfpvH9CR88XQYMCSgKN0JQ2FPbcHvhIX7Hl+xG6PSzgfznE8dcWBUi24FajyGpqlNm8O3uHCfjR3wzO42UQIJFOJOiLb7QGNyWE1KXKYWyzZgAxGQuRUcbYxcnKTbVK3b3TBH+p2ZR+a2ktKmvqNBvQxy6tE4UXDIIpvmknSw==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIEDzCCAvegAwIBAgIJALr9HwgrQ7GeMA0GCSqGSIb3DQEBBQUAMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDAeFw0xMjEyMjkxNTMwNDdaFw0xMzAxMjgxNTMwNDdaMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZiVmNHiXLldrgbS50ONNOH7pJ2zg6OcSMkYZGDZJbOZ/TqwauC6JOnI7+xtkPJsQHZSFJs4U0srjZKzDCmaz2jLAJDShP2jaXlrki16nDLPE//IGAg3BJguSmBCWpDbSm92V9hSsE+Mhx6bDaJiw8yQ+Q8iSm0aTQZtp6O4ICMu00ESdh9NJqIECELvP31ADV1Xhj7IbyyVPDFxMv3ol5BySE9wwwOFUq/wv7Xz9LRiUjUzPO+Lq3OM3o/uCDbk7jD7XrGUuOydALD8ULsXp4EuDO+nFbeXB/iKndZynuVKokirywl2nD2IP0/yncdLQZ8ByIyqP3G82fq/l8p7AsCAwEAAaOBxzCBxDAdBgNVHQ4EFgQUHI2rUXeBjTv1zAllaPGrHFcEK0YwgZQGA1UdIwSBjDCBiYAUHI2rUXeBjTv1zAllaPGrHFcEK0ahZqRkMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZIIJALr9HwgrQ7GeMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFrXIhCy4T4eGrikb0R2wHv/uS548r3pZyBV0CDbcRwAtbnpJMvkGFqKVp4pmyoIDSVNK/j+sLEshB20XftezHZyRJbCUbtKvXQ6FsxoeZMlN0ITYKTaoBZKhUxxj90otAhNC58qwGUPqt2LewJhHyLucKkGJ1mQ3b5xKZ532ToufouH9VLhig3H1KnxWo/zMD6Ke8cCk6qO9htuhI06s3GQGS1QWQtAmm17C6TfKgDwQFZwhqHUUZnwKRH8gU6OgZsvhgV1B7H5mjZcu57KMiDBekU9MEY0DCVTN3WkmcTII668zLsJrkNX6PEfck1AMBbVE6pEUKcWwq3uaLvlAUo=</X509Certificate></X509Data></KeyInfo></Signature><saml:Subject><saml:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" NameQualifier="invalid-value">foo</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2016-09-29T12:44:13.488Z"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2016-09-29T12:34:13.488Z" NotOnOrAfter="2016-09-29T12:44:13.488Z"><saml:AudienceRestriction><saml:Audience>urn:myapp</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"><saml:AttributeValue xsi:type="xs:anyType">foo@bar.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><saml:AttributeValue xsi:type="xs:anyType">Foo Bar</saml:AttributeValue></saml:Attribute></saml:AttributeStatement><saml:AuthnStatement AuthnInstant="2016-09-29T12:34:13.488Z"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement></saml:Assertion>';
-
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-      checkExpiration: false,
     });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        assert.equal(
-          err.message,
-          "NameQualifier attribute in the NameID element does not match urn:issuer"
+
+    it('should validate the NameQualifier when nameid format is "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent"', function (done) {
+        const signedAssertion =
+            '<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="_dZZwXmRpwYcaIdFA5l0qSCCuu0if9UNo" IssueInstant="2016-09-29T12:34:13.488Z"><saml:Issuer>urn:issuer</saml:Issuer><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><Reference URI="#_dZZwXmRpwYcaIdFA5l0qSCCuu0if9UNo"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><DigestValue>ndqj65JwACeDERG2aZF6k0IF85KshkhgILzxhbKRyiw=</DigestValue></Reference></SignedInfo><SignatureValue>LPcIU9W9HmX1QM+baMPLTj9StBFRksnDoFn/HVd8uLJgdH8Xeiv9TOQGElmSaBLypjCeN6ILq6pcZ0mxMC9zfd9X3WKmYtcrGI1BugATeNsqUm63x+Msau8pNuZrNNbfIQvLooMhF4T92ym2ADSm+zCQVNwBH7/v0rVIE6MEy8AYqqfpvH9CR88XQYMCSgKN0JQ2FPbcHvhIX7Hl+xG6PSzgfznE8dcWBUi24FajyGpqlNm8O3uHCfjR3wzO42UQIJFOJOiLb7QGNyWE1KXKYWyzZgAxGQuRUcbYxcnKTbVK3b3TBH+p2ZR+a2ktKmvqNBvQxy6tE4UXDIIpvmknSw==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIEDzCCAvegAwIBAgIJALr9HwgrQ7GeMA0GCSqGSIb3DQEBBQUAMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDAeFw0xMjEyMjkxNTMwNDdaFw0xMzAxMjgxNTMwNDdaMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZiVmNHiXLldrgbS50ONNOH7pJ2zg6OcSMkYZGDZJbOZ/TqwauC6JOnI7+xtkPJsQHZSFJs4U0srjZKzDCmaz2jLAJDShP2jaXlrki16nDLPE//IGAg3BJguSmBCWpDbSm92V9hSsE+Mhx6bDaJiw8yQ+Q8iSm0aTQZtp6O4ICMu00ESdh9NJqIECELvP31ADV1Xhj7IbyyVPDFxMv3ol5BySE9wwwOFUq/wv7Xz9LRiUjUzPO+Lq3OM3o/uCDbk7jD7XrGUuOydALD8ULsXp4EuDO+nFbeXB/iKndZynuVKokirywl2nD2IP0/yncdLQZ8ByIyqP3G82fq/l8p7AsCAwEAAaOBxzCBxDAdBgNVHQ4EFgQUHI2rUXeBjTv1zAllaPGrHFcEK0YwgZQGA1UdIwSBjDCBiYAUHI2rUXeBjTv1zAllaPGrHFcEK0ahZqRkMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZIIJALr9HwgrQ7GeMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFrXIhCy4T4eGrikb0R2wHv/uS548r3pZyBV0CDbcRwAtbnpJMvkGFqKVp4pmyoIDSVNK/j+sLEshB20XftezHZyRJbCUbtKvXQ6FsxoeZMlN0ITYKTaoBZKhUxxj90otAhNC58qwGUPqt2LewJhHyLucKkGJ1mQ3b5xKZ532ToufouH9VLhig3H1KnxWo/zMD6Ke8cCk6qO9htuhI06s3GQGS1QWQtAmm17C6TfKgDwQFZwhqHUUZnwKRH8gU6OgZsvhgV1B7H5mjZcu57KMiDBekU9MEY0DCVTN3WkmcTII668zLsJrkNX6PEfck1AMBbVE6pEUKcWwq3uaLvlAUo=</X509Certificate></X509Data></KeyInfo></Signature><saml:Subject><saml:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" NameQualifier="invalid-value">foo</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2016-09-29T12:44:13.488Z"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2016-09-29T12:34:13.488Z" NotOnOrAfter="2016-09-29T12:44:13.488Z"><saml:AudienceRestriction><saml:Audience>urn:myapp</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"><saml:AttributeValue xsi:type="xs:anyType">foo@bar.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><saml:AttributeValue xsi:type="xs:anyType">Foo Bar</saml:AttributeValue></saml:Attribute></saml:AttributeStatement><saml:AuthnStatement AuthnInstant="2016-09-29T12:34:13.488Z"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement></saml:Assertion>';
+
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+            checkExpiration: false,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                assert.equal(
+                    err.message,
+                    "NameQualifier attribute in the NameID element does not match urn:issuer"
+                );
+                done();
+            }
         );
-        done();
-      }
-    );
-  });
-
-  it('should validate the SPNameQualifier when the nameid format is "urn:oasis:names:tc:SAML:2.0:nameid-format:transient"', function (done) {
-    const signedAssertion =
-      '<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="_muhd3ZBmN9LK3Ev08rkc8CA40YvNOkGl" IssueInstant="2016-09-29T12:35:22.345Z"><saml:Issuer>urn:issuer</saml:Issuer><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><Reference URI="#_muhd3ZBmN9LK3Ev08rkc8CA40YvNOkGl"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><DigestValue>Gsh2DubHXYDeuHyBa+DU1k5G43UjyQsyPRYVgEqpTD8=</DigestValue></Reference></SignedInfo><SignatureValue>mubsqLCaM16gT2rAFLl8XDuLWTALH6cdRMM/kNHLpVzO5PA6FGVPX5ojW2UCKGOhGHn0Hd/mYCOCtgAROphWjxpQl5TDyeQE0frjKs8ik0V/Jjy5T6PeWKHLqN6sHbP6YpkGixshCWtop8JOs6SijM9PBGnWal6Nx5bUMBfAyUnGyIhLwNaE8Z4NHkyAqmdxgLS0e8w5qngKQaUlyERZCrqKQ4w8VaHFG4Dos36XVfh+U7udo3IlbrpBLsu9xG1Azxe2iPC6+84xC09P6EvQylvTnz5NU4jhk10SmmRjZ6AVvzJTz/gbVfRfZoEAUhCuIIh3HuRwf400ESf38ouZTA==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIEDzCCAvegAwIBAgIJALr9HwgrQ7GeMA0GCSqGSIb3DQEBBQUAMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDAeFw0xMjEyMjkxNTMwNDdaFw0xMzAxMjgxNTMwNDdaMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZiVmNHiXLldrgbS50ONNOH7pJ2zg6OcSMkYZGDZJbOZ/TqwauC6JOnI7+xtkPJsQHZSFJs4U0srjZKzDCmaz2jLAJDShP2jaXlrki16nDLPE//IGAg3BJguSmBCWpDbSm92V9hSsE+Mhx6bDaJiw8yQ+Q8iSm0aTQZtp6O4ICMu00ESdh9NJqIECELvP31ADV1Xhj7IbyyVPDFxMv3ol5BySE9wwwOFUq/wv7Xz9LRiUjUzPO+Lq3OM3o/uCDbk7jD7XrGUuOydALD8ULsXp4EuDO+nFbeXB/iKndZynuVKokirywl2nD2IP0/yncdLQZ8ByIyqP3G82fq/l8p7AsCAwEAAaOBxzCBxDAdBgNVHQ4EFgQUHI2rUXeBjTv1zAllaPGrHFcEK0YwgZQGA1UdIwSBjDCBiYAUHI2rUXeBjTv1zAllaPGrHFcEK0ahZqRkMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZIIJALr9HwgrQ7GeMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFrXIhCy4T4eGrikb0R2wHv/uS548r3pZyBV0CDbcRwAtbnpJMvkGFqKVp4pmyoIDSVNK/j+sLEshB20XftezHZyRJbCUbtKvXQ6FsxoeZMlN0ITYKTaoBZKhUxxj90otAhNC58qwGUPqt2LewJhHyLucKkGJ1mQ3b5xKZ532ToufouH9VLhig3H1KnxWo/zMD6Ke8cCk6qO9htuhI06s3GQGS1QWQtAmm17C6TfKgDwQFZwhqHUUZnwKRH8gU6OgZsvhgV1B7H5mjZcu57KMiDBekU9MEY0DCVTN3WkmcTII668zLsJrkNX6PEfck1AMBbVE6pEUKcWwq3uaLvlAUo=</X509Certificate></X509Data></KeyInfo></Signature><saml:Subject><saml:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" SPNameQualifier="invalid-value">foo</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2016-09-29T12:45:22.345Z"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2016-09-29T12:35:22.345Z" NotOnOrAfter="2016-09-29T12:45:22.345Z"><saml:AudienceRestriction><saml:Audience>urn:myapp</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"><saml:AttributeValue xsi:type="xs:anyType">foo@bar.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><saml:AttributeValue xsi:type="xs:anyType">Foo Bar</saml:AttributeValue></saml:Attribute></saml:AttributeStatement><saml:AuthnStatement AuthnInstant="2016-09-29T12:35:22.345Z"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement></saml:Assertion>';
-
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-      checkExpiration: false,
     });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        assert.equal(
-          err.message,
-          "SPNameQualifier attribute in the NameID element does not match urn:myapp"
-        );
-        done();
-      }
-    );
-  });
-
-  it("should parse attributes with multiple values", function (done) {
-    options.attributes = {
-      "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/groups": [
-        "Admins",
-        "Contributors",
-      ],
-    };
 
-    const signedAssertion = saml20.create(options);
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-    });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        if (err) return done(err);
-
-        expect(profile).to.exist;
-        expect(
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/groups"
-          ]
-        ).to.be.an("array");
-        expect(
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/groups"
-          ]
-        ).to.include("Admins");
-        expect(
-          profile[
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/groups"
-          ]
-        ).to.include("Contributors");
-        done();
-      }
-    );
-  });
-
-  it("should validate expiration with default clockSkew", function (done) {
-    options.lifetimeInSeconds = -240;
-
-    const signedAssertion = saml20.create(options);
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-    });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        expect(err).to.exist;
-        expect(err.message).to.equal("assertion has expired.");
-        expect(profile).to.not.exist;
-        done();
-      }
-    );
-  });
-
-  it("should validate expiration with overriden clockSkew", function (done) {
-    options.lifetimeInSeconds = -240;
-
-    const signedAssertion = saml20.create(options);
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-      clockSkew: 5,
-    });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        expect(err).to.not.exist;
-        expect(profile).to.exist;
-        done();
-      }
-    );
-  });
-
-  it("should should allow expired cert if option not passed", function (done) {
-    options.lifetimeInSeconds = 10000;
-
-    const signedAssertion = saml20.create(options);
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    // The embedded cert is expired, so we can use this as is.
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
+    it('should validate the SPNameQualifier when the nameid format is "urn:oasis:names:tc:SAML:2.0:nameid-format:transient"', function (done) {
+        const signedAssertion =
+            '<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="_muhd3ZBmN9LK3Ev08rkc8CA40YvNOkGl" IssueInstant="2016-09-29T12:35:22.345Z"><saml:Issuer>urn:issuer</saml:Issuer><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><Reference URI="#_muhd3ZBmN9LK3Ev08rkc8CA40YvNOkGl"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><DigestValue>Gsh2DubHXYDeuHyBa+DU1k5G43UjyQsyPRYVgEqpTD8=</DigestValue></Reference></SignedInfo><SignatureValue>mubsqLCaM16gT2rAFLl8XDuLWTALH6cdRMM/kNHLpVzO5PA6FGVPX5ojW2UCKGOhGHn0Hd/mYCOCtgAROphWjxpQl5TDyeQE0frjKs8ik0V/Jjy5T6PeWKHLqN6sHbP6YpkGixshCWtop8JOs6SijM9PBGnWal6Nx5bUMBfAyUnGyIhLwNaE8Z4NHkyAqmdxgLS0e8w5qngKQaUlyERZCrqKQ4w8VaHFG4Dos36XVfh+U7udo3IlbrpBLsu9xG1Azxe2iPC6+84xC09P6EvQylvTnz5NU4jhk10SmmRjZ6AVvzJTz/gbVfRfZoEAUhCuIIh3HuRwf400ESf38ouZTA==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIEDzCCAvegAwIBAgIJALr9HwgrQ7GeMA0GCSqGSIb3DQEBBQUAMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDAeFw0xMjEyMjkxNTMwNDdaFw0xMzAxMjgxNTMwNDdaMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZiVmNHiXLldrgbS50ONNOH7pJ2zg6OcSMkYZGDZJbOZ/TqwauC6JOnI7+xtkPJsQHZSFJs4U0srjZKzDCmaz2jLAJDShP2jaXlrki16nDLPE//IGAg3BJguSmBCWpDbSm92V9hSsE+Mhx6bDaJiw8yQ+Q8iSm0aTQZtp6O4ICMu00ESdh9NJqIECELvP31ADV1Xhj7IbyyVPDFxMv3ol5BySE9wwwOFUq/wv7Xz9LRiUjUzPO+Lq3OM3o/uCDbk7jD7XrGUuOydALD8ULsXp4EuDO+nFbeXB/iKndZynuVKokirywl2nD2IP0/yncdLQZ8ByIyqP3G82fq/l8p7AsCAwEAAaOBxzCBxDAdBgNVHQ4EFgQUHI2rUXeBjTv1zAllaPGrHFcEK0YwgZQGA1UdIwSBjDCBiYAUHI2rUXeBjTv1zAllaPGrHFcEK0ahZqRkMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZIIJALr9HwgrQ7GeMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFrXIhCy4T4eGrikb0R2wHv/uS548r3pZyBV0CDbcRwAtbnpJMvkGFqKVp4pmyoIDSVNK/j+sLEshB20XftezHZyRJbCUbtKvXQ6FsxoeZMlN0ITYKTaoBZKhUxxj90otAhNC58qwGUPqt2LewJhHyLucKkGJ1mQ3b5xKZ532ToufouH9VLhig3H1KnxWo/zMD6Ke8cCk6qO9htuhI06s3GQGS1QWQtAmm17C6TfKgDwQFZwhqHUUZnwKRH8gU6OgZsvhgV1B7H5mjZcu57KMiDBekU9MEY0DCVTN3WkmcTII668zLsJrkNX6PEfck1AMBbVE6pEUKcWwq3uaLvlAUo=</X509Certificate></X509Data></KeyInfo></Signature><saml:Subject><saml:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" SPNameQualifier="invalid-value">foo</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2016-09-29T12:45:22.345Z"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2016-09-29T12:35:22.345Z" NotOnOrAfter="2016-09-29T12:45:22.345Z"><saml:AudienceRestriction><saml:Audience>urn:myapp</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"><saml:AttributeValue xsi:type="xs:anyType">foo@bar.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><saml:AttributeValue xsi:type="xs:anyType">Foo Bar</saml:AttributeValue></saml:Attribute></saml:AttributeStatement><saml:AuthnStatement AuthnInstant="2016-09-29T12:35:22.345Z"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement></saml:Assertion>';
+
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+            checkExpiration: false,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                assert.equal(
+                    err.message,
+                    "SPNameQualifier attribute in the NameID element does not match urn:myapp"
+                );
+                done();
+            }
+        );
     });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        expect(err).to.not.exist;
-        expect(profile).to.exist;
-        done();
-      }
-    );
-  });
-
-  it("should validate certificate expiration with embedded cert", function (done) {
-    const signedAssertion = saml20.create(options);
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    // The embedded cert is expired, so we can use this as is.
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-      checkCertExpiration: true,
+
+    it("should parse attributes with multiple values", function (done) {
+        options.attributes = {
+            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/groups": [
+                "Admins",
+                "Contributors",
+            ],
+        };
+
+        const signedAssertion = saml20.create(options);
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                if (err) return done(err);
+
+                expect(profile).to.exist;
+                expect(
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/groups"
+                        ]
+                ).to.be.an("array");
+                expect(
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/groups"
+                        ]
+                ).to.include("Admins");
+                expect(
+                    profile[
+                        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/groups"
+                        ]
+                ).to.include("Contributors");
+                done();
+            }
+        );
     });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        expect(err).to.exist;
-        expect(err.message).to.equal(
-          "The signing certificate is not currently valid."
+
+    it("should validate expiration with default clockSkew", function (done) {
+        options.lifetimeInSeconds = -240;
+
+        const signedAssertion = saml20.create(options);
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                expect(err).to.exist;
+                expect(err.message).to.equal("assertion has expired.");
+                expect(profile).to.not.exist;
+                done();
+            }
         );
-        expect(profile).to.be.undefined;
-        done();
-      }
-    );
-  });
-
-  it("should validate certificate expiration with non-embedded cert", function (done) {
-    const signedAssertion = saml20.create(options);
-
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    // The test cert is expired, so we can use this as is.
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
-      checkCertExpiration: true,
     });
-    const parsedAssertion = utils.parseSamlAssertion(signedAssertion);
-    assert.equal(
-      parsedAssertion.getElementsByTagName("X509Certificate").length,
-      1
-    ); // Make sure we start with exactly one embedded cert
-    const embeddedCert =
-      parsedAssertion.getElementsByTagName("X509Certificate")[0];
-    embeddedCert.parentNode.removeChild(embeddedCert);
-    assert.equal(
-      parsedAssertion.getElementsByTagName("X509Certificate").length,
-      0
-    ); // Make sure we removed the cert(s)
-
-    samlPassport.validateSamlAssertion(
-      parsedAssertion,
-      function (err, profile) {
-        expect(err).to.exist;
-        expect(err.message).to.equal(
-          "The signing certificate is not currently valid."
+
+    it("should validate expiration with overriden clockSkew", function (done) {
+        options.lifetimeInSeconds = -240;
+
+        const signedAssertion = saml20.create(options);
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+            clockSkew: 5,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                expect(err).to.not.exist;
+                expect(profile).to.exist;
+                done();
+            }
         );
-        expect(profile).to.not.exist;
-        done();
-      }
-    );
-  });
-
-  it("should validate recipent", function (done) {
-    options.lifetimeInSeconds = 600;
-    options.recipient = "foo";
-    const signedAssertion = saml20.create(options);
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      recipientUrl: "bar",
     });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        expect(err).to.exist;
-        expect(err.message).to.equal("Recipient is invalid. Configured: bar");
-        expect(profile).to.not.exist;
-        done();
-      }
-    );
-  });
-
-  it("should extract authentication context from assertion as a user prop", function (done) {
-    const options = {
-      cert: fs.readFileSync(__dirname + "/test-auth0.pem"),
-      key: fs.readFileSync(__dirname + "/test-auth0.key"),
-      issuer: "urn:issuer",
-      lifetimeInSeconds: 600,
-      audiences: "urn:myapp",
-      attributes: {
-        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress":
-          "сообщить@bar.com",
-        "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name":
-          "сообщить вКонтакте",
-      },
-      nameIdentifier: "вКонтакте",
-      nameIdentifierFormat:
-        "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
-    };
 
-    const signedAssertion = saml20.create(options);
+    it("should should allow expired cert if option not passed", function (done) {
+        options.lifetimeInSeconds = 10000;
+
+        const signedAssertion = saml20.create(options);
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        // The embedded cert is expired, so we can use this as is.
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                expect(err).to.not.exist;
+                expect(profile).to.exist;
+                done();
+            }
+        );
+    });
 
-    const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
-    const samlPassport = new SamlPassport({
-      cert: publicKey,
-      realm: "urn:myapp",
-      checkRecipient: false,
+    it("should validate certificate expiration with embedded cert", function (done) {
+        const signedAssertion = saml20.create(options);
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        // The embedded cert is expired, so we can use this as is.
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+            checkCertExpiration: true,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                expect(err).to.exist;
+                expect(err.message).to.equal(
+                    "The signing certificate is not currently valid."
+                );
+                expect(profile).to.be.undefined;
+                done();
+            }
+        );
     });
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (error, profile) {
-        if (error) return done(error);
 
-        assert.ok(profile);
+    it("should validate certificate expiration with non-embedded cert", function (done) {
+        const signedAssertion = saml20.create(options);
+
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        // The test cert is expired, so we can use this as is.
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+            checkCertExpiration: true,
+        });
+        const parsedAssertion = utils.parseSamlAssertion(signedAssertion);
+        assert.equal(
+            parsedAssertion.getElementsByTagName("X509Certificate").length,
+            1
+        ); // Make sure we start with exactly one embedded cert
+        const embeddedCert =
+            parsedAssertion.getElementsByTagName("X509Certificate")[0];
+        embeddedCert.parentNode.removeChild(embeddedCert);
         assert.equal(
-          "urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified",
-          profile[
-            "http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod"
-          ]
+            parsedAssertion.getElementsByTagName("X509Certificate").length,
+            0
+        ); // Make sure we removed the cert(s)
+
+        samlPassport.validateSamlAssertion(
+            parsedAssertion.toString(), {},
+            function (err, profile) {
+                expect(err).to.exist;
+                expect(err.message).to.equal(
+                    "The signing certificate is not currently valid."
+                );
+                expect(profile).to.not.exist;
+                done();
+            }
         );
+    });
 
-        done();
-      }
-    );
-  });
-
-  it("should fail when the X509Certificate is invalid", function (done) {
-    const signedAssertion = fs
-      .readFileSync(
-        __dirname + "/samples/plain/samlresponse_saml20_invalid_cert.txt"
-      )
-      .toString();
-    const options = {
-      checkDestination: false,
-      thumbprint: "119B9E027959CDB7C662CFD075D9E2EF384E445F",
-    };
-
-    const samlPassport = new SamlPassport(options);
-    samlPassport.validateSamlAssertion(
-      signedAssertion,
-      function (err, profile) {
-        expect(err).to.exist;
-        const errorMessages = [
-          "The signing certificate is invalid (PEM_read_bio_PUBKEY failed)",
-          "The signing certificate is invalid (error:0906700D:PEM routines:PEM_ASN1_read_bio:ASN1 lib, error:0D07803A:asn1 encoding routines:ASN1_ITEM_EX_D2I:nested asn1 error, error:0D068066:asn1 encoding routines:ASN1_CHECK_TLEN:bad object header)",
-          "The signing certificate is invalid (error:0D07803A:asn1 encoding routines:asn1_item_embed_d2i:nested asn1 error, error:0D068066:asn1 encoding routines:asn1_check_tlen:bad object header)",
-          "The signing certificate is invalid (error:0688010A:asn1 encoding routines::nested asn1 error, error:06800066:asn1 encoding routines::bad object header)",
-        ];
-
-        assert.ok(err, "The signing certificate was unexpectedly valid");
-        assert.ok(
-          errorMessages.includes(err.message),
-          "Error message for invalid certificate is incorrect"
+    it("should validate recipent", function (done) {
+        options.lifetimeInSeconds = 600;
+        options.recipient = "foo";
+        const signedAssertion = saml20.create(options);
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            recipientUrl: "bar",
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (err, profile) {
+                expect(err).to.exist;
+                expect(err.message).to.equal("Recipient is invalid. Configured: bar");
+                expect(profile).to.not.exist;
+                done();
+            }
         );
-        done();
-      }
-    );
-  });
-
-  describe("validate saml assertion (signature checks)", function () {
-    it("should fail when signature is not found", function (done) {
-      const assertion =
-        '<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="_muhd3ZBmN9LK3Ev08rkc8CA40YvNOkGl" IssueInstant="2016-09-29T12:35:22.345Z"><saml:Issuer>urn:issuer</saml:Issuer><saml:Subject><saml:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" SPNameQualifier="invalid-value">foo</saml:NameID><saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml:SubjectConfirmationData NotOnOrAfter="2016-09-29T12:45:22.345Z"/></saml:SubjectConfirmation></saml:Subject><saml:Conditions NotBefore="2016-09-29T12:35:22.345Z" NotOnOrAfter="2016-09-29T12:45:22.345Z"><saml:AudienceRestriction><saml:Audience>urn:myapp</saml:Audience></saml:AudienceRestriction></saml:Conditions><saml:AttributeStatement xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"><saml:AttributeValue xsi:type="xs:anyType">foo@bar.com</saml:AttributeValue></saml:Attribute><saml:Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"><saml:AttributeValue xsi:type="xs:anyType">Foo Bar</saml:AttributeValue></saml:Attribute></saml:AttributeStatement><saml:AuthnStatement AuthnInstant="2016-09-29T12:35:22.345Z"><saml:AuthnContext><saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml:AuthnContextClassRef></saml:AuthnContext></saml:AuthnStatement></saml:Assertion>';
-
-      const publicKey = fs
-        .readFileSync(__dirname + "/test-auth0.cer")
-        .toString();
-      const samlPassport = new SamlPassport({
-        cert: publicKey,
-        realm: "urn:myapp",
-        checkRecipient: false,
-      });
-      samlPassport.validateSamlAssertion(assertion, function (err, profile) {
-        assert.ok(err);
-        assert.ok(!profile);
-        assert.equal(
-          err.message,
-          "Signature is missing (xpath: /*[local-name(.)='Assertion']/*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#'])"
+    });
+
+    it("should extract authentication context from assertion as a user prop", function (done) {
+        const options = {
+            cert: fs.readFileSync(__dirname + "/test-auth0.pem"),
+            key: fs.readFileSync(__dirname + "/test-auth0.key"),
+            issuer: "urn:issuer",
+            lifetimeInSeconds: 600,
+            audiences: "urn:myapp",
+            attributes: {
+                "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress":
+                    "сообщить@bar.com",
+                "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name":
+                    "сообщить вКонтакте",
+            },
+            nameIdentifier: "вКонтакте",
+            nameIdentifierFormat:
+                "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
+        };
+
+        const signedAssertion = saml20.create(options);
+
+        const publicKey = fs.readFileSync(__dirname + "/test-auth0.cer").toString();
+        const samlPassport = new SamlPassport({
+            cert: publicKey,
+            realm: "urn:myapp",
+            checkRecipient: false,
+        });
+        samlPassport.validateSamlAssertion(
+            signedAssertion, {},
+            function (error, profile) {
+                if (error) return done(error);
+
+                assert.ok(profile);
+                assert.equal(
+                    "urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified",
+                    profile[
+                        "http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod"
+                        ]
+                );
+
+                done();
+            }
         );
-        done();
-      });
     });
 
-    it("should fail when signature is found twice", function (done) {
-      const assertion =
-        '<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Version="2.0" ID="_muhd3ZBmN9LK3Ev08rkc8CA40YvNOkGl" IssueInstant="2016-09-29T12:35:22.345Z"><saml:Issuer>urn:issuer</saml:Issuer><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><Reference URI="#_muhd3ZBmN9LK3Ev08rkc8CA40YvNOkGl"><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></Transforms><DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/><DigestValue>Gsh2DubHXYDeuHyBa+DU1k5G43UjyQsyPRYVgEqpTD8=</DigestValue></Reference></SignedInfo><SignatureValue>mubsqLCaM16gT2rAFLl8XDuLWTALH6cdRMM/kNHLpVzO5PA6FGVPX5ojW2UCKGOhGHn0Hd/mYCOCtgAROphWjxpQl5TDyeQE0frjKs8ik0V/Jjy5T6PeWKHLqN6sHbP6YpkGixshCWtop8JOs6SijM9PBGnWal6Nx5bUMBfAyUnGyIhLwNaE8Z4NHkyAqmdxgLS0e8w5qngKQaUlyERZCrqKQ4w8VaHFG4Dos36XVfh+U7udo3IlbrpBLsu9xG1Azxe2iPC6+84xC09P6EvQylvTnz5NU4jhk10SmmRjZ6AVvzJTz/gbVfRfZoEAUhCuIIh3HuRwf400ESf38ouZTA==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIEDzCCAvegAwIBAgIJALr9HwgrQ7GeMA0GCSqGSIb3DQEBBQUAMGIxGDAWBgNVBAMTD2F1dGgwLmF1dGgwLmNvbTESMBAGA1UEChMJQXV0aDAgTExDMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQM
... [truncated]

@@ -2,7 +2,7 @@ var expect  = require('chai').expect;
 var request = require('request');
 var qs      = require('querystring');
 var cheerio = require('cheerio');
-var xmldom  = require('@auth0/xmldom');
+var xmldom  = require('@xmldom/xmldom');
 var fs      = require('fs');
 var path    = require('path');
 var zlib    = require('zlib');
@@ -28,19 +28,19 @@ describe('samlp (functional tests)', function () {
 
     before(function (done) {
       // this samlp request comes from Salesforce
-      doSamlpFlow(`http://localhost:5051/samlp?SAMLRequest=${samlRequest}&RelayState=123`,
-                  'http://localhost:5051/callback', function(err, resp) {
-        if (err) return done(err);
-        if (resp.response.statusCode !== 200) return done(new Error(resp.body));
-        r = resp.response;
-        bod = resp.body;
-        done();
-      });
+      doSamlpFlow(`${server.BASE_URL}/samlp?SAMLRequest=${samlRequest}&RelayState=123`,
+          `${server.BASE_URL}/callback`, function(err, resp) {
+            if (err) return done(err);
+            if (resp.response.statusCode !== 200) return done(new Error(resp.body));
+            r = resp.response;
+            bod = resp.body;
+            done();
+          });
     });
 
     it('should be valid signature', function(){
       expect(r.statusCode)
-            .to.equal(200);
+          .to.equal(200);
     });
 
     it('should return a valid user', function(){
@@ -57,18 +57,18 @@ describe('samlp (functional tests)', function () {
 
     before(function (done) {
       server.options = { signResponse: true };
-      doSamlpFlow(`http://localhost:5051/samlp?SAMLRequest=${samlRequest}&RelayState=123`,
-            'http://localhost:5051/callback/samlp-invalidcert', function(err, resp) {
-        if (err) return done(err);
-        r = resp.response;
-        bod = resp.body;
-        done();
-      });
+      doSamlpFlow(`${server.BASE_URL}/samlp?SAMLRequest=${samlRequest}&RelayState=123`,
+          `${server.BASE_URL}/callback/samlp-invalidcert`, function(err, resp) {
+            if (err) return done(err);
+            r = resp.response;
+            bod = resp.body;
+            done();
+          });
     });
 
     it('should return 400 (invalid signature)', function(){
       expect(r.statusCode)
-            .to.equal(400);
+          .to.equal(400);
     });
   });
 
@@ -77,19 +77,19 @@ describe('samlp (functional tests)', function () {
 
     before(function (done) {
       server.options = { signResponse: true };
-      doSamlpFlow(`http://localhost:5051/samlp?SAMLRequest=${samlRequest}&RelayState=123`,
-            'http://localhost:5051/callback/samlp-signedresponse', function(err, resp) {
-        if (err) return done(err);
-        if (resp.response.statusCode !== 200) return done(new Error(resp.body));
-        r = resp.response;
-        bod = resp.body;
-        done();
-      });
+      doSamlpFlow(`${server.BASE_URL}/samlp?SAMLRequest=${samlRequest}&RelayState=123`,
+          `${server.BASE_URL}/callback/samlp-signedresponse`, function(err, resp) {
+            if (err) return done(err);
+            if (resp.response.statusCode !== 200) return done(new Error(resp.body));
+            r = resp.response;
+            bod = resp.body;
+            done();
+          });
     });
 
     it('should be valid signature', function(){
       expect(r.statusCode)
-            .to.equal(200);
+          .to.equal(200);
     });
 
     it('should return a valid user', function(){
@@ -107,18 +107,18 @@ describe('samlp (functional tests)', function () {
 
     before(function (done) {
       server.options = { signResponse: true };
-      doSamlpFlow(`http://localhost:5051/samlp?SAMLRequest=${samlRequest}&RelayState=123`,
-            'http://localhost:5051/callback/samlp-signedresponse-invalidcert', function(err, resp) {
-        if (err) return done(err);
-        r = resp.response;
-        bod = resp.body;
-        done();
-      });
+      doSamlpFlow(`${server.BASE_URL}/samlp?SAMLRequest=${samlRequest}&RelayState=123`,
+          `${server.BASE_URL}/callback/samlp-signedresponse-invalidcert`, function(err, resp) {
+            if (err) return done(err);
+            r = resp.response;
+            bod = resp.body;
+            done();
+          });
     });
 
     it('should return 400 (invalid signature)', function(){
       expect(r.statusCode)
-            .to.equal(400);
+          .to.equal(400);
     });
   });
 
@@ -128,7 +128,7 @@ describe('samlp (functional tests)', function () {
     before(function (done) {
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback'
+        uri: `${server.BASE_URL}/callback`
       }, function(err, response, body) {
         if(err) return done(err);
         r = response;
@@ -139,9 +139,9 @@ describe('samlp (functional tests)', function () {
 
     it('should redirect to idp', function(){
       expect(r.statusCode)
-            .to.equal(302);
+          .to.equal(302);
       expect(r.headers.location.split('?')[0])
-            .to.equal('http://localhost:5051/samlp');
+          .to.equal(`${server.BASE_URL}/samlp`);
       var querystring = qs.parse(r.headers.location.split('?')[1]);
       expect(querystring).to.have.property('SAMLRequest');
       expect(querystring).to.have.property('RelayState');
@@ -154,7 +154,7 @@ describe('samlp (functional tests)', function () {
     before(function (done) {
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback/samlp-with-invalid-xml',
+        uri: `${server.BASE_URL}/callback/samlp-with-invalid-xml`,
         form: { SAMLResponse: '<?xml version="1.0" encoding="UTF-8"?><saml2p:Response xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol" Destination="https://fmi-test.auth0.com/login/callback" ID="_7686598e3498b718c72726fe25ad57cc" InResponseTo="_37f0262dafe6baeafa8b" IssueInstant="2014-04-11T11:35:24.060Z" Version="2.0"><saml2:Issuer xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">https://aai-logon.ethz.ch/idp/shibboleth</saml2:Issuer><saml2p:Status><saml2p:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/><saml2p:Status><saml2:EncryptedAssertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" /><xenc:EncryptedData xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" Id="_c8f5cd2e00ce2390a2d27e34cf40eb6a" Type="http://www.w3.org/2001/04/xmlenc#Element"><xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"/><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><xenc:EncryptedKey Id="_0f7349851d2644965a47c6f569750951" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"><xenc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/></xenc:EncryptionMethod><ds:KeyInfo><ds:KeyInfo /><ds:KeyInfo /><ds:KeyInfo /><ds:X509Data><ds:X509Certificate>MIIDOzCCAiOgAwIBAgIJAPPoHrEpb7ouMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEmZtaS10
ZXN0LmF1dGgwLmNvbTAeFw0xMzA1MDYyMzAzMTdaFw0yNzAxMTMyMzAzMTdaMB0xGzAZBgNVBAMT
EmZtaS10ZXN0LmF1dGgwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKb9Giff
+KvQPwo9eoObSW7NNYZFrUoxRn74qMcdfZwkuwG3O8EGi8X+UsNtNgwQlMVfYt9lKB71iJSlKOBi
BPSFP7zP9jFtTnfJcaRvdvYPoIC4Y81tu6LkNN3e1/31Np+R6pd7F6LfHWquf+B+hyHJCXasdd6J
lGoeb94+empj9lm8wHNb3sr/88394KJ3FUBexPzQ5rpKLe7d5fm4EKO/iyEpWHUlf7df9yGD6m71
Pxo+8r8Dqq7A5EhGX/zk6SuwZ4j/szizyn/cXullGg3PAsc9XXLT455A1KEBx5eTGrMc7JQ3uDUq
qfDf4vjwlNBcIjxg2X3dM0sJVk/5r00CAwEAAaN+MHwwHQYDVR0OBBYEFBs5lpfveyOSopmNVeeh
XP+PGtk3ME0GA1UdIwRGMESAFBs5lpfveyOSopmNVeehXP+PGtk3oSGkHzAdMRswGQYDVQQDExJm
bWktdGVzdC5hdXRoMC5jb22CCQDz6B6xKW+6LjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
A4IBAQA2Zk3SmSGTOh/6razem/Fi8GzEopcKdIE1ueChTsAzh6/mim5q5lH0PW1b85sQ3/c31SYU
SxVZB84K2MP6+hwC0WZxkq8y0iMEEAxWyC3Z3i9pSlGdw7sv/NWJv4YPjo2sSNHuZ80O11a3cXou
YxLO8DBRMq9VTs7Rb7qKFBWl5Ix+cZxVglrxIv6W08OrrmqPeoDjuiJiBj28csjhehYElKYcnU4L
RdIjBlZFn1AoTJRBFAyjL8BvSMIMRkzEro/Gp3Izj603RBTGOkvnialKHcwLnVFFE0xeZZUq7Kw0
LvO0X8uS3DX7dTc2oqzXOTx42/Oj5q9xUuaiuX0MRZT0</ds:X509Certificate></ds:X509Data></ds:KeyInfo><xenc:CipherData xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"><xenc:CipherValue>Pm7gUD29wP017KRvJNgfW51FD4xyTLbyD7WlIMEVTGlsZw9+vMmGs/edurhOfUdEvHfAWN/uF3bLB99uCZE7GG/2th5AKjKz1Z7SoefnQNxvqomu25CfY10S1in+M1Mw7vkq6eKG8nwDB0Csrl9rzeC2zCPDW5Lo57Lv43MmEi3WXfEanD0d2YOcQTZihr3RZgj9tH2TBeJf8M7o2cPk9qAZN4iNzvMhXNNWDCGnzHlHusqVOQ5c8wiy2l3uiTfY7hB/MXiP5fzdOb+Dml86RkOc2QWwDu0CKudpoyTqAot9HEgRh/nmUuRBEJCsmXGr7qN3vRYnGMtftK0doUc3zA==</xenc:CipherValue></xenc:CipherData></xenc:EncryptedKey></ds:KeyInfo><xenc:CipherData xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"><xenc:CipherValue>1cRGtXiXVLataHqS1eK3rmN9PrrrgIZGnW3LOOnZzKnSl6uaJZtD5qrBDTDNsix6zMyprO9NJAYPbRDCmBmcZU+LJnZIWmOr+CoRubAPgHOd7CEhAPzDeIdXtKEwGoa4sJmrQ29BGuRz0XKycNRaSiIkKhFn4u6BG5tkgsKDQOt7vgtG8nWmis6j3IXIWkXjWOkJZ0GnKWj2jwq0/p+tJ59s5GySB/nW/gAmOr9KzXI2YPZnBNMqIIze6O40Zh4mizfRgSK38tNWCsBFPzCY+f2VeYl35NG+auHDeOADkdBDxwljE2BWD61pJhXnG0SEPHruuoY7bWcXjh45X/8b3XMpqxd1cDROfFLtTLoK2V5jrxbDdoqXvLTv6vy46FVFXESDWLfHaqN0NNSlchNErfpUwH4MQsU8e5QmrxL5AECVWfC+DbsNe5cdXYq/0U0dqbOWVeBGU/xt+2DZeaHPSeZpxhBowbgAJz4eNZPvxHYTFdwnqvazdgyj8UGGlD/f1hIqGXqckpMm2v8JeeGujEzH3g1sNpInXn4yPZMAKHKNiXHe1wii5WeyO/m0yBPfkxdk2YuKsO3/JX9Nqym5uzYB3nfY7RdGmiupCWkioNZ/XbtnAoWCHCrsmtjmdvnk3cAMP/vcRZinBoiJ81vpKu3mJnEtezpEjiC1cWgMLh/6Q+oLmvN/Wr5VVflcHRX1caLD+YDgry2m5BlpSF8U+/Jatz64wcEviyjTX0zSzVTmjJmdn8kqoHCtWtoT+VAKt0oBpdLtx9x53Q5STmkPnq9wgsqVEpFdaG+nj3TbfF9+QA0qBVMAVlifcroMXO6QfZEeL05jEeaRPfi+Ky+kU5E/0WnMaUQMYdMdPXy5mWzvnds3TNCs4c1hXsW6Iqhy4gB1OtAUv8HxKOYXkOFL1SxLK8O/4QE0TAFwHogHDcsULB/42Ggr1f6IUg2Lcc93/7rNRHNWmN+mbzpIuE/OIQLC9Enr3Q+JGTDRJj2lGAbw982ylS62KfDL9J1a3w7moFJ3vnm7SRfx+nBDL6c1AH2SKK5Jk+OuC9eRZYp07W3/SBrNXUTS8inzQhDKIl/9RtoPso+w+tgh+Hck/4DZButrkicpFz0Vfni+EFepDeRKOVpcRMrUExwoXVwJ+ARWLFpHt1IB8xNbSxU8YJsx9LulFyxTC5NaajSCxXXdDCEj19Sj60TXdg08sQcCXtlTKWKT7PAyupj9tVmuX66A0xd0ukw2hcm+5npxDKDmHJuaLIIsH0xX1rAQ4kujTx5hcFfq206H+bAPMqLF2N1CJydaBLwlhz4pkKOs8LEusLkrHeT+xExpDNy830YCs5IJgNF6GwEpWbjIFmSH2ZsJprrpxoxzxkngoCK6/JTdaEh3GbZEfhSeIndLagRKEr6yk3E1/l79qNlBo9iRwSDNTUwd2eG8CaeZrb2PdB0x96/vx/idQspB3BB9+o0QhXguZysJC2kHvfTJwYf4VT0h/MSBy5teVaMdQfqRjBVoilfgrqZV9OLvN9L7O51TajTMDrgexlHWuM5XLs6T+zMus7Z++7+6hcDPh8QzqcicW+zLjNLsw9xYKOB6RxOSGO/BzI1pLandGJrymulZPbqBrdD51qV5LpZ5AqE60x9Dg443IFJOyb1S3wT+2opATACT6PWz4nRl4vIsbu3TeTgFMvbPwJvetSWvf3prGQ49jTzLixeIIQNe29wXjfQ8MS+2RPji2yiAQBrYHMj6S0bXYhaEBFaF7Y154q1RNFNkNjf7kUB0SmYgiU8zo7B7K74pNmRmlHr+LpkEpurTE9/8/wXaEasJ+HoE25YSbqYF+q+45/SEpBPujBkfPvD0GJjT+gllb71VAOg196tcvDU8MGnICzHc4j2QieafAvc6L4Io0BQAxg46WM9HYRr8hYyDP71B0/yJnBWTyC5/XSlFk+AaPyzqtVi2NFxXwntew05GScSav47JHAQTVZFRlwi8FCmiJJeePUdkoaedLNOmhQqL7HfgM4D4f8OLhxqvx7bnPBDO2iArwXlqkw/KsyxvT/eWw5FL9n5+5CMlbbrBLJM3j6ZEq3tI9fnbMo6aGPDQodTEC0hF6dwIbm6TnmtYKp1YI4yQis1ATFb1m68GHmKKbusb0a87pJo4Xl9PuWKHTa1pVt0UMl4Ebc6mxiwrG+Hg3Et4WRNji2GAxV2f2zAZ7Vl5zFFM6vgqlYjCsVecKzC5zjzOf8h7tQ8Ju511biF9a7OtpXBXvjUgoqTEWnR3ZrF282CMWuoQrGn9p4TvzWNEMbZ7vpbbCkXKKwpXaYss/zppx6wrWY4M9GhTN9EXWM4WPeinfu1+TAGC+wHHUSwhvLONoDlhxjqOx1UpyVnnlSy5vBPHmdkax3Oz81hHcxGTKoosuSHQaOa/lQzV8Jol3dreDhn9AZC5n4lkxXWKT8HnACLKuTLN+1zPQV4Qj+H715Ih6Fs6A7lf4uYhcjVqcUufkLqor7t67NrNEzB25+6QSQJXLm3TSc6Q9BP3c5HV8fsTrD/N7EGIRBF/pS6WR366R5zZBbZ6WlSNzMSrypfyPT9988IxkKDVjb152Fw68896oQ/+rGqcpqbPynk/bJUm8VYMoo07SBxchTFw2nkQsUKOBv2GIOMVCGtaEfX8yaPepfxPaqJnmV2SCe7COoUd5ox6K8+/mnYFZMrz7tXCUHSS2l7rSpXM+WgMwVr0jXy9wXJLJ+sK3GWH6XT034vk2MJdwfqOsBppNAcy+MzGy49EVQT/+PoaeOn9337hpbn1gVcLwj/Xc3FYxDKdjF58cT/gttnvidajKTpcgCYxGQv+3QRHbuaDZtrEv4/za6zbDfGpKsnIjyUasmGxzbCT7f1LAMZbRpjIgb/RqTgVxDAtaPcRUOXLA77oYfo7chvI7yFRFnOe03TD8GDQKhb9UIs7RfEsXKLU9VpeZw6vxCYMd8Rq9Clnd8mcGAl48+94UyAVeGTzV31eBjn8B45GL3X91/bT/11hvMKNX21PmFyyTyc6M1xUcr37o6af4HAsUnXgZ8SUKQwJPMVC9+EnvDprR6/Y/5KYy0UgoR+GMHE3Z1ytQGYXFYFUZUmMV2Ugz2IniU4aXLX4YqB8LEX/F5D6u3qQBzHdIxOzSSvTbEszuXn8Wx5+L5mLTc5SRn6lPe4HQVuSIKc87bnTL1s4qZv1t+9ZMLKITGsRxn35aqYuPLt5N3Nw2PYRH8dqrfL/ZP9YnBYz6hAeYvPTniaaveV3SGMymUES9bUmltc9J46tw2CpbI1OCCD2wumnq9onFDjmhAKbpCdiSeIqr6YxcOPo1WNsU2dugVw/WXm9yEBxKJ5Prc4rav8OOa3sH4gG2boJxC+19nzvCnufM4bET7YV9IWfh2K8bZs+Qa6Ob0S9vgQl5ahFzJBPhMQou68J/3dBnRqIOPCT1Hqp3vjKeGpxld1D9wk6MaDDjIxi2oX47k6XDKzRJkPCZnrEL6RnThtRtw8bEBBnVou7GZVLekfFl50iGNWANbia1Fh8ZwG7JlFnxPfHNtv03T+OGf8hg05xaYVB4meDJx/+ZbAC0JaJXyJM2rfy5ncu1NOA5gDWQ7VJt2QrAxvrd9MUxxtgltmzMMsQYl7wAPr2NPEmMrMDyrBqTMcBVmX67Nl4hArN8YD2HOVenifI3paYIs2I87ybxISl2Q/l1rIwRpqYHUsDcjV0fS7yseUeGg+hD07YGTViY/OBGxK032gyKTpWU0qbmo+Y6/ZGUvpjnWBEbyBHdgLbkBT/oB5Q4k7K2/SAwz7oCe+IXoNbLXbAMHfHKozXSqS+1BCuME1JslXjRXY5YbgFk61O3RwKDULhLT5GfJUEQShShvKNghv39IAcZ6aiEZZwYPT+PnvsisXJjqb3iaiMr0+9hB/Gxk8syjdnUMf/qI8JQSI9QXHgKzQNicGRdWc5JWRFkyB138yuAz4t8xr5K1a5+APrz3RIzmJXLiJPrJHaryS/VMrPJhtxXZhaYlbRODZmiBcr/KTiZVM69ce+vSkamdqBjLEM8MXvWC4TcZhH53eyfnRMR22oxJTEeB6CabEgwb63mAyUobTJGZlYogcim6Wgs0ZqC6YaiTvw3n/10ZxGXNWFsLDhCkO/LljAhvIz4TIg7auP+2mtMsjkjoHT4C0nPqxFDFGjuQDrinTCeMYDkgU0aE6m33gDjvPFClcjLG8m7xDKJnl3L3lT+5yCII3occjhliLee7rsJIdxQZxGwh0tEKfI8mtf1o9NJye0G5RzW97b9y9OHDiYhMcmjQGTp9dNxkHvqOjjOPnGA/QXd70aeGW/OOnLR7AvDsKZ0lCkd3ztXzyUKgEpAdG+aRnClORhtoqerp7UqProNdFtuMY+g99rYOWKDqHJ4dPA+yQNAQLuA50K1NQ0x3lGeJZZi4+h+a7TQt1xQSj80VVN3GEIsR7XM6EtMkBKkht66hKZPz2iOofIYuaItBBbQdY7tWMoK0IT/kmmS++nLJbb9HvX7j0loUhjTWhpqu043ptUyPoZUDhEbrelW2euodsfn4xh7P5UIZGaMUNGgi5nqzkjz1ush13Sxn7H557YxiYWjvNeIZgzdbV+GJtDCs0hVm1g8il8v2q2k5b/9Qehu5UiLSUgp/aZzwXN/Ldj42UliXs8MdO8uQTTgg6CoGDmW/hbYeMAWsEzPePibDCfSKtsH3NSFYdTSHEv2XQM38I//biNTuUhR761OE9C/guQfwYgnDIgNnWCOQ7XEtjHvvH369FbHKg6ZpVisEiD2MjbzBlBlNnELQASwP9UA0MbYT6/LnKxXNrWL4pak9Z04GqANm2u5qpZyXfEg5FYwT85GmJfIoICiBJMIxq4mypu6xudOvxOyUBdQ6zt4t4x0ztMd7+9M7v3v3cMVNTXtXoMPFK/SJAdZHeqofHKAmpBbiev88V/NWiTyIUTOW7nLFujRaKO86fZpysMd++yCG+pBCg+0dV9wtnb8dvyywhD6J1LLhzT2tfaQNfXvwUL5wny3twfGz3saWP6bF+JjYwM4JYmb7DmCrI6L/s9ZRuMiFrTEkrj5BtOj2rJNlYpgSVgfvYkKX8fdUaug3EdsVKay8d74pPMuKx3kH77FVnKTucbLGRKP2SQnOTolMYLseAHN+jaRCi82eu4EW0qmcfb2M3bc5PswK7QEPIegam6Jnc0XNyEOScVSXfQFDSqF0McJEcyU2Bb0hX/M+Mk7wHAQR0qkkNANJay+lP/AYbYRuuKOY7WELaxu33GagzYyNlqbEGPPBpSSkSl+b1q2dtWXhfwrWWNvgyg1D8ySySjIQsZLE2KZZodngiZmKjPDcwzC0PopCRUt6dPY3q1Y2c2OAwPiccd7F+aiRJ7s5jOz/A8zy6ZKvYueo1H7hiWvtYIgf+C/LhQnCE1Gmk83suDOCrPILO07n8G+26hzq/CyF++FtsrooWQ1+ooSjsfAjWh6uADv7oCncw8Wfv2WVNipeGeMwRRiq1nUaF7pp+wN4glSsUg6vWmFtt4ADEyzw80LDLO4k3yzlADfszIxW4+3lOqJ7ihjIoJC3FPzv4V5q9UaeZ0v5kvnNXNfToy4xoytTNqES81Yb6b+tyGJjdTrj/VgyutE5oj27txaONlihc8Nl9Po6Yovk+pEQMo0D8JUW6/j/AJRuSOB52YL7PI+qEAzHcKXMx8wywlEGXGkjJ9AphY081Ark2VrP7PBDwlppCeAKcgTwu3m7IQ/Qbo1P1Xp2PzSXUnr67LbFaSOvcjSm4iACqcyuOh1UoJHDdQebzQ7kXGbCTzlEOgSQk9yG2Lcnf8eZTpoEvSmJQ4g2LJ/FJczPaxb9qFWi1tpkv9QkwN/M5RUgzBcc65veFPdMDKOUFe4RsmWxmlZ6eppBbqVNBlXhAPHY+5itcYTwxuKPbMECcp60sMqPA207h9iuYWorTL2cr241JPCCyoeTyL6z28fn+2AtyjLBT/2uzZRobz68w3CEJKSZZAYTDmzejZYwUni1Cpa3bDp3YpwzfAHxKRnkpnRTKh/RaXW/yDIYoE9xt+pPcoI2qtKXfi271Et9yC0LIoFYECgPDMFDjvtfeA9gKiimcbQ8RHgeww6sUKE/5/EIpiQKktP/hIKgkeGni1IrGnrX5NZFee7TtWpe+z3eHBDWI6XxLlzkv8g7PKYmJJqg66Ryy+U3JPdnOiJLhMdsJgv44e6nyjnU+UyEdi7uFMGhhWNRQR5h4cRQ10x1s25GrS8YX9NueY6Ng2P3aBxGa4zvLkv+K06s3wuIvwjbIldvjju39v/4y9V2Z7TgQZQUQS3AGy6afCozUsg7zEB+NflySFpP48xf6SCGXW+mvz5UZmiD1A+6AeFPfNKEwYVdPv9svhIZZRzqT8E4M4+ZUIqKm6djeDzuBgFhExv3Y76e47z8XBkZtHUzhzm6VOMmkObnjQezGVM0UvyFo5XYVPo8SBZ9MPjwSUnoBS0vOMYopRu0C3PPGcUIQngPgpavYTeLzSYvsSNyXL2Jq/EGxybTzF07MJzN8T3zIDTpOER4T8eF0Izs5KpDRtUzsRKB1p6nQrqfDWSpOUD0uqu5SzOLO/fBkoUyAiVjWm1Ab5lmJ6V1n3DrKk43UPLy2v2aLYfl1dtAqdHpjcgpiWKAZmT+A1O30TKBUPGygNSymn9db6fBEAjaLoTHoCKD+GTs58/M8ioxm3STwAw+QIR02WtXN2F3BiAevgZFGLQ4I7yUogTWw8vVqbcJYXFNrQv49tyTAr8QZxijb23ZvcMD3jmp0MmDhLfskmvOGxZGKyoDG97oI8qmfo1cB5q1U3JMMH1ntAbe9z1fEMSNyZBzuLWt2BOLMe7jCPGJXI8f+5+rYfTbDVTqzWP+yk7ZEIQyModr+hJQ6xD8No7Cny+1i2TtqMpLaybZ0P5CG9MCHzxs0lzzn2bEQrRe1VX9MBw4uf4QByFYgZaRcv77Mv+5jUyBt4jhUwwqujwy4c/uXw+PAOb0plgk4Ho2P7/Rmtna4nvAAj6G9vqPUKzjNxwFddElEoVDD5++t7NxaaUWg9cF8KDRYSC4zu1msWAuXdT8hGvCYf67xm75IPuJtmgqBZjXR87oCJoxwivyo8tttqmAZ8Zx+EBcXjWjK35J36oTVwSbNrqIb6KnjGlFXISwrPNEi+RkLotaSyOSvnKnulDc3GhhEXasBcwD0IO73idI4bigGaumolHQxAeLG+U9FrqF8tgQOWLzv4hwwJQG/ci4NFbfHIjDVs4ms9Y7sBWT6B5OZMO6rDMp9IldmErmUPa8z55eWj045aLDBKtCY9PzWhvWXxjy47JlBSfDMPMTXQxrtOPuJ4KJj5WNqNX7Yz1i2LNnpxnJnym9clU7FWS+OgTy3A9jXi1BUx4B0Gg8WYIx/5AwJsSDOT/2WCi3OcExmQToyVkCjyPNyecNrOFBdPzz0kSZB3IhU8unNOStc+Z67Nfqy+I/E9ZT73qCBaTI7U1HVqC9lJynRMsmFf1GolcQ8nCmvo+KOU5mVEs/loA8HgzVeeMGN7JLZ8XIqEdnzy4t26SQm9hmV6d4bKfcBi40oW4fQPWYDmiZZ+GS+L8nJyXw3AZDHZGJXHEr/9KOzDQt9U4YWia/M12+lSrZgyBikulgnpAbe4dDi1FLA6L1D3B0HRZ3EGGjdQnx5GXEexg4oBVT3KgQnjpyrk7F3GKP9HFvqKMFzUbh/dBWy9n4VsbWPYdH7lH1rUH4c7p7IkXg4VTD8Mu35wovNFA+ZEAbdwgz6u4z5vig8HpsbQZMUvEW/uTO7qU8QnzgZ54tGpivc+3npabxRQ6R03i0vXt6BoBIrAA2wq2ls15RMxexVVs7XOnND4epqh1BsGjQ8/uz6rkWQ5REzsBxDqmzYI05QxXfWnqC6YYhYzN7QPS8tHjXlll7Es+8Uc8sO+cFA7DC7cHQmVFiZW7SYbamNaGsaiceXLq8Cv/x2HgmhS6/yMjPUEVHh95YtwasndOJy4gAmIDZHtwdl9lWcVC09x1IAjKyQiiB4O//Cpojf1NRcbQawUPJ0b9errX3EUc7qNUscF2ZnmvUU8q3X6PUiojyL5F1AMubsq8n91fhnERl+ck2ABVborxHNFZRUx/VSX4tLg4NPmUrhejSh5rYRIzKt98oO50lNQ+i/QVFTnkzboRRI+KCS3Z5o2YgHe8lvdhCxv1gxcThQ3miwgHx7fGOKWS2sjlJLXjs1nokiZ0LFt521if3+1RaVeDzBSXXDQYT+plB5KC6/FNdJCYofdeScH0+IG7arydr9HT9NR1sGs6gsbXBsgZub5qJVf3J+/Cy+kaBc0rLKrgu3fiFPmn07aXgm+lQV0OVUdieh6noCJ1pw3OeMubtMOkrd2QdE4D7OVhV+auC9oZHsOnAxCbvhaz/M6X8AZ5wnpu/eWpt6vXpaXzWVIIqPDOCE2tBI7+6SfLwcUqeaNYIXmRTp6tT8hap7nezCfWjPfqSfLTichZDSWeGhXMvV54B82vybh3SA5vBd7pFy3Y9qbsBhvCltJZl3+N89sgm3IXIryNLOrf/uT1Rt44kT3exS97qBYZmxfWenOyLj8p1dbeJ7z2QqxMqetbkqNPpnrwn1ALWudINY8hKbrXKDCBhV2cPNH7UgSrvXTUvOU1FurCAFE8RkOoqlhmFxItQPu35gx1ajiQANC1BYSvY/g6r/iK0tezAhDcmin1UawBMj2FG+c8ewBc5Uo3zeCHtDXVylJV7QGFTfYGBNZiJQrdbqWFa+kMmv4IQf3J69n0DySpE2UcHyvQJCwts9T7sLShzYaMTUJQAf8xpr0W+5ZssG28IqqlI3dmAi3GPkdDnQ7sFb5pVIUETtTBod0Jw+E5Ph/cA/nOElzQatWRe1X+74Yto7YIbAEnz5mXHiokXgNEslGTYxsYJ9APV9+xZ5JNMUXYt8hkTpphPs7Aek1i9xl1nlnnEbv43xg3eLa4rH0As/0LOF+MrWfth0hZt1jrBoNrrcG8mVYRrwoXiqHKsRe4Ua48kF/EuQXVJyFOWNJ5Bcaoq9+0kyIvuhyXq5/T/KILmvpZS36H4rulRaFmGoolz0miIxWaktqiR1uV8XikbzFES4vpey4uJ1eAf52D+3/cKcEzWa6+56TdECEJAa1X9v6/7S1CfPqiY07YM1vWusGpHOCARLPCXfyWfWC+UI8O3QdHHQh/W5zsgtEZuaahdZOecelBkgKCHgZ851i7b/cnD7elDyBTbn4qJEhRYTKYCQeo6HJEwSyosa9RkSIiBIAheGi9REbXclLcRgGqh1zyB/IPqf1KW9qLo8siOpEITSpNzK75+m2W4/g8N2KLh/oS2xa2MvFSJSzgYfjpb9N+zUxNWGLcd5PGbzI7dan2ckJJa6RHKDmVMkjamYLxz3FJ+oRuAaO1ir33XebHezdq+B4JOapyXexk83XHlmdKmuQ85igjFfOTIG2aIsaWq7C/Jifgr+JjuThJnyMWrbCRE5vVFt0GIaioGSlbKH3TXRxZ+KWuz3gq+Yr3IckOTHEH0GADG/isiPIexlrG6dYin7Wm/PedDeswKyLYpTS1z3sTeSItEmzYHDMEDsKAl5XyjvNjRo7898uaEni1b+ijBsjyoMDcDEhw1g8lyjHfWkJ4pF+HXjn32AjOjoFn5R+qc5ejlMUqWCu9E4QbSekVng0Im68ogiayYUCA9YBIRwF9oyvDFyXdInXE8Qld4dbK6uJp3lslDdrSVs0YA7qFpPcC+YgEfpDkckiucGdH51Vhv+2bMXJZngM154Jm+qBx0hNwTt+P20fzfZnx8vLC9stqeLOVoe4Xeg8PKMStT5z/rDd+fMgMPv0wymerlC9j2x/KLbtSBkMkHdMvcYV4r8I6ABWKo4NtBhSbO0uG+x50n7d91aoTufhk3zej5utC4dIFFgE2FW2gorWsI0AOHnUrZvX+bbqbaYPS2ONWIopqmaUU+UvOS703d8YkcHari7EDA5uQJTnqOR5bJbxY7SHcXEf0VEzWiph+/AJ2f/K2TUHh66Y2zjvs8pwJeDJED4SO48FG0KNN97S3y4BLw==</xenc:CipherValue></xenc:CipherData></xenc:EncryptedData></saml2:EncryptedAssertion></saml2p:Response>' }
       }, function(err, response, body) {
         if(err) return done(err);
@@ -166,7 +166,35 @@ describe('samlp (functional tests)', function () {
 
     it('should return a 400', function(){
       expect(r.statusCode)
-            .to.equal(400);
+          .to.equal(400);
+    });
+
+    it('should be recognized as an invalid xml', function(){
+      var err = JSON.parse(bod);
+      expect(err.message)
+          .to.equal('SAMLResponse should be a valid xml');
+    });
+  });
+
+  describe('SAMLResponse with invalid CDATA', function() {
+    var r, bod;
+
+    before(function (done) {
+      request.post({
+        jar: request.jar(),
+        uri: `${server.BASE_URL}/callback/samlp-with-invalid-xml`,
+        form: { SAMLResponse: Buffer.from('<doc><![CDATA[</doc>').toString('base64') }
+      }, function(err, response, body) {
+        if(err) return done(err);
+        r = response;
+        bod = body;
+        done();
+      });
+    });
+
+    it('should return a 400', function(){
+      expect(r.statusCode)
+          .to.equal(400);
     });
 
     it('should be recognized as an invalid xml', function(){
@@ -182,7 +210,7 @@ describe('samlp (functional tests)', function () {
     before(function (done) {
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback/samlp-with-utf8',
+        uri: `${server.BASE_URL}/callback/samlp-with-utf8`,
         form: { SAMLResponse: fs.readFileSync(path.join(__dirname, './samples/encoded/samlresponse_utf8.txt')).toString() }
       }, function(err, response, body) {
         if(err) return done(err);
@@ -194,7 +222,7 @@ describe('samlp (functional tests)', function () {
 
     it('should be valid signature', function(){
       expect(r.statusCode)
-            .to.equal(200);
+          .to.equal(200);
     });
 
     it('should return a valid user', function(){
@@ -215,7 +243,7 @@ describe('samlp (functional tests)', function () {
 
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback/samlp-with-ISO',
+        uri: `${server.BASE_URL}/callback/samlp-with-ISO`,
         form: { SAMLResponse: samlEncoded }
       }, function(err, response, body) {
         if(err) return done(err);
@@ -227,7 +255,7 @@ describe('samlp (functional tests)', function () {
 
     it('should be valid signature', function(){
       expect(r.statusCode)
-            .to.equal(200);
+          .to.equal(200);
     });
 
     it('should return a valid user', function(){
@@ -248,7 +276,7 @@ describe('samlp (functional tests)', function () {
 
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback/samlp-with-ISO-explicit',
+        uri: `${server.BASE_URL}/callback/samlp-with-ISO-explicit`,
         form: { SAMLResponse: samlEncoded }
       }, function(err, response, body) {
         if(err) return done(err);
@@ -260,7 +288,7 @@ describe('samlp (functional tests)', function () {
 
     it('should be valid signature', function(){
       expect(r.statusCode)
-            .to.equal(200);
+          .to.equal(200);
     });
 
     it('should return a valid user', function(){
@@ -279,7 +307,7 @@ describe('samlp (functional tests)', function () {
     before(function (done) {
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback/samlp-with-dsig-at-root',
+        uri: `${server.BASE_URL}/callback/samlp-with-dsig-at-root`,
         form: { SAMLResponse: fs.readFileSync(path.join(__dirname, './samples/encoded/samlresponse_signedassertion_dsprefix.txt')).toString() }
       }, function(err, response, body) {
         if(err) return done(err);
@@ -291,7 +319,7 @@ describe('samlp (functional tests)', function () {
 
     it('should be valid signature', function(){
       expect(r.statusCode)
-            .to.equal(200);
+          .to.equal(200);
     });
   });
 
@@ -301,7 +329,7 @@ describe('samlp (functional tests)', function () {
     before(function (done) {
       request.post({
         jar: request.jar(),
-        uri: 'http://localhost:5051/callback',
+        uri: `${server.BASE_URL}/callback`,
         form: { SAMLResponse: 'foo' }
       }, function(err, response, body) {
         if(err) return done(err);
@@ -313,7 +341,7 @@ describe('samlp (functional tests)', function () {
 
     it('should return a 400', function(){
       expect(r.statusCode)
-            .to.equal(400);
+          .to.equal(400);
     });
   });
 
@@ -325,7 +353,7 @@ describe('samlp (functional tests)', function () {
         request.get({
           jar: request.jar(),
           followRedirect: false,
-          uri: 'http://localhost:5051/login'
+          uri: `${server.BASE_URL}/login`
         }, function (err, resp, b){
           if(err) return done(err);
           r = resp;
@@ -336,38 +364,38 @@ describe('samlp (functional tests)', function () {
 
       it('should redirect to idp', function(){
         expect(r.statusCode)
-              .to.equal(302);
+            .to.equal(302);
       });
 
       it('should have SAMLRequest querystring', function(done){
         expect(r.headers.location.split('?')[0])
-              .to.equal(server.identityProviderUrl);
+            .to.equal(server.identityProviderUrl);
         var querystring = qs.parse(r.headers.location.split('?')[1]);
         expect(querystring).to.have.property('SAMLRequest');
         var SAMLRequest = querystring.SAMLRequest;
 
         zlib.inflateRaw(new Buffer(SAMLRequest, 'base64'), function (err, buffer) {
           if (err) return done(err);
           var request = buffer.toString();
-          var doc = new xmldom.DOMParser().parseFromString(request);
+          var doc = new xmldom.DOMParser().parseFromString(request, 'text/xml');
 
           expect(doc.documentElement.getAttribute('ProtocolBinding'))
-            .to.equal('urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST');
+              .to.equal('urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST');
 
           expect(doc.documentElement.getAttribute('Version'))
-            .to.equal('2.0');
+              .to.equal('2.0');
 
           expect(doc.documentElement.getElementsByTagName('saml:Issuer')[0]
-                                    .getAttribute('xmlns:saml'))
-            .to.equal('urn:oasis:names:tc:SAML:2.0:assertion');
+              .getAttribute('xmlns:saml'))
+              .to.equal('urn:oasis:names:tc:SAML:2.0:assertion');
 
           done();
         });
       });
 
       it('should have RelayState querystring', function(){
         expect(r.headers.location.split('?')[0])
-              .to.equal(server.identityProviderUrl);
+            .to.equal(server.identityProviderUrl);
         var querystring = qs.parse(r.headers.location.split('?')[1]);
         expect(querystring).to.have.property('RelayState');
         expect(querystring.RelayState).to.equal(server.relayState);
@@ -381,7 +409,7 @@ describe('samlp (functional tests)', function () {
         request.get({
           jar: request.jar(),
           followRedirect: false,
-          uri: 'http://localhost:5051/login-http-post'
+          uri: `${server.BASE_URL}/login-http-post`
         }, function (err, resp, b){
           if (err) return done(err);
           r = resp;
@@ -394,23 +422,23 @@ describe('samlp (functional tests)', function () {
       it('should post to idp', function(){
         expect(r.statusCode).to.equal(200);
         expect(r.headers['content-type']).to.contains('text/html');
-        expect($('form').attr('action')).to.equal('http://localhost:5051/samlp');
+        expect($('form').attr('action')).to.equal(`${server.BASE_URL}/samlp`);
       });
 
       it('should have SAMLRequest input', function (done) {
         var SAMLRequest = $('form input[name="SAMLRequest"]').val();
         expect(SAMLRequest).to.be.ok;
 
-        var doc = new xmldom.DOMParser().parseFromString(new Buffer(SAMLRequest, 'base64').toString());
+        var doc = new xmldom.DOMParser().parseFromString(new Buffer(SAMLRequest, 'base64').toString(), 'text/xml');
         expect(doc.documentElement.getAttribute('ProtocolBinding'))
-          .to.equal('urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST');
+            .to.equal('urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST');
 
         expect(doc.documentElement.getAttribute('Version'))
-          .to.equal('2.0');
+            .to.equal('2.0');
 
         expect(doc.documentElement.getElementsByTagName('saml:Issuer')[0]
-                                  .getAttribute('xmlns:saml'))
-          .to.equal('urn:oasis:names:tc:SAML:2.0:assertion');
+            .getAttribute('xmlns:saml'))
+            .to.equal('urn:oasis:names:tc:SAML:2.0:assertion');
 
         done();
       });
@@ -430,7 +458,7 @@ describe('samlp (functional tests)', function () {
       request.get({
         jar: request.jar(),
         followRedirect: false,
-        uri: 'http://localhost:5051/login-custom-request-template'
+        uri: `${server.BASE_URL}/login-custom-request-template`
       }, function (err, resp, b){
         if(err) return done(err);
         r = resp;
@@ -441,32 +469,32 @@ describe('samlp (functional tests)', function () {
 
     it('should redirect to idp', function(){
       expect(r.statusCode)
-            .to.equal(302);
+          .to.equal(302);
     });
 
     it('should have SAMLRequest querystring', function(done){
       expect(r.headers.location.split('?')[0])
-            .to.equal(server.identityProviderUrl);
+          .to.equal(server.identityProviderUrl);
       var querystring = qs.parse(r.headers.location.split('?')[1]);
       expect(querystring).to.have.property('SAMLRequest');
       var SAMLRequest = querystring.SAMLRequest;
 
       zlib.inflateRaw(new Buffer(SAMLRequest, 'base64'), function (err, buffer) {
         if (err) return done(err);
         var request = buffer.toString();
-        var doc = new xmldom.DOMParser().parseFromString(request);
+        var doc = new xmldom.DOMParser().parseFromString(request, 'text/xml');
 
         expect(doc.documentElement.getAttribute('Protocol'))
-          .to.equal('urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST');
+            .to.equal('urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST');
 
         expect(doc.documentElement.getAttribute('Version'))
-          .to.equal('3.0');
+            .to.equal('3.0');
 
         expect(doc.documentElement.getAttribute('Foo'))
-          .to.equal('123');
+            .to.equal('123');
 
         expect(doc.documentElement.getAttribute('Issuertico'))
-          .to.equal('https://auth0-dev-ed.my.salesforce.com');
+            .to.equal('https://auth0-dev-ed.my.salesforce.com');
 
         done();
       });
@@ -482,7 +510,7 @@ describe('samlp (functional tests)', function () {
       request.get({
         jar: request.jar(),
         followRedirect: false,
-        uri: 'http://localhost:5051/login-idp-with-querystring'
+        uri: `${server.BASE_URL}/login-idp-with-querystring`
       }, function (err, resp, b){
         if(err) return done(err);
         r = resp;
@@ -493,12 +521,12 @@ describe('samlp (functional tests)', function () {
 
     it('should redirect to idp', function(){
       expect(r.statusCode)
-            .to.equal(302);
+          .to.equal(302);
     });
 
     it('should have SAMLRequest and foo in querystring', function(){
       expect(r.headers.location.split('?')[0])
-            .to.equal(server.identityProviderUrl);
+          .to.equal(server.identityProviderUrl);
       var querystring = qs.parse(r.headers.location.split('?')[1]);
       expect(querystring).to.have.property('SAMLRequest');
       expect(querystring).to.have.property('foo');
@@ -508,14 +536,16 @@ describe('samlp (functional tests)', function () {
 
   describe('samlp with signed request', function () {
     describe('POST binding', function () {
-      var r, bod, $;
+      let r, bod, $;
 
       before(function (done) {
         request.get({
           jar: request.jar(),
-          uri: 'http://localhost:5051/login-signed-request-post'
+          uri: `${server.BASE_URL}/login-signed-request-post`
         }, function (err, resp, b){
-          if(err) return callback(err);
+          if (err) {
+            return done(err);
+          }
           r = resp;
           bod = b;
           $ = cheerio.load(bod);
@@ -525,7 +555,7 @@ describe('samlp (functional tests)', function () {
 
       it('should return 200 with form element', function(){
         expect(r.statusCode)
-              .to.equal(200);
+            .to.equal(200);
       });
 
       it('should have signed SAMLRequest with valid signature', function(done){
@@ -534,15 +564,15 @@ describe('samlp (functional tests)', function () {
         var signingCert = fs.readFileSync(__dirname + '/test-auth0.pem');
 
         expect(helpers.isValidSignature(signedRequest, signingCert))
-          .to.equal(true);
+            .to.equal(true);
 
         done();
       });
 
       it('should show issuer before signature', function(done){
         var signedSAMLRequest = $('form input[name="SAMLRequest"]').val();
         var signedRequest = new Buffer(signedSAMLRequest, 'base64').toString();
-        var doc = new xmldom.DOMParser().parseFromString(signedRequest);
+        var doc = new xmldom.DOMParser().parseFromString(signedRequest, 'text/xml');
 
         // First child has to be the issuer
         expect(doc.documentElement.childNodes[0].nodeName).to.equal('saml:Issuer');
@@ -559,7 +589,7 @@ describe('samlp (functional tests)', function () {
         request.get({
           jar: request.jar(),
           followRedirect: false,
-          uri: 'http://localhost:5051/login-signed-request-without-deflate'
+          uri: `${server.BASE_URL}/login-signed-request-without-deflate`
         }, function (err, resp, b){
           if(err) return callback(err);
           r = resp;
@@ -570,12 +600,12 @@ describe('samlp (functional tests)', function () {
 
       it('should redirect to idp', function(){
         expect(r.statusCode)
-              .to.equal(302);
+            .to.equal(302);
       });
 
       it('should have signed SAMLRequest with valid signature', function(done){
         expect(r.headers.location.split('?')[0])
-              .to.equal(server.identityProviderUrl);
+            .to.equal(server.identityProviderUrl);
         var querystring = qs.parse(r.headers.location.split('?')[1]);
         expect(querystring).to.have.property('SAMLRequest');
         expect(querystring.RelayState).to.equal('somestate');
@@ -585,7 +615,7 @@ describe('samlp (functional tests)', function () {
         var signingCert = fs.readFileSync(__dirname + '/test-auth0.pem');
 
         expect(helpers.isValidSignature(signedRequest, signingCert))
-          .to.equal(true);
+            .to.equal(true);
         done();
       });
     });
@@ -597,9 +627,9 @@ describe('samlp (functional tests)', function () {
         request.get({
           jar: request.jar(),
           followRedirect: false,
-          uri: 'http://localhost:5051/login-signed-request-with-deflate'
+          uri: `${server.BASE_URL}/login-signed-request-with-deflate`
         }, function (err, resp, b){
-          if(err) return callback(err);
+          if(err) return done(err);
           r = resp;
           bod = b;
           done();
@@ -608,12 +638,12 @@ describe('samlp (functional tests)', function () {
 
       it('should redirect to idp', function(){
         expect(r.statusCode)
-              .to.equal(302);
+            .to.equal(302);
       });
 
       it('should have signed SAMLRequest with valid signature', function(done){
         expect(r.headers.location.split('?')[0])
-              .to.equal(server.identityProviderUrl);
+            .to.equal(server.identityProviderUrl);
         var querystring = qs.parse(r.headers.location.split('?')[1]);
         expect(querystring).to.have.property('SAMLRequest');
         expect(querystring).to.have.property('Signature');
@@ -646,7 +676,7 @@ function doSamlpFlow(samlRequestUrl, callbackEndpoint, callback) {
   }, function (err, response, b){
     if(err) return callback(err);
     expect(response.statusCode)
-      .to.equal(200);
+        .to.equal(200);
 
     var $ = cheerio.load(b);
     var SAMLResponse = $('input[name="SAMLResponse"]').attr('value');
@@ -661,4 +691,4 @@ function doSamlpFlow(samlRequestUrl, callbackEndpoint, callback) {
       callback(null, { response: response, body: body });
     });
   });
-}
+}
\ No newline at end of file

@@ -8,155 +8,155 @@ chai.use(passport);
 describe('samlp - using custom session state store', function() {
 
   var SAMLResponse = 'PHNhbWxwOlJlc3BvbnNlIHhtbG5zOnNhbWxwPSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6cHJvdG9jb2wiIHhtbG5zOnNhbWw9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphc3NlcnRpb24iIElEPSJfOGU4ZGM1ZjY5YTk4Y2M0YzFmZjM0MjdlNWNlMzQ2MDZmZDY3MmY5MWU2IiBWZXJzaW9uPSIyLjAiIElzc3VlSW5zdGFudD0iMjAxNC0wNy0xN1QwMTowMTo0OFoiIERlc3RpbmF0aW9uPSJodHRwOi8vc3AuZXhhbXBsZS5jb20vZGVtbzEvaW5kZXgucGhwP2FjcyIgSW5SZXNwb25zZVRvPSJPTkVMT0dJTl80ZmVlM2IwNDYzOTVjNGU3NTEwMTFlOTdmODkwMGI1MjczZDU2Njg1Ij4NCiAgPHNhbWw6SXNzdWVyPmh0dHA6Ly9pZHAuZXhhbXBsZS5jb20vbWV0YWRhdGEucGhwPC9zYW1sOklzc3Vlcj4NCiAgPHNhbWxwOlN0YXR1cz4NCiAgICA8c2FtbHA6U3RhdHVzQ29kZSBWYWx1ZT0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOnN0YXR1czpTdWNjZXNzIi8+DQogIDwvc2FtbHA6U3RhdHVzPg0KICA8c2FtbDpBc3NlcnRpb24geG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiBJRD0iX2Q3MWEzYThlOWZjYzQ1YzllOWQyNDhlZjcwNDkzOTNmYzhmMDRlNWY3NSIgVmVyc2lvbj0iMi4wIiBJc3N1ZUluc3RhbnQ9IjIwMTQtMDctMTdUMDE6MDE6NDhaIj4NCiAgICA8c2FtbDpJc3N1ZXI+aHR0cDovL2lkcC5leGFtcGxlLmNvbS9tZXRhZGF0YS5waHA8L3NhbWw6SXNzdWVyPg0KICAgIDxzYW1sOlN1YmplY3Q+DQogICAgICA8c2FtbDpOYW1lSUQgU1BOYW1lUXVhbGlmaWVyPSJodHRwOi8vc3AuZXhhbXBsZS5jb20vZGVtbzEvbWV0YWRhdGEucGhwIiBGb3JtYXQ9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDpuYW1laWQtZm9ybWF0OnRyYW5zaWVudCI+X2NlM2QyOTQ4YjRjZjIwMTQ2ZGVlMGEwYjNkZDZmNjliNmNmODZmNjJkNzwvc2FtbDpOYW1lSUQ+DQogICAgICA8c2FtbDpTdWJqZWN0Q29uZmlybWF0aW9uIE1ldGhvZD0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmNtOmJlYXJlciI+DQogICAgICAgIDxzYW1sOlN1YmplY3RDb25maXJtYXRpb25EYXRhIE5vdE9uT3JBZnRlcj0iMjAyNC0wMS0xOFQwNjoyMTo0OFoiIFJlY2lwaWVudD0iaHR0cDovL3NwLmV4YW1wbGUuY29tL2RlbW8xL2luZGV4LnBocD9hY3MiIEluUmVzcG9uc2VUbz0iT05FTE9HSU5fNGZlZTNiMDQ2Mzk1YzRlNzUxMDExZTk3Zjg5MDBiNTI3M2Q1NjY4NSIvPg0KICAgICAgPC9zYW1sOlN1YmplY3RDb25maXJtYXRpb24+DQogICAgPC9zYW1sOlN1YmplY3Q+DQogICAgPHNhbWw6Q29uZGl0aW9ucyBOb3RCZWZvcmU9IjIwMTQtMDctMTdUMDE6MDE6MThaIiBOb3RPbk9yQWZ0ZXI9IjIwMjQtMDEtMThUMDY6MjE6NDhaIj4NCiAgICAgIDxzYW1sOkF1ZGllbmNlUmVzdHJpY3Rpb24+DQogICAgICAgIDxzYW1sOkF1ZGllbmNlPmh0dHA6Ly9zcC5leGFtcGxlLmNvbS9kZW1vMS9tZXRhZGF0YS5waHA8L3NhbWw6QXVkaWVuY2U+DQogICAgICA8L3NhbWw6QXVkaWVuY2VSZXN0cmljdGlvbj4NCiAgICA8L3NhbWw6Q29uZGl0aW9ucz4NCiAgICA8c2FtbDpBdXRoblN0YXRlbWVudCBBdXRobkluc3RhbnQ9IjIwMTQtMDctMTdUMDE6MDE6NDhaIiBTZXNzaW9uTm90T25PckFmdGVyPSIyMDI0LTA3LTE3VDA5OjAxOjQ4WiIgU2Vzc2lvbkluZGV4PSJfYmU5OTY3YWJkOTA0ZGRjYWUzYzBlYjQxODlhZGJlM2Y3MWUzMjdjZjkzIj4NCiAgICAgIDxzYW1sOkF1dGhuQ29udGV4dD4NCiAgICAgICAgPHNhbWw6QXV0aG5Db250ZXh0Q2xhc3NSZWY+dXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFjOmNsYXNzZXM6UGFzc3dvcmQ8L3NhbWw6QXV0aG5Db250ZXh0Q2xhc3NSZWY+DQogICAgICA8L3NhbWw6QXV0aG5Db250ZXh0Pg0KICAgIDwvc2FtbDpBdXRoblN0YXRlbWVudD4NCiAgICA8c2FtbDpBdHRyaWJ1dGVTdGF0ZW1lbnQ+DQogICAgICA8c2FtbDpBdHRyaWJ1dGUgTmFtZT0idWlkIiBOYW1lRm9ybWF0PSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6YXR0cm5hbWUtZm9ybWF0OmJhc2ljIj4NCiAgICAgICAgPHNhbWw6QXR0cmlidXRlVmFsdWUgeHNpOnR5cGU9InhzOnN0cmluZyI+dGVzdDwvc2FtbDpBdHRyaWJ1dGVWYWx1ZT4NCiAgICAgIDwvc2FtbDpBdHRyaWJ1dGU+DQogICAgICA8c2FtbDpBdHRyaWJ1dGUgTmFtZT0ibWFpbCIgTmFtZUZvcm1hdD0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmF0dHJuYW1lLWZvcm1hdDpiYXNpYyI+DQogICAgICAgIDxzYW1sOkF0dHJpYnV0ZVZhbHVlIHhzaTp0eXBlPSJ4czpzdHJpbmciPnRlc3RAZXhhbXBsZS5jb208L3NhbWw6QXR0cmlidXRlVmFsdWU+DQogICAgICA8L3NhbWw6QXR0cmlidXRlPg0KICAgICAgPHNhbWw6QXR0cmlidXRlIE5hbWU9ImVkdVBlcnNvbkFmZmlsaWF0aW9uIiBOYW1lRm9ybWF0PSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6YXR0cm5hbWUtZm9ybWF0OmJhc2ljIj4NCiAgICAgICAgPHNhbWw6QXR0cmlidXRlVmFsdWUgeHNpOnR5cGU9InhzOnN0cmluZyI+dXNlcnM8L3NhbWw6QXR0cmlidXRlVmFsdWU+DQogICAgICAgIDxzYW1sOkF0dHJpYnV0ZVZhbHVlIHhzaTp0eXBlPSJ4czpzdHJpbmciPmV4YW1wbGVyb2xlMTwvc2FtbDpBdHRyaWJ1dGVWYWx1ZT4NCiAgICAgIDwvc2FtbDpBdHRyaWJ1dGU+DQogICAgPC9zYW1sOkF0dHJpYnV0ZVN0YXRlbWVudD4NCiAgPC9zYW1sOkFzc2VydGlvbj4NCjwvc2FtbHA6UmVzcG9uc2U+';
-  
+
   describe('that accepts meta argument', function() {
     function CustomStore() {}
 
     CustomStore.prototype.store = function(req, meta, cb) {
       if (req.url === '/error') { return cb(new Error('something went wrong storing state')); }
       if (req.url === '/exception') { throw new Error('something went horribly wrong storing state'); }
-      
+
       if (req.url !== '/me') { return cb(new Error('incorrect req argument')); }
       if (meta.identityProviderUrl !== 'http://www.example.com/samlp') { return cb(new Error('incorrect meta.identityProviderUrl argument')); }
-      
+
       req.customStoreStoreCalled = req.customStoreStoreCalled ? req.customStoreStoreCalled++ : 1;
       return cb(null, 'foos7473');
     };
-    
+
     CustomStore.prototype.verify = function(req, state, meta, cb) {
       if (req.url === '/error') { return cb(new Error('something went wrong verifying state')); }
       if (req.url === '/exception') { throw new Error('something went horribly wrong verifying state'); }
-      
+
       if (state !== 'foos7473') { return cb(new Error('incorrect state argument')); }
       if (meta.identityProviderUrl !== 'http://www.example.com/samlp') { return cb(new Error('incorrect meta.identityProviderUrl argument')); }
-      
+
       req.customStoreVerifyCalled = req.customStoreVerifyCalled ? req.customStoreVerifyCalled++ : 1;
       return cb(null, true);
     };
-    
+
     describe('issuing authorization request', function() {
       var strategy = new Strategy({
-        protocol: 'samlp',
-        path: '/callback',
-        realm: 'https://auth0-dev-ed.my.salesforce.com',
-        identityProviderUrl: 'http://www.example.com/samlp',
-        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-        store: new CustomStore()
-      },
-      function() {});
-      
+            protocol: 'samlp',
+            path: '/callback',
+            realm: 'https://auth0-dev-ed.my.salesforce.com',
+            identityProviderUrl: 'http://www.example.com/samlp',
+            thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+            store: new CustomStore()
+          },
+          function() {});
+
       describe('that redirects to service provider', function() {
         var request, url;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .redirect(function(u) {
-              url = u;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.url = '/me';
-            })
-            .authenticate({});
+              .redirect(function(u) {
+                url = u;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.url = '/me';
+              })
+              .authenticate({});
         });
-  
+
         it('should be redirected', function() {
           expect(url).to.have.string('http://www.example.com/samlp?SAMLRequest=');
           expect(url).to.have.string('&RelayState=foos7473');
         });
-      
+
         it('should serialize state using custom store', function() {
           expect(request.customStoreStoreCalled).to.equal(1);
         });
       });
-      
+
       describe('that errors due to custom store supplying error', function() {
         var request, err;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.url = '/error';
-            })
-            .authenticate({});
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.url = '/error';
+              })
+              .authenticate({});
         });
-  
+
         it('should error', function() {
           expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal('something went wrong storing state');
         });
       });
-      
+
       describe('that errors due to custom store throwing error', function() {
         var request, err;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.url = '/exception';
-            })
-            .authenticate({});
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.url = '/exception';
+              })
+              .authenticate({});
         });
-  
+
         it('should error', function() {
           expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal('something went horribly wrong storing state');
         });
       });
     });
-    
+
     describe('processing response to authorization request', function() {
       var strategy = new Strategy({
-        protocol: 'samlp',
-        path: '/callback',
-        realm: 'https://auth0-dev-ed.my.salesforce.com',
-        identityProviderUrl: 'http://www.example.com/samlp',
-        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-        store: new CustomStore()
-      },
-      function (profile, done) {
-        return done(null, profile, { message: 'Hello' });
-      });
+            protocol: 'samlp',
+            path: '/callback',
+            realm: 'https://auth0-dev-ed.my.salesforce.com',
+            identityProviderUrl: 'http://www.example.com/samlp',
+            thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+            store: new CustomStore()
+          },
+          function (profile, done) {
+            return done(null, profile, { message: 'Hello' });
+          });
 
-      strategy._samlp.validateSamlResponse = function(token, done) {
-        expect(token).to.be.an('object');
+      strategy._samlp.validateSamlResponse = function(token, _options, done) {
+        expect(token).to.be.a('string');
         done(null, { id: '1234' });
       };
-      
+
       describe('that was approved', function() {
         var request, user, info;
 
         before(function (done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-          
-              req.url = '/login';
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'foos7473';
-              req.method = 'POST';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.url = '/login';
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'foos7473';
+                req.method = 'POST';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
         });
 
         it('should supply user', function() {
@@ -168,58 +168,58 @@ describe('samlp - using custom session state store', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Hello');
         });
-    
+
         it('should verify state using custom store', function() {
           expect(request.customStoreVerifyCalled).to.equal(1);
         });
       });
-      
+
       describe('that errors due to custom store supplying error', function() {
         var request, err;
 
         before(function (done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-          
-              req.url = '/error';
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'foos7473';
-              req.method = 'POST';
-            })
-            .authenticate({});
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.url = '/error';
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'foos7473';
+                req.method = 'POST';
+              })
+              .authenticate({});
         });
 
         it('should error', function() {
           expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal('something went wrong verifying state');
         });
       });
-      
+
       describe('that errors due to custom store throwing error', function() {
         var request, err;
 
         before(function (done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-          
-              req.url = '/exception';
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'foos7473';
-              req.method = 'POST';
-            })
-            .authenticate({});
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.url = '/exception';
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'foos7473';
+                req.method = 'POST';
+              })
+              .authenticate({});
         });
 
         it('should error', function() {
@@ -229,57 +229,57 @@ describe('samlp - using custom session state store', function() {
       });
     });
   });
-  
+
   describe('that accepts meta argument and supplies state', function() {
     function CustomStore() {}
-    
+
     CustomStore.prototype.verify = function(req, state, meta, cb) {
       req.customStoreVerifyCalled = req.customStoreVerifyCalled ? req.customStoreVerifyCalled++ : 1;
       return cb(null, true, { returnTo: 'http://www.example.com/' });
     };
-    
+
     describe('processing response to authorization request', function() {
-      
+
       describe('that was approved without info', function() {
         var strategy = new Strategy({
-          protocol: 'samlp',
-          path: '/callback',
-          realm: 'https://auth0-dev-ed.my.salesforce.com',
-          identityProviderUrl: 'http://www.example.com/samlp',
-          thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-          store: new CustomStore()
-        },
-        function (profile, done) {
-          return done(null, profile);
-        });
+              protocol: 'samlp',
+              path: '/callback',
+              realm: 'https://auth0-dev-ed.my.salesforce.com',
+              identityProviderUrl: 'http://www.example.com/samlp',
+              thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+              store: new CustomStore()
+            },
+            function (profile, done) {
+              return done(null, profile);
+            });
 
-        strategy._samlp.validateSamlResponse = function(token, done) {
-          expect(token).to.be.an('object');
+        strategy._samlp.validateSamlResponse = function(token, _options, done) {
+          expect(token).to.be.a('string');
           done(null, { id: '1234' });
         };
-        
+
         var request, user, info;
 
         before(function (done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-        
-              req.url = '/login';
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'foos7473';
-              req.method = 'POST';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.url = '/login';
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'foos7473';
+                req.method = 'POST';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
         });
 
         it('should supply user', function() {
@@ -293,52 +293,52 @@ describe('samlp - using custom session state store', function() {
           expect(info.state).to.be.an('object');
           expect(info.state.returnTo).to.equal('http://www.example.com/');
         });
-  
+
         it('should verify state using custom store', function() {
           expect(request.customStoreVerifyCalled).to.equal(1);
         });
       });
-      
+
       describe('that was approved with info', function() {
         var strategy = new Strategy({
-          protocol: 'samlp',
-          path: '/callback',
-          realm: 'https://auth0-dev-ed.my.salesforce.com',
-          identityProviderUrl: 'http://www.example.com/samlp',
-          thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-          store: new CustomStore()
-        },
-        function (profile, done) {
-          return done(null, profile, { message: 'Hello' });
-        });
+              protocol: 'samlp',
+              path: '/callback',
+              realm: 'https://auth0-dev-ed.my.salesforce.com',
+              identityProviderUrl: 'http://www.example.com/samlp',
+              thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+              store: new CustomStore()
+            },
+            function (profile, done) {
+              return done(null, profile, { message: 'Hello' });
+            });
 
-        strategy._samlp.validateSamlResponse = function(token, done) {
-          expect(token).to.be.an('object');
+        strategy._samlp.validateSamlResponse = function(token, _options, done) {
+          expect(token).to.be.a('string');
           done(null, { id: '1234' });
         };
 
         var request, user, info;
 
         before(function (done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-        
-              req.url = '/login';
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'foos7473';
-              req.method = 'POST';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.url = '/login';
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'foos7473';
+                req.method = 'POST';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
         });
 
         it('should supply user', function() {
@@ -353,11 +353,11 @@ describe('samlp - using custom session state store', function() {
           expect(info.state).to.be.an('object');
           expect(info.state.returnTo).to.equal('http://www.example.com/');
         });
-  
+
         it('should verify state using custom store', function() {
           expect(request.customStoreVerifyCalled).to.equal(1);
         });
       });
     });
   });
-});
+});
\ No newline at end of file

@@ -9,9 +9,9 @@ chai.use(passport);
 describe('samlp - using default session state store', function() {
 
   var SAMLResponse = 'PHNhbWxwOlJlc3BvbnNlIHhtbG5zOnNhbWxwPSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6cHJvdG9jb2wiIHhtbG5zOnNhbWw9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphc3NlcnRpb24iIElEPSJfOGU4ZGM1ZjY5YTk4Y2M0YzFmZjM0MjdlNWNlMzQ2MDZmZDY3MmY5MWU2IiBWZXJzaW9uPSIyLjAiIElzc3VlSW5zdGFudD0iMjAxNC0wNy0xN1QwMTowMTo0OFoiIERlc3RpbmF0aW9uPSJodHRwOi8vc3AuZXhhbXBsZS5jb20vZGVtbzEvaW5kZXgucGhwP2FjcyIgSW5SZXNwb25zZVRvPSJPTkVMT0dJTl80ZmVlM2IwNDYzOTVjNGU3NTEwMTFlOTdmODkwMGI1MjczZDU2Njg1Ij4NCiAgPHNhbWw6SXNzdWVyPmh0dHA6Ly9pZHAuZXhhbXBsZS5jb20vbWV0YWRhdGEucGhwPC9zYW1sOklzc3Vlcj4NCiAgPHNhbWxwOlN0YXR1cz4NCiAgICA8c2FtbHA6U3RhdHVzQ29kZSBWYWx1ZT0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOnN0YXR1czpTdWNjZXNzIi8+DQogIDwvc2FtbHA6U3RhdHVzPg0KICA8c2FtbDpBc3NlcnRpb24geG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeG1sbnM6eHM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiBJRD0iX2Q3MWEzYThlOWZjYzQ1YzllOWQyNDhlZjcwNDkzOTNmYzhmMDRlNWY3NSIgVmVyc2lvbj0iMi4wIiBJc3N1ZUluc3RhbnQ9IjIwMTQtMDctMTdUMDE6MDE6NDhaIj4NCiAgICA8c2FtbDpJc3N1ZXI+aHR0cDovL2lkcC5leGFtcGxlLmNvbS9tZXRhZGF0YS5waHA8L3NhbWw6SXNzdWVyPg0KICAgIDxzYW1sOlN1YmplY3Q+DQogICAgICA8c2FtbDpOYW1lSUQgU1BOYW1lUXVhbGlmaWVyPSJodHRwOi8vc3AuZXhhbXBsZS5jb20vZGVtbzEvbWV0YWRhdGEucGhwIiBGb3JtYXQ9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDpuYW1laWQtZm9ybWF0OnRyYW5zaWVudCI+X2NlM2QyOTQ4YjRjZjIwMTQ2ZGVlMGEwYjNkZDZmNjliNmNmODZmNjJkNzwvc2FtbDpOYW1lSUQ+DQogICAgICA8c2FtbDpTdWJqZWN0Q29uZmlybWF0aW9uIE1ldGhvZD0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmNtOmJlYXJlciI+DQogICAgICAgIDxzYW1sOlN1YmplY3RDb25maXJtYXRpb25EYXRhIE5vdE9uT3JBZnRlcj0iMjAyNC0wMS0xOFQwNjoyMTo0OFoiIFJlY2lwaWVudD0iaHR0cDovL3NwLmV4YW1wbGUuY29tL2RlbW8xL2luZGV4LnBocD9hY3MiIEluUmVzcG9uc2VUbz0iT05FTE9HSU5fNGZlZTNiMDQ2Mzk1YzRlNzUxMDExZTk3Zjg5MDBiNTI3M2Q1NjY4NSIvPg0KICAgICAgPC9zYW1sOlN1YmplY3RDb25maXJtYXRpb24+DQogICAgPC9zYW1sOlN1YmplY3Q+DQogICAgPHNhbWw6Q29uZGl0aW9ucyBOb3RCZWZvcmU9IjIwMTQtMDctMTdUMDE6MDE6MThaIiBOb3RPbk9yQWZ0ZXI9IjIwMjQtMDEtMThUMDY6MjE6NDhaIj4NCiAgICAgIDxzYW1sOkF1ZGllbmNlUmVzdHJpY3Rpb24+DQogICAgICAgIDxzYW1sOkF1ZGllbmNlPmh0dHA6Ly9zcC5leGFtcGxlLmNvbS9kZW1vMS9tZXRhZGF0YS5waHA8L3NhbWw6QXVkaWVuY2U+DQogICAgICA8L3NhbWw6QXVkaWVuY2VSZXN0cmljdGlvbj4NCiAgICA8L3NhbWw6Q29uZGl0aW9ucz4NCiAgICA8c2FtbDpBdXRoblN0YXRlbWVudCBBdXRobkluc3RhbnQ9IjIwMTQtMDctMTdUMDE6MDE6NDhaIiBTZXNzaW9uTm90T25PckFmdGVyPSIyMDI0LTA3LTE3VDA5OjAxOjQ4WiIgU2Vzc2lvbkluZGV4PSJfYmU5OTY3YWJkOTA0ZGRjYWUzYzBlYjQxODlhZGJlM2Y3MWUzMjdjZjkzIj4NCiAgICAgIDxzYW1sOkF1dGhuQ29udGV4dD4NCiAgICAgICAgPHNhbWw6QXV0aG5Db250ZXh0Q2xhc3NSZWY+dXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmFjOmNsYXNzZXM6UGFzc3dvcmQ8L3NhbWw6QXV0aG5Db250ZXh0Q2xhc3NSZWY+DQogICAgICA8L3NhbWw6QXV0aG5Db250ZXh0Pg0KICAgIDwvc2FtbDpBdXRoblN0YXRlbWVudD4NCiAgICA8c2FtbDpBdHRyaWJ1dGVTdGF0ZW1lbnQ+DQogICAgICA8c2FtbDpBdHRyaWJ1dGUgTmFtZT0idWlkIiBOYW1lRm9ybWF0PSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6YXR0cm5hbWUtZm9ybWF0OmJhc2ljIj4NCiAgICAgICAgPHNhbWw6QXR0cmlidXRlVmFsdWUgeHNpOnR5cGU9InhzOnN0cmluZyI+dGVzdDwvc2FtbDpBdHRyaWJ1dGVWYWx1ZT4NCiAgICAgIDwvc2FtbDpBdHRyaWJ1dGU+DQogICAgICA8c2FtbDpBdHRyaWJ1dGUgTmFtZT0ibWFpbCIgTmFtZUZvcm1hdD0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOmF0dHJuYW1lLWZvcm1hdDpiYXNpYyI+DQogICAgICAgIDxzYW1sOkF0dHJpYnV0ZVZhbHVlIHhzaTp0eXBlPSJ4czpzdHJpbmciPnRlc3RAZXhhbXBsZS5jb208L3NhbWw6QXR0cmlidXRlVmFsdWU+DQogICAgICA8L3NhbWw6QXR0cmlidXRlPg0KICAgICAgPHNhbWw6QXR0cmlidXRlIE5hbWU9ImVkdVBlcnNvbkFmZmlsaWF0aW9uIiBOYW1lRm9ybWF0PSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6YXR0cm5hbWUtZm9ybWF0OmJhc2ljIj4NCiAgICAgICAgPHNhbWw6QXR0cmlidXRlVmFsdWUgeHNpOnR5cGU9InhzOnN0cmluZyI+dXNlcnM8L3NhbWw6QXR0cmlidXRlVmFsdWU+DQogICAgICAgIDxzYW1sOkF0dHJpYnV0ZVZhbHVlIHhzaTp0eXBlPSJ4czpzdHJpbmciPmV4YW1wbGVyb2xlMTwvc2FtbDpBdHRyaWJ1dGVWYWx1ZT4NCiAgICAgIDwvc2FtbDpBdHRyaWJ1dGU+DQogICAgPC9zYW1sOkF0dHJpYnV0ZVN0YXRlbWVudD4NCiAgPC9zYW1sOkFzc2VydGlvbj4NCjwvc2FtbHA6UmVzcG9uc2U+';
-  
+
   describe('without session key option', function() {
-    
+
     describe('issuing authorization request', function() {
       var strategy = new Strategy({
         protocol: 'samlp',
@@ -21,421 +21,421 @@ describe('samlp - using default session state store', function() {
         thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
         state: true
       }, function () {});
-      
+
       describe('that redirects to service provider', function() {
         var request, url;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .redirect(function(u) {
-              url = u;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.session = {};
-            })
-            .authenticate({});
-        });
-  
+              .redirect(function(u) {
+                url = u;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.session = {};
+              })
+              .authenticate({});
+        });
+
         it('should be redirected', function() {
           var u = uri.parse(url, true);
           expect(u.query.RelayState).to.have.length(24);
         });
-      
+
         it('should save state in session', function() {
           var u = uri.parse(url, true);
           expect(request.session['samlp:www.example.com'].state).to.have.length(24);
           expect(request.session['samlp:www.example.com'].state).to.equal(u.query.RelayState);
         });
       });
-      
+
       describe('that redirects to service provider with other data in session', function() {
         var request, url;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .redirect(function(u) {
-              url = u;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.session = {};
-              req.session['samlp:www.example.com'] = {};
-              req.session['samlp:www.example.com'].foo = 'bar';
-            })
-            .authenticate({});
-        });
-  
+              .redirect(function(u) {
+                url = u;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.session = {};
+                req.session['samlp:www.example.com'] = {};
+                req.session['samlp:www.example.com'].foo = 'bar';
+              })
+              .authenticate({});
+        });
+
         it('should be redirected', function() {
           var u = uri.parse(url, true);
           expect(u.query.RelayState).to.have.length(24);
         });
-      
+
         it('should save state in session', function() {
           var u = uri.parse(url, true);
-        
+
           expect(request.session['samlp:www.example.com'].state).to.have.length(24);
           expect(request.session['samlp:www.example.com'].state).to.equal(u.query.RelayState);
         });
-        
+
         it('should preserve other data in session', function() {
           expect(request.session['samlp:www.example.com'].foo).to.equal('bar');
         });
       });
-      
+
       describe('that errors due to lack of session support in app', function() {
         var request, err;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            })
-            .authenticate({});
-        });
-  
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+              })
+              .authenticate({});
+        });
+
         it('should error', function() {
           expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal('Authentication requires session support when using state. Did you forget to use express-session middleware?');
         });
       });
     });
-    
+
     describe('processing response to authorization request', function() {
       var strategy = new Strategy({
-        protocol: 'samlp',
-        path: '/callback',
-        realm: 'https://auth0-dev-ed.my.salesforce.com',
-        identityProviderUrl: 'http://www.example.com/samlp',
-        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-        state: true
-      },
-      function (profile, done) {
-        return done(null, profile, { message: 'Hello' });
-      });
+            protocol: 'samlp',
+            path: '/callback',
+            realm: 'https://auth0-dev-ed.my.salesforce.com',
+            identityProviderUrl: 'http://www.example.com/samlp',
+            thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+            state: true
+          },
+          function (profile, done) {
+            return done(null, profile, { message: 'Hello' });
+          });
 
-      strategy._samlp.validateSamlResponse = function(token, done) {
-        expect(token).to.be.an('object');
+      strategy._samlp.validateSamlResponse = function(token, options, done) {
+        expect(token).to.be.a('string');
         done(null, { id: '1234' });
       };
-      
+
       describe('that was approved', function() {
         var request, user, info;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.method = 'POST';
-              req.session = {};
-              req.session['samlp:www.example.com'] = {};
-              req.session['samlp:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
-        });
-  
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.method = 'POST';
+                req.session = {};
+                req.session['samlp:www.example.com'] = {};
+                req.session['samlp:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
+        });
+
         it('should supply user', function() {
           expect(user).to.be.an('object');
           expect(user.id).to.equal('1234');
         });
-  
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Hello');
         });
-      
+
         it('should remove state from session', function() {
           expect(request.session['samlp:www.example.com']).to.be.undefined;
         });
       });
-      
+
       describe('that was approved with other data in the session', function() {
         var request, user, info;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.method = 'POST';
-              req.session = {};
-              req.session['samlp:www.example.com'] = {};
-              req.session['samlp:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.session['samlp:www.example.com'].foo = 'bar';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
-        });
-  
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.method = 'POST';
+                req.session = {};
+                req.session['samlp:www.example.com'] = {};
+                req.session['samlp:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.session['samlp:www.example.com'].foo = 'bar';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
+        });
+
         it('should supply user', function() {
           expect(user).to.be.an('object');
           expect(user.id).to.equal('1234');
         });
-  
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Hello');
         });
-      
+
         it('should preserve other data from session', function() {
           expect(request.session['samlp:www.example.com'].state).to.be.undefined;
           expect(request.session['samlp:www.example.com'].foo).to.equal('bar');
         });
       });
-      
+
       describe('that fails due to state being invalid', function() {
         var request, info, status;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .fail(function(i, s) {
-              info = i;
-              status = s;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK-WRONG';
-              req.method = 'POST';
-              req.session = {};
-              req.session['samlp:www.example.com'] = {};
-              req.session['samlp:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
-            })
-            .authenticate({});
-        });
-  
+              .fail(function(i, s) {
+                info = i;
+                status = s;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK-WRONG';
+                req.method = 'POST';
+                req.session = {};
+                req.session['samlp:www.example.com'] = {};
+                req.session['samlp:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
+              })
+              .authenticate({});
+        });
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Invalid authorization request state.');
         });
-      
+
         it('should supply status', function() {
           expect(status).to.equal(403);
         });
-      
+
         it('should remove state from session', function() {
           expect(request.session['samlp:www.example.com']).to.be.undefined;
         });
       });
-      
+
       describe('that fails due to provider-specific state not found in session', function() {
         var request, info, status;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .fail(function(i, s) {
-              info = i;
-              status = s;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.method = 'POST';
-              req.session = {};
-            })
-            .authenticate({});
-        });
-  
+              .fail(function(i, s) {
+                info = i;
+                status = s;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.method = 'POST';
+                req.session = {};
+              })
+              .authenticate({});
+        });
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Unable to verify authorization request state.');
         });
-      
+
         it('should supply status', function() {
           expect(status).to.equal(403);
         });
       });
-      
+
       describe('that fails due to provider-specific state lacking state value', function() {
         var request, info, status;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .fail(function(i, s) {
-              info = i;
-              status = s;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.method = 'POST';
-              req.session = {};
-              req.session['samlp:www.example.com'] = {};
-            })
-            .authenticate({});
-        });
-  
+              .fail(function(i, s) {
+                info = i;
+                status = s;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.method = 'POST';
+                req.session = {};
+                req.session['samlp:www.example.com'] = {};
+              })
+              .authenticate({});
+        });
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Unable to verify authorization request state.');
         });
-      
+
         it('should supply status', function() {
           expect(status).to.equal(403);
         });
       });
-      
+
       describe('that errors due to lack of session support in app', function() {
         var request, err;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.method = 'POST';
-            })
-            .authenticate({});
-        });
-  
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.method = 'POST';
+              })
+              .authenticate({});
+        });
+
         it('should error', function() {
           expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal('Authentication requires session support when using state. Did you forget to use express-session middleware?');
         });
       });
     });
   });
-  
+
   describe('with session key option', function() {
     var strategy = new Strategy({
-      protocol: 'samlp',
-      path: '/callback',
-      realm: 'https://auth0-dev-ed.my.salesforce.com',
-      identityProviderUrl: 'http://www.example.com/samlp',
-      thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-      state: true,
-      sessionKey: 'samlp:example'
-    },
-    function (profile, done) {
-      return done(null, profile, { message: 'Hello' });
-    });
+          protocol: 'samlp',
+          path: '/callback',
+          realm: 'https://auth0-dev-ed.my.salesforce.com',
+          identityProviderUrl: 'http://www.example.com/samlp',
+          thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+          state: true,
+          sessionKey: 'samlp:example'
+        },
+        function (profile, done) {
+          return done(null, profile, { message: 'Hello' });
+        });
 
-    strategy._samlp.validateSamlResponse = function(token, done) {
-      expect(token).to.be.an('object');
+    strategy._samlp.validateSamlResponse = function(token, _options, done) {
+      expect(token).to.be.a('string');
       done(null, { id: '1234' });
     };
-    
+
     describe('issuing authorization request', function() {
-      
+
       describe('that redirects to service provider', function() {
         var request, url;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .redirect(function(u) {
-              url = u;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.session = {};
-            })
-            .authenticate({});
-        });
-  
+              .redirect(function(u) {
+                url = u;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.session = {};
+              })
+              .authenticate({});
+        });
+
         it('should be redirected', function() {
           var u = uri.parse(url, true);
           expect(u.query.RelayState).to.have.length(24);
         });
-      
+
         it('should save state in session', function() {
           var u = uri.parse(url, true);
-        
+
           expect(request.session['samlp:example'].state).to.have.length(24);
           expect(request.session['samlp:example'].state).to.equal(u.query.RelayState);
         });
       });
     });
-    
+
     describe('processing response to authorization request', function() {
-      
+
       describe('that was approved', function() {
         var request, user, info;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.SAMLResponse = SAMLResponse;
-              req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.method = 'POST';
-              req.session = {};
-              req.session['samlp:example'] = {};
-              req.session['samlp:example']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
-        });
-  
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.SAMLResponse = SAMLResponse;
+                req.body.RelayState = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.method = 'POST';
+                req.session = {};
+                req.session['samlp:example'] = {};
+                req.session['samlp:example']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
+        });
+
         it('should supply user', function() {
           expect(user).to.be.an('object');
           expect(user.id).to.equal('1234');
         });
-  
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Hello');
         });
-      
+
         it('should remove state from session', function() {
           expect(request.session['samlp:example']).to.be.undefined;
         });
       });
     });
   });
-});
+});
\ No newline at end of file

@@ -1,162 +1,166 @@
-var chai      = require('chai');
-var expect    = require('chai').expect;
-var passport  = require('chai-passport-strategy');
-var Strategy  = require('../../lib/passport-wsfed-saml2').Strategy;
+const chai      = require('chai');
+const expect    = require('chai').expect;
+const passport  = require('chai-passport-strategy');
+const Strategy  = require('../../lib/passport-wsfed-saml2').Strategy;
+
+const xmldom = require('@xmldom/xmldom');
+const domParser = new xmldom.DOMParser();
+
 
 chai.use(passport);
 
 describe('wsfed - using custom session state store', function() {
-  
+
   describe('that accepts meta argument', function() {
     function CustomStore() {}
 
     CustomStore.prototype.store = function(req, meta, cb) {
       if (req.url === '/error') { return cb(new Error('something went wrong storing state')); }
       if (req.url === '/exception') { throw new Error('something went horribly wrong storing state'); }
-      
+
       if (req.url !== '/me') { return cb(new Error('incorrect req argument')); }
       if (meta.identityProviderUrl !== 'http://www.example.com/login') { return cb(new Error('incorrect meta.identityProviderUrl argument')); }
-      
+
       req.customStoreStoreCalled = req.customStoreStoreCalled ? req.customStoreStoreCalled++ : 1;
       return cb(null, 'foos7473');
     };
-    
+
     CustomStore.prototype.verify = function(req, state, meta, cb) {
       if (req.url === '/error') { return cb(new Error('something went wrong verifying state')); }
       if (req.url === '/exception') { throw new Error('something went horribly wrong verifying state'); }
-      
+
       if (state !== 'foos7473') { return cb(new Error('incorrect state argument')); }
       if (meta.identityProviderUrl !== 'http://www.example.com/login') { return cb(new Error('incorrect meta.identityProviderUrl argument')); }
-      
+
       req.customStoreVerifyCalled = req.customStoreVerifyCalled ? req.customStoreVerifyCalled++ : 1;
       return cb(null, true);
     };
-    
+
     describe('issuing authorization request', function() {
       var strategy = new Strategy({
-        path: '/callback',
-        realm: 'urn:fixture-test',
-        identityProviderUrl: 'http://www.example.com/login',
-        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-        store: new CustomStore()
-      },
-      function() {});
-      
+            path: '/callback',
+            realm: 'urn:fixture-test',
+            identityProviderUrl: 'http://www.example.com/login',
+            thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+            store: new CustomStore()
+          },
+          function() {});
+
       describe('that redirects to service provider', function() {
         var request, url;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .redirect(function(u) {
-              url = u;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.url = '/me';
-            })
-            .authenticate({});
+              .redirect(function(u) {
+                url = u;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.url = '/me';
+              })
+              .authenticate({});
         });
-  
+
         it('should be redirected', function() {
           expect(url).to.equal('http://www.example.com/login?wctx=foos7473&wtrealm=urn%3Afixture-test&wa=wsignin1.0&whr=');
         });
-      
+
         it('should serialize state using custom store', function() {
           expect(request.customStoreStoreCalled).to.equal(1);
         });
       });
-      
+
       describe('that errors due to custom store supplying error', function() {
         var request, err;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.url = '/error';
-            })
-            .authenticate({});
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.url = '/error';
+              })
+              .authenticate({});
         });
-  
+
         it('should error', function() {
           expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal('something went wrong storing state');
         });
       });
-      
+
       describe('that errors due to custom store throwing error', function() {
         var request, err;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.url = '/exception';
-            })
-            .authenticate({});
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.url = '/exception';
+              })
+              .authenticate({});
         });
-  
+
         it('should error', function() {
           expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal('something went horribly wrong storing state');
         });
       });
     });
-    
+
     describe('processing response to authorization request', function() {
       var strategy = new Strategy({
-        path: '/callback',
-        realm: 'urn:fixture-test',
-        identityProviderUrl: 'http://www.example.com/login',
-        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-        store: new CustomStore()
-      },
-      function (profile, done) {
-        return done(null, profile, { message: 'Hello' });
-      });
+            path: '/callback',
+            realm: 'urn:fixture-test',
+            identityProviderUrl: 'http://www.example.com/login',
+            thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+            store: new CustomStore()
+          },
+          function (profile, done) {
+            return done(null, profile, { message: 'Hello' });
+          });
 
       strategy._wsfed.extractToken = function(req) {
         expect(req).to.be.an('object');
-        return '<trust:RequestedSecurityToken>...</trust:RequestedSecurityToken>';
+        return domParser.parseFromString('<trust:RequestedSecurityToken xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestedSecurityToken>', 'text/xml');
       };
 
-      strategy._saml.validateSamlAssertion = function(token, done) {
-        expect(token).to.equal('<trust:RequestedSecurityToken>...</trust:RequestedSecurityToken>');
+      strategy._saml.validateSamlAssertion = function(wResult, _options, done) {
+        expect(wResult).to.equal('<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>');
         done(null, { id: '1234' });
       };
-      
+
       describe('that was approved', function() {
         var request, user, info;
 
         before(function (done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-          
-              req.url = '/login';
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'foos7473';
-              req.method = 'POST';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.url = '/login';
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'foos7473';
+                req.method = 'POST';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
         });
 
         it('should supply user', function() {
@@ -168,58 +172,58 @@ describe('wsfed - using custom session state store', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Hello');
         });
-    
+
         it('should verify state using custom store', function() {
           expect(request.customStoreVerifyCalled).to.equal(1);
         });
       });
-      
+
       describe('that errors due to custom store supplying error', function() {
         var request, err;
 
         before(function (done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-          
-              req.url = '/error';
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'foos7473';
-              req.method = 'POST';
-            })
-            .authenticate({});
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.url = '/error';
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'foos7473';
+                req.method = 'POST';
+              })
+              .authenticate({});
         });
 
         it('should error', function() {
           expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal('something went wrong verifying state');
         });
       });
-      
+
       describe('that errors due to custom store throwing error', function() {
         var request, err;
 
         before(function (done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-          
-              req.url = '/exception';
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'foos7473';
-              req.method = 'POST';
-            })
-            .authenticate({});
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.url = '/exception';
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'foos7473';
+                req.method = 'POST';
+              })
+              .authenticate({});
         });
 
         it('should error', function() {
@@ -229,61 +233,61 @@ describe('wsfed - using custom session state store', function() {
       });
     });
   });
-  
+
   describe('that accepts meta argument and supplies state', function() {
     function CustomStore() {}
-    
+
     CustomStore.prototype.verify = function(req, state, meta, cb) {
       req.customStoreVerifyCalled = req.customStoreVerifyCalled ? req.customStoreVerifyCalled++ : 1;
       return cb(null, true, { returnTo: 'http://www.example.com/' });
     };
-    
+
     describe('processing response to authorization request', function() {
-      
+
       describe('that was approved without info', function() {
         var strategy = new Strategy({
-          path: '/callback',
-          realm: 'urn:fixture-test',
-          identityProviderUrl: 'http://www.example.com/login',
-          thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-          store: new CustomStore()
-        },
-        function (profile, done) {
-          return done(null, profile);
-        });
+              path: '/callback',
+              realm: 'urn:fixture-test',
+              identityProviderUrl: 'http://www.example.com/login',
+              thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+              store: new CustomStore()
+            },
+            function (profile, done) {
+              return done(null, profile);
+            });
 
         strategy._wsfed.extractToken = function(req) {
           expect(req).to.be.an('object');
-          return '<trust:RequestedSecurityToken>...</trust:RequestedSecurityToken>';
+          return domParser.parseFromString('<trust:RequestedSecurityToken xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestedSecurityToken>', 'text/xml');
         };
 
-        strategy._saml.validateSamlAssertion = function(token, done) {
-          expect(token).to.equal('<trust:RequestedSecurityToken>...</trust:RequestedSecurityToken>');
+        strategy._saml.validateSamlAssertion = function(token, _options, done) {
+          expect(token).to.equal('<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>');
           done(null, { id: '1234' });
         };
-        
+
         var request, user, info;
 
         before(function (done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-        
-              req.url = '/login';
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'foos7473';
-              req.method = 'POST';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.url = '/login';
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'foos7473';
+                req.method = 'POST';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
         });
 
         it('should supply user', function() {
@@ -297,56 +301,56 @@ describe('wsfed - using custom session state store', function() {
           expect(info.state).to.be.an('object');
           expect(info.state.returnTo).to.equal('http://www.example.com/');
         });
-  
+
         it('should verify state using custom store', function() {
           expect(request.customStoreVerifyCalled).to.equal(1);
         });
       });
-      
+
       describe('that was approved with info', function() {
         var strategy = new Strategy({
-          path: '/callback',
-          realm: 'urn:fixture-test',
-          identityProviderUrl: 'http://www.example.com/login',
-          thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-          store: new CustomStore()
-        },
-        function (profile, done) {
-          return done(null, profile, { message: 'Hello' });
-        });
+              path: '/callback',
+              realm: 'urn:fixture-test',
+              identityProviderUrl: 'http://www.example.com/login',
+              thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+              store: new CustomStore()
+            },
+            function (profile, done) {
+              return done(null, profile, { message: 'Hello' });
+            });
 
         strategy._wsfed.extractToken = function(req) {
           expect(req).to.be.an('object');
-          return '<trust:RequestedSecurityToken>...</trust:RequestedSecurityToken>';
+          return domParser.parseFromString('<trust:RequestedSecurityToken xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestedSecurityToken>', 'text/xml');
         };
 
-        strategy._saml.validateSamlAssertion = function(token, done) {
-          expect(token).to.equal('<trust:RequestedSecurityToken>...</trust:RequestedSecurityToken>');
+        strategy._saml.validateSamlAssertion = function(token, _options, done) {
+          expect(token).to.equal('<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>');
           done(null, { id: '1234' });
         };
 
         var request, user, info;
 
         before(function (done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-        
-              req.url = '/login';
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'foos7473';
-              req.method = 'POST';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.url = '/login';
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'foos7473';
+                req.method = 'POST';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
         });
 
         it('should supply user', function() {
@@ -361,11 +365,11 @@ describe('wsfed - using custom session state store', function() {
           expect(info.state).to.be.an('object');
           expect(info.state.returnTo).to.equal('http://www.example.com/');
         });
-  
+
         it('should verify state using custom store', function() {
           expect(request.customStoreVerifyCalled).to.equal(1);
         });
       });
     });
   });
-});
+});
\ No newline at end of file

@@ -1,15 +1,19 @@
-var chai      = require('chai');
-var uri       = require('url');
-var expect    = require('chai').expect;
-var passport  = require('chai-passport-strategy');
-var Strategy  = require('../../lib/passport-wsfed-saml2').Strategy;
+const chai      = require('chai');
+const uri       = require('url');
+const expect    = require('chai').expect;
+const passport  = require('chai-passport-strategy');
+const Strategy  = require('../../lib/passport-wsfed-saml2').Strategy;
+
+const xmldom = require('@xmldom/xmldom');
+const domParser = new xmldom.DOMParser();
+
 
 chai.use(passport);
 
 describe('wsfed - using default session state store', function() {
-  
+
   describe('without session key option', function() {
-    
+
     describe('issuing authorization request', function() {
       var strategy = new Strategy({
         path: '/callback',
@@ -18,429 +22,429 @@ describe('wsfed - using default session state store', function() {
         thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
         state: true
       }, function () {});
-      
+
       describe('that redirects to service provider', function() {
         var request, url;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .redirect(function(u) {
-              url = u;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.session = {};
-            })
-            .authenticate({});
-        });
-  
+              .redirect(function(u) {
+                url = u;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.session = {};
+              })
+              .authenticate({});
+        });
+
         it('should be redirected', function() {
           var u = uri.parse(url, true);
           expect(u.query.wctx).to.have.length(24);
         });
-      
+
         it('should save state in session', function() {
           var u = uri.parse(url, true);
           expect(request.session['wsfed:www.example.com'].state).to.have.length(24);
           expect(request.session['wsfed:www.example.com'].state).to.equal(u.query.wctx);
         });
       });
-      
+
       describe('that redirects to service provider with other data in session', function() {
         var request, url;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .redirect(function(u) {
-              url = u;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.session = {};
-              req.session['wsfed:www.example.com'] = {};
-              req.session['wsfed:www.example.com'].foo = 'bar';
-            })
-            .authenticate({});
-        });
-  
+              .redirect(function(u) {
+                url = u;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.session = {};
+                req.session['wsfed:www.example.com'] = {};
+                req.session['wsfed:www.example.com'].foo = 'bar';
+              })
+              .authenticate({});
+        });
+
         it('should be redirected', function() {
           var u = uri.parse(url, true);
           expect(u.query.wctx).to.have.length(24);
         });
-      
+
         it('should save state in session', function() {
           var u = uri.parse(url, true);
-        
+
           expect(request.session['wsfed:www.example.com'].state).to.have.length(24);
           expect(request.session['wsfed:www.example.com'].state).to.equal(u.query.wctx);
         });
-        
+
         it('should preserve other data in session', function() {
           expect(request.session['wsfed:www.example.com'].foo).to.equal('bar');
         });
       });
-      
+
       describe('that errors due to lack of session support in app', function() {
         var request, err;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            })
-            .authenticate({});
-        });
-  
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+              })
+              .authenticate({});
+        });
+
         it('should error', function() {
           expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal('Authentication requires session support when using state. Did you forget to use express-session middleware?');
         });
       });
     });
-    
+
     describe('processing response to authorization request', function() {
       var strategy = new Strategy({
-        path: '/callback',
-        realm: 'urn:fixture-test',
-        identityProviderUrl: 'http://www.example.com/login',
-        thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-        state: true
-      },
-      function (profile, done) {
-        return done(null, profile, { message: 'Hello' });
-      });
+            path: '/callback',
+            realm: 'urn:fixture-test',
+            identityProviderUrl: 'http://www.example.com/login',
+            thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+            state: true
+          },
+          function (profile, done) {
+            return done(null, profile, { message: 'Hello' });
+          });
 
       strategy._wsfed.extractToken = function(req) {
         expect(req).to.be.an('object');
-        return '<trust:RequestedSecurityToken>...</trust:RequestedSecurityToken>';
+        return domParser.parseFromString('<trust:RequestedSecurityToken xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestedSecurityToken>', 'text/xml');
       };
 
-      strategy._saml.validateSamlAssertion = function(token, done) {
-        expect(token).to.equal('<trust:RequestedSecurityToken>...</trust:RequestedSecurityToken>');
+      strategy._saml.validateSamlAssertion = function(token, _options, done) {
+        expect(token).to.equal('<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>');
         done(null, { id: '1234' });
       };
-      
+
       describe('that was approved', function() {
         var request, user, info;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.method = 'POST';
-              req.session = {};
-              req.session['wsfed:www.example.com'] = {};
-              req.session['wsfed:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
-        });
-  
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.method = 'POST';
+                req.session = {};
+                req.session['wsfed:www.example.com'] = {};
+                req.session['wsfed:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
+        });
+
         it('should supply user', function() {
           expect(user).to.be.an('object');
           expect(user.id).to.equal('1234');
         });
-  
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Hello');
         });
-      
+
         it('should remove state from session', function() {
           expect(request.session['wsfed:www.example.com']).to.be.undefined;
         });
       });
-      
+
       describe('that was approved with other data in the session', function() {
         var request, user, info;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.method = 'POST';
-              req.session = {};
-              req.session['wsfed:www.example.com'] = {};
-              req.session['wsfed:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.session['wsfed:www.example.com'].foo = 'bar';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
-        });
-  
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.method = 'POST';
+                req.session = {};
+                req.session['wsfed:www.example.com'] = {};
+                req.session['wsfed:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.session['wsfed:www.example.com'].foo = 'bar';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
+        });
+
         it('should supply user', function() {
           expect(user).to.be.an('object');
           expect(user.id).to.equal('1234');
         });
-  
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Hello');
         });
-      
+
         it('should preserve other data from session', function() {
           expect(request.session['wsfed:www.example.com'].state).to.be.undefined;
           expect(request.session['wsfed:www.example.com'].foo).to.equal('bar');
         });
       });
-      
+
       describe('that fails due to state being invalid', function() {
         var request, info, status;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .fail(function(i, s) {
-              info = i;
-              status = s;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK-WRONG';
-              req.method = 'POST';
-              req.session = {};
-              req.session['wsfed:www.example.com'] = {};
-              req.session['wsfed:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
-            })
-            .authenticate({});
-        });
-  
+              .fail(function(i, s) {
+                info = i;
+                status = s;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK-WRONG';
+                req.method = 'POST';
+                req.session = {};
+                req.session['wsfed:www.example.com'] = {};
+                req.session['wsfed:www.example.com']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
+              })
+              .authenticate({});
+        });
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Invalid authorization request state.');
         });
-      
+
         it('should supply status', function() {
           expect(status).to.equal(403);
         });
-      
+
         it('should remove state from session', function() {
           expect(request.session['wsfed:www.example.com']).to.be.undefined;
         });
       });
-      
+
       describe('that fails due to provider-specific state not found in session', function() {
         var request, info, status;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .fail(function(i, s) {
-              info = i;
-              status = s;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK-WRONG';
-              req.method = 'POST';
-              req.session = {};
-            })
-            .authenticate({});
-        });
-  
+              .fail(function(i, s) {
+                info = i;
+                status = s;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK-WRONG';
+                req.method = 'POST';
+                req.session = {};
+              })
+              .authenticate({});
+        });
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Unable to verify authorization request state.');
         });
-      
+
         it('should supply status', function() {
           expect(status).to.equal(403);
         });
       });
-      
+
       describe('that fails due to provider-specific state lacking state value', function() {
         var request, info, status;
-  
+
         before(function(done) {
           chai.passport.use(strategy)
-            .fail(function(i, s) {
-              info = i;
-              status = s;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK-WRONG';
-              req.method = 'POST';
-              req.session = {};
-              req.session['wsfed:www.example.com'] = {};
-            })
-            .authenticate({});
-        });
-  
+              .fail(function(i, s) {
+                info = i;
+                status = s;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK-WRONG';
+                req.method = 'POST';
+                req.session = {};
+                req.session['wsfed:www.example.com'] = {};
+              })
+              .authenticate({});
+        });
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Unable to verify authorization request state.');
         });
-      
+
         it('should supply status', function() {
           expect(status).to.equal(403);
         });
       });
-      
+
       describe('that errors due to lack of session support in app', function() {
         var request, err;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .error(function(e) {
-              err = e;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK-WRONG';
-              req.method = 'POST';
-            })
-            .authenticate({});
-        });
-  
+              .error(function(e) {
+                err = e;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK-WRONG';
+                req.method = 'POST';
+              })
+              .authenticate({});
+        });
+
         it('should error', function() {
           expect(err).to.be.an.instanceof(Error);
           expect(err.message).to.equal('Authentication requires session support when using state. Did you forget to use express-session middleware?');
         });
       });
     });
   });
-  
+
   describe('with session key option', function() {
     var strategy = new Strategy({
-      path: '/callback',
-      realm: 'urn:fixture-test',
-      identityProviderUrl: 'http://www.example.com/login',
-      thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
-      state: true,
-      sessionKey: 'wsfed:example'
-    },
-    function (profile, done) {
-      return done(null, profile, { message: 'Hello' });
-    });
+          path: '/callback',
+          realm: 'urn:fixture-test',
+          identityProviderUrl: 'http://www.example.com/login',
+          thumbprints: ['5ca6e1202eafc0a63a5b93a43572eb2376fed309'],
+          state: true,
+          sessionKey: 'wsfed:example'
+        },
+        function (profile, done) {
+          return done(null, profile, { message: 'Hello' });
+        });
 
     strategy._wsfed.extractToken = function(req) {
       expect(req).to.be.an('object');
-      return '<trust:RequestedSecurityToken>...</trust:RequestedSecurityToken>';
+      return domParser.parseFromString('<trust:RequestedSecurityToken xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestedSecurityToken>', 'text/xml');
     };
 
-    strategy._saml.validateSamlAssertion = function(token, done) {
-      expect(token).to.equal('<trust:RequestedSecurityToken>...</trust:RequestedSecurityToken>');
+    strategy._saml.validateSamlAssertion = function(token, _options, done) {
+      expect(token).to.equal('<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>');
       done(null, { id: '1234' });
     };
-    
+
     describe('issuing authorization request', function() {
-      
+
       describe('that redirects to service provider', function() {
         var request, url;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .redirect(function(u) {
-              url = u;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-              req.session = {};
-            })
-            .authenticate({});
-        });
-  
+              .redirect(function(u) {
+                url = u;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+                req.session = {};
+              })
+              .authenticate({});
+        });
+
         it('should be redirected', function() {
           var u = uri.parse(url, true);
           expect(u.query.wctx).to.have.length(24);
         });
-      
+
         it('should save state in session', function() {
           var u = uri.parse(url, true);
-        
+
           expect(request.session['wsfed:example'].state).to.have.length(24);
           expect(request.session['wsfed:example'].state).to.equal(u.query.wctx);
         });
       });
     });
-    
+
     describe('processing response to authorization request', function() {
-      
+
       describe('that was approved', function() {
         var request, user, info;
-  
+
         before(function (done) {
           chai.passport.use(strategy)
-            .success(function(u, i) {
-              user = u;
-              info = i;
-              done();
-            })
-            .req(function(req) {
-              request = req;
-            
-              req.body = {};
-              req.body.wresult = '<trust:RequestSecurityTokenResponseCollection>...</trust:RequestSecurityTokenResponseCollection>';
-              req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.method = 'POST';
-              req.session = {};
-              req.session['wsfed:example'] = {};
-              req.session['wsfed:example']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
-              req.get = function(){
-                return '';
-              };
-            })
-            .authenticate({});
-        });
-  
+              .success(function(u, i) {
+                user = u;
+                info = i;
+                done();
+              })
+              .req(function(req) {
+                request = req;
+
+                req.body = {};
+                req.body.wresult = '<trust:RequestSecurityTokenResponseCollection xmlns:trust="http://docs.oasis-open.org/ws-sx/ws-trust/200512">...</trust:RequestSecurityTokenResponseCollection>';
+                req.body.wctx = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.method = 'POST';
+                req.session = {};
+                req.session['wsfed:example'] = {};
+                req.session['wsfed:example']['state'] = 'DkbychwKu8kBaJoLE5yeR5NK';
+                req.get = function(){
+                  return '';
+                };
+              })
+              .authenticate({});
+        });
+
         it('should supply user', function() {
           expect(user).to.be.an('object');
           expect(user.id).to.equal('1234');
         });
-  
+
         it('should supply info', function() {
           expect(info).to.be.an('object');
           expect(info.message).to.equal('Hello');
         });
-      
+
         it('should remove state from session', function() {
           expect(request.session['wsfed:example']).to.be.undefined;
         });
       });
     });
   });
-});
+});
\ No newline at end of file

@@ -1,14 +1,13 @@
 var expect = require('chai').expect;
 
-var lib   = require('../lib/passport-wsfed-saml2');
 var utils = require('../lib/passport-wsfed-saml2/utils');
 
 describe('utils', function () {
   describe('parseSamlAssertion', function () {
     it('should work', function (done) {
       var assertion = utils.parseSamlAssertion('<t:RequestSecurityTokenResponse xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust"></t:RequestSecurityTokenResponse>');
       expect(assertion.childNodes.length)
-        .to.equal(1);
+          .to.equal(1);
       done();
     });
 
@@ -23,9 +22,14 @@ describe('utils', function () {
 
       var err = parse();
       expect(err.name)
-        .to.equal('SamlAssertionParserError');
-      expect(err.detail)
-        .to.equal('end tag name: div is not match the current start tagName:t:RequestSecurityTokenResponse');
+          .to.equal('SamlAssertionParserError');
+      expect(err.detail.message)
+          .to.equal('Opening and ending tag mismatch: "AssertionAssertion" != "div"');
+      done();
+    });
+
+    it('should throw an error with invalid xml = ""<doc><![CDATA[</doc>""', function (done) {
+      expect(() => { utils.parseSamlAssertion('<doc><![CDATA[</doc>'); }).to.throw('SAML Assertion should be a valid xml');
       done();
     });
   });
@@ -34,7 +38,7 @@ describe('utils', function () {
     it('should work', function (done) {
       var response = utils.parseSamlResponse('<t:RequestSecurityTokenResponse xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust"></t:RequestSecurityTokenResponse>');
       expect(response.childNodes.length)
-        .to.equal(1);
+          .to.equal(1);
       done();
     });
 
@@ -49,9 +53,14 @@ describe('utils', function () {
 
       var err = parse();
       expect(err.name)
-        .to.equal('SamlResponseParserError');
-      expect(err.detail)
-        .to.equal('end tag name: div is not match the current start tagName:t:RequestSecurityTokenResponse');
+          .to.equal('SamlResponseParserError');
+      expect(err.detail.message)
+          .to.equal('Opening and ending tag mismatch: "AssertionAssertion" != "div"');
+      done();
+    });
+
+    it('should throw an error with invalid xml = ""<doc><![CDATA[</doc>""', function (done) {
+      expect(() => { utils.parseSamlResponse('<doc><![CDATA[</doc>'); }).to.throw('SAMLResponse should be a valid xml');
       done();
     });
   });
@@ -60,7 +69,7 @@ describe('utils', function () {
     it('should work', function (done) {
       var response = utils.parseWsFedResponse('<t:RequestSecurityTokenResponse xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust"></t:RequestSecurityTokenResponse>');
       expect(response.childNodes.length)
-        .to.equal(1);
+          .to.equal(1);
       done();
     });
 
@@ -75,10 +84,159 @@ describe('utils', function () {
 
       var err = parse();
       expect(err.name)
-        .to.equal('WSFederationResultParseError');
-      expect(err.detail)
-        .to.equal('end tag name: div is not match the current start tagName:t:RequestSecurityTokenResponse');
+          .to.equal('WSFederationResultParseError');
+      expect(err.detail.message)
+          .to.equal('Opening and ending tag mismatch: "AssertionAssertion" != "div"');
+      done();
+    });
+
+    it('should throw an error with invalid xml = ""<doc><![CDATA[</doc>""', function (done) {
+      expect(() => { utils.parseWsFedResponse('<doc><![CDATA[</doc>'); }).to.throw('wresult should be a valid xml');
       done();
     });
   });
-});
+
+  describe('parseXmlString', () => {
+    it("should parse XML string", () => {
+      const xml = "<foo><bar>baz</bar></foo>";
+      const result = utils.parseXmlString(xml);
+      expect(result.documentElement.nodeName).to.equal("foo");
+      expect(result.documentElement.firstChild.nodeName).to.equal("bar");
+      expect(result.documentElement.firstChild.firstChild.nodeValue).to.equal(
+          "baz"
+      );
+    });
+
+    it("should throw on = that is not attached to an attribute", () => {
+      const xml = "<foo><bar =>baz</bar></foo>";
+      expect(() => utils.parseXmlString(xml)).to.throw('Opening and ending tag mismatch: "foo" != "bar"');
+    });
+
+    it("should throw on closing elements without opening elements", () => {
+      const xml = "<foo></bar></foo>";
+      expect(() => utils.parseXmlString(xml)).to.throw('Opening and ending tag mismatch: "foo" != "bar"');
+    });
+
+    describe("CDATA sections", () => {
+      it("should handle CDATA sections", () => {
+        const xml = "<foo><![CDATA[<bar>baz</bar>]]></foo>";
+        const result = utils.parseXmlString(xml);
+        expect(result.documentElement.nodeName).to.equal("foo");
+        expect(result.documentElement.firstChild.nodeValue).to.equal(
+            "<bar>baz</bar>"
+        );
+      });
+
+      it("should not throw CDATA sections on second line", () => {
+        const xml = `<foo>
+          <![CDATA[<bar>baz</bar>]]>
+        </foo>`;
+        const result = utils.parseXmlString(xml);
+        expect(result.documentElement.nodeName).to.equal("foo");
+      });
+
+      it("should not throw multi line CDATA section starting on first line", () => {
+        const xml = `<foo><![CDATA[
+        
+        
+        This should all be ignored
+        
+        ]]>
+        </foo>
+        `;
+        const result = utils.parseXmlString(xml);
+        expect(result.documentElement.nodeName).to.equal("foo");
+      });
+
+      it("should not throw multi line CDATA section starting on second line", () => {
+        const xml = `<foo>
+        <![CDATA[
+        
+        
+        This should all be ignored
+        
+        ]]>
+        </foo>
+        `;
+        const result = utils.parseXmlString(xml);
+        expect(result.documentElement.nodeName).to.equal("foo");
+      });
+
+      it("should throw if document is single line unclosed CDATA section", () => {
+        const xml = `<![CDATA[ this is an unclosed CDATA section`;
+        expect(() => utils.parseXmlString(xml)).to.throw('Invalid CDATA starting at position 0');
+      });
+
+      it("should throw if document is single line closed CDATA section", () => {
+        const xml = `<![CDATA[ this is a closed CDATA section ]]>`;
+        expect(() => utils.parseXmlString(xml)).to.throw('CDATA outside of element');
+      });
+
+      it("should throw if document is multi line unclosed CDATA section", () => {
+        const xml = `<![CDATA[ 
+          this is an unclosed CDATA section
+        `;
+        expect(() => utils.parseXmlString(xml)).to.throw('Invalid CDATA starting at position 0');
+      });
+
+      it("should throw with nested CDATA if no start tag", () => {
+        const xml = `<![CDATA[ 
+          <![CDATA should this be ignored since the other cdata is still open?
+            this is a closed CDATA section 
+        ]]>`;
+        expect(() => utils.parseXmlString(xml)).to.throw('CDATA outside of element');
+      });
+
+      it('should not throw if the second CDATA element on a single line is unclosed', () => {
+        const xml = `<foo>
+          <![CDATA[ignored]]><![CDATA[
+          
+          just some data
+          
+          ]]>
+        </foo>`;
+        expect(() => utils.parseXmlString(xml)).to.not.throw();
+      });
+
+      it("should not throw with nested CDATA if with start tag", () => {
+        const xml = `<foo><![CDATA[ 
+          <![CDATA this CDATA open should be ignored since the other CDATA is still open
+            this is a closed CDATA section 
+        ]]></foo>`;
+        expect(() => utils.parseXmlString(xml)).to.not.throw();
+      });
+
+      it("should throw on unclosed CDATA sections on first line", () => {
+        const xml = "<foo><![CDATA[<bar>baz</bar>></foo>";
+        expect(() => utils.parseXmlString(xml)).to.throw("Invalid CDATA starting at position 5");
+      });
+
+      it('should throw on unclosed CDATA sections with closing brackets to finish', () => {
+        const xml = '<doc><![CDATA[</doc>]]'
+        expect(() => utils.parseXmlString(xml)).to.throw("Invalid CDATA starting at position 5");
+      });
+
+      it("should throw on lowercase cdata sections", () => {
+        const xml = "<foo><![cdata[flism</foo>";
+        expect(() => utils.parseXmlString(xml)).to.throw();
+      });
+
+      it("should throw on URL encoded XML", () => {
+        const xml = encodeURIComponent("<foo></foo>");
+        expect(() => utils.parseXmlString(xml)).to.throw();
+      });
+
+      it("should throw on base64 encoded XML", () => {
+        const xml = Buffer.from("<foo><![CDATA[flism></foo>", "utf-8").toString(
+            "base64"
+        );
+        expect(() => utils.parseXmlString(xml)).to.throw();
+      });
+
+      it("should throw on unclosed CDATA element", () => {
+        const xml = "<foo><![CDATA[flism></foo>";
+        expect(() => utils.parseXmlString(xml)).to.throw();
+      });
+    });
+  });
+});
\ No newline at end of file