@planningcenter/chat-react-native 2.2.2-rc.0 → 2.2.2-rc.1

package/build/contexts/chat_context.d.ts

@@ -5,12 +5,13 @@ import { ENV, Session } from '../utils';
 import { ChatTheme, DefaultTheme } from '../utils/theme';
 export type ChatContextValue = {
     token?: OAuthToken;
+    onForceLogout: () => void;
     onTokenExpired: () => void;
     theme: ChatTheme;
     env?: ENV;
     session: Session;
 };
-export interface ChatProviderProps extends Omit<ChatContextValue, 'theme' | 'session'> {
+export interface ChatProviderProps extends Omit<ChatContextValue, 'client' | 'theme' | 'session'> {
     theme: CreateChatThemeProps;
 }
 export declare const ChatContext: React.Context<ChatContextValue>;

package/build/contexts/chat_context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat_context.d.ts","sourceRoot":"","sources":["../../src/contexts/chat_context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAiC,MAAM,OAAO,CAAA;AACrD,OAAO,EAAE,eAAe,EAAkB,MAAM,cAAc,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,SAAS,EAAgB,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAEtE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B,KAAK,EAAE,SAAS,CAAA;IAChB,GAAG,CAAC,EAAE,GAAG,CAAA;IACT,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,WAAW,iBAAkB,SAAQ,IAAI,CAAC,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAC;IACpF,KAAK,EAAE,oBAAoB,CAAA;CAC5B;AAED,eAAO,MAAM,WAAW,iCAMtB,CAAA;AAEF,wBAAgB,YAAY,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;IAAE,QAAQ,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,iBAAiB,CAAA;CAAE,qBAc5F;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,WAAW,CAAC,YAAY,CAAC,CAAA;IACjC,WAAW,CAAC,EAAE,eAAe,CAAA;CAC9B;AAED,eAAO,MAAM,kBAAkB,yDAG5B,oBAAoB,KAAG,SAYzB,CAAA"}
+{"version":3,"file":"chat_context.d.ts","sourceRoot":"","sources":["../../src/contexts/chat_context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAiC,MAAM,OAAO,CAAA;AACrD,OAAO,EAAE,eAAe,EAAkB,MAAM,cAAc,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,SAAS,EAAgB,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAEtE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,aAAa,EAAE,MAAM,IAAI,CAAA;IACzB,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B,KAAK,EAAE,SAAS,CAAA;IAChB,GAAG,CAAC,EAAE,GAAG,CAAA;IACT,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,WAAW,iBAAkB,SAAQ,IAAI,CAAC,gBAAgB,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;IAC/F,KAAK,EAAE,oBAAoB,CAAA;CAC5B;AAED,eAAO,MAAM,WAAW,iCAOtB,CAAA;AAEF,wBAAgB,YAAY,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;IAAE,QAAQ,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,iBAAiB,CAAA;CAAE,qBAe5F;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,WAAW,CAAC,YAAY,CAAC,CAAA;IACjC,WAAW,CAAC,EAAE,eAAe,CAAA;CAC9B;AAED,eAAO,MAAM,kBAAkB,yDAG5B,oBAAoB,KAAG,SAYzB,CAAA"}

package/build/contexts/chat_context.js

@@ -7,17 +7,19 @@ export const ChatContext = createContext({
     theme: defaultTheme('light'),
     token: undefined,
     env: undefined,
+    onForceLogout: () => { },
     onTokenExpired: () => { },
     session: new Session(),
 });
 export function ChatProvider({ children, value }) {
-    const { env, token, onTokenExpired } = value;
+    const { env, token, onTokenExpired, onForceLogout } = value;
     const theme = useCreateChatTheme(value.theme || {});
     const session = useMemo(() => new Session({ token, env }), [env, token]);
     const contextValue = {
         env,
         token,
         onTokenExpired,
+        onForceLogout,
         session,
         theme,
     };

package/build/contexts/chat_context.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat_context.js","sourceRoot":"","sources":["../../src/contexts/chat_context.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAC9B,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AACrD,OAAO,EAAmB,cAAc,EAAE,MAAM,cAAc,CAAA;AAE9D,OAAO,EAAO,OAAO,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAa,YAAY,EAAgB,MAAM,gBAAgB,CAAA;AActE,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAmB;IACzD,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;IAC5B,KAAK,EAAE,SAAS;IAChB,GAAG,EAAE,SAAS;IACd,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,OAAO,EAAE,IAAI,OAAO,EAAE;CACvB,CAAC,CAAA;AAEF,MAAM,UAAU,YAAY,CAAC,EAAE,QAAQ,EAAE,KAAK,EAA+C;IAC3F,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,KAAK,CAAA;IAC5C,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA;IACnD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IAExE,MAAM,YAAY,GAAqB;QACrC,GAAG;QACH,KAAK;QACL,cAAc;QACd,OAAO;QACP,KAAK;KACN,CAAA;IAED,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;AACrF,CAAC;AAOD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,KAAK,EAAE,WAAW,GAAG,EAAE,EACvB,WAAW,EAAE,cAAc,GACN,EAAa,EAAE;IACpC,MAAM,mBAAmB,GAAG,cAAc,EAAE,IAAI,OAAO,CAAA;IACvD,MAAM,WAAW,GAAG,cAAc,IAAI,mBAAmB,CAAA;IAEzD,MAAM,KAAK,GAAG;QACZ,GAAG,KAAK,CAAC,EAAE,EAAE,YAAY,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;QACpD,MAAM,EAAE;YACN,GAAG,KAAK,CAAC,EAAE,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC;SACpE;KACF,CAAA;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA","sourcesContent":["import { merge } from 'lodash'\nimport React, { createContext, useMemo } from 'react'\nimport { ColorSchemeName, useColorScheme } from 'react-native'\nimport { DeepPartial, OAuthToken } from '../types'\nimport { ENV, Session } from '../utils'\nimport { ChatTheme, defaultTheme, DefaultTheme } from '../utils/theme'\n\nexport type ChatContextValue = {\n  token?: OAuthToken\n  onTokenExpired: () => void\n  theme: ChatTheme\n  env?: ENV\n  session: Session\n}\n\nexport interface ChatProviderProps extends Omit<ChatContextValue, 'theme' | 'session'> {\n  theme: CreateChatThemeProps\n}\n\nexport const ChatContext = createContext<ChatContextValue>({\n  theme: defaultTheme('light'),\n  token: undefined,\n  env: undefined,\n  onTokenExpired: () => {},\n  session: new Session(),\n})\n\nexport function ChatProvider({ children, value }: { children: any; value: ChatProviderProps }) {\n  const { env, token, onTokenExpired } = value\n  const theme = useCreateChatTheme(value.theme || {})\n  const session = useMemo(() => new Session({ token, env }), [env, token])\n\n  const contextValue: ChatContextValue = {\n    env,\n    token,\n    onTokenExpired,\n    session,\n    theme,\n  }\n\n  return <ChatContext.Provider value={contextValue}>{children}</ChatContext.Provider>\n}\n\nexport interface CreateChatThemeProps {\n  theme?: DeepPartial<DefaultTheme>\n  colorScheme?: ColorSchemeName\n}\n\nexport const useCreateChatTheme = ({\n  theme: customTheme = {},\n  colorScheme: appColorScheme,\n}: CreateChatThemeProps): ChatTheme => {\n  const internalColorScheme = useColorScheme() || 'light'\n  const colorScheme = appColorScheme || internalColorScheme\n\n  const theme = {\n    ...merge({}, defaultTheme(colorScheme), customTheme),\n    colors: {\n      ...merge({}, defaultTheme(colorScheme).colors, customTheme?.colors),\n    },\n  }\n\n  return theme\n}\n"]}
+{"version":3,"file":"chat_context.js","sourceRoot":"","sources":["../../src/contexts/chat_context.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAC9B,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AACrD,OAAO,EAAmB,cAAc,EAAE,MAAM,cAAc,CAAA;AAE9D,OAAO,EAAO,OAAO,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAa,YAAY,EAAgB,MAAM,gBAAgB,CAAA;AAetE,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAmB;IACzD,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;IAC5B,KAAK,EAAE,SAAS;IAChB,GAAG,EAAE,SAAS;IACd,aAAa,EAAE,GAAG,EAAE,GAAE,CAAC;IACvB,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,OAAO,EAAE,IAAI,OAAO,EAAE;CACvB,CAAC,CAAA;AAEF,MAAM,UAAU,YAAY,CAAC,EAAE,QAAQ,EAAE,KAAK,EAA+C;IAC3F,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,KAAK,CAAA;IAC3D,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA;IACnD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IAExE,MAAM,YAAY,GAAqB;QACrC,GAAG;QACH,KAAK;QACL,cAAc;QACd,aAAa;QACb,OAAO;QACP,KAAK;KACN,CAAA;IAED,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;AACrF,CAAC;AAOD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,KAAK,EAAE,WAAW,GAAG,EAAE,EACvB,WAAW,EAAE,cAAc,GACN,EAAa,EAAE;IACpC,MAAM,mBAAmB,GAAG,cAAc,EAAE,IAAI,OAAO,CAAA;IACvD,MAAM,WAAW,GAAG,cAAc,IAAI,mBAAmB,CAAA;IAEzD,MAAM,KAAK,GAAG;QACZ,GAAG,KAAK,CAAC,EAAE,EAAE,YAAY,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;QACpD,MAAM,EAAE;YACN,GAAG,KAAK,CAAC,EAAE,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC;SACpE;KACF,CAAA;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA","sourcesContent":["import { merge } from 'lodash'\nimport React, { createContext, useMemo } from 'react'\nimport { ColorSchemeName, useColorScheme } from 'react-native'\nimport { DeepPartial, OAuthToken } from '../types'\nimport { ENV, Session } from '../utils'\nimport { ChatTheme, defaultTheme, DefaultTheme } from '../utils/theme'\n\nexport type ChatContextValue = {\n  token?: OAuthToken\n  onForceLogout: () => void\n  onTokenExpired: () => void\n  theme: ChatTheme\n  env?: ENV\n  session: Session\n}\n\nexport interface ChatProviderProps extends Omit<ChatContextValue, 'client' | 'theme' | 'session'> {\n  theme: CreateChatThemeProps\n}\n\nexport const ChatContext = createContext<ChatContextValue>({\n  theme: defaultTheme('light'),\n  token: undefined,\n  env: undefined,\n  onForceLogout: () => {},\n  onTokenExpired: () => {},\n  session: new Session(),\n})\n\nexport function ChatProvider({ children, value }: { children: any; value: ChatProviderProps }) {\n  const { env, token, onTokenExpired, onForceLogout } = value\n  const theme = useCreateChatTheme(value.theme || {})\n  const session = useMemo(() => new Session({ token, env }), [env, token])\n\n  const contextValue: ChatContextValue = {\n    env,\n    token,\n    onTokenExpired,\n    onForceLogout,\n    session,\n    theme,\n  }\n\n  return <ChatContext.Provider value={contextValue}>{children}</ChatContext.Provider>\n}\n\nexport interface CreateChatThemeProps {\n  theme?: DeepPartial<DefaultTheme>\n  colorScheme?: ColorSchemeName\n}\n\nexport const useCreateChatTheme = ({\n  theme: customTheme = {},\n  colorScheme: appColorScheme,\n}: CreateChatThemeProps): ChatTheme => {\n  const internalColorScheme = useColorScheme() || 'light'\n  const colorScheme = appColorScheme || internalColorScheme\n\n  const theme = {\n    ...merge({}, defaultTheme(colorScheme), customTheme),\n    colors: {\n      ...merge({}, defaultTheme(colorScheme).colors, customTheme?.colors),\n    },\n  }\n\n  return theme\n}\n"]}

package/build/types/api_primitives.d.ts

@@ -2,6 +2,18 @@ export interface ResourceObject {
     id: string;
     type: string;
 }
+export interface ErrorObject {
+    source?: {
+        parameter: string;
+    };
+    detail: string;
+    meta?: {
+        associated_resources: any[];
+        resource: string;
+    };
+    title: string;
+    status: string;
+}
 export type ApiResource<Type = ResourceObject> = {
     data: Type;
     links: Record<string, string>;
@@ -12,6 +24,9 @@ export type ApiCollection<Type = ResourceObject> = {
     links: Record<string, string>;
     meta: CollectionMeta;
 };
+export interface ApiError {
+    errors: ErrorObject[];
+}
 export interface CollectionMeta {
     count: number;
     totalCount: number;

package/build/types/api_primitives.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api_primitives.d.ts","sourceRoot":"","sources":["../../src/types/api_primitives.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,MAAM,WAAW,CAAC,IAAI,GAAG,cAAc,IAAI;IAC/C,IAAI,EAAE,IAAI,CAAA;IACV,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,IAAI,GAAG,cAAc,IAAI;IACjD,IAAI,EAAE,IAAI,EAAE,CAAA;IACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,IAAI,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,cAAc,CAAA;IACvB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAA;CACjC"}
+{"version":3,"file":"api_primitives.d.ts","sourceRoot":"","sources":["../../src/types/api_primitives.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE;QAAE,oBAAoB,EAAE,GAAG,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAA;IACxD,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,MAAM,WAAW,CAAC,IAAI,GAAG,cAAc,IAAI;IAC/C,IAAI,EAAE,IAAI,CAAA;IACV,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,IAAI,GAAG,cAAc,IAAI;IACjD,IAAI,EAAE,IAAI,EAAE,CAAA;IACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,IAAI,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,WAAW,EAAE,CAAA;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,MAAM,CAAC,EAAE,cAAc,CAAA;IACvB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAA;CACjC"}

package/build/types/api_primitives.js.map

@@ -1 +1 @@
-{"version":3,"file":"api_primitives.js","sourceRoot":"","sources":["../../src/types/api_primitives.ts"],"names":[],"mappings":"","sourcesContent":["export interface ResourceObject {\n  id: string\n  type: string\n}\n\nexport type ApiResource<Type = ResourceObject> = {\n  data: Type\n  links: Record<string, string>\n  meta: Record<string, unknown>\n}\n\nexport type ApiCollection<Type = ResourceObject> = {\n  data: Type[]\n  links: Record<string, string>\n  meta: CollectionMeta\n}\n\nexport interface CollectionMeta {\n  count: number\n  totalCount: number\n  next?: Record<string, unknown>\n  parent?: ResourceObject\n  [attributeName: string]: unknown\n}\n"]}
+{"version":3,"file":"api_primitives.js","sourceRoot":"","sources":["../../src/types/api_primitives.ts"],"names":[],"mappings":"","sourcesContent":["export interface ResourceObject {\n  id: string\n  type: string\n}\n\nexport interface ErrorObject {\n  source?: { parameter: string }\n  detail: string\n  meta?: { associated_resources: any[]; resource: string }\n  title: string\n  status: string\n}\n\nexport type ApiResource<Type = ResourceObject> = {\n  data: Type\n  links: Record<string, string>\n  meta: Record<string, unknown>\n}\n\nexport type ApiCollection<Type = ResourceObject> = {\n  data: Type[]\n  links: Record<string, string>\n  meta: CollectionMeta\n}\n\nexport interface ApiError {\n  errors: ErrorObject[]\n}\n\nexport interface CollectionMeta {\n  count: number\n  totalCount: number\n  next?: Record<string, unknown>\n  parent?: ResourceObject\n  [attributeName: string]: unknown\n}\n"]}

package/build/utils/client/client.d.ts

@@ -1,11 +1,12 @@
-import { ApiCollection, ApiResource } from '../../types';
+import { ApiCollection, ApiError, ApiResource } from '../../types';
 import { Session } from '../session';
 import { Uri } from '../uri';
 import { DeleteRequest, GetRequest, PatchRequest, PostRequest } from './types';
 type ClientArgs = {
     version: string;
     defaultHeaders?: Record<string, string>;
-    onTokenExpired: () => void;
+    onForceLogout?: () => void;
+    onTokenExpired?: () => void;
     session: Session;
     app: string;
 };
@@ -13,13 +14,15 @@ export declare class Client {
     version: string;
     defaultHeaders: Record<string, string>;
     uri: Uri;
-    onTokenExpired: () => void;
-    constructor({ version, defaultHeaders, session, app, onTokenExpired }: ClientArgs);
+    onTokenExpired?: () => void;
+    onForceLogout?: () => void;
+    constructor({ version, defaultHeaders, session, app, onTokenExpired, onForceLogout, }: ClientArgs);
     get<T extends ApiCollection | ApiResource>(args: GetRequest): Promise<T>;
     patch(args: PatchRequest): Promise<any>;
     post(args: PostRequest): Promise<any>;
     delete(args: DeleteRequest): Promise<any>;
-    handleTokenExpired: (response: Response) => Promise<never>;
+    handleNotOk: (response: Response) => Promise<never>;
+    parseErrorResponse: (response: Response) => Promise<ApiError | undefined>;
     get headers(): {
         'User-Agent': string;
         Authorization: string;

package/build/utils/client/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAU5B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAE3F,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvC,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,qBAAa,MAAM;IACjB,OAAO,EAAE,MAAM,CAAK;IACpB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IAC3C,GAAG,EAAE,GAAG,CAAA;IACR,cAAc,EAAE,MAAM,IAAI,CAAA;gBAEd,EAAE,OAAO,EAAE,cAAmB,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,UAAU;IAOhF,GAAG,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC;IAuCxE,KAAK,CAAC,IAAI,EAAE,YAAY;IASxB,IAAI,CAAC,IAAI,EAAE,WAAW;IAStB,MAAM,CAAC,IAAI,EAAE,aAAa;IAShC,kBAAkB,aAAc,QAAQ,oBAMvC;IAED,IAAI,OAAO;;;;;;MAQV;CACF;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAU5B,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAe,MAAM,SAAS,CAAA;AAE3F,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvC,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,qBAAa,MAAM;IACjB,OAAO,EAAE,MAAM,CAAK;IACpB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAK;IAC3C,GAAG,EAAE,GAAG,CAAA;IACR,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;gBAEd,EACV,OAAO,EACP,cAAmB,EACnB,OAAO,EACP,GAAG,EACH,cAAc,EACd,aAAa,GACd,EAAE,UAAU;IAQP,GAAG,CAAC,CAAC,SAAS,aAAa,GAAG,WAAW,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC;IAuCxE,KAAK,CAAC,IAAI,EAAE,YAAY;IASxB,IAAI,CAAC,IAAI,EAAE,WAAW;IAStB,MAAM,CAAC,IAAI,EAAE,aAAa;IAShC,WAAW,aAAoB,QAAQ,oBAWtC;IAED,kBAAkB,aAAoB,QAAQ,KAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAM7E;IAED,IAAI,OAAO;;;;;;MAQV;CACF;AAED,eAAe,MAAM,CAAA"}

package/build/utils/client/client.js

@@ -5,11 +5,13 @@ export class Client {
     defaultHeaders = {};
     uri;
     onTokenExpired;
-    constructor({ version, defaultHeaders = {}, session, app, onTokenExpired }) {
+    onForceLogout;
+    constructor({ version, defaultHeaders = {}, session, app, onTokenExpired, onForceLogout, }) {
         this.version = version;
         this.uri = new Uri({ session, app });
         this.defaultHeaders = defaultHeaders;
         this.onTokenExpired = onTokenExpired;
+        this.onForceLogout = onForceLogout;
     }
     async get(args) {
         const { walk, ...data } = args.data;
@@ -37,32 +39,45 @@ export class Client {
             });
         };
         const handler = isWalking ? walkRequest : makeRequest;
-        return throwErrorIfFieldsMissing(handler, requestArgs).catch(this.handleTokenExpired);
+        return throwErrorIfFieldsMissing(handler, requestArgs).catch(this.handleNotOk);
     }
     async patch(args) {
         const headers = { ...this.headers, ...args.headers };
         const url = this.uri.appUrl(args.url);
         const requestArgs = { data: args.data, url, action: 'PATCH', headers };
-        return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleTokenExpired);
+        return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleNotOk);
     }
     async post(args) {
         const headers = { ...this.headers, ...args.headers };
         const url = this.uri.appUrl(args.url);
         const requestArgs = { ...args, data: args.data, url, action: 'POST', headers };
-        return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleTokenExpired);
+        return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleNotOk);
     }
     async delete(args) {
         const headers = { ...this.headers, ...args.headers };
         const url = this.uri.appUrl(args.url);
         const requestArgs = { url, action: 'DELETE', headers };
-        return makeRequest(requestArgs).catch(this.handleTokenExpired);
+        return makeRequest(requestArgs).catch(this.handleNotOk);
     }
-    handleTokenExpired = (response) => {
+    handleNotOk = async (response) => {
         if (response.status === 401) {
-            this.onTokenExpired();
+            const parsed = await this.parseErrorResponse(response);
+            const errors = parsed?.errors || [];
+            const isTokenExpired = errors.some(e => /baboon/i.test(e.detail));
+            const isForceLogout = errors.some(e => /capuchin/i.test(e.detail));
+            isTokenExpired && this.onTokenExpired?.();
+            isForceLogout && this.onForceLogout?.();
         }
         return Promise.reject(response);
     };
+    parseErrorResponse = async (response) => {
+        try {
+            return (await response.json());
+        }
+        catch {
+            return undefined;
+        }
+    };
     get headers() {
         return {
             Accept: 'application/vnd.api+json',

package/build/utils/client/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/utils/client/client.ts"],"names":[],"mappings":"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","sourcesContent":["import { ApiCollection, ApiResource } from '../../types'\nimport { Session } from '../session'\nimport { Uri } from '../uri'\nimport {\n  concatRecords,\n  ensureNoQueryParamsInDev,\n  makeRequest,\n  MakeRequestArgs,\n  throwErrorIfFieldsMissing,\n  throwErrorIfQueryParams,\n} from './request_helpers'\n\nimport { DeleteRequest, GetRequest, PatchRequest, PostRequest, WalkRequest } from './types'\n\ntype ClientArgs = {\n  version: string\n  defaultHeaders?: Record<string, string>\n  onTokenExpired: () => void\n  session: Session\n  app: string\n}\n\nexport class Client {\n  version: string = ''\n  defaultHeaders: Record<string, string> = {}\n  uri: Uri\n  onTokenExpired: () => void\n\n  constructor({ version, defaultHeaders = {}, session, app, onTokenExpired }: ClientArgs) {\n    this.version = version\n    this.uri = new Uri({ session, app })\n    this.defaultHeaders = defaultHeaders\n    this.onTokenExpired = onTokenExpired\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.uri.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) => {\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 ? walkRequest : makeRequest\n\n    return throwErrorIfFieldsMissing(handler, requestArgs).catch(this.handleTokenExpired)\n  }\n\n  async patch(args: PatchRequest) {\n    const headers = { ...this.headers, ...args.headers }\n    const url = this.uri.appUrl(args.url)\n\n    const requestArgs: MakeRequestArgs = { data: args.data, url, action: 'PATCH', headers }\n\n    return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleTokenExpired)\n  }\n\n  async post(args: PostRequest) {\n    const headers = { ...this.headers, ...args.headers }\n    const url = this.uri.appUrl(args.url)\n\n    const requestArgs: MakeRequestArgs = { ...args, data: args.data, url, action: 'POST', headers }\n\n    return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleTokenExpired)\n  }\n\n  async delete(args: DeleteRequest) {\n    const headers = { ...this.headers, ...args.headers }\n    const url = this.uri.appUrl(args.url)\n\n    const requestArgs: MakeRequestArgs = { url, action: 'DELETE', headers }\n\n    return makeRequest(requestArgs).catch(this.handleTokenExpired)\n  }\n\n  handleTokenExpired = (response: Response) => {\n    if (response.status === 401) {\n      this.onTokenExpired()\n    }\n\n    return Promise.reject(response)\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.uri.headers,\n      ...this.defaultHeaders,\n    }\n  }\n}\n\nexport default Client\n"]}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/utils/client/client.ts"],"names":[],"mappings":"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","sourcesContent":["import { ApiCollection, ApiError, ApiResource } from '../../types'\nimport { Session } from '../session'\nimport { Uri } from '../uri'\nimport {\n  concatRecords,\n  ensureNoQueryParamsInDev,\n  makeRequest,\n  MakeRequestArgs,\n  throwErrorIfFieldsMissing,\n  throwErrorIfQueryParams,\n} from './request_helpers'\n\nimport { DeleteRequest, GetRequest, PatchRequest, PostRequest, WalkRequest } from './types'\n\ntype ClientArgs = {\n  version: string\n  defaultHeaders?: Record<string, string>\n  onForceLogout?: () => void\n  onTokenExpired?: () => void\n  session: Session\n  app: string\n}\n\nexport class Client {\n  version: string = ''\n  defaultHeaders: Record<string, string> = {}\n  uri: Uri\n  onTokenExpired?: () => void\n  onForceLogout?: () => void\n\n  constructor({\n    version,\n    defaultHeaders = {},\n    session,\n    app,\n    onTokenExpired,\n    onForceLogout,\n  }: ClientArgs) {\n    this.version = version\n    this.uri = new Uri({ session, app })\n    this.defaultHeaders = defaultHeaders\n    this.onTokenExpired = onTokenExpired\n    this.onForceLogout = onForceLogout\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.uri.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) => {\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 ? walkRequest : makeRequest\n\n    return throwErrorIfFieldsMissing(handler, requestArgs).catch(this.handleNotOk)\n  }\n\n  async patch(args: PatchRequest) {\n    const headers = { ...this.headers, ...args.headers }\n    const url = this.uri.appUrl(args.url)\n\n    const requestArgs: MakeRequestArgs = { data: args.data, url, action: 'PATCH', headers }\n\n    return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleNotOk)\n  }\n\n  async post(args: PostRequest) {\n    const headers = { ...this.headers, ...args.headers }\n    const url = this.uri.appUrl(args.url)\n\n    const requestArgs: MakeRequestArgs = { ...args, data: args.data, url, action: 'POST', headers }\n\n    return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleNotOk)\n  }\n\n  async delete(args: DeleteRequest) {\n    const headers = { ...this.headers, ...args.headers }\n    const url = this.uri.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) => {\n    if (response.status === 401) {\n      const parsed = await this.parseErrorResponse(response)\n      const errors = parsed?.errors || []\n      const isTokenExpired = errors.some(e => /baboon/i.test(e.detail))\n      const isForceLogout = errors.some(e => /capuchin/i.test(e.detail))\n      isTokenExpired && this.onTokenExpired?.()\n      isForceLogout && this.onForceLogout?.()\n    }\n\n    return Promise.reject(response)\n  }\n\n  parseErrorResponse = async (response: Response): Promise<ApiError | undefined> => {\n    try {\n      return (await response.json()) as ApiError\n    } catch {\n      return undefined\n    }\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.uri.headers,\n      ...this.defaultHeaders,\n    }\n  }\n}\n\nexport default Client\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "2.2.2-rc.0",
+  "version": "2.2.2-rc.1",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -52,5 +52,5 @@
     "prettier": "^3.4.2",
     "typescript": "<5.6.0"
   },
-  "gitHead": "85b57656095e4430283d8bcb345bf56875172a9f"
+  "gitHead": "9a3a46afb5c78a3e7b5c4892a1d92c9874214f37"
 }

package/src/__tests__/client.ts

@@ -3,7 +3,7 @@ import Client from '../utils/client/client'
 import { Session } from '../utils/session'
 import DefaultFixtures from '../__utils__/fixtures/defaults'
 import { BASE_URL } from '../__utils__/handlers'
-import { OAuthToken } from '../types'
+import { ApiError, OAuthToken } from '../types'
 
 const APP_BASE_URL = BASE_URL
 
@@ -16,6 +16,9 @@ beforeAll(() => MockServer.server().listen())
 afterEach(() => MockServer.server().resetHandlers())
 afterAll(() => MockServer.server().close())
 
+const onTokenExpired = jest.fn()
+const onForceLogout = jest.fn()
+
 beforeEach(() => {
   jest.clearAllMocks()
   fetchSpy = jest.spyOn(globalThis, 'fetch')
@@ -24,7 +27,8 @@ beforeEach(() => {
     app: 'chat',
     version: '2018-11-01',
     session,
-    onTokenExpired: () => {},
+    onTokenExpired,
+    onForceLogout,
   })
   clientWithDefaultHeaders = new Client({
     app: 'chat',
@@ -33,7 +37,8 @@ beforeEach(() => {
       'X-Custom-Default-Header': 'important data',
     },
     session,
-    onTokenExpired: () => {},
+    onTokenExpired,
+    onForceLogout,
   })
 })
 
@@ -184,7 +189,12 @@ describe('get', () => {
   })
 
   it('throws an error if response is not ok', async () => {
-    MockServer.get(url, { errors: [{ status: '403' }] }, 403, { once: true })
+    MockServer.get(
+      url,
+      { errors: [{ status: '403', detail: 'Zoinks, your token is borked' }] },
+      403,
+      { once: true }
+    )
 
     await expect(
       client.get({
@@ -428,6 +438,51 @@ describe('url switching', () => {
   })
 })
 
+describe('error handling', () => {
+  describe('401 errors', () => {
+    it('defaults', async () => {
+      await test401({ secretWord: '' })
+      expect(onTokenExpired).not.toHaveBeenCalled()
+      expect(onForceLogout).not.toHaveBeenCalled()
+    })
+
+    it('handles forced logout', async () => {
+      await test401({ secretWord: 'CAPUCHIN' })
+      expect(onTokenExpired).not.toHaveBeenCalled()
+      expect(onForceLogout).toHaveBeenCalled()
+    })
+
+    it('handles token refresh', async () => {
+      await test401({ secretWord: 'BABOON' })
+      expect(onTokenExpired).toHaveBeenCalled()
+      expect(onForceLogout).not.toHaveBeenCalled()
+    })
+
+    const test401 = async ({ secretWord }: { secretWord: string }) => {
+      const url = '/records'
+
+      const expiredTokenResource: Partial<ApiError> = {
+        errors: [
+          {
+            detail: `Zoinks, your token is borked ( ${secretWord} )`,
+            title: 'Unauthorized',
+            status: '401',
+          },
+        ],
+      }
+
+      MockServer.get(url, expiredTokenResource, 401, { once: true })
+
+      await expect(
+        client.get({
+          url,
+          data: { fields: { Record: ['id'] } },
+        })
+      ).rejects.toHaveProperty('status', 401)
+    }
+  })
+})
+
 const requestHeadersShouldContain = ({
   headers,
   key,

package/src/__tests__/hooks/useTheme.tsx

@@ -1,6 +1,6 @@
 import { renderHook } from '@testing-library/react-native'
 import { useTheme } from '../../hooks'
-import { ChatProvider, CreateChatThemeProps } from '../../contexts'
+import { ChatProvider, CreateChatThemeProps } from '../../contexts/chat_context'
 import React from 'react'
 
 let themeProps: CreateChatThemeProps = {

package/src/contexts/chat_context.tsx

@@ -7,13 +7,14 @@ import { ChatTheme, defaultTheme, DefaultTheme } from '../utils/theme'
 
 export type ChatContextValue = {
   token?: OAuthToken
+  onForceLogout: () => void
   onTokenExpired: () => void
   theme: ChatTheme
   env?: ENV
   session: Session
 }
 
-export interface ChatProviderProps extends Omit<ChatContextValue, 'theme' | 'session'> {
+export interface ChatProviderProps extends Omit<ChatContextValue, 'client' | 'theme' | 'session'> {
   theme: CreateChatThemeProps
 }
 
@@ -21,12 +22,13 @@ export const ChatContext = createContext<ChatContextValue>({
   theme: defaultTheme('light'),
   token: undefined,
   env: undefined,
+  onForceLogout: () => {},
   onTokenExpired: () => {},
   session: new Session(),
 })
 
 export function ChatProvider({ children, value }: { children: any; value: ChatProviderProps }) {
-  const { env, token, onTokenExpired } = value
+  const { env, token, onTokenExpired, onForceLogout } = value
   const theme = useCreateChatTheme(value.theme || {})
   const session = useMemo(() => new Session({ token, env }), [env, token])
 
@@ -34,6 +36,7 @@ export function ChatProvider({ children, value }: { children: any; value: ChatPr
     env,
     token,
     onTokenExpired,
+    onForceLogout,
     session,
     theme,
   }

package/src/types/api_primitives.ts

@@ -3,6 +3,14 @@ export interface ResourceObject {
   type: string
 }
 
+export interface ErrorObject {
+  source?: { parameter: string }
+  detail: string
+  meta?: { associated_resources: any[]; resource: string }
+  title: string
+  status: string
+}
+
 export type ApiResource<Type = ResourceObject> = {
   data: Type
   links: Record<string, string>
@@ -15,6 +23,10 @@ export type ApiCollection<Type = ResourceObject> = {
   meta: CollectionMeta
 }
 
+export interface ApiError {
+  errors: ErrorObject[]
+}
+
 export interface CollectionMeta {
   count: number
   totalCount: number

package/src/utils/client/client.ts

@@ -1,4 +1,4 @@
-import { ApiCollection, ApiResource } from '../../types'
+import { ApiCollection, ApiError, ApiResource } from '../../types'
 import { Session } from '../session'
 import { Uri } from '../uri'
 import {
@@ -15,7 +15,8 @@ import { DeleteRequest, GetRequest, PatchRequest, PostRequest, WalkRequest } fro
 type ClientArgs = {
   version: string
   defaultHeaders?: Record<string, string>
-  onTokenExpired: () => void
+  onForceLogout?: () => void
+  onTokenExpired?: () => void
   session: Session
   app: string
 }
@@ -24,13 +25,22 @@ export class Client {
   version: string = ''
   defaultHeaders: Record<string, string> = {}
   uri: Uri
-  onTokenExpired: () => void
-
-  constructor({ version, defaultHeaders = {}, session, app, onTokenExpired }: ClientArgs) {
+  onTokenExpired?: () => void
+  onForceLogout?: () => void
+
+  constructor({
+    version,
+    defaultHeaders = {},
+    session,
+    app,
+    onTokenExpired,
+    onForceLogout,
+  }: ClientArgs) {
     this.version = version
     this.uri = new Uri({ session, app })
     this.defaultHeaders = defaultHeaders
     this.onTokenExpired = onTokenExpired
+    this.onForceLogout = onForceLogout
   }
 
   async get<T extends ApiCollection | ApiResource>(args: GetRequest): Promise<T> {
@@ -69,7 +79,7 @@ export class Client {
 
     const handler = isWalking ? walkRequest : makeRequest
 
-    return throwErrorIfFieldsMissing(handler, requestArgs).catch(this.handleTokenExpired)
+    return throwErrorIfFieldsMissing(handler, requestArgs).catch(this.handleNotOk)
   }
 
   async patch(args: PatchRequest) {
@@ -78,7 +88,7 @@ export class Client {
 
     const requestArgs: MakeRequestArgs = { data: args.data, url, action: 'PATCH', headers }
 
-    return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleTokenExpired)
+    return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleNotOk)
   }
 
   async post(args: PostRequest) {
@@ -87,7 +97,7 @@ export class Client {
 
     const requestArgs: MakeRequestArgs = { ...args, data: args.data, url, action: 'POST', headers }
 
-    return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleTokenExpired)
+    return ensureNoQueryParamsInDev(makeRequest, requestArgs).catch(this.handleNotOk)
   }
 
   async delete(args: DeleteRequest) {
@@ -96,17 +106,30 @@ export class Client {
 
     const requestArgs: MakeRequestArgs = { url, action: 'DELETE', headers }
 
-    return makeRequest(requestArgs).catch(this.handleTokenExpired)
+    return makeRequest(requestArgs).catch(this.handleNotOk)
   }
 
-  handleTokenExpired = (response: Response) => {
+  handleNotOk = async (response: Response) => {
     if (response.status === 401) {
-      this.onTokenExpired()
+      const parsed = await this.parseErrorResponse(response)
+      const errors = parsed?.errors || []
+      const isTokenExpired = errors.some(e => /baboon/i.test(e.detail))
+      const isForceLogout = errors.some(e => /capuchin/i.test(e.detail))
+      isTokenExpired && this.onTokenExpired?.()
+      isForceLogout && this.onForceLogout?.()
     }
 
     return Promise.reject(response)
   }
 
+  parseErrorResponse = async (response: Response): Promise<ApiError | undefined> => {
+    try {
+      return (await response.json()) as ApiError
+    } catch {
+      return undefined
+    }
+  }
+
   get headers() {
     return {
       Accept: 'application/vnd.api+json',