Use getChildElements to fix bugs in SASL and XMPPError (#966)

Fixes #952

ava.config.js

@@ -7,6 +7,7 @@ export default {
           "@babel/plugin-transform-react-jsx",
           {
             pragma: "xml",
+            throwIfNamespace: false,
           },
         ],
         [

packages/error/index.js

@@ -12,7 +12,7 @@ class XMPPError extends Error {
   }
 
   static fromElement(element) {
-    const [condition, second, third] = element.children;
+    const [condition, second, third] = element.getChildElements();
     let text;
     let application;
 

packages/error/test.js

@@ -0,0 +1,55 @@
+"use strict";
+
+const test = require("ava");
+const XMPPError = require(".");
+// eslint-disable-next-line node/no-extraneous-require
+const parse = require("@xmpp/xml/lib/parse.js");
+
+test("fromElement", (t) => {
+  const application_element = (
+    <escape-your-data xmlns="http://example.org/ns" />
+  );
+
+  const nonza = (
+    <stream:error>
+      <some-condition xmlns="urn:ietf:params:xml:ns:xmpp-streams" />
+      <text xmlns="urn:ietf:params:xml:ns:xmpp-streams" xml:lang="langcode">
+        foo
+      </text>
+      {application_element}
+    </stream:error>
+  );
+
+  const error = XMPPError.fromElement(nonza);
+
+  t.is(error instanceof Error, true);
+  t.is(error.name, "XMPPError");
+  t.is(error.condition, "some-condition");
+  t.is(error.text, "foo");
+  t.is(error.application, application_element);
+});
+
+test("fromElement - whitespaces", (t) => {
+  const nonza = parse(
+    `
+    <stream:error>
+      <some-condition xmlns="urn:ietf:params:xml:ns:xmpp-streams" />
+      <text xmlns="urn:ietf:params:xml:ns:xmpp-streams" xml:lang="langcode">
+        foo
+      </text>
+      <escape-your-data xmlns='http://example.org/ns'/>
+    </stream:error>
+  `.trim(),
+  );
+
+  const error = XMPPError.fromElement(nonza);
+
+  t.is(error instanceof Error, true);
+  t.is(error.name, "XMPPError");
+  t.is(error.condition, "some-condition");
+  t.is(error.text, "\n        foo\n      ");
+  t.is(
+    error.application.toString(),
+    `<escape-your-data xmlns="http://example.org/ns"/>`,
+  );
+});

packages/sasl/index.js

@@ -10,7 +10,10 @@ const SASLFactory = require("saslmechanisms");
 const NS = "urn:ietf:params:xml:ns:xmpp-sasl";
 
 function getMechanismNames(features) {
-  return features.getChild("mechanisms", NS).children.map((el) => el.text());
+  return features
+    .getChild("mechanisms", NS)
+    .getChildElements()
+    .map((el) => el.text());
 }
 
 async function authenticate(SASL, entity, mechname, credentials) {

packages/sasl/test.js

@@ -2,6 +2,7 @@
 
 const test = require("ava");
 const { mockClient, promise } = require("@xmpp/test");
+const parse = require("@xmpp/xml/lib/parse.js");
 
 const username = "foo";
 const password = "bar";
@@ -150,3 +151,24 @@ test("use ANONYMOUS if username and password are not provided", async (t) => {
   const result = await promise(entity, "send");
   t.deepEqual(result.attrs.mechanism, "ANONYMOUS");
 });
+
+test("with whitespaces", async (t) => {
+  const { entity } = mockClient();
+
+  entity.mockInput(
+    parse(
+      `
+      <features xmlns="http://etherx.jabber.org/streams">
+        <mechanisms xmlns="urn:ietf:params:xml:ns:xmpp-sasl">
+          <mechanism>ANONYMOUS</mechanism>
+          <mechanism>PLAIN</mechanism>
+          <mechanism>SCRAM-SHA-1</mechanism>
+        </mechanisms>
+      </features>
+      `.trim(),
+    ),
+  );
+
+  const result = await promise(entity, "send");
+  t.deepEqual(result.attrs.mechanism, "ANONYMOUS");
+});