fix(transport-commons): Do not error when adding an undefined connect…

…ion to a channel (#2268)
feathersjs · Mar 26, 2021 · 28114c4 · 28114c4
1 parent f588257
commit 28114c4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/packages/transport-commons/src/channels/channel/base.ts b/packages/transport-commons/src/channels/channel/base.ts
@@ -43,7 +43,7 @@ export class Channel extends EventEmitter {
 
   join (...connections: RealTimeConnection[]) {
     connections.forEach(connection => {
-      if (this.connections.indexOf(connection) === -1) {
+      if (connection && this.connections.indexOf(connection) === -1) {
         this.connections.push(connection);
       }
     });

diff --git a/packages/transport-commons/src/channels/channel/combined.ts b/packages/transport-commons/src/channels/channel/combined.ts
@@ -48,8 +48,7 @@ export class CombinedChannel extends Channel {
   }
 
   private callChildren (method: string, connections: RealTimeConnection[]) {
-    // @ts-ignore
-    this.children.forEach(child => child[method](...connections));
+    this.children.forEach((child: any) => child[method](...connections));
     this.refresh();
 
     return this;

diff --git a/packages/transport-commons/test/channels/channel.test.ts b/packages/transport-commons/test/channels/channel.test.ts
@@ -181,6 +181,12 @@ describe('app.channel', () => {
       assert.strictEqual(combined.length, 2);
     });
 
+    it('does nothing when the channel is undefined (#2207)', () => {
+      const channel = app.channel('test', 'me');
+
+      channel.join(undefined);
+    });
+
     it('.join all child channels', () => {
       const c1 = { id: 1 };
       const c2 = { id: 2 };