@linktr.ee/messaging-react 3.7.0-rc-1783336702 → 3.7.0-rc-1783337316

package/dist/index.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-joaNq6Id.cjs");exports.ActionButton=e.ActionButton;exports.Avatar=e.Avatar;exports.ChannelEmptyState=e.ChannelEmptyState;exports.ChannelList=e.ChannelList;exports.ChannelView=e.ChannelView;exports.CustomMessageProvider=e.CustomMessageProvider;exports.FaqList=e.FaqList;exports.FaqListItem=e.FaqListItem;exports.LinkAttachment=e.LinkAttachment;exports.LockedAttachment=e.LockedAttachment;exports.MediaMessage=e.MediaMessage;exports.MessageAttachment=e.MessageAttachment;exports.MessageVoteButtons=e.MessageVoteButtons;exports.MessagingProvider=e.MessagingProvider;exports.MessagingShell=e.MessagingShell;exports.buildCompactMetaLabel=e.buildCompactMetaLabel;exports.formatFileSize=e.formatFileSize;exports.formatRelativeTime=e.formatRelativeTime;exports.getFileExtensionLabel=e.getFileExtensionLabel;exports.getMessageDisplayText=e.getMessageDisplayText;exports.isLinkAttachment=e.isLinkAttachment;exports.isUuidLike=e.isUuidLike;exports.messageAttachmentGroupPositionFromStream=e.bubbleGroupPositionFromStream;exports.normalizeLanguageCode=e.normalizeLanguageCode;exports.resolveConversationParticipant=e.resolveConversationParticipant;exports.resolveLinkAttachment=e.resolveLinkAttachment;exports.resolveMediaFromMessage=e.resolveMediaFromMessage;exports.resolveParticipantDisplayName=e.resolveParticipantDisplayName;exports.useComposerLocked=e.useComposerLocked;exports.useCustomMessage=e.useCustomMessage;exports.useMessageVote=e.useMessageVote;exports.useMessaging=e.useMessaging;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-DdN7z-9Y.cjs");exports.ActionButton=e.ActionButton;exports.Avatar=e.Avatar;exports.ChannelEmptyState=e.ChannelEmptyState;exports.ChannelList=e.ChannelList;exports.ChannelView=e.ChannelView;exports.CustomMessageProvider=e.CustomMessageProvider;exports.FaqList=e.FaqList;exports.FaqListItem=e.FaqListItem;exports.LinkAttachment=e.LinkAttachment;exports.LockedAttachment=e.LockedAttachment;exports.MediaMessage=e.MediaMessage;exports.MessageAttachment=e.MessageAttachment;exports.MessageVoteButtons=e.MessageVoteButtons;exports.MessagingProvider=e.MessagingProvider;exports.MessagingShell=e.MessagingShell;exports.buildCompactMetaLabel=e.buildCompactMetaLabel;exports.formatFileSize=e.formatFileSize;exports.formatRelativeTime=e.formatRelativeTime;exports.getFileExtensionLabel=e.getFileExtensionLabel;exports.getMessageDisplayText=e.getMessageDisplayText;exports.isLinkAttachment=e.isLinkAttachment;exports.isUuidLike=e.isUuidLike;exports.messageAttachmentGroupPositionFromStream=e.bubbleGroupPositionFromStream;exports.normalizeLanguageCode=e.normalizeLanguageCode;exports.resolveConversationParticipant=e.resolveConversationParticipant;exports.resolveLinkAttachment=e.resolveLinkAttachment;exports.resolveMediaFromMessage=e.resolveMediaFromMessage;exports.resolveParticipantDisplayName=e.resolveParticipantDisplayName;exports.useComposerLocked=e.useComposerLocked;exports.useCustomMessage=e.useCustomMessage;exports.useMessageVote=e.useMessageVote;exports.useMessaging=e.useMessaging;
 //# sourceMappingURL=index.cjs.map

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as e, b as t, C as i, c as o, d as n, e as m, F as r, f as g, L as l, h as M, M as c, i as u, j as L, k as h, l as d, m as p, n as v, o as C, p as A, q as k, s as F, t as P, u as b, v as f, w as x, x as y, y as S, z as q, B as z, D as B, E as D, G as E } from "./index-DaO2_oHM.js";
+import { a as e, b as t, C as i, c as o, d as n, e as m, F as r, f as g, L as l, h as M, M as c, i as u, j as L, k as h, l as d, m as p, n as v, o as C, p as A, q as k, s as F, t as P, u as b, v as f, w as x, x as y, y as S, z as q, B as z, D as B, E as D, G as E } from "./index-C-2O97qw.js";
 export {
   e as ActionButton,
   t as Avatar,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@linktr.ee/messaging-react",
-  "version": "3.7.0-rc-1783336702",
+  "version": "3.7.0-rc-1783337316",
   "description": "React messaging components built on messaging-core for web applications",
   "type": "module",
   "main": "dist/index.cjs",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@linktr.ee/component-library": "11.8.6",
-    "@linktr.ee/messaging-core": "2.3.0-rc-1783336702",
+    "@linktr.ee/messaging-core": "2.3.0-rc-1783337316",
     "@phosphor-icons/react": "^2.1.10"
   },
   "devDependencies": {

package/src/providers/MessagingProvider.test.tsx

@@ -418,4 +418,72 @@ describe('MessagingProvider', () => {
       expect.objectContaining({ id: 'user-2' })
     )
   })
+
+  it('clears apiKey client/connection state on injection so it cannot leak back to apiKey mode', async () => {
+    setupServiceMock()
+    const states: Array<{
+      isConnected: boolean
+      hasClient: boolean
+      error: string | null
+    }> = []
+    const apiKeyProps = {
+      apiKey: 'mock-api-key',
+      serviceConfig: {
+        fetchToken: async () => 'token',
+        createChannel: async () => ({ channelId: 'ch-1' }),
+      },
+    }
+    const onState = (s: unknown) =>
+      states.push(
+        s as { isConnected: boolean; hasClient: boolean; error: string | null }
+      )
+
+    const { rerender } = render(
+      <MessagingProvider
+        {...apiKeyProps}
+        user={{ id: 'user-1', name: 'User One' } as MessagingUser}
+      >
+        <Probe onState={onState} />
+      </MessagingProvider>
+    )
+
+    // apiKey path connects: client + isConnected become truthy.
+    await waitFor(() => {
+      const last = states[states.length - 1]
+      expect(last.isConnected).toBe(true)
+      expect(last.hasClient).toBe(true)
+    })
+
+    const injectedClient = {
+      userID: 'injected-user',
+    } as unknown as StreamChat
+    rerender(
+      <MessagingProvider
+        client={injectedClient}
+        user={{ id: 'user-1', name: 'User One' } as MessagingUser}
+      >
+        <Probe onState={onState} />
+      </MessagingProvider>
+    )
+    await act(async () => {
+      await Promise.resolve()
+    })
+
+    // Return to apiKey mode with no user, so nothing reconnects. The stale
+    // apiKey client/isConnected must have been cleared on injection, not
+    // resurface for MessagingShell to queryChannels against.
+    rerender(
+      <MessagingProvider {...apiKeyProps} user={null}>
+        <Probe onState={onState} />
+      </MessagingProvider>
+    )
+    await act(async () => {
+      await Promise.resolve()
+    })
+
+    const last = states[states.length - 1]
+    expect(last.isConnected).toBe(false)
+    expect(last.hasClient).toBe(false)
+    expect(last.error).toBeNull()
+  })
 })

package/src/providers/MessagingProvider.tsx

@@ -162,15 +162,19 @@ export const MessagingProvider: React.FC<MessagingProviderProps> = ({
     const currentConfig = serviceConfigRef.current
 
     // An injected client owns its own connection — never create a service or
-    // connect for it. Also drop any apiKey-path service left from a prior
-    // connect: otherwise, if this instance later returns to apiKey mode, the
-    // user-connection effect would see the stale service (before the new one is
-    // installed) and connectUser on the previous backend.
+    // connect for it. Reset all apiKey-path connection state (service, client,
+    // isConnected, error, isLoading): while injected these are masked by the
+    // context, but on a later return to apiKey mode they would leak back —
+    // before the fresh service reconnects — feeding the user-connection effect
+    // a stale service and MessagingShell (which gates its load on
+    // `client && isConnected`) a disconnected client to queryChannels on.
     if (injectedClient) {
-      if (serviceRef.current) {
-        serviceRef.current = null
-        setService(null)
-      }
+      serviceRef.current = null
+      setService(null)
+      setClient(null)
+      setIsConnected(false)
+      setError(null)
+      setIsLoading(false)
       return
     }