@planningcenter/chat-react-native 4.8.0-qa-staging.11 → 4.8.0-qa-staging.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- import { ApiCollection, ApiResource, FailedResponse } from '../../types'
1
+ import { ApiCollection, ApiResource, FailedResponse, OAuthToken } from '../../types'
2
2
  import { isResponseLike } from '../response_error'
3
3
  import {
4
4
  concatRecords,
@@ -10,18 +10,23 @@ import {
10
10
  } from './request_helpers'
11
11
  import { DeleteRequest, GetRequest, PatchRequest, PostRequest, WalkRequest } from './types'
12
12
 
13
- export type OnUnauthorizedResponse = (_response: FailedResponse) => void
13
+ type RefreshedToken = Pick<OAuthToken, 'access_token'>
14
+ type Headers = Record<string, string>
15
+
16
+ export type OnUnauthorizedResponse = (
17
+ _response: FailedResponse
18
+ ) => void | Promise<RefreshedToken | void>
14
19
 
15
20
  type ClientArgs = {
16
21
  version: string
17
- defaultHeaders?: Record<string, string>
22
+ defaultHeaders?: Headers
18
23
  onUnauthorizedResponse?: OnUnauthorizedResponse
19
24
  root?: string
20
25
  }
21
26
 
22
27
  export class Client {
23
28
  version: string = ''
24
- defaultHeaders: Record<string, string> = {}
29
+ defaultHeaders: Headers = {}
25
30
  onUnauthorizedResponse?: OnUnauthorizedResponse
26
31
  root?: string
27
32
 
@@ -35,91 +40,129 @@ export class Client {
35
40
  async get<T extends ApiCollection | ApiResource>(args: GetRequest): Promise<T> {
36
41
  const { walk, ...data } = args.data
37
42
  const isWalking = Boolean(walk)
38
- const headers = { ...this.headers, ...args.headers }
39
43
  const url = this.appUrl(args.url)
40
44
 
41
45
  await throwErrorIfQueryParams(url)
42
46
 
43
- const requestArgs: MakeRequestArgs = { data, url, action: 'GET', headers }
44
-
45
- const walkRequest = ({
46
- url: requestUrl,
47
- data: d = { fields: {} },
48
- acc = { data: [], included: [], meta: {}, links: {} },
49
- ...options
50
- }: WalkRequest): Promise<T> => {
51
- return makeRequest({
52
- action: 'GET',
53
- data: d,
54
- url: requestUrl,
55
- ...options,
56
- headers,
57
- }).then(({ links, ...rest }) => {
58
- const records = Array.isArray(rest.data) ? concatRecords(acc, rest) : rest
59
-
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({ ...options, data: d, url: links.next, acc: records })
63
- } else {
64
- return records
47
+ return this.send(
48
+ headers => {
49
+ const requestArgs: MakeRequestArgs = { data, url, action: 'GET', headers }
50
+
51
+ const walkRequest = ({
52
+ url: requestUrl,
53
+ data: d = { fields: {} },
54
+ acc = { data: [], included: [], meta: {}, links: {} },
55
+ ...options
56
+ }: WalkRequest): Promise<T> => {
57
+ return makeRequest({
58
+ action: 'GET',
59
+ data: d,
60
+ url: requestUrl,
61
+ ...options,
62
+ headers,
63
+ }).then(({ links, ...rest }) => {
64
+ const records = Array.isArray(rest.data) ? concatRecords(acc, rest) : rest
65
+
66
+ // `next` will have our params in the link so we do not want to pass them back in
67
+ if (links?.next) {
68
+ return walkRequest({ ...options, data: d, url: links.next, acc: records })
69
+ } else {
70
+ return records
71
+ }
72
+ })
65
73
  }
66
- })
67
- }
68
74
 
69
- const handler = isWalking
70
- ? (a: MakeRequestArgs | WalkRequest) => walkRequest(a as WalkRequest)
71
- : (a: MakeRequestArgs | WalkRequest) => makeRequest(a as MakeRequestArgs)
75
+ const handler = isWalking
76
+ ? (a: MakeRequestArgs | WalkRequest) => walkRequest(a as WalkRequest)
77
+ : (a: MakeRequestArgs | WalkRequest) => makeRequest(a as MakeRequestArgs)
72
78
 
73
- return throwErrorIfFieldsMissing(handler, requestArgs)
74
- .then(response => response as T)
75
- .catch(this.handleNotOk)
79
+ return throwErrorIfFieldsMissing(handler, requestArgs).then(response => response as T)
80
+ },
81
+ { ...this.headers, ...args.headers }
82
+ )
76
83
  }
77
84
 
78
85
  async patch<T extends ApiCollection | ApiResource>(args: PatchRequest): Promise<T> {
79
- const headers = { ...this.headers, ...args.headers }
80
86
  const url = this.appUrl(args.url)
81
87
 
82
- const requestArgs: MakeRequestArgs = { data: args.data, url, action: 'PATCH', headers }
88
+ return this.send(
89
+ headers => {
90
+ const requestArgs: MakeRequestArgs = { data: args.data, url, action: 'PATCH', headers }
83
91
 
84
- return ensureNoQueryParamsInDev(makeRequest, requestArgs)
85
- .then(response => response as T)
86
- .catch(this.handleNotOk)
92
+ return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response as T)
93
+ },
94
+ { ...this.headers, ...args.headers }
95
+ )
87
96
  }
88
97
 
89
98
  async post<T extends ApiCollection | ApiResource>(args: PostRequest): Promise<T> {
90
- const headers = { ...this.headers, ...args.headers }
91
99
  const url = this.appUrl(args.url)
92
100
 
93
- const requestArgs: MakeRequestArgs = { ...args, data: args.data, url, action: 'POST', headers }
101
+ return this.send(
102
+ headers => {
103
+ const requestArgs: MakeRequestArgs = {
104
+ ...args,
105
+ data: args.data,
106
+ url,
107
+ action: 'POST',
108
+ headers,
109
+ }
94
110
 
95
- return ensureNoQueryParamsInDev(makeRequest, requestArgs)
96
- .then(response => response as T)
97
- .catch(this.handleNotOk)
111
+ return ensureNoQueryParamsInDev(makeRequest, requestArgs).then(response => response as T)
112
+ },
113
+ { ...this.headers, ...args.headers }
114
+ )
98
115
  }
99
116
 
100
117
  async delete(args: DeleteRequest) {
101
- const headers = { ...this.headers, ...args.headers }
102
118
  const url = this.appUrl(args.url)
103
119
 
104
- const requestArgs: MakeRequestArgs = { url, action: 'DELETE', headers }
120
+ return this.send(headers => makeRequest({ url, action: 'DELETE', headers }), {
121
+ ...this.headers,
122
+ ...args.headers,
123
+ })
124
+ }
105
125
 
106
- return makeRequest(requestArgs).catch(this.handleNotOk)
126
+ private send<T>(request: (_headers: Headers) => Promise<T>, headers: Headers): Promise<T> {
127
+ return request(headers).catch((error: Response | Error) =>
128
+ this.handleNotOk(error, ({ access_token }) =>
129
+ request({ ...headers, Authorization: `Bearer ${access_token}` }).catch(
130
+ (retryError: Response | Error) => this.handleNotOk(retryError)
131
+ )
132
+ )
133
+ )
107
134
  }
108
135
 
109
- handleNotOk = async (response: Response | Error) => {
136
+ handleNotOk = async <T = never>(
137
+ response: Response | Error,
138
+ retry?: (_token: RefreshedToken) => Promise<T>
139
+ ): Promise<T> => {
110
140
  if (!isResponseLike(response)) return Promise.reject(response)
111
141
 
112
142
  const errorData = await this.parseErrorResponse(response)
113
143
  const notOkResponse = response.clone() as FailedResponse
114
144
  notOkResponse.errors = errorData.errors || []
115
145
 
116
- if (response.status === 401) {
117
- this.onUnauthorizedResponse?.(notOkResponse)
118
- }
146
+ if (response.status !== 401) return Promise.reject(notOkResponse)
147
+
148
+ const refreshedToken = await this.refreshedTokenFor(notOkResponse)
149
+
150
+ if (refreshedToken && retry) return retry(refreshedToken)
119
151
 
120
152
  return Promise.reject(notOkResponse)
121
153
  }
122
154
 
155
+ private refreshedTokenFor = async (
156
+ response: FailedResponse
157
+ ): Promise<RefreshedToken | undefined> => {
158
+ try {
159
+ const token = await this.onUnauthorizedResponse?.(response)
160
+ return token && token.access_token ? token : undefined
161
+ } catch {
162
+ return undefined
163
+ }
164
+ }
165
+
123
166
  parseErrorResponse = async (response: Response): Promise<Partial<FailedResponse>> => {
124
167
  try {
125
168
  return (await response.clone().json()) as FailedResponse