refactor(saml11): reuse ./xml/encrypt instead of xmlenc copy-pasta

Author: luuuis

lib/saml11.js

@@ -7,6 +7,7 @@ var moment = require('moment');
 var async = require('async');
 var crypto = require('crypto');
 
+var EncryptXml = require('./xml/encrypt');
 var SignXml = require('./xml/sign');
 
 var saml11 = fs.readFileSync(path.join(__dirname, 'saml11.template')).toString();
@@ -176,39 +177,6 @@ function createAssertion(options, strategies, callback) {
   });
 }
 
-var EncryptXml = Object.freeze({
-  fromEncryptXmlOptions: function (options) {
-    if (!options.encryptionCert) {
-      return this.unencrypted;
-    } else {
-      var encryptOptions = {
-        rsa_pub: options.encryptionPublicKey,
-        pem: options.encryptionCert,
-        encryptionAlgorithm: options.encryptionAlgorithm || 'http://www.w3.org/2001/04/xmlenc#aes256-cbc',
-        keyEncryptionAlgorighm: options.keyEncryptionAlgorighm || 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p',
-      };
-
-      // expose the encryptOptions as these are needed when adding the SubjectConfirmation
-      return Object.assign(this.encrypted(encryptOptions), { encryptOptions: encryptOptions });
-    }
-  },
-  unencrypted: function (xml, callback) {
-    if (callback) {
-      setImmediate(callback, null, xml);
-    } else {
-      return xml;
-    }
-  },
-  encrypted: function (encryptOptions) {
-    return function encrypt(xml, callback) {
-      xmlenc.encrypt(xml, encryptOptions, function (err, encrypted) {
-        if (err) return callback(err);
-        callback(null, utils.removeWhitespace(encrypted));
-      });
-    };
-  }
-})
-
 function addSubjectConfirmation(encryptOptions, doc, randomBytes, callback) {
   xmlenc.encryptKeyInfo(randomBytes, encryptOptions, function(err, keyinfo) {
     if (err) return callback(err);

lib/xml/encrypt.js

@@ -6,12 +6,15 @@ exports.fromEncryptXmlOptions = function (options) {
   if (!options.encryptionCert) {
     return this.unencrypted;
   } else {
-    return this.encrypted({
+    var encryptOptions = {
       rsa_pub: options.encryptionPublicKey,
       pem: options.encryptionCert,
       encryptionAlgorithm: options.encryptionAlgorithm || 'http://www.w3.org/2001/04/xmlenc#aes256-cbc',
-      keyEncryptionAlgorighm: options.keyEncryptionAlgorighm || 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p'
-    });
+      keyEncryptionAlgorighm: options.keyEncryptionAlgorighm || 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p',
+    };
+
+    // expose the encryptOptions as these are needed when adding the SubjectConfirmation
+    return Object.assign(this.encrypted(encryptOptions), { encryptOptions: encryptOptions });
   }
 };