Do not include sasl2 in @xmpp/client

xmppjs · Dec 22, 2024 · a53d94a · a53d94a
1 parent 968204f
commit a53d94a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 40 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/client/index.js b/packages/client/index.js
@@ -12,7 +12,6 @@ import _iqCaller from "@xmpp/iq/caller.js";
 import _iqCallee from "@xmpp/iq/callee.js";
 import _resolve from "@xmpp/resolve";
 import _starttls from "@xmpp/starttls/client.js";
-import _sasl2 from "@xmpp/sasl2";
 import _sasl from "@xmpp/sasl";
 import _resourceBinding from "@xmpp/resource-binding";
 import _sessionEstablishment from "@xmpp/session-establishment";
@@ -24,7 +23,6 @@ import anonymous from "@xmpp/sasl-anonymous";
 
 function client(options = {}) {
   const { resource, credentials, username, password, ...params } = options;
-  const { clientId, software, device } = params;
 
   const { domain, service } = params;
   if (!domain && service) {
@@ -54,12 +52,6 @@ function client(options = {}) {
     anonymous,
   }).map(([k, v]) => ({ [k]: v(saslFactory) }));
 
-  const sasl2 = _sasl2(
-    { streamFeatures, saslFactory },
-    credentials || { username, password },
-    { clientId, software, device },
-  );
-
   const sasl = _sasl(
     { streamFeatures, saslFactory },
     credentials || { username, password },
@@ -92,7 +84,6 @@ function client(options = {}) {
     resolve,
     starttls,
     saslFactory,
-    sasl2,
     sasl,
     resourceBinding,
     sessionEstablishment,

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -18,7 +18,6 @@
     "@xmpp/sasl-anonymous": "^0.13.2",
     "@xmpp/sasl-plain": "^0.13.2",
     "@xmpp/sasl-scram-sha-1": "^0.13.2",
-    "@xmpp/sasl2": "^0.13.0",
     "@xmpp/session-establishment": "^0.13.2",
     "@xmpp/starttls": "^0.13.2",
     "@xmpp/stream-features": "^0.13.2",

diff --git a/packages/sasl2/test.js b/packages/sasl2/test.js
@@ -1,12 +1,18 @@
 import { mockClient, promise } from "@xmpp/test";
-import parse from "@xmpp/xml/lib/parse.js";
+import sasl2 from "./index";
 
 const username = "foo";
 const password = "bar";
 const credentials = { username, password };
 
+function makeClient({ credentials, ...args }) {
+  const entity = mockClient({ credentials, ...args });
+  sasl2(entity, (credentials = { username, password }));
+  return entity;
+}
+
 test("no compatibles mechanisms", async () => {
-  const { entity } = mockClient({ username, password });
+  const { entity } = makeClient({ username, password });
 
   entity.mockInput(
     <features xmlns="http://etherx.jabber.org/streams">
@@ -22,7 +28,7 @@ test("no compatibles mechanisms", async () => {
 });
 
 test("with object credentials", async () => {
-  const { entity } = mockClient({ credentials });
+  const { entity } = makeClient({ credentials });
 
   entity.mockInput(
     <features xmlns="http://etherx.jabber.org/streams">
@@ -52,7 +58,7 @@ test("with function credentials", async () => {
     return auth(credentials, mech);
   }
 
-  const { entity } = mockClient({ credentials: authenticate });
+  const { entity } = makeClient({ credentials: authenticate });
 
   entity.mockInput(
     <features xmlns="http://etherx.jabber.org/streams">
@@ -75,7 +81,7 @@ test("with function credentials", async () => {
 });
 
 test("failure", async () => {
-  const { entity } = mockClient({ credentials });
+  const { entity } = makeClient({ credentials });
 
   entity.mockInput(
     <features xmlns="http://etherx.jabber.org/streams">
@@ -107,7 +113,7 @@ test("failure", async () => {
 });
 
 test("prefers SCRAM-SHA-1", async () => {
-  const { entity } = mockClient({ credentials });
+  const { entity } = makeClient({ credentials });
 
   entity.mockInput(
     <features xmlns="http://etherx.jabber.org/streams">
@@ -123,8 +129,8 @@ test("prefers SCRAM-SHA-1", async () => {
   expect(result.attrs.mechanism).toEqual("SCRAM-SHA-1");
 });
 
-test("use ANONYMOUS if username and password are not provided", async () => {
-  const { entity } = mockClient();
+test.skip("use ANONYMOUS if username and password are not provided", async () => {
+  const { entity } = makeClient();
 
   entity.mockInput(
     <features xmlns="http://etherx.jabber.org/streams">
@@ -139,24 +145,3 @@ test("use ANONYMOUS if username and password are not provided", async () => {
   const result = await promise(entity, "send");
   expect(result.attrs.mechanism).toEqual("ANONYMOUS");
 });
-
-test("with whitespaces", async () => {
-  const { entity } = mockClient();
-
-  entity.mockInput(
-    parse(
-      `
-      <features xmlns="http://etherx.jabber.org/streams">
-        <authentication xmlns="urn:xmpp:sasl:2">
-          <mechanism>ANONYMOUS</mechanism>
-          <mechanism>PLAIN</mechanism>
-          <mechanism>SCRAM-SHA-1</mechanism>
-        </authentication>
-      </features>
-      `.trim(),
-    ),
-  );
-
-  const result = await promise(entity, "send");
-  expect(result.attrs.mechanism).toEqual("ANONYMOUS");
-});