f

xmppjs · Jan 1, 2025 · 876b6f9 · 876b6f9
1 parent 434072b
commit 876b6f9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/packages/client-core/package.json b/packages/client-core/package.json
@@ -11,7 +11,6 @@
     "@xmpp/connection": "^0.14.0",
     "@xmpp/jid": "^0.14.0",
     "@xmpp/sasl": "^0.14.0",
-    "@xmpp/sasl2": "^0.14.0",
     "@xmpp/xml": "^0.14.0",
     "saslmechanisms": "^0.1.1"
   },

diff --git a/packages/client-core/src/fast/fast.js b/packages/client-core/src/fast/fast.js
@@ -1,4 +1,4 @@
-import { getAvailableMechanisms } from "@xmpp/sasl2";
+import { getAvailableMechanisms } from "@xmpp/sasl";
 import xml from "@xmpp/xml";
 import SASLFactory from "saslmechanisms";
 

diff --git a/packages/sasl/index.js b/packages/sasl/index.js
@@ -7,8 +7,12 @@ import { procedure } from "@xmpp/events";
 
 const NS = "urn:ietf:params:xml:ns:xmpp-sasl";
 
-function getMechanismNames(element) {
-  return element.getChildElements().map((el) => el.text());
+export function getAvailableMechanisms(element, NS, saslFactory) {
+  const offered = new Set(
+    element.getChildren("mechanism", NS).map((m) => m.text()),
+  );
+  const supported = saslFactory._mechs.map(({ name }) => name);
+  return supported.filter((mech) => offered.has(mech));
 }
 
 async function authenticate({ saslFactory, entity, mechanism, credentials }) {
@@ -66,11 +70,8 @@ async function authenticate({ saslFactory, entity, mechanism, credentials }) {
 
 export default function sasl({ streamFeatures, saslFactory }, onAuthenticate) {
   streamFeatures.use("mechanisms", NS, async ({ entity }, _next, element) => {
-    const offered = getMechanismNames(element);
-    const supported = saslFactory._mechs.map(({ name }) => name);
-    const intersection = supported.filter((mech) => offered.includes(mech));
-
-    if (intersection.length === 0) {
+    const mechanisms = getAvailableMechanisms(element, NS, saslFactory);
+    if (mechanisms.length === 0) {
       throw new SASLError("SASL: No compatible mechanism available.");
     }
 
@@ -83,7 +84,7 @@ export default function sasl({ streamFeatures, saslFactory }, onAuthenticate) {
       });
     }
 
-    await onAuthenticate(done, intersection);
+    await onAuthenticate(done, mechanisms);
 
     await entity.restart();
   });

diff --git a/packages/sasl2/index.js b/packages/sasl2/index.js
@@ -2,19 +2,12 @@ import { encode, decode } from "@xmpp/base64";
 import SASLError from "@xmpp/sasl/lib/SASLError.js";
 import xml from "@xmpp/xml";
 import { procedure } from "@xmpp/events";
+import { getAvailableMechanisms } from "@xmpp/sasl";
 
 // https://xmpp.org/extensions/xep-0388.html
 
 const NS = "urn:xmpp:sasl:2";
 
-export function getAvailableMechanisms(element, NS, saslFactory) {
-  const offered = new Set(
-    element.getChildren("mechanism", NS).map((m) => m.text()),
-  );
-  const supported = saslFactory._mechs.map(({ name }) => name);
-  return supported.filter((mech) => offered.has(mech));
-}
-
 async function authenticate({
   saslFactory,
   entity,