Renamed option.prefix to option.signaturePrefix

Author: Marcos Castany

lib/saml20.js

@@ -67,7 +67,10 @@ exports.create = function(options, callback) {
 
   options.includeAttributeNameFormat = (typeof options.includeAttributeNameFormat !== 'undefined') ? options.includeAttributeNameFormat : true;
   options.typedAttributes = (typeof options.typedAttributes !== 'undefined') ? options.typedAttributes : true;
-  options.prefix = options.prefix && (typeof options.prefix === 'string') ? options.prefix : '' ; 
+
+  // 0.10.1 added prefix, but we want to name it signatureNamespacePrefix - This is just to keep supporting prefix
+  options.signatureNamespacePrefix = options.signatureNamespacePrefix || options.prefix;
+  options.signatureNamespacePrefix = typeof options.signatureNamespacePrefix === 'string' ? options.signatureNamespacePrefix : '' ; 
 
   var cert = utils.pemToCert(options.cert);
 
@@ -190,7 +193,7 @@ exports.create = function(options, callback) {
         reference: options.xpathToNodeBeforeSignature || "//*[local-name(.)='Issuer']", 
         action: 'after'
       },
-      prefix: options.prefix
+      prefix: options.signatureNamespacePrefix
     };
 
     sig.computeSignature(token, opts);

test/saml20.tests.js

@@ -365,6 +365,31 @@ describe('saml 2.0', function () {
   });
 
   it('should place signature with prefix where specified', function () {
+     var options = {
+      cert: fs.readFileSync(__dirname + '/test-auth0.pem'),
+      key: fs.readFileSync(__dirname + '/test-auth0.key'),
+      xpathToNodeBeforeSignature: "//*[local-name(.)='Conditions']",
+      signatureNamespacePrefix: 'anyprefix',
+      attributes: {
+        'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress': '[email protected]',
+        'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name': 'Foo Bar',
+        'http://example.org/claims/testemptyarray': [], // should dont include empty arrays
+        'http://example.org/claims/testaccent': 'fóo', // should supports accents
+        'http://undefinedattribute/ws/com.com': undefined
+      }
+    };
+
+    var signedAssertion = saml.create(options);
+    
+    var isValid = utils.isValidSignature(signedAssertion, options.cert);
+    assert.equal(true, isValid);
+    
+    var doc = new xmldom.DOMParser().parseFromString(signedAssertion);
+    var signature = doc.documentElement.getElementsByTagName(options.signatureNamespacePrefix + ':Signature');
+    assert.equal('saml:Conditions', signature[0].previousSibling.nodeName);
+  });
+
+  it('should place signature with prefix where specified (backwards compat)', function () {
      var options = {
       cert: fs.readFileSync(__dirname + '/test-auth0.pem'),
       key: fs.readFileSync(__dirname + '/test-auth0.key'),
@@ -385,7 +410,7 @@ describe('saml 2.0', function () {
     assert.equal(true, isValid);
 
     var doc = new xmldom.DOMParser().parseFromString(signedAssertion);
-    var signature = doc.documentElement.getElementsByTagName(options.prefix + ':Signature');
+    var signature = doc.documentElement.getElementsByTagName(options.signatureNamespacePrefix + ':Signature');
     assert.equal('saml:Conditions', signature[0].previousSibling.nodeName);
   });
 
@@ -394,7 +419,7 @@ describe('saml 2.0', function () {
       cert: fs.readFileSync(__dirname + '/test-auth0.pem'),
       key: fs.readFileSync(__dirname + '/test-auth0.key'),
       xpathToNodeBeforeSignature: "//*[local-name(.)='Conditions']",
-      prefix: 123,
+      signatureNamespacePrefix: 123,
       attributes: {
         'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress': '[email protected]',
         'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name': 'Foo Bar',