Merge pull request #1 from LoneRifle/master

Miscellaneous fixes for PR

Author: troyfactor4

lib/signed-xml.js

@@ -343,7 +343,7 @@ SignedXml.prototype.checkSignature = function(xml, callback) {
 
   if (!this.keyInfoProvider) {
     var err = new Error("cannot validate signature since no key info resolver was provided")
-    if (!callback){
+    if (!callback) {
       throw err
     } else {
       callback(err)
@@ -354,7 +354,7 @@ SignedXml.prototype.checkSignature = function(xml, callback) {
   this.signingKey = this.keyInfoProvider.getKey(this.keyInfo)
   if (!this.signingKey) {
     var err = new Error("key info provider could not resolve key info " + this.keyInfo)
-    if (!callback){
+    if (!callback) {
       throw err
     } else {
       callback(err)
@@ -365,15 +365,15 @@ SignedXml.prototype.checkSignature = function(xml, callback) {
   var doc = new Dom().parseFromString(xml)
 
   if (!this.validateReferences(doc)) {
-    if (!callback){
+    if (!callback) {
       return false;
     } else {
       callback(new Error('Could not validate references'))
       return
     }
   }
 
-  if (!callback){
+  if (!callback) {
     //Syncronous flow
     if (!this.validateSignatureValue(doc)) {
       return false
@@ -691,11 +691,11 @@ SignedXml.prototype.addReference = function(xpath, transforms, digestAlgorithm,
  *
  */
 SignedXml.prototype.computeSignature = function(xml, opts, callback) {
-  if (typeof opts === 'function' && callback == null){
+  if (typeof opts === 'function' && callback == null) {
     callback = opts
   }
 
-  if (callback != null && typeof callback !== 'function'){
+  if (callback != null && typeof callback !== 'function') {
     throw new Error("Last paramater must be a callback function")
   }
 
@@ -722,7 +722,7 @@ SignedXml.prototype.computeSignature = function(xml, opts, callback) {
   if (validActions.indexOf(location.action) === -1) {
     var err = new Error("location.action option has an invalid action: " + location.action +
       ", must be any of the following values: " + validActions.join(", "));
-    if (!callback){
+    if (!callback) {
       throw err;
     } else {
       callback(err, null)
@@ -770,7 +770,7 @@ SignedXml.prototype.computeSignature = function(xml, opts, callback) {
 
   if (!referenceNode || referenceNode.length === 0) {
     var err = new Error("the following xpath cannot be used because it was not found: " + location.reference);
-    if (!callback){
+    if (!callback) {
       throw err
     } else {
       callback(err, null)
@@ -794,7 +794,7 @@ SignedXml.prototype.computeSignature = function(xml, opts, callback) {
   var signedInfoNode = utils.findChilds(this.signatureNode, "SignedInfo")
   if (signedInfoNode.length == 0) {
     var err = new Error("could not find SignedInfo element in the message")
-    if (!callback){
+    if (!callback) {
       throw err
     } else {
       callback(err)
@@ -803,22 +803,23 @@ SignedXml.prototype.computeSignature = function(xml, opts, callback) {
   }
   signedInfoNode = signedInfoNode[0];
 
-  if (!callback){
+  if (!callback) {
     //Synchronous flow
     this.calculateSignatureValue(doc)
     signatureDoc.insertBefore(this.createSignature(prefix), signedInfoNode.nextSibling)
     this.signatureXml = signatureDoc.toString()
     this.signedXml = doc.toString()
   } else {
+    var self = this
     //Asynchronous flow
-    this.calculateSignatureValue(doc, (err, signature) => {
+    this.calculateSignatureValue(doc, function(err, signature) {
       if (err) {
         callback(err)
       } else {
-        this.signatureValue = signature
-        signatureDoc.insertBefore(this.createSignature(prefix), signedInfoNode.nextSibling)
-        this.signatureXml = signatureDoc.toString()
-        this.signedXml = doc.toString()
+        self.signatureValue = signature
+        signatureDoc.insertBefore(self.createSignature(prefix), signedInfoNode.nextSibling)
+        self.signatureXml = signatureDoc.toString()
+        self.signedXml = doc.toString()
         callback()
       }
     })