@planningcenter/chat-react-native 4.8.0 → 4.9.1-qa-staging.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api_provider.d.ts","sourceRoot":"","sources":["../../src/contexts/api_provider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EAIZ,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAwBxC,eAAO,MAAM,eAAe,GAAI,cAAc,MAAM,EAAE,OAAO,OAAO,YAInE,CAAA;AAaD,eAAO,MAAM,eAAe,aAO1B,CAAA;AAEF,wBAAgB,WAAW,CAAC,EAAE,QAAQ,EAAE,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"api_provider.d.ts","sourceRoot":"","sources":["../../src/contexts/api_provider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EAIZ,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAwBxC,eAAO,MAAM,eAAe,GAAI,cAAc,MAAM,EAAE,OAAO,OAAO,YAInE,CAAA;AAaD,eAAO,MAAM,eAAe,aAO1B,CAAA;AAEF,wBAAgB,WAAW,CAAC,EAAE,QAAQ,EAAE,EAAE,SAAS,2CAiClD;AAoBD,wBAAgB,eAAe,WAQ9B"}
|
|
@@ -47,7 +47,7 @@ export const chatQueryClient = new QueryClient({
|
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
49
|
export function ApiProvider(t0) {
|
|
50
|
-
const $ = _c(
|
|
50
|
+
const $ = _c(17);
|
|
51
51
|
const {
|
|
52
52
|
children
|
|
53
53
|
} = t0;
|
|
@@ -75,11 +75,12 @@ export function ApiProvider(t0) {
|
|
|
75
75
|
const client = useApiClient();
|
|
76
76
|
let t2;
|
|
77
77
|
let t3;
|
|
78
|
-
if ($[4] !== sessionChanged) {
|
|
78
|
+
if ($[4] !== session || $[5] !== sessionChanged) {
|
|
79
79
|
t2 = () => {
|
|
80
|
-
if (!sessionChanged) {
|
|
80
|
+
if (!sessionChanged || session === lastResetSession) {
|
|
81
81
|
return;
|
|
82
82
|
}
|
|
83
|
+
lastResetSession = session;
|
|
83
84
|
emitAuthRefresh();
|
|
84
85
|
cancelThrottledRefreshes(chatQueryClient);
|
|
85
86
|
if (chatQueryClient.isFetching()) {
|
|
@@ -88,56 +89,57 @@ export function ApiProvider(t0) {
|
|
|
88
89
|
}
|
|
89
90
|
chatQueryClient.clear();
|
|
90
91
|
};
|
|
91
|
-
t3 = [sessionChanged];
|
|
92
|
-
$[4] =
|
|
93
|
-
$[5] =
|
|
94
|
-
$[6] =
|
|
92
|
+
t3 = [sessionChanged, session];
|
|
93
|
+
$[4] = session;
|
|
94
|
+
$[5] = sessionChanged;
|
|
95
|
+
$[6] = t2;
|
|
96
|
+
$[7] = t3;
|
|
95
97
|
} else {
|
|
96
|
-
t2 = $[
|
|
97
|
-
t3 = $[
|
|
98
|
+
t2 = $[6];
|
|
99
|
+
t3 = $[7];
|
|
98
100
|
}
|
|
99
101
|
useEffect(t2, t3);
|
|
100
102
|
let t4;
|
|
101
103
|
let t5;
|
|
102
|
-
if ($[
|
|
104
|
+
if ($[8] !== client) {
|
|
103
105
|
t4 = () => {
|
|
104
106
|
apiClient = client;
|
|
105
107
|
};
|
|
106
108
|
t5 = [client];
|
|
107
|
-
$[
|
|
108
|
-
$[
|
|
109
|
-
$[
|
|
109
|
+
$[8] = client;
|
|
110
|
+
$[9] = t4;
|
|
111
|
+
$[10] = t5;
|
|
110
112
|
} else {
|
|
111
|
-
t4 = $[
|
|
112
|
-
t5 = $[
|
|
113
|
+
t4 = $[9];
|
|
114
|
+
t5 = $[10];
|
|
113
115
|
}
|
|
114
116
|
useEffect(t4, t5);
|
|
115
117
|
let t6;
|
|
116
|
-
if ($[
|
|
118
|
+
if ($[11] !== session.isAuthenticated) {
|
|
117
119
|
t6 = session.isAuthenticated && /*#__PURE__*/_jsx(PrefetchQueries, {});
|
|
118
|
-
$[
|
|
119
|
-
$[
|
|
120
|
+
$[11] = session.isAuthenticated;
|
|
121
|
+
$[12] = t6;
|
|
120
122
|
} else {
|
|
121
|
-
t6 = $[
|
|
123
|
+
t6 = $[12];
|
|
122
124
|
}
|
|
123
125
|
let t7;
|
|
124
|
-
if ($[
|
|
126
|
+
if ($[13] === Symbol.for("react.memo_cache_sentinel")) {
|
|
125
127
|
t7 = /*#__PURE__*/_jsx(JoltForegroundPing, {});
|
|
126
|
-
$[
|
|
128
|
+
$[13] = t7;
|
|
127
129
|
} else {
|
|
128
|
-
t7 = $[
|
|
130
|
+
t7 = $[13];
|
|
129
131
|
}
|
|
130
132
|
let t8;
|
|
131
|
-
if ($[
|
|
133
|
+
if ($[14] !== children || $[15] !== t6) {
|
|
132
134
|
t8 = /*#__PURE__*/_jsxs(QueryClientProvider, {
|
|
133
135
|
client: chatQueryClient,
|
|
134
136
|
children: [t6, t7, children]
|
|
135
137
|
});
|
|
136
|
-
$[
|
|
137
|
-
$[
|
|
138
|
-
$[
|
|
138
|
+
$[14] = children;
|
|
139
|
+
$[15] = t6;
|
|
140
|
+
$[16] = t8;
|
|
139
141
|
} else {
|
|
140
|
-
t8 = $[
|
|
142
|
+
t8 = $[16];
|
|
141
143
|
}
|
|
142
144
|
return t8;
|
|
143
145
|
}
|
|
@@ -215,6 +217,11 @@ function useSessionChanged(value) {
|
|
|
215
217
|
const prototypeChanged = Boolean(prevEnv && newPrototypeName !== prevPrototypeName);
|
|
216
218
|
return tokenChanged || envChanged || prototypeChanged;
|
|
217
219
|
}
|
|
220
|
+
|
|
221
|
+
// Comparing by identity relies on ChatProvider memoizing `session` on token, env, and prototype,
|
|
222
|
+
// so a new object always means a new session. Several providers can share one ChatProvider, and
|
|
223
|
+
// each resetting for the same change would cancel the others' refetches into a burst.
|
|
224
|
+
let lastResetSession;
|
|
218
225
|
function usePrevious(value) {
|
|
219
226
|
const ref = useRef(value);
|
|
220
227
|
useEffect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api_provider.js","names":["focusManager","QueryClient","QueryClientProvider","usePrefetchQuery","React","useContext","useEffect","useRef","useApiClient","useAppState","appGrantsQueryOptions","featuresQueryOptions","useJoltForegroundPing","emitAuthRefresh","isResponseLike","ResponseError","cancelThrottledRefreshes","ChatContext","jsx","_jsx","jsxs","_jsxs","apiClient","defaultQueryFn","queryKey","Error","url","data","headers","app","get","configuredRetry","failureCount","error","isClientError","status","errorStatus","undefined","chatQueryClient","defaultOptions","queries","queryFn","retry","ApiProvider","t0","$","_c","children","token","env","prototypeName","session","t1","sessionChanged","useSessionChanged","client","t2","t3","isFetching","cancelQueries","then","_temp","clear","t4","t5","t6","isAuthenticated","PrefetchQueries","t7","Symbol","for","JoltForegroundPing","t8","invalidateQueries","useFocusManager","appState","setFocused","value","newToken","newEnv","newPrototypeName","prevToken","prevEnv","prevPrototypeName","usePrevious","isInitialLogin","tokenChanged","Boolean","access_token","envChanged","prototypeChanged","ref","current"],"sources":["../../src/contexts/api_provider.tsx"],"sourcesContent":["import {\n focusManager,\n QueryClient,\n QueryClientProvider,\n QueryKey,\n usePrefetchQuery,\n} from '@tanstack/react-query'\nimport React, { useContext, useEffect, useRef } from 'react'\nimport { ViewProps } from 'react-native'\nimport { ApiClient, useApiClient } from '../hooks/use_api_client'\nimport { useAppState } from '../hooks/use_app_state'\nimport { appGrantsQueryOptions } from '../hooks/use_chat_permissions'\nimport { featuresQueryOptions } from '../hooks/use_features'\nimport { useJoltForegroundPing } from '../hooks/use_jolt'\nimport { RequestQueryKey } from '../hooks/use_suspense_api'\nimport { emitAuthRefresh } from '../utils/auth_events'\nimport { isResponseLike, ResponseError } from '../utils/response_error'\nimport { cancelThrottledRefreshes } from '../utils/throttled_refresh'\nimport { ChatContext, ChatContextValue } from './chat_context'\n\nlet apiClient: ApiClient | undefined\n\nconst defaultQueryFn = ({ queryKey }: { queryKey: QueryKey }) => {\n if (!apiClient) {\n throw new Error('No token present')\n }\n\n const [url, data, headers, app = 'chat'] = queryKey as RequestQueryKey\n\n return apiClient[app].get({ url, data, headers })\n}\n\nexport const configuredRetry = (failureCount: number, error: unknown) => {\n if (isClientError(error)) return false\n\n return failureCount < 3\n}\n\nconst isClientError = (error: unknown): boolean => {\n const status = errorStatus(error)\n return status !== undefined && status >= 400 && status < 500\n}\n\nconst errorStatus = (error: unknown): number | undefined => {\n if (error instanceof ResponseError) return error.status\n if (isResponseLike(error)) return error.status\n return undefined\n}\n\nexport const chatQueryClient = new QueryClient({\n defaultOptions: {\n queries: {\n queryFn: defaultQueryFn,\n retry: configuredRetry,\n },\n },\n})\n\nexport function ApiProvider({ children }: ViewProps) {\n const { token, env, prototypeName, session } = useContext(ChatContext)\n const sessionChanged = useSessionChanged({ token, env, prototypeName })\n\n const client = useApiClient()\n\n useEffect(() => {\n if (!sessionChanged) return\n\n emitAuthRefresh()\n cancelThrottledRefreshes(chatQueryClient)\n\n if (chatQueryClient.isFetching()) {\n chatQueryClient.cancelQueries().then(() => chatQueryClient.invalidateQueries())\n return\n }\n\n chatQueryClient.clear()\n }, [sessionChanged])\n\n useEffect(() => {\n apiClient = client\n }, [client])\n\n return (\n <QueryClientProvider client={chatQueryClient}>\n {session.isAuthenticated && <PrefetchQueries />}\n <JoltForegroundPing />\n {children}\n </QueryClientProvider>\n )\n}\n\n// Component to prefetch queries when the app is focused\n// This needs to live in the provider so that it can access the api client\n// and the chat query client\nconst PrefetchQueries = () => {\n const client = useApiClient()\n\n usePrefetchQuery(appGrantsQueryOptions(client))\n usePrefetchQuery(featuresQueryOptions(client))\n\n return null\n}\n\nconst JoltForegroundPing = () => {\n useJoltForegroundPing()\n\n return null\n}\n\nexport function useFocusManager() {\n const appState = useAppState()\n\n useEffect(() => {\n focusManager.setFocused(appState === 'active')\n }, [appState])\n\n return appState\n}\n\nfunction useSessionChanged(\n value: Pick<ChatContextValue, 'token' | 'env' | 'prototypeName'>\n): boolean {\n const { token: newToken, env: newEnv, prototypeName: newPrototypeName } = value\n const {\n token: prevToken,\n env: prevEnv,\n prototypeName: prevPrototypeName,\n } = usePrevious<typeof value>(value)\n\n const isInitialLogin = !prevToken && !!newToken\n if (isInitialLogin) return false\n\n const tokenChanged = Boolean(\n prevToken?.access_token && newToken?.access_token !== prevToken?.access_token\n )\n\n const envChanged = Boolean(prevEnv && newEnv !== prevEnv)\n const prototypeChanged = Boolean(prevEnv && newPrototypeName !== prevPrototypeName)\n\n return tokenChanged || envChanged || prototypeChanged\n}\n\nfunction usePrevious<T>(value: T): T {\n const ref = useRef<T>(value)\n\n useEffect(() => {\n ref.current = value\n }, [value])\n\n return ref.current\n}\n"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"api_provider.js","names":["focusManager","QueryClient","QueryClientProvider","usePrefetchQuery","React","useContext","useEffect","useRef","useApiClient","useAppState","appGrantsQueryOptions","featuresQueryOptions","useJoltForegroundPing","emitAuthRefresh","isResponseLike","ResponseError","cancelThrottledRefreshes","ChatContext","jsx","_jsx","jsxs","_jsxs","apiClient","defaultQueryFn","queryKey","Error","url","data","headers","app","get","configuredRetry","failureCount","error","isClientError","status","errorStatus","undefined","chatQueryClient","defaultOptions","queries","queryFn","retry","ApiProvider","t0","$","_c","children","token","env","prototypeName","session","t1","sessionChanged","useSessionChanged","client","t2","t3","lastResetSession","isFetching","cancelQueries","then","_temp","clear","t4","t5","t6","isAuthenticated","PrefetchQueries","t7","Symbol","for","JoltForegroundPing","t8","invalidateQueries","useFocusManager","appState","setFocused","value","newToken","newEnv","newPrototypeName","prevToken","prevEnv","prevPrototypeName","usePrevious","isInitialLogin","tokenChanged","Boolean","access_token","envChanged","prototypeChanged","ref","current"],"sources":["../../src/contexts/api_provider.tsx"],"sourcesContent":["import {\n focusManager,\n QueryClient,\n QueryClientProvider,\n QueryKey,\n usePrefetchQuery,\n} from '@tanstack/react-query'\nimport React, { useContext, useEffect, useRef } from 'react'\nimport { ViewProps } from 'react-native'\nimport { ApiClient, useApiClient } from '../hooks/use_api_client'\nimport { useAppState } from '../hooks/use_app_state'\nimport { appGrantsQueryOptions } from '../hooks/use_chat_permissions'\nimport { featuresQueryOptions } from '../hooks/use_features'\nimport { useJoltForegroundPing } from '../hooks/use_jolt'\nimport { RequestQueryKey } from '../hooks/use_suspense_api'\nimport { emitAuthRefresh } from '../utils/auth_events'\nimport { isResponseLike, ResponseError } from '../utils/response_error'\nimport { cancelThrottledRefreshes } from '../utils/throttled_refresh'\nimport { ChatContext, ChatContextValue } from './chat_context'\n\nlet apiClient: ApiClient | undefined\n\nconst defaultQueryFn = ({ queryKey }: { queryKey: QueryKey }) => {\n if (!apiClient) {\n throw new Error('No token present')\n }\n\n const [url, data, headers, app = 'chat'] = queryKey as RequestQueryKey\n\n return apiClient[app].get({ url, data, headers })\n}\n\nexport const configuredRetry = (failureCount: number, error: unknown) => {\n if (isClientError(error)) return false\n\n return failureCount < 3\n}\n\nconst isClientError = (error: unknown): boolean => {\n const status = errorStatus(error)\n return status !== undefined && status >= 400 && status < 500\n}\n\nconst errorStatus = (error: unknown): number | undefined => {\n if (error instanceof ResponseError) return error.status\n if (isResponseLike(error)) return error.status\n return undefined\n}\n\nexport const chatQueryClient = new QueryClient({\n defaultOptions: {\n queries: {\n queryFn: defaultQueryFn,\n retry: configuredRetry,\n },\n },\n})\n\nexport function ApiProvider({ children }: ViewProps) {\n const { token, env, prototypeName, session } = useContext(ChatContext)\n const sessionChanged = useSessionChanged({ token, env, prototypeName })\n\n const client = useApiClient()\n\n useEffect(() => {\n if (!sessionChanged || session === lastResetSession) return\n\n lastResetSession = session\n\n emitAuthRefresh()\n cancelThrottledRefreshes(chatQueryClient)\n\n if (chatQueryClient.isFetching()) {\n chatQueryClient.cancelQueries().then(() => chatQueryClient.invalidateQueries())\n return\n }\n\n chatQueryClient.clear()\n }, [sessionChanged, session])\n\n useEffect(() => {\n apiClient = client\n }, [client])\n\n return (\n <QueryClientProvider client={chatQueryClient}>\n {session.isAuthenticated && <PrefetchQueries />}\n <JoltForegroundPing />\n {children}\n </QueryClientProvider>\n )\n}\n\n// Component to prefetch queries when the app is focused\n// This needs to live in the provider so that it can access the api client\n// and the chat query client\nconst PrefetchQueries = () => {\n const client = useApiClient()\n\n usePrefetchQuery(appGrantsQueryOptions(client))\n usePrefetchQuery(featuresQueryOptions(client))\n\n return null\n}\n\nconst JoltForegroundPing = () => {\n useJoltForegroundPing()\n\n return null\n}\n\nexport function useFocusManager() {\n const appState = useAppState()\n\n useEffect(() => {\n focusManager.setFocused(appState === 'active')\n }, [appState])\n\n return appState\n}\n\nfunction useSessionChanged(\n value: Pick<ChatContextValue, 'token' | 'env' | 'prototypeName'>\n): boolean {\n const { token: newToken, env: newEnv, prototypeName: newPrototypeName } = value\n const {\n token: prevToken,\n env: prevEnv,\n prototypeName: prevPrototypeName,\n } = usePrevious<typeof value>(value)\n\n const isInitialLogin = !prevToken && !!newToken\n if (isInitialLogin) return false\n\n const tokenChanged = Boolean(\n prevToken?.access_token && newToken?.access_token !== prevToken?.access_token\n )\n\n const envChanged = Boolean(prevEnv && newEnv !== prevEnv)\n const prototypeChanged = Boolean(prevEnv && newPrototypeName !== prevPrototypeName)\n\n return tokenChanged || envChanged || prototypeChanged\n}\n\n// Comparing by identity relies on ChatProvider memoizing `session` on token, env, and prototype,\n// so a new object always means a new session. Several providers can share one ChatProvider, and\n// each resetting for the same change would cancel the others' refetches into a burst.\nlet lastResetSession: ChatContextValue['session'] | undefined\n\nfunction usePrevious<T>(value: T): T {\n const ref = useRef<T>(value)\n\n useEffect(() => {\n ref.current = value\n }, [value])\n\n return ref.current\n}\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@planningcenter/chat-react-native",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.9.1-qa-staging.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@fortawesome/fontawesome-svg-core": "^7.2.0",
|
|
35
35
|
"@fortawesome/react-native-fontawesome": "^0.3.2",
|
|
36
|
-
"@planningcenter/emoji-keyboard": "4.
|
|
36
|
+
"@planningcenter/emoji-keyboard": "4.9.1-qa-staging.0",
|
|
37
37
|
"lodash-inflection": "^1.5.0"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
@@ -84,5 +84,5 @@
|
|
|
84
84
|
"sf-symbols-typescript": "^2.2.0",
|
|
85
85
|
"typescript": "~6.0.3"
|
|
86
86
|
},
|
|
87
|
-
"gitHead": "
|
|
87
|
+
"gitHead": "a21a686eb800c58ea51a9f3fd35ab834a5f23ec4"
|
|
88
88
|
}
|
|
@@ -4,6 +4,7 @@ import { Text } from 'react-native'
|
|
|
4
4
|
import { useApiGet } from '../../hooks/use_api'
|
|
5
5
|
import { ApiClient, useApiClient } from '../../hooks/use_api_client'
|
|
6
6
|
import { Session } from '../../utils'
|
|
7
|
+
import { onAuthRefresh } from '../../utils/auth_events'
|
|
7
8
|
import { ApiProvider, chatQueryClient } from '../api_provider'
|
|
8
9
|
import { ChatContext, ChatContextValue } from '../chat_context'
|
|
9
10
|
|
|
@@ -37,7 +38,15 @@ const Probe = () => {
|
|
|
37
38
|
return <Text>{`${status}:${fetchStatus}:${data?.id ?? ''}`}</Text>
|
|
38
39
|
}
|
|
39
40
|
|
|
40
|
-
const Tree = ({
|
|
41
|
+
const Tree = ({
|
|
42
|
+
accessToken,
|
|
43
|
+
prototypeName,
|
|
44
|
+
providers = 1,
|
|
45
|
+
}: {
|
|
46
|
+
accessToken: string
|
|
47
|
+
prototypeName?: string
|
|
48
|
+
providers?: number
|
|
49
|
+
}) => {
|
|
41
50
|
const value = useMemo(() => {
|
|
42
51
|
const env = prototypeName ? 'prototype' : 'production'
|
|
43
52
|
const session = new Session({ token: { access_token: accessToken }, env, prototypeName })
|
|
@@ -52,9 +61,11 @@ const Tree = ({ accessToken, prototypeName }: { accessToken: string; prototypeNa
|
|
|
52
61
|
|
|
53
62
|
return (
|
|
54
63
|
<ChatContext.Provider value={value}>
|
|
55
|
-
|
|
56
|
-
<
|
|
57
|
-
|
|
64
|
+
{Array.from({ length: providers }, (_, i) => (
|
|
65
|
+
<ApiProvider key={i}>
|
|
66
|
+
<Probe />
|
|
67
|
+
</ApiProvider>
|
|
68
|
+
))}
|
|
58
69
|
</ChatContext.Provider>
|
|
59
70
|
)
|
|
60
71
|
}
|
|
@@ -105,6 +116,32 @@ describe('ApiProvider on access token change', () => {
|
|
|
105
116
|
|
|
106
117
|
expect(await screen.findByText('success:idle:42')).toBeTruthy()
|
|
107
118
|
})
|
|
119
|
+
|
|
120
|
+
it('refetches once however many providers are mounted', async () => {
|
|
121
|
+
const { rerender } = render(<Tree accessToken="stale" providers={3} />)
|
|
122
|
+
await waitFor(() => expect(meRequests()).toEqual(['stale']))
|
|
123
|
+
|
|
124
|
+
rerender(<Tree accessToken="fresh" providers={3} />)
|
|
125
|
+
|
|
126
|
+
expect(await screen.findAllByText('success:idle:42')).toHaveLength(3)
|
|
127
|
+
expect(meRequests()).toEqual(['stale', 'fresh'])
|
|
128
|
+
})
|
|
129
|
+
|
|
130
|
+
it('resets for a token it already reset for once another came between', () => {
|
|
131
|
+
const reset = jest.fn()
|
|
132
|
+
const unsubscribe = onAuthRefresh(reset)
|
|
133
|
+
|
|
134
|
+
const { rerender } = render(<Tree accessToken="first" />)
|
|
135
|
+
rerender(<Tree accessToken="second" />)
|
|
136
|
+
expect(reset).toHaveBeenCalledTimes(1)
|
|
137
|
+
|
|
138
|
+
rerender(<Tree accessToken="third" providers={0} />)
|
|
139
|
+
rerender(<Tree accessToken="third" />)
|
|
140
|
+
rerender(<Tree accessToken="second" />)
|
|
141
|
+
expect(reset).toHaveBeenCalledTimes(2)
|
|
142
|
+
|
|
143
|
+
unsubscribe()
|
|
144
|
+
})
|
|
108
145
|
})
|
|
109
146
|
|
|
110
147
|
describe('ApiProvider on Protonova environment change', () => {
|
|
@@ -63,7 +63,9 @@ export function ApiProvider({ children }: ViewProps) {
|
|
|
63
63
|
const client = useApiClient()
|
|
64
64
|
|
|
65
65
|
useEffect(() => {
|
|
66
|
-
if (!sessionChanged) return
|
|
66
|
+
if (!sessionChanged || session === lastResetSession) return
|
|
67
|
+
|
|
68
|
+
lastResetSession = session
|
|
67
69
|
|
|
68
70
|
emitAuthRefresh()
|
|
69
71
|
cancelThrottledRefreshes(chatQueryClient)
|
|
@@ -74,7 +76,7 @@ export function ApiProvider({ children }: ViewProps) {
|
|
|
74
76
|
}
|
|
75
77
|
|
|
76
78
|
chatQueryClient.clear()
|
|
77
|
-
}, [sessionChanged])
|
|
79
|
+
}, [sessionChanged, session])
|
|
78
80
|
|
|
79
81
|
useEffect(() => {
|
|
80
82
|
apiClient = client
|
|
@@ -140,6 +142,11 @@ function useSessionChanged(
|
|
|
140
142
|
return tokenChanged || envChanged || prototypeChanged
|
|
141
143
|
}
|
|
142
144
|
|
|
145
|
+
// Comparing by identity relies on ChatProvider memoizing `session` on token, env, and prototype,
|
|
146
|
+
// so a new object always means a new session. Several providers can share one ChatProvider, and
|
|
147
|
+
// each resetting for the same change would cancel the others' refetches into a burst.
|
|
148
|
+
let lastResetSession: ChatContextValue['session'] | undefined
|
|
149
|
+
|
|
143
150
|
function usePrevious<T>(value: T): T {
|
|
144
151
|
const ref = useRef<T>(value)
|
|
145
152
|
|