@planningcenter/chat-react-native 4.8.0-qa-staging.12 → 4.8.0-qa-staging.14
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.
- package/build/contexts/chat_context.d.ts +2 -2
- package/build/contexts/chat_context.d.ts.map +1 -1
- package/build/contexts/chat_context.js.map +1 -1
- package/build/contexts/session_context.d.ts +1 -1
- package/build/contexts/session_context.d.ts.map +1 -1
- package/build/contexts/session_context.js +338 -143
- package/build/contexts/session_context.js.map +1 -1
- package/build/utils/client/client.d.ts +5 -9
- package/build/utils/client/client.d.ts.map +1 -1
- package/build/utils/client/client.js +78 -95
- package/build/utils/client/client.js.map +1 -1
- package/package.json +3 -3
- package/src/__tests__/contexts/session_context.tsx +0 -46
- package/src/__tests__/utils/client.ts +0 -36
- package/src/contexts/chat_context.tsx +2 -2
- package/src/contexts/session_context.tsx +14 -19
- package/src/utils/client/client.ts +52 -95
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session_context.js","names":["useMutation","React","createContext","useCallback","useEffect","useMemo","useRef","useState","Alert","currentPersonQueryKey","organizationRequestArgs","useStorage","getRequestQueryKey","Session","UNAUTHENTICATED_SESSION_ID","SessionManager","cancelThrottledRefreshes","chatQueryClient","jsx","_jsx","SessionContext","env","setEnv","session","sessions","token","undefined","handleUnauthorizedResponse","Promise","resolve","logout","setToken","switchSession","createSession","decorateSession","isAuthenticated","data","personData","fetchQuery","queryKey","organizationData","name","avatar","id","setPerson","type","setOrganization","SessionContextProvider","children","queryClient","config","secureStorage","refreshTokenFn","onLogout","storageKeys","alertConfig","sessionsKey","managerString","setManagerString","sessionManager","hydrate","currentSession","alertShown","setAlertShown","mutate","refreshToken","mutateAsync","refreshTokenAsync","isError","isRefreshError","mutationKey","refresh_token","mutationFn","reject","Error","prototypeName","then","refreshedToken","handleTokenUpdate","onError","t","handleRefreshFailed","handleClearQueryClient","clear","handleSetEnv","_env","_prototypeName","updatedManager","sameEnvironment","productionEnvironments","switchingToDevelopment","includes","switchingToProduction","switchingPrototype","newSession","upsertSession","toString","handleCreateSession","currentSessionId","handleSwitchSession","sessionId","_error","alert","handleLogout","manager","removeSession","updateCurrentToken","status","errors","isForcedLogout","some","e","test","detail","refreshInFlight","response","isUnauthorized","current","catch","finally","sessionContextValue","alertTitle","title","alertMessage","message","retryText","logoutText","text","onPress","decoratedSession","Provider","value"],"sources":["../../src/contexts/session_context.tsx"],"sourcesContent":["import { QueryClient, useMutation } from '@tanstack/react-query'\nimport React, {\n createContext,\n PropsWithChildren,\n useCallback,\n useEffect,\n useMemo,\n useRef,\n useState,\n} from 'react'\nimport { Alert } from 'react-native'\nimport { currentPersonQueryKey } from '../hooks/use_current_person'\nimport { organizationRequestArgs } from '../hooks/use_organization'\nimport { useStorage } from '../hooks/use_storage'\nimport { getRequestQueryKey } from '../hooks/use_suspense_api'\nimport { CurrentPersonResource, FailedResponse, OAuthToken, OrganizationResource } from '../types'\nimport { ApiResource } from '../types/api_primitives'\nimport { ENV, PartialToken, Session, UNAUTHENTICATED_SESSION_ID } from '../utils'\nimport { StorageAdapter } from '../utils/native_adapters/storage_adapter'\nimport { SessionManager } from '../utils/session_manager'\nimport { cancelThrottledRefreshes } from '../utils/throttled_refresh'\nimport { chatQueryClient } from './api_provider'\n\ntype Sessions = Record<string, string> // Key is session ID\n\nexport type SessionContextValue = {\n env: ENV\n setEnv: (_env: ENV, _prototypeName?: string) => void\n session: Session\n sessions: Sessions\n token: OAuthToken | undefined\n handleUnauthorizedResponse: (_response: FailedResponse) => Promise<OAuthToken | undefined>\n logout: () => void\n setToken: (_token: OAuthToken) => void\n switchSession: (_sessionId: string) => void\n createSession: (_session: Session) => Promise<void>\n}\n\nexport const SessionContext = createContext<SessionContextValue>({\n env: 'production',\n setEnv: () => null,\n session: new Session(),\n sessions: {},\n token: undefined,\n handleUnauthorizedResponse: () => Promise.resolve(undefined),\n logout: () => null,\n setToken: () => null,\n switchSession: () => null,\n createSession: () => Promise.resolve(),\n})\n\nexport type SessionContextConfig = {\n // Storage adapters\n secureStorage: StorageAdapter // For sensitive data (tokens/sessions)\n\n // Functional callbacks\n refreshTokenFn: (params: {\n refresh_token: string\n env: ENV\n prototypeName?: string\n }) => Promise<OAuthToken>\n onLogout: () => void | Promise<void>\n\n // Optional configuration\n storageKeys?: {\n sessions?: string\n currentSessionId?: string\n }\n alertConfig?: {\n title?: string\n message?: string\n retryText?: string\n logoutText?: string\n }\n}\n\nconst decorateSession = async <T extends PartialToken>(session: Session<T>) => {\n if (!session.isAuthenticated) return session\n\n const { data: personData } = await chatQueryClient.fetchQuery<ApiResource<CurrentPersonResource>>(\n {\n queryKey: currentPersonQueryKey,\n }\n )\n const { data: organizationData } = await chatQueryClient.fetchQuery<\n ApiResource<OrganizationResource>\n >({\n queryKey: getRequestQueryKey(organizationRequestArgs),\n })\n\n if (personData) {\n const { name, avatar, id } = personData || {}\n session.setPerson({ id, type: 'Person', name, avatar })\n }\n\n if (organizationData) {\n session.setOrganization({\n id: organizationData.id,\n type: 'Organization',\n name: organizationData.name,\n })\n }\n\n return session\n}\n\nexport function SessionContextProvider({\n children,\n queryClient,\n config,\n}: PropsWithChildren<{ queryClient: QueryClient; config: SessionContextConfig }>) {\n const { secureStorage, refreshTokenFn, onLogout, storageKeys = {}, alertConfig = {} } = config\n\n const sessionsKey = storageKeys.sessions || 'sessions-storage'\n const [managerString, setManagerString] = useStorage<string>(secureStorage, sessionsKey, '')\n const sessionManager = useMemo(() => SessionManager.hydrate(managerString), [managerString])\n\n const sessions = sessionManager.sessions\n const currentSession = sessionManager.currentSession\n\n const [alertShown, setAlertShown] = useState(false)\n\n const { token } = currentSession\n\n const {\n mutate: refreshToken,\n mutateAsync: refreshTokenAsync,\n isError: isRefreshError,\n } = useMutation({\n mutationKey: ['refresh-token', token?.refresh_token],\n mutationFn: () => {\n if (!token?.refresh_token) {\n return Promise.reject(new Error('Refresh token is required'))\n }\n return refreshTokenFn({\n refresh_token: token.refresh_token,\n env: currentSession.env,\n prototypeName: currentSession.prototypeName,\n }).then(async refreshedToken => {\n await handleTokenUpdate(refreshedToken)\n return refreshedToken\n })\n },\n onError: (t: Partial<FailedResponse>) => {\n handleRefreshFailed(t)\n },\n })\n\n const handleClearQueryClient = useCallback(() => {\n cancelThrottledRefreshes(chatQueryClient)\n cancelThrottledRefreshes(queryClient)\n chatQueryClient.clear()\n queryClient.clear()\n }, [queryClient])\n\n const handleSetEnv = useCallback(\n async (_env: ENV, _prototypeName?: string) => {\n const updatedManager = SessionManager.hydrate(managerString)\n const session = updatedManager.currentSession\n const sameEnvironment = _env === session.env && _prototypeName === session.prototypeName\n if (sameEnvironment) return\n\n const productionEnvironments = ['production', 'staging']\n const switchingToDevelopment =\n _env === 'development' && productionEnvironments.includes(session.env)\n const switchingToProduction = _env === 'production' && session.env === 'development'\n const switchingPrototype = _env === 'prototype' || session.env === 'prototype'\n\n if (switchingToDevelopment || switchingToProduction || switchingPrototype) {\n const newSession = new Session({ env: _env, prototypeName: _prototypeName })\n updatedManager.upsertSession(newSession)\n }\n\n updatedManager.setEnv(_env, _prototypeName)\n await setManagerString(updatedManager.toString())\n },\n [managerString, setManagerString]\n )\n\n const handleCreateSession = useCallback(\n async (session: Session) => {\n const updatedManager = SessionManager.hydrate(managerString)\n updatedManager.sessions[session.id] = session.toString()\n updatedManager.currentSessionId = session.id\n await setManagerString(updatedManager.toString())\n },\n [managerString, setManagerString]\n )\n\n const handleSwitchSession = useCallback(\n async (sessionId: string) => {\n const updatedManager = SessionManager.hydrate(managerString)\n try {\n updatedManager.switchSession(sessionId)\n } catch (_error) {\n Alert.alert('Error', 'Session is not authenticated')\n }\n await setManagerString(updatedManager.toString())\n },\n [managerString, setManagerString]\n )\n\n const handleLogout = useCallback(async () => {\n handleClearQueryClient()\n const manager = SessionManager.hydrate(managerString)\n\n // Clear the current session ID\n if (manager.currentSessionId) {\n manager.removeSession(manager.currentSessionId)\n await setManagerString(manager.toString())\n }\n\n return onLogout()\n }, [managerString, setManagerString, handleClearQueryClient, onLogout])\n\n const handleTokenUpdate = useCallback(\n async (t: OAuthToken) => {\n const updatedManager = SessionManager.hydrate(managerString)\n\n updatedManager.updateCurrentToken(t)\n await setManagerString(updatedManager.toString())\n },\n [managerString, setManagerString]\n )\n\n const handleRefreshFailed = useCallback(\n (t: Partial<FailedResponse>) => {\n if (t.status !== 401) return\n // If we didn't fail because of an unauthorized response ( 401 ),\n // it could be because we were unable to store the token.\n // Do not log out.\n\n const { errors = [] } = t\n // The code for a forced logout is \"capuchin\"\n const isForcedLogout = errors.some((e: { detail?: string }) =>\n /capuchin/i.test(e.detail || '')\n )\n\n if (isForcedLogout) {\n handleLogout()\n }\n },\n [handleLogout]\n )\n\n const refreshInFlight = useRef<Promise<OAuthToken | undefined> | undefined>(undefined)\n\n const handleUnauthorizedResponse = useCallback(\n (response: FailedResponse) => {\n const { errors = [] } = response\n\n const isUnauthorized = errors.some((e: { detail?: string }) =>\n /TRASH_PANDA/i.test(e.detail || '')\n )\n\n if (isUnauthorized) return Promise.resolve(undefined)\n\n refreshInFlight.current ??= refreshTokenAsync()\n .catch(() => undefined)\n .finally(() => {\n refreshInFlight.current = undefined\n })\n\n return refreshInFlight.current\n },\n [refreshTokenAsync]\n )\n\n const sessionContextValue: SessionContextValue = {\n env: currentSession.env,\n token: currentSession.token as OAuthToken | undefined,\n session: currentSession,\n sessions,\n logout: handleLogout,\n setToken: handleTokenUpdate,\n handleUnauthorizedResponse,\n setEnv: handleSetEnv,\n switchSession: handleSwitchSession,\n createSession: handleCreateSession,\n }\n\n const alertTitle = alertConfig.title || 'Oops'\n const alertMessage = alertConfig.message || 'Something went wrong with your login!'\n const retryText = alertConfig.retryText || 'Keep trying'\n const logoutText = alertConfig.logoutText || 'Logout'\n\n useEffect(() => {\n if (isRefreshError && !alertShown && token?.refresh_token) {\n setAlertShown(true)\n Alert.alert(alertTitle, alertMessage, [\n {\n text: retryText,\n onPress: () => {\n refreshToken()\n setAlertShown(false)\n },\n },\n { text: logoutText, onPress: () => handleLogout() },\n ])\n }\n }, [\n isRefreshError,\n handleLogout,\n alertShown,\n refreshToken,\n token?.refresh_token,\n alertTitle,\n alertMessage,\n retryText,\n logoutText,\n ])\n\n useEffect(() => {\n const manager = SessionManager.hydrate(managerString)\n if (manager.currentSessionId === UNAUTHENTICATED_SESSION_ID) return\n\n decorateSession(manager.currentSession).then(async decoratedSession => {\n manager.upsertSession(decoratedSession)\n await setManagerString(manager.toString())\n })\n }, [managerString, setManagerString])\n\n return <SessionContext.Provider value={sessionContextValue}>{children}</SessionContext.Provider>\n}\n"],"mappings":"AAAA,SAAsBA,WAAW,QAAQ,uBAAuB;AAChE,OAAOC,KAAK,IACVC,aAAa,EAEbC,WAAW,EACXC,SAAS,EACTC,OAAO,EACPC,MAAM,EACNC,QAAQ,QACH,OAAO;AACd,SAASC,KAAK,QAAQ,cAAc;AACpC,SAASC,qBAAqB,QAAQ,6BAA6B;AACnE,SAASC,uBAAuB,QAAQ,2BAA2B;AACnE,SAASC,UAAU,QAAQ,sBAAsB;AACjD,SAASC,kBAAkB,QAAQ,2BAA2B;AAG9D,SAA4BC,OAAO,EAAEC,0BAA0B,QAAQ,UAAU;AAEjF,SAASC,cAAc,QAAQ,0BAA0B;AACzD,SAASC,wBAAwB,QAAQ,4BAA4B;AACrE,SAASC,eAAe,QAAQ,gBAAgB;;AAET;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAevC,OAAO,MAAMC,cAAc,GAAGlB,aAAa,CAAsB;EAC/DmB,GAAG,EAAE,YAAY;EACjBC,MAAM,EAAEA,CAAA,KAAM,IAAI;EAClBC,OAAO,EAAE,IAAIV,OAAO,CAAC,CAAC;EACtBW,QAAQ,EAAE,CAAC,CAAC;EACZC,KAAK,EAAEC,SAAS;EAChBC,0BAA0B,EAAEA,CAAA,KAAMC,OAAO,CAACC,OAAO,CAACH,SAAS,CAAC;EAC5DI,MAAM,EAAEA,CAAA,KAAM,IAAI;EAClBC,QAAQ,EAAEA,CAAA,KAAM,IAAI;EACpBC,aAAa,EAAEA,CAAA,KAAM,IAAI;EACzBC,aAAa,EAAEA,CAAA,KAAML,OAAO,CAACC,OAAO,CAAC;AACvC,CAAC,CAAC;AA2BF,MAAMK,eAAe,GAAG,MAA+BX,OAAmB,IAAK;EAC7E,IAAI,CAACA,OAAO,CAACY,eAAe,EAAE,OAAOZ,OAAO;EAE5C,MAAM;IAAEa,IAAI,EAAEC;EAAW,CAAC,GAAG,MAAMpB,eAAe,CAACqB,UAAU,CAC3D;IACEC,QAAQ,EAAE9B;EACZ,CACF,CAAC;EACD,MAAM;IAAE2B,IAAI,EAAEI;EAAiB,CAAC,GAAG,MAAMvB,eAAe,CAACqB,UAAU,CAEjE;IACAC,QAAQ,EAAE3B,kBAAkB,CAACF,uBAAuB;EACtD,CAAC,CAAC;EAEF,IAAI2B,UAAU,EAAE;IACd,MAAM;MAAEI,IAAI;MAAEC,MAAM;MAAEC;IAAG,CAAC,GAAGN,UAAU,IAAI,CAAC,CAAC;IAC7Cd,OAAO,CAACqB,SAAS,CAAC;MAAED,EAAE;MAAEE,IAAI,EAAE,QAAQ;MAAEJ,IAAI;MAAEC;IAAO,CAAC,CAAC;EACzD;EAEA,IAAIF,gBAAgB,EAAE;IACpBjB,OAAO,CAACuB,eAAe,CAAC;MACtBH,EAAE,EAAEH,gBAAgB,CAACG,EAAE;MACvBE,IAAI,EAAE,cAAc;MACpBJ,IAAI,EAAED,gBAAgB,CAACC;IACzB,CAAC,CAAC;EACJ;EAEA,OAAOlB,OAAO;AAChB,CAAC;AAED,OAAO,SAASwB,sBAAsBA,CAAC;EACrCC,QAAQ;EACRC,WAAW;EACXC;AAC6E,CAAC,EAAE;EAChF,MAAM;IAAEC,aAAa;IAAEC,cAAc;IAAEC,QAAQ;IAAEC,WAAW,GAAG,CAAC,CAAC;IAAEC,WAAW,GAAG,CAAC;EAAE,CAAC,GAAGL,MAAM;EAE9F,MAAMM,WAAW,GAAGF,WAAW,CAAC9B,QAAQ,IAAI,kBAAkB;EAC9D,MAAM,CAACiC,aAAa,EAAEC,gBAAgB,CAAC,GAAG/C,UAAU,CAASwC,aAAa,EAAEK,WAAW,EAAE,EAAE,CAAC;EAC5F,MAAMG,cAAc,GAAGtD,OAAO,CAAC,MAAMU,cAAc,CAAC6C,OAAO,CAACH,aAAa,CAAC,EAAE,CAACA,aAAa,CAAC,CAAC;EAE5F,MAAMjC,QAAQ,GAAGmC,cAAc,CAACnC,QAAQ;EACxC,MAAMqC,cAAc,GAAGF,cAAc,CAACE,cAAc;EAEpD,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAGxD,QAAQ,CAAC,KAAK,CAAC;EAEnD,MAAM;IAAEkB;EAAM,CAAC,GAAGoC,cAAc;EAEhC,MAAM;IACJG,MAAM,EAAEC,YAAY;IACpBC,WAAW,EAAEC,iBAAiB;IAC9BC,OAAO,EAAEC;EACX,CAAC,GAAGrE,WAAW,CAAC;IACdsE,WAAW,EAAE,CAAC,eAAe,EAAE7C,KAAK,EAAE8C,aAAa,CAAC;IACpDC,UAAU,EAAEA,CAAA,KAAM;MAChB,IAAI,CAAC/C,KAAK,EAAE8C,aAAa,EAAE;QACzB,OAAO3C,OAAO,CAAC6C,MAAM,CAAC,IAAIC,KAAK,CAAC,2BAA2B,CAAC,CAAC;MAC/D;MACA,OAAOtB,cAAc,CAAC;QACpBmB,aAAa,EAAE9C,KAAK,CAAC8C,aAAa;QAClClD,GAAG,EAAEwC,cAAc,CAACxC,GAAG;QACvBsD,aAAa,EAAEd,cAAc,CAACc;MAChC,CAAC,CAAC,CAACC,IAAI,CAAC,MAAMC,cAAc,IAAI;QAC9B,MAAMC,iBAAiB,CAACD,cAAc,CAAC;QACvC,OAAOA,cAAc;MACvB,CAAC,CAAC;IACJ,CAAC;IACDE,OAAO,EAAGC,CAA0B,IAAK;MACvCC,mBAAmB,CAACD,CAAC,CAAC;IACxB;EACF,CAAC,CAAC;EAEF,MAAME,sBAAsB,GAAG/E,WAAW,CAAC,MAAM;IAC/Ca,wBAAwB,CAACC,eAAe,CAAC;IACzCD,wBAAwB,CAACiC,WAAW,CAAC;IACrChC,eAAe,CAACkE,KAAK,CAAC,CAAC;IACvBlC,WAAW,CAACkC,KAAK,CAAC,CAAC;EACrB,CAAC,EAAE,CAAClC,WAAW,CAAC,CAAC;EAEjB,MAAMmC,YAAY,GAAGjF,WAAW,CAC9B,OAAOkF,IAAS,EAAEC,cAAuB,KAAK;IAC5C,MAAMC,cAAc,GAAGxE,cAAc,CAAC6C,OAAO,CAACH,aAAa,CAAC;IAC5D,MAAMlC,OAAO,GAAGgE,cAAc,CAAC1B,cAAc;IAC7C,MAAM2B,eAAe,GAAGH,IAAI,KAAK9D,OAAO,CAACF,GAAG,IAAIiE,cAAc,KAAK/D,OAAO,CAACoD,aAAa;IACxF,IAAIa,eAAe,EAAE;IAErB,MAAMC,sBAAsB,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC;IACxD,MAAMC,sBAAsB,GAC1BL,IAAI,KAAK,aAAa,IAAII,sBAAsB,CAACE,QAAQ,CAACpE,OAAO,CAACF,GAAG,CAAC;IACxE,MAAMuE,qBAAqB,GAAGP,IAAI,KAAK,YAAY,IAAI9D,OAAO,CAACF,GAAG,KAAK,aAAa;IACpF,MAAMwE,kBAAkB,GAAGR,IAAI,KAAK,WAAW,IAAI9D,OAAO,CAACF,GAAG,KAAK,WAAW;IAE9E,IAAIqE,sBAAsB,IAAIE,qBAAqB,IAAIC,kBAAkB,EAAE;MACzE,MAAMC,UAAU,GAAG,IAAIjF,OAAO,CAAC;QAAEQ,GAAG,EAAEgE,IAAI;QAAEV,aAAa,EAAEW;MAAe,CAAC,CAAC;MAC5EC,cAAc,CAACQ,aAAa,CAACD,UAAU,CAAC;IAC1C;IAEAP,cAAc,CAACjE,MAAM,CAAC+D,IAAI,EAAEC,cAAc,CAAC;IAC3C,MAAM5B,gBAAgB,CAAC6B,cAAc,CAACS,QAAQ,CAAC,CAAC,CAAC;EACnD,CAAC,EACD,CAACvC,aAAa,EAAEC,gBAAgB,CAClC,CAAC;EAED,MAAMuC,mBAAmB,GAAG9F,WAAW,CACrC,MAAOoB,SAAgB,IAAK;IAC1B,MAAMgE,gBAAc,GAAGxE,cAAc,CAAC6C,OAAO,CAACH,aAAa,CAAC;IAC5D8B,gBAAc,CAAC/D,QAAQ,CAACD,SAAO,CAACoB,EAAE,CAAC,GAAGpB,SAAO,CAACyE,QAAQ,CAAC,CAAC;IACxDT,gBAAc,CAACW,gBAAgB,GAAG3E,SAAO,CAACoB,EAAE;IAC5C,MAAMe,gBAAgB,CAAC6B,gBAAc,CAACS,QAAQ,CAAC,CAAC,CAAC;EACnD,CAAC,EACD,CAACvC,aAAa,EAAEC,gBAAgB,CAClC,CAAC;EAED,MAAMyC,mBAAmB,GAAGhG,WAAW,CACrC,MAAOiG,SAAiB,IAAK;IAC3B,MAAMb,gBAAc,GAAGxE,cAAc,CAAC6C,OAAO,CAACH,aAAa,CAAC;IAC5D,IAAI;MACF8B,gBAAc,CAACvD,aAAa,CAACoE,SAAS,CAAC;IACzC,CAAC,CAAC,OAAOC,MAAM,EAAE;MACf7F,KAAK,CAAC8F,KAAK,CAAC,OAAO,EAAE,8BAA8B,CAAC;IACtD;IACA,MAAM5C,gBAAgB,CAAC6B,gBAAc,CAACS,QAAQ,CAAC,CAAC,CAAC;EACnD,CAAC,EACD,CAACvC,aAAa,EAAEC,gBAAgB,CAClC,CAAC;EAED,MAAM6C,YAAY,GAAGpG,WAAW,CAAC,YAAY;IAC3C+E,sBAAsB,CAAC,CAAC;IACxB,MAAMsB,OAAO,GAAGzF,cAAc,CAAC6C,OAAO,CAACH,aAAa,CAAC;;IAErD;IACA,IAAI+C,OAAO,CAACN,gBAAgB,EAAE;MAC5BM,OAAO,CAACC,aAAa,CAACD,OAAO,CAACN,gBAAgB,CAAC;MAC/C,MAAMxC,gBAAgB,CAAC8C,OAAO,CAACR,QAAQ,CAAC,CAAC,CAAC;IAC5C;IAEA,OAAO3C,QAAQ,CAAC,CAAC;EACnB,CAAC,EAAE,CAACI,aAAa,EAAEC,gBAAgB,EAAEwB,sBAAsB,EAAE7B,QAAQ,CAAC,CAAC;EAEvE,MAAMyB,iBAAiB,GAAG3E,WAAW,CACnC,MAAO6E,GAAa,IAAK;IACvB,MAAMO,gBAAc,GAAGxE,cAAc,CAAC6C,OAAO,CAACH,aAAa,CAAC;IAE5D8B,gBAAc,CAACmB,kBAAkB,CAAC1B,GAAC,CAAC;IACpC,MAAMtB,gBAAgB,CAAC6B,gBAAc,CAACS,QAAQ,CAAC,CAAC,CAAC;EACnD,CAAC,EACD,CAACvC,aAAa,EAAEC,gBAAgB,CAClC,CAAC;EAED,MAAMuB,mBAAmB,GAAG9E,WAAW,CACpC6E,GAA0B,IAAK;IAC9B,IAAIA,GAAC,CAAC2B,MAAM,KAAK,GAAG,EAAE;IACtB;IACA;IACA;;IAEA,MAAM;MAAEC,MAAM,GAAG;IAAG,CAAC,GAAG5B,GAAC;IACzB;IACA,MAAM6B,cAAc,GAAGD,MAAM,CAACE,IAAI,CAAEC,CAAsB,IACxD,WAAW,CAACC,IAAI,CAACD,CAAC,CAACE,MAAM,IAAI,EAAE,CACjC,CAAC;IAED,IAAIJ,cAAc,EAAE;MAClBN,YAAY,CAAC,CAAC;IAChB;EACF,CAAC,EACD,CAACA,YAAY,CACf,CAAC;EAED,MAAMW,eAAe,GAAG5G,MAAM,CAA8CoB,SAAS,CAAC;EAEtF,MAAMC,0BAA0B,GAAGxB,WAAW,CAC3CgH,QAAwB,IAAK;IAC5B,MAAM;MAAEP,MAAM,EAANA,QAAM,GAAG;IAAG,CAAC,GAAGO,QAAQ;IAEhC,MAAMC,cAAc,GAAGR,QAAM,CAACE,IAAI,CAAEC,GAAsB,IACxD,cAAc,CAACC,IAAI,CAACD,GAAC,CAACE,MAAM,IAAI,EAAE,CACpC,CAAC;IAED,IAAIG,cAAc,EAAE,OAAOxF,OAAO,CAACC,OAAO,CAACH,SAAS,CAAC;IAErDwF,eAAe,CAACG,OAAO,KAAKlD,iBAAiB,CAAC,CAAC,CAC5CmD,KAAK,CAAC,MAAM5F,SAAS,CAAC,CACtB6F,OAAO,CAAC,MAAM;MACbL,eAAe,CAACG,OAAO,GAAG3F,SAAS;IACrC,CAAC,CAAC;IAEJ,OAAOwF,eAAe,CAACG,OAAO;EAChC,CAAC,EACD,CAAClD,iBAAiB,CACpB,CAAC;EAED,MAAMqD,mBAAwC,GAAG;IAC/CnG,GAAG,EAAEwC,cAAc,CAACxC,GAAG;IACvBI,KAAK,EAAEoC,cAAc,CAACpC,KAA+B;IACrDF,OAAO,EAAEsC,cAAc;IACvBrC,QAAQ;IACRM,MAAM,EAAEyE,YAAY;IACpBxE,QAAQ,EAAE+C,iBAAiB;IAC3BnD,0BAA0B;IAC1BL,MAAM,EAAE8D,YAAY;IACpBpD,aAAa,EAAEmE,mBAAmB;IAClClE,aAAa,EAAEgE;EACjB,CAAC;EAED,MAAMwB,UAAU,GAAGlE,WAAW,CAACmE,KAAK,IAAI,MAAM;EAC9C,MAAMC,YAAY,GAAGpE,WAAW,CAACqE,OAAO,IAAI,uCAAuC;EACnF,MAAMC,SAAS,GAAGtE,WAAW,CAACsE,SAAS,IAAI,aAAa;EACxD,MAAMC,UAAU,GAAGvE,WAAW,CAACuE,UAAU,IAAI,QAAQ;EAErD1H,SAAS,CAAC,MAAM;IACd,IAAIiE,cAAc,IAAI,CAACP,UAAU,IAAIrC,KAAK,EAAE8C,aAAa,EAAE;MACzDR,aAAa,CAAC,IAAI,CAAC;MACnBvD,KAAK,CAAC8F,KAAK,CAACmB,UAAU,EAAEE,YAAY,EAAE,CACpC;QACEI,IAAI,EAAEF,SAAS;QACfG,OAAO,EAAEA,CAAA,KAAM;UACb/D,YAAY,CAAC,CAAC;UACdF,aAAa,CAAC,KAAK,CAAC;QACtB;MACF,CAAC,EACD;QAAEgE,IAAI,EAAED,UAAU;QAAEE,OAAO,EAAEA,CAAA,KAAMzB,YAAY,CAAC;MAAE,CAAC,CACpD,CAAC;IACJ;EACF,CAAC,EAAE,CACDlC,cAAc,EACdkC,YAAY,EACZzC,UAAU,EACVG,YAAY,EACZxC,KAAK,EAAE8C,aAAa,EACpBkD,UAAU,EACVE,YAAY,EACZE,SAAS,EACTC,UAAU,CACX,CAAC;EAEF1H,SAAS,CAAC,MAAM;IACd,MAAMoG,SAAO,GAAGzF,cAAc,CAAC6C,OAAO,CAACH,aAAa,CAAC;IACrD,IAAI+C,SAAO,CAACN,gBAAgB,KAAKpF,0BAA0B,EAAE;IAE7DoB,eAAe,CAACsE,SAAO,CAAC3C,cAAc,CAAC,CAACe,IAAI,CAAC,MAAMqD,gBAAgB,IAAI;MACrEzB,SAAO,CAACT,aAAa,CAACkC,gBAAgB,CAAC;MACvC,MAAMvE,gBAAgB,CAAC8C,SAAO,CAACR,QAAQ,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC;EACJ,CAAC,EAAE,CAACvC,aAAa,EAAEC,gBAAgB,CAAC,CAAC;EAErC,oBAAOvC,IAAA,CAACC,cAAc,CAAC8G,QAAQ;IAACC,KAAK,EAAEX,mBAAoB;IAAAxE,QAAA,EAAEA;EAAQ,CAA0B,CAAC;AAClG","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"session_context.js","names":["useMutation","React","createContext","useCallback","useEffect","useMemo","useState","Alert","currentPersonQueryKey","organizationRequestArgs","useStorage","getRequestQueryKey","Session","UNAUTHENTICATED_SESSION_ID","SessionManager","cancelThrottledRefreshes","chatQueryClient","jsx","_jsx","SessionContext","env","setEnv","session","sessions","token","undefined","handleUnauthorizedResponse","logout","setToken","switchSession","createSession","Promise","resolve","decorateSession","isAuthenticated","data","personData","fetchQuery","queryKey","organizationData","name","avatar","id","setPerson","type","setOrganization","SessionContextProvider","t0","$","_c","children","queryClient","config","secureStorage","refreshTokenFn","onLogout","storageKeys","t1","alertConfig","t2","t3","t4","sessionsKey","managerString","setManagerString","t5","hydrate","sessionManager","currentSession","alertShown","setAlertShown","t6","refresh_token","t7","mutate","refreshToken","isPending","isRefreshingToken","isError","isRefreshError","mutationKey","mutationFn","reject","Error","prototypeName","then","handleTokenUpdate","onError","t","handleRefreshFailed","t8","clear","handleClearQueryClient","t9","_env","_prototypeName","updatedManager","sameEnvironment","productionEnvironments","switchingToDevelopment","includes","switchingToProduction","switchingPrototype","newSession","upsertSession","toString","handleSetEnv","t10","session_0","updatedManager_0","currentSessionId","handleCreateSession","t11","sessionId","updatedManager_1","t12","alert","handleSwitchSession","manager","removeSession","handleLogout","t13","t_0","updatedManager_2","updateCurrentToken","t14","t_1","status","errors","t15","isForcedLogout","some","_temp","response","t16","errors_0","isUnauthorized","_temp2","isForcedLogout_0","_temp3","isExpiredToken","_temp4","t17","sessionContextValue","alertTitle","title","alertMessage","message","retryText","logoutText","t18","text","onPress","t19","t20","t21","t22","manager_0","decoratedSession","t23","Provider","e_2","test","e","detail","e_1","e_0"],"sources":["../../src/contexts/session_context.tsx"],"sourcesContent":["import { QueryClient, useMutation } from '@tanstack/react-query'\nimport React, {\n createContext,\n PropsWithChildren,\n useCallback,\n useEffect,\n useMemo,\n useState,\n} from 'react'\nimport { Alert } from 'react-native'\nimport { currentPersonQueryKey } from '../hooks/use_current_person'\nimport { organizationRequestArgs } from '../hooks/use_organization'\nimport { useStorage } from '../hooks/use_storage'\nimport { getRequestQueryKey } from '../hooks/use_suspense_api'\nimport { CurrentPersonResource, FailedResponse, OAuthToken, OrganizationResource } from '../types'\nimport { ApiResource } from '../types/api_primitives'\nimport { ENV, PartialToken, Session, UNAUTHENTICATED_SESSION_ID } from '../utils'\nimport { StorageAdapter } from '../utils/native_adapters/storage_adapter'\nimport { SessionManager } from '../utils/session_manager'\nimport { cancelThrottledRefreshes } from '../utils/throttled_refresh'\nimport { chatQueryClient } from './api_provider'\n\ntype Sessions = Record<string, string> // Key is session ID\n\nexport type SessionContextValue = {\n env: ENV\n setEnv: (_env: ENV, _prototypeName?: string) => void\n session: Session\n sessions: Sessions\n token: OAuthToken | undefined\n handleUnauthorizedResponse: (_response: FailedResponse) => void\n logout: () => void\n setToken: (_token: OAuthToken) => void\n switchSession: (_sessionId: string) => void\n createSession: (_session: Session) => Promise<void>\n}\n\nexport const SessionContext = createContext<SessionContextValue>({\n env: 'production',\n setEnv: () => null,\n session: new Session(),\n sessions: {},\n token: undefined,\n handleUnauthorizedResponse: () => null,\n logout: () => null,\n setToken: () => null,\n switchSession: () => null,\n createSession: () => Promise.resolve(),\n})\n\nexport type SessionContextConfig = {\n // Storage adapters\n secureStorage: StorageAdapter // For sensitive data (tokens/sessions)\n\n // Functional callbacks\n refreshTokenFn: (params: {\n refresh_token: string\n env: ENV\n prototypeName?: string\n }) => Promise<OAuthToken>\n onLogout: () => void | Promise<void>\n\n // Optional configuration\n storageKeys?: {\n sessions?: string\n currentSessionId?: string\n }\n alertConfig?: {\n title?: string\n message?: string\n retryText?: string\n logoutText?: string\n }\n}\n\nconst decorateSession = async <T extends PartialToken>(session: Session<T>) => {\n if (!session.isAuthenticated) return session\n\n const { data: personData } = await chatQueryClient.fetchQuery<ApiResource<CurrentPersonResource>>(\n {\n queryKey: currentPersonQueryKey,\n }\n )\n const { data: organizationData } = await chatQueryClient.fetchQuery<\n ApiResource<OrganizationResource>\n >({\n queryKey: getRequestQueryKey(organizationRequestArgs),\n })\n\n if (personData) {\n const { name, avatar, id } = personData || {}\n session.setPerson({ id, type: 'Person', name, avatar })\n }\n\n if (organizationData) {\n session.setOrganization({\n id: organizationData.id,\n type: 'Organization',\n name: organizationData.name,\n })\n }\n\n return session\n}\n\nexport function SessionContextProvider({\n children,\n queryClient,\n config,\n}: PropsWithChildren<{ queryClient: QueryClient; config: SessionContextConfig }>) {\n const { secureStorage, refreshTokenFn, onLogout, storageKeys = {}, alertConfig = {} } = config\n\n const sessionsKey = storageKeys.sessions || 'sessions-storage'\n const [managerString, setManagerString] = useStorage<string>(secureStorage, sessionsKey, '')\n const sessionManager = useMemo(() => SessionManager.hydrate(managerString), [managerString])\n\n const sessions = sessionManager.sessions\n const currentSession = sessionManager.currentSession\n\n const [alertShown, setAlertShown] = useState(false)\n\n const { token } = currentSession\n\n const {\n mutate: refreshToken,\n isPending: isRefreshingToken,\n isError: isRefreshError,\n } = useMutation({\n mutationKey: ['refresh-token', token?.refresh_token],\n mutationFn: () => {\n if (!token?.refresh_token) {\n return Promise.reject(new Error('Refresh token is required'))\n }\n return refreshTokenFn({\n refresh_token: token.refresh_token,\n env: currentSession.env,\n prototypeName: currentSession.prototypeName,\n }).then(handleTokenUpdate)\n },\n onError: (t: Partial<FailedResponse>) => {\n handleRefreshFailed(t)\n },\n })\n\n const handleClearQueryClient = useCallback(() => {\n cancelThrottledRefreshes(chatQueryClient)\n cancelThrottledRefreshes(queryClient)\n chatQueryClient.clear()\n queryClient.clear()\n }, [queryClient])\n\n const handleSetEnv = useCallback(\n async (_env: ENV, _prototypeName?: string) => {\n const updatedManager = SessionManager.hydrate(managerString)\n const session = updatedManager.currentSession\n const sameEnvironment = _env === session.env && _prototypeName === session.prototypeName\n if (sameEnvironment) return\n\n const productionEnvironments = ['production', 'staging']\n const switchingToDevelopment =\n _env === 'development' && productionEnvironments.includes(session.env)\n const switchingToProduction = _env === 'production' && session.env === 'development'\n const switchingPrototype = _env === 'prototype' || session.env === 'prototype'\n\n if (switchingToDevelopment || switchingToProduction || switchingPrototype) {\n const newSession = new Session({ env: _env, prototypeName: _prototypeName })\n updatedManager.upsertSession(newSession)\n }\n\n updatedManager.setEnv(_env, _prototypeName)\n await setManagerString(updatedManager.toString())\n },\n [managerString, setManagerString]\n )\n\n const handleCreateSession = useCallback(\n async (session: Session) => {\n const updatedManager = SessionManager.hydrate(managerString)\n updatedManager.sessions[session.id] = session.toString()\n updatedManager.currentSessionId = session.id\n await setManagerString(updatedManager.toString())\n },\n [managerString, setManagerString]\n )\n\n const handleSwitchSession = useCallback(\n async (sessionId: string) => {\n const updatedManager = SessionManager.hydrate(managerString)\n try {\n updatedManager.switchSession(sessionId)\n } catch (_error) {\n Alert.alert('Error', 'Session is not authenticated')\n }\n await setManagerString(updatedManager.toString())\n },\n [managerString, setManagerString]\n )\n\n const handleLogout = useCallback(async () => {\n handleClearQueryClient()\n const manager = SessionManager.hydrate(managerString)\n\n // Clear the current session ID\n if (manager.currentSessionId) {\n manager.removeSession(manager.currentSessionId)\n await setManagerString(manager.toString())\n }\n\n return onLogout()\n }, [managerString, setManagerString, handleClearQueryClient, onLogout])\n\n const handleTokenUpdate = useCallback(\n async (t: OAuthToken) => {\n const updatedManager = SessionManager.hydrate(managerString)\n\n updatedManager.updateCurrentToken(t)\n await setManagerString(updatedManager.toString())\n },\n [managerString, setManagerString]\n )\n\n const handleRefreshFailed = useCallback(\n (t: Partial<FailedResponse>) => {\n if (t.status !== 401) return\n // If we didn't fail because of an unauthorized response ( 401 ),\n // it could be because we were unable to store the token.\n // Do not log out.\n\n const { errors = [] } = t\n // The code for a forced logout is \"capuchin\"\n const isForcedLogout = errors.some((e: { detail?: string }) =>\n /capuchin/i.test(e.detail || '')\n )\n\n if (isForcedLogout) {\n handleLogout()\n }\n },\n [handleLogout]\n )\n\n const handleUnauthorizedResponse = useCallback(\n async (response: FailedResponse) => {\n const { errors = [] } = response\n\n const isUnauthorized = errors.some((e: { detail?: string }) =>\n /TRASH_PANDA/i.test(e.detail || '')\n )\n\n if (isUnauthorized) return\n\n const isForcedLogout = errors.some((e: { detail?: string }) =>\n /capuchin/i.test(e.detail || '')\n )\n const isExpiredToken = errors.some((e: { detail?: string }) => /baboon/i.test(e.detail || ''))\n\n if (!isRefreshingToken || isExpiredToken || isForcedLogout) {\n refreshToken()\n }\n },\n [refreshToken, isRefreshingToken]\n )\n\n const sessionContextValue: SessionContextValue = {\n env: currentSession.env,\n token: currentSession.token as OAuthToken | undefined,\n session: currentSession,\n sessions,\n logout: handleLogout,\n setToken: handleTokenUpdate,\n handleUnauthorizedResponse,\n setEnv: handleSetEnv,\n switchSession: handleSwitchSession,\n createSession: handleCreateSession,\n }\n\n const alertTitle = alertConfig.title || 'Oops'\n const alertMessage = alertConfig.message || 'Something went wrong with your login!'\n const retryText = alertConfig.retryText || 'Keep trying'\n const logoutText = alertConfig.logoutText || 'Logout'\n\n useEffect(() => {\n if (isRefreshError && !alertShown && token?.refresh_token) {\n setAlertShown(true)\n Alert.alert(alertTitle, alertMessage, [\n {\n text: retryText,\n onPress: () => {\n refreshToken()\n setAlertShown(false)\n },\n },\n { text: logoutText, onPress: () => handleLogout() },\n ])\n }\n }, [\n isRefreshError,\n handleLogout,\n alertShown,\n refreshToken,\n token?.refresh_token,\n alertTitle,\n alertMessage,\n retryText,\n logoutText,\n ])\n\n useEffect(() => {\n const manager = SessionManager.hydrate(managerString)\n if (manager.currentSessionId === UNAUTHENTICATED_SESSION_ID) return\n\n decorateSession(manager.currentSession).then(async decoratedSession => {\n manager.upsertSession(decoratedSession)\n await setManagerString(manager.toString())\n })\n }, [managerString, setManagerString])\n\n return <SessionContext.Provider value={sessionContextValue}>{children}</SessionContext.Provider>\n}\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,17 +1,15 @@
|
|
|
1
|
-
import { ApiCollection, ApiResource, FailedResponse
|
|
1
|
+
import { ApiCollection, ApiResource, FailedResponse } from '../../types';
|
|
2
2
|
import { DeleteRequest, GetRequest, PatchRequest, PostRequest } from './types';
|
|
3
|
-
type
|
|
4
|
-
type Headers = Record<string, string>;
|
|
5
|
-
export type OnUnauthorizedResponse = (_response: FailedResponse) => void | Promise<RefreshedToken | void>;
|
|
3
|
+
export type OnUnauthorizedResponse = (_response: FailedResponse) => void;
|
|
6
4
|
type ClientArgs = {
|
|
7
5
|
version: string;
|
|
8
|
-
defaultHeaders?:
|
|
6
|
+
defaultHeaders?: Record<string, string>;
|
|
9
7
|
onUnauthorizedResponse?: OnUnauthorizedResponse;
|
|
10
8
|
root?: string;
|
|
11
9
|
};
|
|
12
10
|
export declare class Client {
|
|
13
11
|
version: string;
|
|
14
|
-
defaultHeaders:
|
|
12
|
+
defaultHeaders: Record<string, string>;
|
|
15
13
|
onUnauthorizedResponse?: OnUnauthorizedResponse;
|
|
16
14
|
root?: string;
|
|
17
15
|
constructor({ version, defaultHeaders, onUnauthorizedResponse, root }: ClientArgs);
|
|
@@ -19,9 +17,7 @@ export declare class Client {
|
|
|
19
17
|
patch<T extends ApiCollection | ApiResource>(args: PatchRequest): Promise<T>;
|
|
20
18
|
post<T extends ApiCollection | ApiResource>(args: PostRequest): Promise<T>;
|
|
21
19
|
delete(args: DeleteRequest): Promise<any>;
|
|
22
|
-
|
|
23
|
-
handleNotOk: <T = never>(response: Response | Error, retry?: (_token: RefreshedToken) => Promise<T>) => Promise<T>;
|
|
24
|
-
private refreshedTokenFor;
|
|
20
|
+
handleNotOk: (response: Response | Error) => Promise<never>;
|
|
25
21
|
parseErrorResponse: (response: Response) => Promise<Partial<FailedResponse>>;
|
|
26
22
|
appUrl(url: string): string;
|
|
27
23
|
get headers(): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAUxE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAE3F,MAAM,MAAM,sBAAsB,GAAG,CAAC,SAAS,EAAE,cAAc,KAAK,IAAI,CAAA;AAExE,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvC,sBAAsB,CAAC,EAAE,sBAAsB,CAAA;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,qBAAa,MAAM;IACjB,OAAO,EAAE,MAAM,CAAK;IACpB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IAC3C,sBAAsB,CAAC,EAAE,sBAAsB,CAAA;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAA;gBAED,EAAE,OAAO,EAAE,cAAmB,EAAE,sBAAsB,EAAE,IAAI,EAAE,EAAE,UAAU;IAOhF,GAAG,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC;IA2CxE,KAAK,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC;IAW5E,IAAI,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC;IAW1E,MAAM,CAAC,IAAI,EAAE,aAAa;IAShC,WAAW,GAAU,UAAU,QAAQ,GAAG,KAAK,oBAY9C;IAED,kBAAkB,GAAU,UAAU,QAAQ,KAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAMhF;IAED,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,IAAI,OAAO;;;;MAOV;CACF;AAED,eAAe,MAAM,CAAA"}
|
|
@@ -20,127 +20,110 @@ export class Client {
|
|
|
20
20
|
...data
|
|
21
21
|
} = args.data;
|
|
22
22
|
const isWalking = Boolean(walk);
|
|
23
|
+
const headers = {
|
|
24
|
+
...this.headers,
|
|
25
|
+
...args.headers
|
|
26
|
+
};
|
|
23
27
|
const url = this.appUrl(args.url);
|
|
24
28
|
await throwErrorIfQueryParams(url);
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
+
const requestArgs = {
|
|
30
|
+
data,
|
|
31
|
+
url,
|
|
32
|
+
action: 'GET',
|
|
33
|
+
headers
|
|
34
|
+
};
|
|
35
|
+
const walkRequest = ({
|
|
36
|
+
url: requestUrl,
|
|
37
|
+
data: d = {
|
|
38
|
+
fields: {}
|
|
39
|
+
},
|
|
40
|
+
acc = {
|
|
41
|
+
data: [],
|
|
42
|
+
included: [],
|
|
43
|
+
meta: {},
|
|
44
|
+
links: {}
|
|
45
|
+
},
|
|
46
|
+
...options
|
|
47
|
+
}) => {
|
|
48
|
+
return makeRequest({
|
|
29
49
|
action: 'GET',
|
|
30
|
-
|
|
31
|
-
};
|
|
32
|
-
const walkRequest = ({
|
|
50
|
+
data: d,
|
|
33
51
|
url: requestUrl,
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
included: [],
|
|
40
|
-
meta: {},
|
|
41
|
-
links: {}
|
|
42
|
-
},
|
|
43
|
-
...options
|
|
52
|
+
...options,
|
|
53
|
+
headers
|
|
54
|
+
}).then(({
|
|
55
|
+
links,
|
|
56
|
+
...rest
|
|
44
57
|
}) => {
|
|
45
|
-
|
|
46
|
-
action: 'GET',
|
|
47
|
-
data: d,
|
|
48
|
-
url: requestUrl,
|
|
49
|
-
...options,
|
|
50
|
-
headers
|
|
51
|
-
}).then(({
|
|
52
|
-
links,
|
|
53
|
-
...rest
|
|
54
|
-
}) => {
|
|
55
|
-
const records = Array.isArray(rest.data) ? concatRecords(acc, rest) : rest;
|
|
58
|
+
const records = Array.isArray(rest.data) ? concatRecords(acc, rest) : rest;
|
|
56
59
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
}, {
|
|
73
|
-
...this.headers,
|
|
74
|
-
...args.headers
|
|
75
|
-
});
|
|
60
|
+
// `next` will have our params in the link so we do not want to pass them back in
|
|
61
|
+
if (links?.next) {
|
|
62
|
+
return walkRequest({
|
|
63
|
+
...options,
|
|
64
|
+
data: d,
|
|
65
|
+
url: links.next,
|
|
66
|
+
acc: records
|
|
67
|
+
});
|
|
68
|
+
} else {
|
|
69
|
+
return records;
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
};
|
|
73
|
+
const handler = isWalking ? a => walkRequest(a) : a => makeRequest(a);
|
|
74
|
+
return throwErrorIfFieldsMissing(handler, requestArgs).then(response => response).catch(this.handleNotOk);
|
|
76
75
|
}
|
|
77
76
|
async patch(args) {
|
|
78
|
-
const
|
|
79
|
-
return this.send(headers => {
|
|
80
|
-
const requestArgs = {
|
|
81
|
-
data: args.data,
|
|
82
|
-
url,
|
|
83
|
-
action: 'PATCH',
|
|
84
|
-
headers
|
|
85
|
-
};
|
|
86
|
-
return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response);
|
|
87
|
-
}, {
|
|
77
|
+
const headers = {
|
|
88
78
|
...this.headers,
|
|
89
79
|
...args.headers
|
|
90
|
-
}
|
|
80
|
+
};
|
|
81
|
+
const url = this.appUrl(args.url);
|
|
82
|
+
const requestArgs = {
|
|
83
|
+
data: args.data,
|
|
84
|
+
url,
|
|
85
|
+
action: 'PATCH',
|
|
86
|
+
headers
|
|
87
|
+
};
|
|
88
|
+
return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response).catch(this.handleNotOk);
|
|
91
89
|
}
|
|
92
90
|
async post(args) {
|
|
93
|
-
const
|
|
94
|
-
return this.send(headers => {
|
|
95
|
-
const requestArgs = {
|
|
96
|
-
...args,
|
|
97
|
-
data: args.data,
|
|
98
|
-
url,
|
|
99
|
-
action: 'POST',
|
|
100
|
-
headers
|
|
101
|
-
};
|
|
102
|
-
return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response);
|
|
103
|
-
}, {
|
|
91
|
+
const headers = {
|
|
104
92
|
...this.headers,
|
|
105
93
|
...args.headers
|
|
106
|
-
}
|
|
94
|
+
};
|
|
95
|
+
const url = this.appUrl(args.url);
|
|
96
|
+
const requestArgs = {
|
|
97
|
+
...args,
|
|
98
|
+
data: args.data,
|
|
99
|
+
url,
|
|
100
|
+
action: 'POST',
|
|
101
|
+
headers
|
|
102
|
+
};
|
|
103
|
+
return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response).catch(this.handleNotOk);
|
|
107
104
|
}
|
|
108
105
|
async delete(args) {
|
|
106
|
+
const headers = {
|
|
107
|
+
...this.headers,
|
|
108
|
+
...args.headers
|
|
109
|
+
};
|
|
109
110
|
const url = this.appUrl(args.url);
|
|
110
|
-
|
|
111
|
+
const requestArgs = {
|
|
111
112
|
url,
|
|
112
113
|
action: 'DELETE',
|
|
113
114
|
headers
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
...args.headers
|
|
117
|
-
});
|
|
118
|
-
}
|
|
119
|
-
send(request, headers) {
|
|
120
|
-
return request(headers).catch(error => this.handleNotOk(error, ({
|
|
121
|
-
access_token
|
|
122
|
-
}) => request({
|
|
123
|
-
...headers,
|
|
124
|
-
Authorization: `Bearer ${access_token}`
|
|
125
|
-
}).catch(retryError => this.handleNotOk(retryError))));
|
|
115
|
+
};
|
|
116
|
+
return makeRequest(requestArgs).catch(this.handleNotOk);
|
|
126
117
|
}
|
|
127
|
-
handleNotOk = async
|
|
118
|
+
handleNotOk = async response => {
|
|
128
119
|
if (!isResponseLike(response)) return Promise.reject(response);
|
|
129
120
|
const errorData = await this.parseErrorResponse(response);
|
|
130
121
|
const notOkResponse = response.clone();
|
|
131
122
|
notOkResponse.errors = errorData.errors || [];
|
|
132
|
-
if (response.status
|
|
133
|
-
|
|
134
|
-
if (refreshedToken && retry) return retry(refreshedToken);
|
|
135
|
-
return Promise.reject(notOkResponse);
|
|
136
|
-
};
|
|
137
|
-
refreshedTokenFor = async response => {
|
|
138
|
-
try {
|
|
139
|
-
const token = await this.onUnauthorizedResponse?.(response);
|
|
140
|
-
return token && token.access_token ? token : undefined;
|
|
141
|
-
} catch {
|
|
142
|
-
return undefined;
|
|
123
|
+
if (response.status === 401) {
|
|
124
|
+
this.onUnauthorizedResponse?.(notOkResponse);
|
|
143
125
|
}
|
|
126
|
+
return Promise.reject(notOkResponse);
|
|
144
127
|
};
|
|
145
128
|
parseErrorResponse = async response => {
|
|
146
129
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","names":["isResponseLike","concatRecords","ensureNoQueryParamsInDev","makeRequest","throwErrorIfFieldsMissing","throwErrorIfQueryParams","Client","version","defaultHeaders","constructor","onUnauthorizedResponse","root","get","args","walk","data","isWalking","Boolean","url","appUrl","send","headers","requestArgs","action","walkRequest","requestUrl","d","fields","acc","included","meta","links","options","then","rest","records","Array","isArray","next","handler","a","response","patch","post","delete","request","catch","error","handleNotOk","access_token","Authorization","retryError","retry","Promise","reject","errorData","parseErrorResponse","notOkResponse","clone","errors","status","refreshedToken","refreshedTokenFor","token","undefined","json","Accept"],"sources":["../../../src/utils/client/client.ts"],"sourcesContent":["import { ApiCollection, ApiResource, FailedResponse, OAuthToken } from '../../types'\nimport { isResponseLike } from '../response_error'\nimport {\n concatRecords,\n ensureNoQueryParamsInDev,\n makeRequest,\n MakeRequestArgs,\n throwErrorIfFieldsMissing,\n throwErrorIfQueryParams,\n} from './request_helpers'\nimport { DeleteRequest, GetRequest, PatchRequest, PostRequest, WalkRequest } from './types'\n\ntype RefreshedToken = Pick<OAuthToken, 'access_token'>\ntype Headers = Record<string, string>\n\nexport type OnUnauthorizedResponse = (\n _response: FailedResponse\n) => void | Promise<RefreshedToken | void>\n\ntype ClientArgs = {\n version: string\n defaultHeaders?: Headers\n onUnauthorizedResponse?: OnUnauthorizedResponse\n root?: string\n}\n\nexport class Client {\n version: string = ''\n defaultHeaders: Headers = {}\n onUnauthorizedResponse?: OnUnauthorizedResponse\n root?: string\n\n constructor({ version, defaultHeaders = {}, onUnauthorizedResponse, root }: ClientArgs) {\n this.version = version\n this.defaultHeaders = defaultHeaders\n this.onUnauthorizedResponse = onUnauthorizedResponse\n this.root = root\n }\n\n async get<T extends ApiCollection | ApiResource>(args: GetRequest): Promise<T> {\n const { walk, ...data } = args.data\n const isWalking = Boolean(walk)\n const url = this.appUrl(args.url)\n\n await throwErrorIfQueryParams(url)\n\n return this.send(\n headers => {\n const requestArgs: MakeRequestArgs = { data, url, action: 'GET', headers }\n\n const walkRequest = ({\n url: requestUrl,\n data: d = { fields: {} },\n acc = { data: [], included: [], meta: {}, links: {} },\n ...options\n }: WalkRequest): Promise<T> => {\n return makeRequest({\n action: 'GET',\n data: d,\n url: requestUrl,\n ...options,\n headers,\n }).then(({ links, ...rest }) => {\n const records = Array.isArray(rest.data) ? concatRecords(acc, rest) : rest\n\n // `next` will have our params in the link so we do not want to pass them back in\n if (links?.next) {\n return walkRequest({ ...options, data: d, url: links.next, acc: records })\n } else {\n return records\n }\n })\n }\n\n const handler = isWalking\n ? (a: MakeRequestArgs | WalkRequest) => walkRequest(a as WalkRequest)\n : (a: MakeRequestArgs | WalkRequest) => makeRequest(a as MakeRequestArgs)\n\n return throwErrorIfFieldsMissing(handler, requestArgs).then(response => response as T)\n },\n { ...this.headers, ...args.headers }\n )\n }\n\n async patch<T extends ApiCollection | ApiResource>(args: PatchRequest): Promise<T> {\n const url = this.appUrl(args.url)\n\n return this.send(\n headers => {\n const requestArgs: MakeRequestArgs = { data: args.data, url, action: 'PATCH', headers }\n\n return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response as T)\n },\n { ...this.headers, ...args.headers }\n )\n }\n\n async post<T extends ApiCollection | ApiResource>(args: PostRequest): Promise<T> {\n const url = this.appUrl(args.url)\n\n return this.send(\n headers => {\n const requestArgs: MakeRequestArgs = {\n ...args,\n data: args.data,\n url,\n action: 'POST',\n headers,\n }\n\n return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response as T)\n },\n { ...this.headers, ...args.headers }\n )\n }\n\n async delete(args: DeleteRequest) {\n const url = this.appUrl(args.url)\n\n return this.send(headers => makeRequest({ url, action: 'DELETE', headers }), {\n ...this.headers,\n ...args.headers,\n })\n }\n\n private send<T>(request: (_headers: Headers) => Promise<T>, headers: Headers): Promise<T> {\n return request(headers).catch((error: Response | Error) =>\n this.handleNotOk(error, ({ access_token }) =>\n request({ ...headers, Authorization: `Bearer ${access_token}` }).catch(\n (retryError: Response | Error) => this.handleNotOk(retryError)\n )\n )\n )\n }\n\n handleNotOk = async <T = never>(\n response: Response | Error,\n retry?: (_token: RefreshedToken) => Promise<T>\n ): Promise<T> => {\n if (!isResponseLike(response)) return Promise.reject(response)\n\n const errorData = await this.parseErrorResponse(response)\n const notOkResponse = response.clone() as FailedResponse\n notOkResponse.errors = errorData.errors || []\n\n if (response.status !== 401) return Promise.reject(notOkResponse)\n\n const refreshedToken = await this.refreshedTokenFor(notOkResponse)\n\n if (refreshedToken && retry) return retry(refreshedToken)\n\n return Promise.reject(notOkResponse)\n }\n\n private refreshedTokenFor = async (\n response: FailedResponse\n ): Promise<RefreshedToken | undefined> => {\n try {\n const token = await this.onUnauthorizedResponse?.(response)\n return token && token.access_token ? token : undefined\n } catch {\n return undefined\n }\n }\n\n parseErrorResponse = async (response: Response): Promise<Partial<FailedResponse>> => {\n try {\n return (await response.clone().json()) as FailedResponse\n } catch {\n return {}\n }\n }\n\n appUrl(url: string) {\n return `${this.root}${url}`\n }\n\n get headers() {\n return {\n Accept: 'application/vnd.api+json',\n 'Content-Type': 'application/json',\n 'X-PCO-API-Version': this.version,\n ...this.defaultHeaders,\n }\n }\n}\n\nexport default Client\n"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"client.js","names":["isResponseLike","concatRecords","ensureNoQueryParamsInDev","makeRequest","throwErrorIfFieldsMissing","throwErrorIfQueryParams","Client","version","defaultHeaders","constructor","onUnauthorizedResponse","root","get","args","walk","data","isWalking","Boolean","headers","url","appUrl","requestArgs","action","walkRequest","requestUrl","d","fields","acc","included","meta","links","options","then","rest","records","Array","isArray","next","handler","a","response","catch","handleNotOk","patch","post","delete","Promise","reject","errorData","parseErrorResponse","notOkResponse","clone","errors","status","json","Accept"],"sources":["../../../src/utils/client/client.ts"],"sourcesContent":["import { ApiCollection, ApiResource, FailedResponse } from '../../types'\nimport { isResponseLike } from '../response_error'\nimport {\n concatRecords,\n ensureNoQueryParamsInDev,\n makeRequest,\n MakeRequestArgs,\n throwErrorIfFieldsMissing,\n throwErrorIfQueryParams,\n} from './request_helpers'\nimport { DeleteRequest, GetRequest, PatchRequest, PostRequest, WalkRequest } from './types'\n\nexport type OnUnauthorizedResponse = (_response: FailedResponse) => void\n\ntype ClientArgs = {\n version: string\n defaultHeaders?: Record<string, string>\n onUnauthorizedResponse?: OnUnauthorizedResponse\n root?: string\n}\n\nexport class Client {\n version: string = ''\n defaultHeaders: Record<string, string> = {}\n onUnauthorizedResponse?: OnUnauthorizedResponse\n root?: string\n\n constructor({ version, defaultHeaders = {}, onUnauthorizedResponse, root }: ClientArgs) {\n this.version = version\n this.defaultHeaders = defaultHeaders\n this.onUnauthorizedResponse = onUnauthorizedResponse\n this.root = root\n }\n\n async get<T extends ApiCollection | ApiResource>(args: GetRequest): Promise<T> {\n const { walk, ...data } = args.data\n const isWalking = Boolean(walk)\n const headers = { ...this.headers, ...args.headers }\n const url = this.appUrl(args.url)\n\n await throwErrorIfQueryParams(url)\n\n const requestArgs: MakeRequestArgs = { data, url, action: 'GET', headers }\n\n const walkRequest = ({\n url: requestUrl,\n data: d = { fields: {} },\n acc = { data: [], included: [], meta: {}, links: {} },\n ...options\n }: WalkRequest): Promise<T> => {\n return makeRequest({\n action: 'GET',\n data: d,\n url: requestUrl,\n ...options,\n headers,\n }).then(({ links, ...rest }) => {\n const records = Array.isArray(rest.data) ? concatRecords(acc, rest) : rest\n\n // `next` will have our params in the link so we do not want to pass them back in\n if (links?.next) {\n return walkRequest({ ...options, data: d, url: links.next, acc: records })\n } else {\n return records\n }\n })\n }\n\n const handler = isWalking\n ? (a: MakeRequestArgs | WalkRequest) => walkRequest(a as WalkRequest)\n : (a: MakeRequestArgs | WalkRequest) => makeRequest(a as MakeRequestArgs)\n\n return throwErrorIfFieldsMissing(handler, requestArgs)\n .then(response => response as T)\n .catch(this.handleNotOk)\n }\n\n async patch<T extends ApiCollection | ApiResource>(args: PatchRequest): Promise<T> {\n const headers = { ...this.headers, ...args.headers }\n const url = this.appUrl(args.url)\n\n const requestArgs: MakeRequestArgs = { data: args.data, url, action: 'PATCH', headers }\n\n return ensureNoQueryParamsInDev(makeRequest, requestArgs)\n .then(response => response as T)\n .catch(this.handleNotOk)\n }\n\n async post<T extends ApiCollection | ApiResource>(args: PostRequest): Promise<T> {\n const headers = { ...this.headers, ...args.headers }\n const url = this.appUrl(args.url)\n\n const requestArgs: MakeRequestArgs = { ...args, data: args.data, url, action: 'POST', headers }\n\n return ensureNoQueryParamsInDev(makeRequest, requestArgs)\n .then(response => response as T)\n .catch(this.handleNotOk)\n }\n\n async delete(args: DeleteRequest) {\n const headers = { ...this.headers, ...args.headers }\n const url = this.appUrl(args.url)\n\n const requestArgs: MakeRequestArgs = { url, action: 'DELETE', headers }\n\n return makeRequest(requestArgs).catch(this.handleNotOk)\n }\n\n handleNotOk = async (response: Response | Error) => {\n if (!isResponseLike(response)) return Promise.reject(response)\n\n const errorData = await this.parseErrorResponse(response)\n const notOkResponse = response.clone() as FailedResponse\n notOkResponse.errors = errorData.errors || []\n\n if (response.status === 401) {\n this.onUnauthorizedResponse?.(notOkResponse)\n }\n\n return Promise.reject(notOkResponse)\n }\n\n parseErrorResponse = async (response: Response): Promise<Partial<FailedResponse>> => {\n try {\n return (await response.clone().json()) as FailedResponse\n } catch {\n return {}\n }\n }\n\n appUrl(url: string) {\n return `${this.root}${url}`\n }\n\n get headers() {\n return {\n Accept: 'application/vnd.api+json',\n 'Content-Type': 'application/json',\n 'X-PCO-API-Version': this.version,\n ...this.defaultHeaders,\n }\n }\n}\n\nexport default Client\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.8.0-qa-staging.
|
|
3
|
+
"version": "4.8.0-qa-staging.14",
|
|
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.8.0-qa-staging.
|
|
36
|
+
"@planningcenter/emoji-keyboard": "4.8.0-qa-staging.14",
|
|
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": "0af4cc2f6b3e662645568129e572d029b3214582"
|
|
88
88
|
}
|
|
@@ -288,52 +288,6 @@ describe('SessionContextProvider', () => {
|
|
|
288
288
|
expect(mockRefreshTokenFn).toHaveBeenCalledTimes(1)
|
|
289
289
|
})
|
|
290
290
|
|
|
291
|
-
it('should share one refresh between expired-token responses in the same tick', async () => {
|
|
292
|
-
const token: OAuthToken = {
|
|
293
|
-
access_token: 'old-token-12345678',
|
|
294
|
-
refresh_token: 'refresh-token',
|
|
295
|
-
expires_in: 3600,
|
|
296
|
-
token_type: 'Bearer',
|
|
297
|
-
scope: 'read write',
|
|
298
|
-
created_at: Date.now(),
|
|
299
|
-
}
|
|
300
|
-
const refreshedToken: OAuthToken = { ...token, access_token: 'new-token-12345678' }
|
|
301
|
-
|
|
302
|
-
const session = new Session({ env: 'production', token })
|
|
303
|
-
const manager = new SessionManager()
|
|
304
|
-
manager.upsertSession(session)
|
|
305
|
-
await mockSecureStorage.setItem(TEST_SESSIONS_KEY, JSON.stringify(manager.toString()))
|
|
306
|
-
|
|
307
|
-
mockRefreshTokenFn.mockResolvedValue(refreshedToken)
|
|
308
|
-
|
|
309
|
-
const config = createConfig()
|
|
310
|
-
const { result } = renderHook(() => useSessionContext(), {
|
|
311
|
-
wrapper: createWrapper(config),
|
|
312
|
-
})
|
|
313
|
-
|
|
314
|
-
await waitForQuery()
|
|
315
|
-
|
|
316
|
-
const expiredResponse: FailedResponse = {
|
|
317
|
-
status: 401,
|
|
318
|
-
statusText: 'Unauthorized',
|
|
319
|
-
errors: [{ detail: 'Error Code Hint: (BABOON)', title: 'Unauthorized', status: '401' }],
|
|
320
|
-
} as FailedResponse
|
|
321
|
-
|
|
322
|
-
let resolved: (OAuthToken | undefined)[] = []
|
|
323
|
-
await act(async () => {
|
|
324
|
-
const pending = Promise.all([
|
|
325
|
-
result.current.handleUnauthorizedResponse(expiredResponse),
|
|
326
|
-
result.current.handleUnauthorizedResponse(expiredResponse),
|
|
327
|
-
result.current.handleUnauthorizedResponse(expiredResponse),
|
|
328
|
-
])
|
|
329
|
-
await jest.runOnlyPendingTimersAsync()
|
|
330
|
-
resolved = await pending
|
|
331
|
-
})
|
|
332
|
-
|
|
333
|
-
expect(mockRefreshTokenFn).toHaveBeenCalledTimes(1)
|
|
334
|
-
expect(resolved).toEqual([refreshedToken, refreshedToken, refreshedToken])
|
|
335
|
-
})
|
|
336
|
-
|
|
337
291
|
it('should logout on forced logout error (capuchin)', async () => {
|
|
338
292
|
const token: OAuthToken = {
|
|
339
293
|
access_token: 'old-token-12345678',
|
|
@@ -334,42 +334,6 @@ describe('error handling', () => {
|
|
|
334
334
|
it('defaults', async () => {
|
|
335
335
|
await test401({ secretWord: '' })
|
|
336
336
|
expect(onUnauthorizedResponse).toHaveBeenCalled()
|
|
337
|
-
expect(fetchSpy).toHaveBeenCalledTimes(1)
|
|
338
|
-
})
|
|
339
|
-
|
|
340
|
-
it('retries once with the refreshed token the host resolves', async () => {
|
|
341
|
-
const url = '/records'
|
|
342
|
-
onUnauthorizedResponse.mockResolvedValueOnce({ access_token: 'refreshed-token' })
|
|
343
|
-
MockServer.get(url, { errors: [] }, 401, { once: true })
|
|
344
|
-
|
|
345
|
-
const response = await client.get({ url, data: { fields: { Record: ['id'] } } })
|
|
346
|
-
|
|
347
|
-
expect(response).toHaveProperty('data')
|
|
348
|
-
expect(fetchSpy).toHaveBeenCalledTimes(2)
|
|
349
|
-
expect(fetchSpy.mock.calls[1][1].headers).toMatchObject({
|
|
350
|
-
Authorization: 'Bearer refreshed-token',
|
|
351
|
-
})
|
|
352
|
-
})
|
|
353
|
-
|
|
354
|
-
it('rejects when the retried request is unauthorized too', async () => {
|
|
355
|
-
const url = '/records'
|
|
356
|
-
onUnauthorizedResponse.mockResolvedValue({ access_token: 'refreshed-token' })
|
|
357
|
-
MockServer.get(url, { errors: [] }, 401)
|
|
358
|
-
|
|
359
|
-
await expect(
|
|
360
|
-
client.get({ url, data: { fields: { Record: ['id'] } } })
|
|
361
|
-
).rejects.toHaveProperty('status', 401)
|
|
362
|
-
expect(fetchSpy).toHaveBeenCalledTimes(2)
|
|
363
|
-
})
|
|
364
|
-
|
|
365
|
-
it('rejects with the 401 when the host refresh fails', async () => {
|
|
366
|
-
const url = '/records'
|
|
367
|
-
onUnauthorizedResponse.mockRejectedValueOnce(new Error('refresh failed'))
|
|
368
|
-
MockServer.get(url, { errors: [] }, 401, { once: true })
|
|
369
|
-
|
|
370
|
-
await expect(
|
|
371
|
-
client.get({ url, data: { fields: { Record: ['id'] } } })
|
|
372
|
-
).rejects.toHaveProperty('status', 401)
|
|
373
337
|
})
|
|
374
338
|
|
|
375
339
|
const test401 = async ({ secretWord }: { secretWord: string }) => {
|
|
@@ -3,8 +3,8 @@ import React, { createContext, useMemo } from 'react'
|
|
|
3
3
|
import { ColorSchemeName, useColorScheme } from 'react-native'
|
|
4
4
|
import { AgeCheckContactInfo } from '../screens/age_check/screen_props'
|
|
5
5
|
import { DeepPartial } from '../types'
|
|
6
|
+
import { FailedResponse } from '../types'
|
|
6
7
|
import { ENV, OauthType, PartialToken, Session } from '../utils'
|
|
7
|
-
import { OnUnauthorizedResponse } from '../utils/client/client'
|
|
8
8
|
import { setLiquidGlassCapability } from '../utils/liquid_glass'
|
|
9
9
|
import { ChatTheme, defaultTheme, DefaultTheme } from '../utils/theme'
|
|
10
10
|
|
|
@@ -13,7 +13,7 @@ export interface ChatProviderProps {
|
|
|
13
13
|
prototypeName?: string
|
|
14
14
|
giphyApiKey?: string
|
|
15
15
|
onAgeDisqualification?: (params: AgeCheckContactInfo) => void
|
|
16
|
-
onUnauthorizedResponse:
|
|
16
|
+
onUnauthorizedResponse: (_response: FailedResponse) => void
|
|
17
17
|
token?: PartialToken
|
|
18
18
|
tokenType?: OauthType
|
|
19
19
|
theme: CreateChatThemeProps
|
|
@@ -5,7 +5,6 @@ import React, {
|
|
|
5
5
|
useCallback,
|
|
6
6
|
useEffect,
|
|
7
7
|
useMemo,
|
|
8
|
-
useRef,
|
|
9
8
|
useState,
|
|
10
9
|
} from 'react'
|
|
11
10
|
import { Alert } from 'react-native'
|
|
@@ -29,7 +28,7 @@ export type SessionContextValue = {
|
|
|
29
28
|
session: Session
|
|
30
29
|
sessions: Sessions
|
|
31
30
|
token: OAuthToken | undefined
|
|
32
|
-
handleUnauthorizedResponse: (_response: FailedResponse) =>
|
|
31
|
+
handleUnauthorizedResponse: (_response: FailedResponse) => void
|
|
33
32
|
logout: () => void
|
|
34
33
|
setToken: (_token: OAuthToken) => void
|
|
35
34
|
switchSession: (_sessionId: string) => void
|
|
@@ -42,7 +41,7 @@ export const SessionContext = createContext<SessionContextValue>({
|
|
|
42
41
|
session: new Session(),
|
|
43
42
|
sessions: {},
|
|
44
43
|
token: undefined,
|
|
45
|
-
handleUnauthorizedResponse: () =>
|
|
44
|
+
handleUnauthorizedResponse: () => null,
|
|
46
45
|
logout: () => null,
|
|
47
46
|
setToken: () => null,
|
|
48
47
|
switchSession: () => null,
|
|
@@ -124,7 +123,7 @@ export function SessionContextProvider({
|
|
|
124
123
|
|
|
125
124
|
const {
|
|
126
125
|
mutate: refreshToken,
|
|
127
|
-
|
|
126
|
+
isPending: isRefreshingToken,
|
|
128
127
|
isError: isRefreshError,
|
|
129
128
|
} = useMutation({
|
|
130
129
|
mutationKey: ['refresh-token', token?.refresh_token],
|
|
@@ -136,10 +135,7 @@ export function SessionContextProvider({
|
|
|
136
135
|
refresh_token: token.refresh_token,
|
|
137
136
|
env: currentSession.env,
|
|
138
137
|
prototypeName: currentSession.prototypeName,
|
|
139
|
-
}).then(
|
|
140
|
-
await handleTokenUpdate(refreshedToken)
|
|
141
|
-
return refreshedToken
|
|
142
|
-
})
|
|
138
|
+
}).then(handleTokenUpdate)
|
|
143
139
|
},
|
|
144
140
|
onError: (t: Partial<FailedResponse>) => {
|
|
145
141
|
handleRefreshFailed(t)
|
|
@@ -243,27 +239,26 @@ export function SessionContextProvider({
|
|
|
243
239
|
[handleLogout]
|
|
244
240
|
)
|
|
245
241
|
|
|
246
|
-
const refreshInFlight = useRef<Promise<OAuthToken | undefined> | undefined>(undefined)
|
|
247
|
-
|
|
248
242
|
const handleUnauthorizedResponse = useCallback(
|
|
249
|
-
(response: FailedResponse) => {
|
|
243
|
+
async (response: FailedResponse) => {
|
|
250
244
|
const { errors = [] } = response
|
|
251
245
|
|
|
252
246
|
const isUnauthorized = errors.some((e: { detail?: string }) =>
|
|
253
247
|
/TRASH_PANDA/i.test(e.detail || '')
|
|
254
248
|
)
|
|
255
249
|
|
|
256
|
-
if (isUnauthorized) return
|
|
250
|
+
if (isUnauthorized) return
|
|
257
251
|
|
|
258
|
-
|
|
259
|
-
.
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
})
|
|
252
|
+
const isForcedLogout = errors.some((e: { detail?: string }) =>
|
|
253
|
+
/capuchin/i.test(e.detail || '')
|
|
254
|
+
)
|
|
255
|
+
const isExpiredToken = errors.some((e: { detail?: string }) => /baboon/i.test(e.detail || ''))
|
|
263
256
|
|
|
264
|
-
|
|
257
|
+
if (!isRefreshingToken || isExpiredToken || isForcedLogout) {
|
|
258
|
+
refreshToken()
|
|
259
|
+
}
|
|
265
260
|
},
|
|
266
|
-
[
|
|
261
|
+
[refreshToken, isRefreshingToken]
|
|
267
262
|
)
|
|
268
263
|
|
|
269
264
|
const sessionContextValue: SessionContextValue = {
|