more linting and formatting

node-saml · Jun 8, 2023 · 79b3920 · 79b3920
1 parent fd3c0e0
commit 79b3920
Show file tree

Hide file tree

Showing 6 changed files with 219 additions and 222 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -19,6 +19,6 @@
     "curly": "warn",
     "eqeqeq": ["warn", "smart"],
     "no-var": "warn",
-    "prefer-const":"warn"
+    "prefer-const": "warn"
   }
-}
+}
diff --git a/lib/enveloped-signature.js b/lib/enveloped-signature.js
@@ -41,4 +41,3 @@ EnvelopedSignature.prototype.getAlgorithmName = function () {
 };
 
 exports.EnvelopedSignature = EnvelopedSignature;
-
diff --git a/lib/exclusive-canonicalization.js b/lib/exclusive-canonicalization.js
@@ -344,4 +344,3 @@ ExclusiveCanonicalizationWithComments.prototype.getAlgorithmName = function () {
 
 exports.ExclusiveCanonicalization = ExclusiveCanonicalization;
 exports.ExclusiveCanonicalizationWithComments = ExclusiveCanonicalizationWithComments;
-
diff --git a/lib/signed-xml.js b/lib/signed-xml.js
@@ -1129,8 +1129,6 @@ SignedXml.prototype.getSignedXml = function () {
   return this.signedXml;
 };
 
-
 exports.SignedXml = SignedXml;
 exports.StringKeyInfo = StringKeyInfo;
 exports.FileKeyInfo = FileKeyInfo;
-
diff --git a/test/signature-integration-tests.js b/test/signature-integration-tests.js
@@ -6,6 +6,40 @@ var xpath = require("xpath"),
 var expect = require("chai").expect;
 
 describe("Signature integration tests", function () {
+  function verifySignature(xml, expected, xpath) {
+    var sig = new SignedXml();
+    sig.signingKey = fs.readFileSync("./test/static/client.pem");
+    sig.keyInfo = null;
+
+    xpath.map(function (n) {
+      sig.addReference(n);
+    });
+
+    sig.computeSignature(xml);
+    var signed = sig.getSignedXml();
+
+    //fs.writeFileSync("./test/validators/XmlCryptoUtilities/XmlCryptoUtilities/bin/Debug/signedExample.xml", signed)
+    var expectedContent = fs.readFileSync(expected).toString();
+    expect(signed, "signature xml different than expected").to.equal(expectedContent);
+    /*
+    var spawn = require('child_process').spawn
+    var proc = spawn('./test/validators/XmlCryptoUtilities/XmlCryptoUtilities/bin/Debug/XmlCryptoUtilities.exe', ['verify'])
+  
+    proc.stdout.on('data', function (data) {
+      console.log('stdout: ' + data);
+    });
+  
+    proc.stderr.on('data', function (data) {
+      console.log('stderr: ' + data);
+    });
+  
+    proc.on('exit', function (code) {
+      test.equal(0, code, "signature validation failed")
+      test.done()
+    });
+    */
+  }
+
   it("verify signature", function () {
     var xml =
       '<root><x xmlns="ns"></x><y z_attr="value" a_attr1="foo"></y><z><ns:w ns:attr="value" xmlns:ns="myns"></ns:w></z></root>';
@@ -188,37 +222,3 @@ describe("Signature integration tests", function () {
     ).to.equal(2);
   });
 });
-
-function verifySignature(xml, expected, xpath) {
-  var sig = new SignedXml();
-  sig.signingKey = fs.readFileSync("./test/static/client.pem");
-  sig.keyInfo = null;
-
-  xpath.map(function (n) {
-    sig.addReference(n);
-  });
-
-  sig.computeSignature(xml);
-  var signed = sig.getSignedXml();
-
-  //fs.writeFileSync("./test/validators/XmlCryptoUtilities/XmlCryptoUtilities/bin/Debug/signedExample.xml", signed)
-  var expectedContent = fs.readFileSync(expected).toString();
-  expect(signed, "signature xml different than expected").to.equal(expectedContent);
-  /*
-  var spawn = require('child_process').spawn
-  var proc = spawn('./test/validators/XmlCryptoUtilities/XmlCryptoUtilities/bin/Debug/XmlCryptoUtilities.exe', ['verify'])
-
-  proc.stdout.on('data', function (data) {
-    console.log('stdout: ' + data);
-  });
-
-  proc.stderr.on('data', function (data) {
-    console.log('stderr: ' + data);
-  });
-
-  proc.on('exit', function (code) {
-    test.equal(0, code, "signature validation failed")
-    test.done()
-  });
-  */
-}