Merge branch 'master' of https://github.com/GauriSpears/xml-crypto

node-saml · Jan 18, 2024 · c440f5b · c440f5b
2 parents 8f682f0 + 17c628c
commit c440f5b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/signed-xml.ts b/src/signed-xml.ts
@@ -927,12 +927,14 @@ export class SignedXml {
       let nodes = xpath.selectWithResolver(ref.xpath ?? "", doc, this.namespaceResolver);
 
       if (!utils.isArrayHasLength(nodes)) {
+<<<<<<< HEAD
         if (this.xadesQualifyingProperties != null) {
           nodes = xpath.selectWithResolver(
             ref.xpath ?? "",
             new xmldom.DOMParser().parseFromString(this.xadesQualifyingProperties()),
             this.namespaceResolver,
           );
+>>>>>>> 17c628c0bc401c3c80d5129fd7f6757dc0834621
         }
         if (!utils.isArrayHasLength(nodes)) {
           throw new Error(
@@ -942,6 +944,7 @@ export class SignedXml {
       }
 
       for (const node of nodes) {
+<<<<<<< HEAD
         let addattr = "";
         if (node["localName"] === "SignedProperties") {
           addattr = ' Type="http://uri.etsi.org/01903#SignedProperties"';
@@ -952,6 +955,7 @@ export class SignedXml {
           const id = this.ensureHasId(node);
           ref.uri = id;
           res += `<${prefix}Reference URI="#${id}"${addattr}>`;
+>>>>>>> 17c628c0bc401c3c80d5129fd7f6757dc0834621
         }
         res += `<${prefix}Transforms>`;
         for (const trans of ref.transforms || []) {