refactor: extracts utils.factoryForNode() and uses it in saml11 and saml20

Author: luuuis

lib/saml11.js

@@ -1,4 +1,3 @@
-var fs = require('fs');
 var path = require('path');
 var utils = require('./utils');
 var Parser = require('xmldom').DOMParser;
@@ -10,7 +9,7 @@ var crypto = require('crypto');
 var EncryptXml = require('./xml/encrypt');
 var SignXml = require('./xml/sign');
 
-var saml11 = fs.readFileSync(path.join(__dirname, 'saml11.template')).toString();
+var newSaml11Document = utils.factoryForNode(path.join(__dirname, 'saml11.template'));
 
 var NAMESPACE = 'urn:oasis:names:tc:SAML:1.0:assertion';
 
@@ -74,7 +73,7 @@ exports.create = function(options, callback) {
 function createAssertion(options, strategies, callback) {
   var doc;
   try {
-    doc = new Parser().parseFromString(saml11.toString());
+    doc = newSaml11Document();
   } catch(err){
     return utils.reportError(err, callback);
   }

lib/saml20.js

@@ -1,7 +1,5 @@
-var fs = require('fs');
 var path = require('path');
 var async = require('async');
-var Parser = require('xmldom').DOMParser;
 var moment = require('moment');
 var xmlNameValidator = require('xml-name-validator');
 var is_uri = require('valid-url').is_uri;
@@ -10,14 +8,7 @@ var EncryptXml = require('./xml/encrypt');
 var SignXml = require('./xml/sign');
 var utils = require('./utils');
 
-var newSaml20Document = (function () {
-  var saml20Template = fs.readFileSync(path.join(__dirname, 'saml20.template'));
-  var prototypeDoc = new Parser().parseFromString(saml20Template.toString())
-
-  return function () {
-    return prototypeDoc.cloneNode(true);
-  };
-})();
+var newSaml20Document = utils.factoryForNode(path.join(__dirname, 'saml20.template'));
 
 var NAMESPACE = 'urn:oasis:names:tc:SAML:2.0:assertion';
 

lib/utils.js

@@ -1,3 +1,6 @@
+var fs = require('fs');
+var Parser = require('xmldom').DOMParser;
+
 exports.pemToCert = function(pem) {
   var cert = /-----BEGIN CERTIFICATE-----([^-]*)-----END CERTIFICATE-----/g.exec(pem.toString());
   if (cert && cert.length > 0) {
@@ -57,4 +60,19 @@ exports.removeWhitespace = function(xml) {
 
 function getRandomInt(min, max) {
   return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+/**
+ * Returns a function that can be called to create a new Node.
+ *
+ * @param {string} pathToTemplate an absolute path to a template file
+ * @return {function(): Node}
+ */
+exports.factoryForNode = function factoryForNode(pathToTemplate) {
+  var template = fs.readFileSync(pathToTemplate)
+  var prototypeDoc = new Parser().parseFromString(template.toString())
+
+  return function () {
+    return prototypeDoc.cloneNode(true);
+  };
 };