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

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/build/vendor/tapestry/alias_tokens_color_map.d.ts

@@ -1,6 +1,12 @@
 export declare const aliasTokensColorMap: {
     readonly light: {
         readonly name: string;
+        readonly borderColorDefaultBase: string;
+        readonly borderColorDefaultDark: string;
+        readonly borderColorDefaultDarker: string;
+        readonly borderColorDefaultDisabled: string;
+        readonly borderColorDefaultDim: string;
+        readonly borderColorDefaultWhite: string;
         readonly iconColorDefaultPrimary: string;
         readonly iconColorDefaultSecondary: string;
         readonly iconColorDefaultDim: string;
@@ -32,6 +38,12 @@ export declare const aliasTokensColorMap: {
     };
     readonly dark: {
         readonly name: string;
+        readonly borderColorDefaultBase: string;
+        readonly borderColorDefaultDark: string;
+        readonly borderColorDefaultDarker: string;
+        readonly borderColorDefaultDisabled: string;
+        readonly borderColorDefaultDim: string;
+        readonly borderColorDefaultWhite: string;
         readonly iconColorDefaultPrimary: string;
         readonly iconColorDefaultSecondary: string;
         readonly iconColorDefaultDim: string;

package/build/vendor/tapestry/alias_tokens_color_map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alias_tokens_color_map.d.ts","sourceRoot":"","sources":["../../../src/vendor/tapestry/alias_tokens_color_map.ts"],"names":[],"mappings":"AAkHA,eAAO,MAAM,mBAAmB;;uBA9DxB,MAAM;0CACa,MAAM;4CACJ,MAAM;sCACZ,MAAM;2CACD,MAAM;2CACN,MAAM;2CACN,MAAM;0CACP,MAAM;4CACJ,MAAM;2CACP,MAAM;8CACH,MAAM;2CACT,MAAM;oDACG,MAAM;8CACZ,MAAM;6CACP,MAAM;sDACG,MAAM;uCACrB,MAAM;kCACX,MAAM;sCA7DF,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;0CACF,MAAM;sCACV,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;8CACE,MAAM;;;uBAkC7B,MAAM;0CACa,MAAM;4CACJ,MAAM;sCACZ,MAAM;2CACD,MAAM;2CACN,MAAM;2CACN,MAAM;0CACP,MAAM;4CACJ,MAAM;2CACP,MAAM;8CACH,MAAM;2CACT,MAAM;oDACG,MAAM;8CACZ,MAAM;6CACP,MAAM;sDACG,MAAM;uCACrB,MAAM;kCACX,MAAM;sCA7DF,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;0CACF,MAAM;sCACV,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;8CACE,MAAM;;CAmG3B,CAAA"}
+{"version":3,"file":"alias_tokens_color_map.d.ts","sourceRoot":"","sources":["../../../src/vendor/tapestry/alias_tokens_color_map.ts"],"names":[],"mappings":"AAoIA,eAAO,MAAM,mBAAmB;;uBAhFxB,MAAM;yCACY,MAAM;yCACN,MAAM;2CACJ,MAAM;6CACJ,MAAM;wCACX,MAAM;0CACJ,MAAM;0CACN,MAAM;4CACJ,MAAM;sCACZ,MAAM;2CACD,MAAM;2CACN,MAAM;2CACN,MAAM;0CACP,MAAM;4CACJ,MAAM;2CACP,MAAM;8CACH,MAAM;2CACT,MAAM;oDACG,MAAM;8CACZ,MAAM;6CACP,MAAM;sDACG,MAAM;uCACrB,MAAM;kCACX,MAAM;sCAnEF,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;0CACF,MAAM;sCACV,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;8CACE,MAAM;;;uBAkC7B,MAAM;yCACY,MAAM;yCACN,MAAM;2CACJ,MAAM;6CACJ,MAAM;wCACX,MAAM;0CACJ,MAAM;0CACN,MAAM;4CACJ,MAAM;sCACZ,MAAM;2CACD,MAAM;2CACN,MAAM;2CACN,MAAM;0CACP,MAAM;4CACJ,MAAM;2CACP,MAAM;8CACH,MAAM;2CACT,MAAM;oDACG,MAAM;8CACZ,MAAM;6CACP,MAAM;sDACG,MAAM;uCACrB,MAAM;kCACX,MAAM;sCAnEF,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;0CACF,MAAM;sCACV,MAAM;sCACN,MAAM;sCACN,MAAM;sCACN,MAAM;8CACE,MAAM;;CAqH3B,CAAA"}

package/build/vendor/tapestry/alias_tokens_color_map.js

@@ -29,6 +29,12 @@ const neutralsDark = {
 };
 const semanticAliasesLight = {
     name: 'light',
+    borderColorDefaultBase: neutralsLight.fillColorNeutral050Base,
+    borderColorDefaultDark: neutralsLight.fillColorNeutral040,
+    borderColorDefaultDarker: neutralsLight.fillColorNeutral020,
+    borderColorDefaultDisabled: neutralsLight.fillColorNeutral050Base,
+    borderColorDefaultDim: neutralsLight.fillColorNeutral070,
+    borderColorDefaultWhite: neutralsLight.fillColorNeutral100Inverted,
     iconColorDefaultPrimary: neutralsLight.fillColorNeutral010,
     iconColorDefaultSecondary: neutralsLight.fillColorNeutral020,
     iconColorDefaultDim: neutralsLight.fillColorNeutral030,
@@ -49,6 +55,12 @@ const semanticAliasesLight = {
 };
 const semanticAliasesDark = {
     name: 'dark',
+    borderColorDefaultBase: neutralsDark.fillColorNeutral050Base,
+    borderColorDefaultDark: neutralsDark.fillColorNeutral040,
+    borderColorDefaultDarker: neutralsDark.fillColorNeutral020,
+    borderColorDefaultDisabled: neutralsDark.fillColorNeutral050Base,
+    borderColorDefaultDim: neutralsDark.fillColorNeutral070,
+    borderColorDefaultWhite: neutralsDark.fillColorNeutral100Inverted,
     iconColorDefaultPrimary: neutralsDark.fillColorNeutral010,
     iconColorDefaultSecondary: neutralsDark.fillColorNeutral020,
     iconColorDefaultDim: neutralsDark.fillColorNeutral030,

package/build/vendor/tapestry/alias_tokens_color_map.js.map

@@ -1 +1 @@
-{"version":3,"file":"alias_tokens_color_map.js","sourceRoot":"","sources":["../../../src/vendor/tapestry/alias_tokens_color_map.ts"],"names":[],"mappings":"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","sourcesContent":["import { tokens } from './tokens'\n\n// Copied from `@planningcenter/tapestry` package.\n// Defining these tokens locally is a temporary solution until the package supports mobile.\n// Tokens Reference: https://planningcenter.github.io/tapestry/?path=/docs/foundations-design-tokens--docs\n\ninterface NeutralColors {\n  name: string\n  fillColorNeutral000: string\n  fillColorNeutral010: string\n  fillColorNeutral020: string\n  fillColorNeutral030: string\n  fillColorNeutral040: string\n  fillColorNeutral050Base: string\n  fillColorNeutral060: string\n  fillColorNeutral070: string\n  fillColorNeutral080: string\n  fillColorNeutral090: string\n  fillColorNeutral100Inverted: string\n}\n\nconst neutralsLight: NeutralColors = {\n  name: 'light',\n  fillColorNeutral000: tokens.colorNeutral12,\n  fillColorNeutral010: tokens.colorNeutral24,\n  fillColorNeutral020: tokens.colorNeutral45,\n  fillColorNeutral030: tokens.colorNeutral58,\n  fillColorNeutral040: tokens.colorNeutral81,\n  fillColorNeutral050Base: tokens.colorNeutral88,\n  fillColorNeutral060: tokens.colorNeutral93,\n  fillColorNeutral070: tokens.colorNeutral95,\n  fillColorNeutral080: tokens.colorNeutral97,\n  fillColorNeutral090: tokens.colorNeutral98,\n  fillColorNeutral100Inverted: tokens.colorNeutral100White,\n} as const\n\nconst neutralsDark: NeutralColors = {\n  name: 'dark',\n  fillColorNeutral000: tokens.colorNeutral98,\n  fillColorNeutral010: tokens.colorNeutral88,\n  fillColorNeutral020: tokens.colorNeutral68,\n  fillColorNeutral030: tokens.colorNeutral50,\n  fillColorNeutral040: tokens.colorNeutral32,\n  fillColorNeutral050Base: tokens.colorNeutral24,\n  fillColorNeutral060: tokens.colorNeutral19,\n  fillColorNeutral070: tokens.colorNeutral17,\n  fillColorNeutral080: tokens.colorNeutral15,\n  fillColorNeutral090: tokens.colorNeutral12,\n  fillColorNeutral100Inverted: tokens.colorNeutral7,\n} as const\n\ninterface SemanticAliasesColors {\n  name: string\n  iconColorDefaultPrimary: string\n  iconColorDefaultSecondary: string\n  iconColorDefaultDim: string\n  iconColorDefaultDisabled: string\n  iconColorDefaultInverted: string\n  textColorDefaultHeadline: string\n  textColorDefaultPrimary: string\n  textColorDefaultSecondary: string\n  textColorDefaultDisabled: string\n  textColorDefaultPlaceholder: string\n  textColorDefaultInverted: string\n  fillColorInteractionOnlineDefault: string\n  fillColorInteractionDefault: string\n  fillColorStatusErrorMedium: string\n  fillColorButtonNeutralSolidDisabled: string\n  androidRippleNeutral: string\n  needsDesignPass: string\n}\n\nconst semanticAliasesLight: SemanticAliasesColors = {\n  name: 'light',\n  iconColorDefaultPrimary: neutralsLight.fillColorNeutral010,\n  iconColorDefaultSecondary: neutralsLight.fillColorNeutral020,\n  iconColorDefaultDim: neutralsLight.fillColorNeutral030,\n  iconColorDefaultDisabled: neutralsLight.fillColorNeutral040,\n  iconColorDefaultInverted: neutralsLight.fillColorNeutral100Inverted,\n  textColorDefaultHeadline: neutralsLight.fillColorNeutral000,\n  textColorDefaultPrimary: neutralsLight.fillColorNeutral010,\n  textColorDefaultSecondary: neutralsLight.fillColorNeutral020,\n  textColorDefaultDisabled: neutralsLight.fillColorNeutral040,\n  textColorDefaultPlaceholder: neutralsLight.fillColorNeutral030,\n  textColorDefaultInverted: tokens.colorNeutral100White,\n  fillColorInteractionOnlineDefault: tokens.colorInteractionOnlineDefault,\n  fillColorInteractionDefault: tokens.fillColorInteractionDefault,\n  fillColorStatusErrorMedium: tokens.fillColorStatusErrorMedium,\n  fillColorButtonNeutralSolidDisabled: neutralsLight.fillColorNeutral070,\n  androidRippleNeutral: tokens.fillColorTransparencyDark020,\n  needsDesignPass: 'hotpink',\n} as const\n\nconst semanticAliasesDark: SemanticAliasesColors = {\n  name: 'dark',\n  iconColorDefaultPrimary: neutralsDark.fillColorNeutral010,\n  iconColorDefaultSecondary: neutralsDark.fillColorNeutral020,\n  iconColorDefaultDim: neutralsDark.fillColorNeutral030,\n  iconColorDefaultDisabled: neutralsDark.fillColorNeutral040,\n  iconColorDefaultInverted: neutralsDark.fillColorNeutral100Inverted,\n  textColorDefaultHeadline: neutralsDark.fillColorNeutral000,\n  textColorDefaultPrimary: neutralsDark.fillColorNeutral010,\n  textColorDefaultSecondary: neutralsDark.fillColorNeutral020,\n  textColorDefaultDisabled: neutralsDark.fillColorNeutral040,\n  textColorDefaultPlaceholder: neutralsDark.fillColorNeutral030,\n  textColorDefaultInverted: tokens.colorNeutral7,\n  fillColorInteractionOnlineDefault: tokens.colorInteractionOnlineDefault,\n  fillColorInteractionDefault: tokens.fillColorInteractionDefaultDark,\n  fillColorStatusErrorMedium: tokens.fillColorStatusErrorMedium,\n  fillColorButtonNeutralSolidDisabled: neutralsDark.fillColorNeutral070,\n  androidRippleNeutral: tokens.fillColorTransparencyLight020,\n  needsDesignPass: 'pink',\n}\n\nexport const aliasTokensColorMap = {\n  light: { ...neutralsLight, ...semanticAliasesLight },\n  dark: { ...neutralsDark, ...semanticAliasesDark },\n} as const\n"]}
+{"version":3,"file":"alias_tokens_color_map.js","sourceRoot":"","sources":["../../../src/vendor/tapestry/alias_tokens_color_map.ts"],"names":[],"mappings":"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","sourcesContent":["import { tokens } from './tokens'\n\n// Copied from `@planningcenter/tapestry` package.\n// Defining these tokens locally is a temporary solution until the package supports mobile.\n// Tokens Reference: https://planningcenter.github.io/tapestry/?path=/docs/foundations-design-tokens--docs\n\ninterface NeutralColors {\n  name: string\n  fillColorNeutral000: string\n  fillColorNeutral010: string\n  fillColorNeutral020: string\n  fillColorNeutral030: string\n  fillColorNeutral040: string\n  fillColorNeutral050Base: string\n  fillColorNeutral060: string\n  fillColorNeutral070: string\n  fillColorNeutral080: string\n  fillColorNeutral090: string\n  fillColorNeutral100Inverted: string\n}\n\nconst neutralsLight: NeutralColors = {\n  name: 'light',\n  fillColorNeutral000: tokens.colorNeutral12,\n  fillColorNeutral010: tokens.colorNeutral24,\n  fillColorNeutral020: tokens.colorNeutral45,\n  fillColorNeutral030: tokens.colorNeutral58,\n  fillColorNeutral040: tokens.colorNeutral81,\n  fillColorNeutral050Base: tokens.colorNeutral88,\n  fillColorNeutral060: tokens.colorNeutral93,\n  fillColorNeutral070: tokens.colorNeutral95,\n  fillColorNeutral080: tokens.colorNeutral97,\n  fillColorNeutral090: tokens.colorNeutral98,\n  fillColorNeutral100Inverted: tokens.colorNeutral100White,\n} as const\n\nconst neutralsDark: NeutralColors = {\n  name: 'dark',\n  fillColorNeutral000: tokens.colorNeutral98,\n  fillColorNeutral010: tokens.colorNeutral88,\n  fillColorNeutral020: tokens.colorNeutral68,\n  fillColorNeutral030: tokens.colorNeutral50,\n  fillColorNeutral040: tokens.colorNeutral32,\n  fillColorNeutral050Base: tokens.colorNeutral24,\n  fillColorNeutral060: tokens.colorNeutral19,\n  fillColorNeutral070: tokens.colorNeutral17,\n  fillColorNeutral080: tokens.colorNeutral15,\n  fillColorNeutral090: tokens.colorNeutral12,\n  fillColorNeutral100Inverted: tokens.colorNeutral7,\n} as const\n\ninterface SemanticAliasesColors {\n  name: string\n  borderColorDefaultBase: string\n  borderColorDefaultDark: string\n  borderColorDefaultDarker: string\n  borderColorDefaultDisabled: string\n  borderColorDefaultDim: string\n  borderColorDefaultWhite: string\n  iconColorDefaultPrimary: string\n  iconColorDefaultSecondary: string\n  iconColorDefaultDim: string\n  iconColorDefaultDisabled: string\n  iconColorDefaultInverted: string\n  textColorDefaultHeadline: string\n  textColorDefaultPrimary: string\n  textColorDefaultSecondary: string\n  textColorDefaultDisabled: string\n  textColorDefaultPlaceholder: string\n  textColorDefaultInverted: string\n  fillColorInteractionOnlineDefault: string\n  fillColorInteractionDefault: string\n  fillColorStatusErrorMedium: string\n  fillColorButtonNeutralSolidDisabled: string\n  androidRippleNeutral: string\n  needsDesignPass: string\n}\n\nconst semanticAliasesLight: SemanticAliasesColors = {\n  name: 'light',\n  borderColorDefaultBase: neutralsLight.fillColorNeutral050Base,\n  borderColorDefaultDark: neutralsLight.fillColorNeutral040,\n  borderColorDefaultDarker: neutralsLight.fillColorNeutral020,\n  borderColorDefaultDisabled: neutralsLight.fillColorNeutral050Base,\n  borderColorDefaultDim: neutralsLight.fillColorNeutral070,\n  borderColorDefaultWhite: neutralsLight.fillColorNeutral100Inverted,\n  iconColorDefaultPrimary: neutralsLight.fillColorNeutral010,\n  iconColorDefaultSecondary: neutralsLight.fillColorNeutral020,\n  iconColorDefaultDim: neutralsLight.fillColorNeutral030,\n  iconColorDefaultDisabled: neutralsLight.fillColorNeutral040,\n  iconColorDefaultInverted: neutralsLight.fillColorNeutral100Inverted,\n  textColorDefaultHeadline: neutralsLight.fillColorNeutral000,\n  textColorDefaultPrimary: neutralsLight.fillColorNeutral010,\n  textColorDefaultSecondary: neutralsLight.fillColorNeutral020,\n  textColorDefaultDisabled: neutralsLight.fillColorNeutral040,\n  textColorDefaultPlaceholder: neutralsLight.fillColorNeutral030,\n  textColorDefaultInverted: tokens.colorNeutral100White,\n  fillColorInteractionOnlineDefault: tokens.colorInteractionOnlineDefault,\n  fillColorInteractionDefault: tokens.fillColorInteractionDefault,\n  fillColorStatusErrorMedium: tokens.fillColorStatusErrorMedium,\n  fillColorButtonNeutralSolidDisabled: neutralsLight.fillColorNeutral070,\n  androidRippleNeutral: tokens.fillColorTransparencyDark020,\n  needsDesignPass: 'hotpink',\n} as const\n\nconst semanticAliasesDark: SemanticAliasesColors = {\n  name: 'dark',\n  borderColorDefaultBase: neutralsDark.fillColorNeutral050Base,\n  borderColorDefaultDark: neutralsDark.fillColorNeutral040,\n  borderColorDefaultDarker: neutralsDark.fillColorNeutral020,\n  borderColorDefaultDisabled: neutralsDark.fillColorNeutral050Base,\n  borderColorDefaultDim: neutralsDark.fillColorNeutral070,\n  borderColorDefaultWhite: neutralsDark.fillColorNeutral100Inverted,\n  iconColorDefaultPrimary: neutralsDark.fillColorNeutral010,\n  iconColorDefaultSecondary: neutralsDark.fillColorNeutral020,\n  iconColorDefaultDim: neutralsDark.fillColorNeutral030,\n  iconColorDefaultDisabled: neutralsDark.fillColorNeutral040,\n  iconColorDefaultInverted: neutralsDark.fillColorNeutral100Inverted,\n  textColorDefaultHeadline: neutralsDark.fillColorNeutral000,\n  textColorDefaultPrimary: neutralsDark.fillColorNeutral010,\n  textColorDefaultSecondary: neutralsDark.fillColorNeutral020,\n  textColorDefaultDisabled: neutralsDark.fillColorNeutral040,\n  textColorDefaultPlaceholder: neutralsDark.fillColorNeutral030,\n  textColorDefaultInverted: tokens.colorNeutral7,\n  fillColorInteractionOnlineDefault: tokens.colorInteractionOnlineDefault,\n  fillColorInteractionDefault: tokens.fillColorInteractionDefaultDark,\n  fillColorStatusErrorMedium: tokens.fillColorStatusErrorMedium,\n  fillColorButtonNeutralSolidDisabled: neutralsDark.fillColorNeutral070,\n  androidRippleNeutral: tokens.fillColorTransparencyLight020,\n  needsDesignPass: 'pink',\n}\n\nexport const aliasTokensColorMap = {\n  light: { ...neutralsLight, ...semanticAliasesLight },\n  dark: { ...neutralsDark, ...semanticAliasesDark },\n} as const\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planningcenter/chat-react-native",
-  "version": "2.2.1",
+  "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": "741dafe86166ebbf82c7792a8bf9cdf56e158cdd"
+  "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,
   }