@planningcenter/chat-react-native 4.6.4-qa-staging.3 → 4.6.4-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/contexts/api_provider.d.ts +0 -1
- package/build/contexts/api_provider.d.ts.map +1 -1
- package/build/contexts/api_provider.js +38 -50
- package/build/contexts/api_provider.js.map +1 -1
- package/build/contexts/chat_context.d.ts +0 -1
- package/build/contexts/chat_context.d.ts.map +1 -1
- package/build/contexts/chat_context.js +25 -28
- package/build/contexts/chat_context.js.map +1 -1
- package/build/contexts/session_context.d.ts +1 -2
- package/build/contexts/session_context.d.ts.map +1 -1
- package/build/contexts/session_context.js +6 -10
- package/build/contexts/session_context.js.map +1 -1
- package/build/hooks/index.d.ts +0 -1
- package/build/hooks/index.d.ts.map +1 -1
- package/build/hooks/index.js +0 -1
- package/build/hooks/index.js.map +1 -1
- package/build/screens/system_message_people_screen.d.ts.map +1 -1
- package/build/screens/system_message_people_screen.js +96 -33
- package/build/screens/system_message_people_screen.js.map +1 -1
- package/build/utils/session.d.ts +1 -3
- package/build/utils/session.d.ts.map +1 -1
- package/build/utils/session.js +0 -3
- package/build/utils/session.js.map +1 -1
- package/build/utils/session_manager.d.ts +1 -1
- package/build/utils/session_manager.d.ts.map +1 -1
- package/build/utils/session_manager.js +1 -2
- package/build/utils/session_manager.js.map +1 -1
- package/build/utils/upload_uri.d.ts.map +1 -1
- package/build/utils/upload_uri.js +0 -3
- package/build/utils/upload_uri.js.map +1 -1
- package/build/utils/uri.d.ts.map +1 -1
- package/build/utils/uri.js +0 -4
- package/build/utils/uri.js.map +1 -1
- package/package.json +3 -3
- package/src/contexts/__tests__/api_provider.test.tsx +4 -17
- package/src/contexts/api_provider.tsx +11 -25
- package/src/contexts/chat_context.tsx +2 -4
- package/src/contexts/session_context.tsx +10 -18
- package/src/hooks/index.ts +0 -1
- package/src/screens/system_message_people_screen.tsx +20 -6
- package/src/utils/__tests__/session_manager.test.ts +0 -12
- package/src/utils/session.ts +3 -11
- package/src/utils/session_manager.ts +1 -2
- package/src/utils/upload_uri.ts +0 -4
- package/src/utils/uri.ts +0 -5
- package/build/hooks/use_system_message_people.d.ts +0 -14
- package/build/hooks/use_system_message_people.d.ts.map +0 -1
- package/build/hooks/use_system_message_people.js +0 -101
- package/build/hooks/use_system_message_people.js.map +0 -1
- package/src/contexts/__tests__/configured_retry.test.ts +0 -39
- package/src/hooks/__tests__/use_system_message_people.test.tsx +0 -79
- package/src/hooks/use_system_message_people.ts +0 -55
- package/src/utils/__tests__/uri.test.ts +0 -26
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,yCAAyC,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,yCAAyC,CAAA;AACvD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,wBAAwB,CAAA;AACtC,cAAc,mCAAmC,CAAA;AACjD,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kCAAkC,CAAA;AAChD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,kBAAkB,CAAA;AAChC,cAAc,2BAA2B,CAAA;AACzC,cAAc,qBAAqB,CAAA;AACnC,cAAc,cAAc,CAAA;AAC5B,cAAc,sCAAsC,CAAA;AACpD,cAAc,2CAA2C,CAAA;AACzD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,wBAAwB,CAAA;AACtC,cAAc,oBAAoB,CAAA;AAClC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,yCAAyC,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,yCAAyC,CAAA;AACvD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,wBAAwB,CAAA;AACtC,cAAc,mCAAmC,CAAA;AACjD,cAAc,sBAAsB,CAAA;AACpC,cAAc,oBAAoB,CAAA;AAClC,cAAc,kCAAkC,CAAA;AAChD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,kBAAkB,CAAA;AAChC,cAAc,2BAA2B,CAAA;AACzC,cAAc,qBAAqB,CAAA;AACnC,cAAc,cAAc,CAAA;AAC5B,cAAc,sCAAsC,CAAA;AACpD,cAAc,2CAA2C,CAAA;AACzD,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,qBAAqB,CAAA;AACnC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,wBAAwB,CAAA;AACtC,cAAc,oBAAoB,CAAA;AAClC,cAAc,aAAa,CAAA"}
|
package/build/hooks/index.js
CHANGED
|
@@ -29,6 +29,5 @@ export * from './use_reduce_motion';
|
|
|
29
29
|
export * from './use_scalable_number_of_lines';
|
|
30
30
|
export * from './use_submit_age_check';
|
|
31
31
|
export * from './use_suspense_api';
|
|
32
|
-
export * from './use_system_message_people';
|
|
33
32
|
export * from './use_theme';
|
|
34
33
|
//# sourceMappingURL=index.js.map
|
package/build/hooks/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["useApiClient"],"sources":["../../src/hooks/index.ts"],"sourcesContent":["export * from './use_animated_message_background_color'\nexport { useApiClient } from './use_api_client'\nexport * from './use_api'\nexport * from './use_app_state'\nexport * from './use_async_storage'\nexport * from './use_can_browse_archived_conversations'\nexport * from './use_at_font_scale_breakpoint'\nexport * from './use_chat_permissions'\nexport * from './use_create_android_ripple_color'\nexport * from './use_current_person'\nexport * from './use_deleting_ids'\nexport * from './use_direct_message_eligibility'\nexport * from './use_direct_messages_eligible'\nexport * from './use_font_scale'\nexport * from './use_has_direct_messages'\nexport * from './use_groups_groups'\nexport * from './use_groups'\nexport * from './use_selected_chip_background_color'\nexport * from './use_interaction_tinted_background_color'\nexport * from './use_manual_archiving_enabled'\nexport * from './use_message_reaction_toggle'\nexport * from './use_new_conversation_entry'\nexport * from './use_organization'\nexport * from './use_people_person'\nexport * from './use_preview_avatar_diameter'\nexport * from './use_product_analytics'\nexport * from './use_qualified_by_age'\nexport * from './use_reduce_motion'\nexport * from './use_scalable_number_of_lines'\nexport * from './use_submit_age_check'\nexport * from './use_suspense_api'\nexport * from './
|
|
1
|
+
{"version":3,"file":"index.js","names":["useApiClient"],"sources":["../../src/hooks/index.ts"],"sourcesContent":["export * from './use_animated_message_background_color'\nexport { useApiClient } from './use_api_client'\nexport * from './use_api'\nexport * from './use_app_state'\nexport * from './use_async_storage'\nexport * from './use_can_browse_archived_conversations'\nexport * from './use_at_font_scale_breakpoint'\nexport * from './use_chat_permissions'\nexport * from './use_create_android_ripple_color'\nexport * from './use_current_person'\nexport * from './use_deleting_ids'\nexport * from './use_direct_message_eligibility'\nexport * from './use_direct_messages_eligible'\nexport * from './use_font_scale'\nexport * from './use_has_direct_messages'\nexport * from './use_groups_groups'\nexport * from './use_groups'\nexport * from './use_selected_chip_background_color'\nexport * from './use_interaction_tinted_background_color'\nexport * from './use_manual_archiving_enabled'\nexport * from './use_message_reaction_toggle'\nexport * from './use_new_conversation_entry'\nexport * from './use_organization'\nexport * from './use_people_person'\nexport * from './use_preview_avatar_diameter'\nexport * from './use_product_analytics'\nexport * from './use_qualified_by_age'\nexport * from './use_reduce_motion'\nexport * from './use_scalable_number_of_lines'\nexport * from './use_submit_age_check'\nexport * from './use_suspense_api'\nexport * from './use_theme'\n"],"mappings":"AAAA,cAAc,yCAAyC;AACvD,SAASA,YAAY,QAAQ,kBAAkB;AAC/C,cAAc,WAAW;AACzB,cAAc,iBAAiB;AAC/B,cAAc,qBAAqB;AACnC,cAAc,yCAAyC;AACvD,cAAc,gCAAgC;AAC9C,cAAc,wBAAwB;AACtC,cAAc,mCAAmC;AACjD,cAAc,sBAAsB;AACpC,cAAc,oBAAoB;AAClC,cAAc,kCAAkC;AAChD,cAAc,gCAAgC;AAC9C,cAAc,kBAAkB;AAChC,cAAc,2BAA2B;AACzC,cAAc,qBAAqB;AACnC,cAAc,cAAc;AAC5B,cAAc,sCAAsC;AACpD,cAAc,2CAA2C;AACzD,cAAc,gCAAgC;AAC9C,cAAc,+BAA+B;AAC7C,cAAc,8BAA8B;AAC5C,cAAc,oBAAoB;AAClC,cAAc,qBAAqB;AACnC,cAAc,+BAA+B;AAC7C,cAAc,yBAAyB;AACvC,cAAc,wBAAwB;AACtC,cAAc,qBAAqB;AACnC,cAAc,gCAAgC;AAC9C,cAAc,wBAAwB;AACtC,cAAc,oBAAoB;AAClC,cAAc,aAAa","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system_message_people_screen.d.ts","sourceRoot":"","sources":["../../src/screens/system_message_people_screen.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"system_message_people_screen.d.ts","sourceRoot":"","sources":["../../src/screens/system_message_people_screen.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAU5D,eAAO,MAAM,gCAAgC,6EAM3C,CAAA;AAEF,MAAM,MAAM,8BAA8B,GAAG,iBAAiB,CAAC;IAC7D,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAC,CAAA;AAEF,wBAAgB,yBAAyB,CAAC,EAAE,KAAK,EAAE,EAAE,8BAA8B,2CA8BlF"}
|
|
@@ -5,7 +5,7 @@ import { FlatList } from 'react-native-gesture-handler';
|
|
|
5
5
|
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|
6
6
|
import { Avatar, Text } from '../components';
|
|
7
7
|
import FormSheet, { getFormSheetScreenOptions } from '../components/primitive/form_sheet';
|
|
8
|
-
import {
|
|
8
|
+
import { useSuspenseGet } from '../hooks';
|
|
9
9
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
10
10
|
export const SystemMessagePeopleScreenOptions = getFormSheetScreenOptions({
|
|
11
11
|
sheetAllowedDetents: Platform.select({
|
|
@@ -15,7 +15,7 @@ export const SystemMessagePeopleScreenOptions = getFormSheetScreenOptions({
|
|
|
15
15
|
headerTitle: 'People'
|
|
16
16
|
});
|
|
17
17
|
export function SystemMessagePeopleScreen(t0) {
|
|
18
|
-
const $ = _c(
|
|
18
|
+
const $ = _c(22);
|
|
19
19
|
const {
|
|
20
20
|
route
|
|
21
21
|
} = t0;
|
|
@@ -24,50 +24,110 @@ export function SystemMessagePeopleScreen(t0) {
|
|
|
24
24
|
person_ids
|
|
25
25
|
} = route.params;
|
|
26
26
|
const styles = useStyles();
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
const t1 = `/me/conversations/${conversation_id}/members`;
|
|
28
|
+
let t2;
|
|
29
|
+
if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
|
|
30
|
+
t2 = {
|
|
31
|
+
Member: ["id", "name", "avatar"]
|
|
32
|
+
};
|
|
33
|
+
$[0] = t2;
|
|
34
|
+
} else {
|
|
35
|
+
t2 = $[0];
|
|
36
|
+
}
|
|
37
|
+
let t3;
|
|
38
|
+
if ($[1] !== person_ids) {
|
|
39
|
+
t3 = {
|
|
40
|
+
id: person_ids
|
|
32
41
|
};
|
|
33
|
-
$[0] = conversation_id;
|
|
34
42
|
$[1] = person_ids;
|
|
35
|
-
$[2] =
|
|
43
|
+
$[2] = t3;
|
|
36
44
|
} else {
|
|
37
|
-
|
|
45
|
+
t3 = $[2];
|
|
46
|
+
}
|
|
47
|
+
let t4;
|
|
48
|
+
if ($[3] !== person_ids.length || $[4] !== t3) {
|
|
49
|
+
t4 = {
|
|
50
|
+
fields: t2,
|
|
51
|
+
where: t3,
|
|
52
|
+
limit: person_ids.length
|
|
53
|
+
};
|
|
54
|
+
$[3] = person_ids.length;
|
|
55
|
+
$[4] = t3;
|
|
56
|
+
$[5] = t4;
|
|
57
|
+
} else {
|
|
58
|
+
t4 = $[5];
|
|
59
|
+
}
|
|
60
|
+
let t5;
|
|
61
|
+
if ($[6] !== t1 || $[7] !== t4) {
|
|
62
|
+
t5 = {
|
|
63
|
+
url: t1,
|
|
64
|
+
data: t4
|
|
65
|
+
};
|
|
66
|
+
$[6] = t1;
|
|
67
|
+
$[7] = t4;
|
|
68
|
+
$[8] = t5;
|
|
69
|
+
} else {
|
|
70
|
+
t5 = $[8];
|
|
38
71
|
}
|
|
39
72
|
const {
|
|
40
|
-
data:
|
|
41
|
-
} =
|
|
42
|
-
let
|
|
43
|
-
if ($[
|
|
44
|
-
|
|
45
|
-
|
|
73
|
+
data: members
|
|
74
|
+
} = useSuspenseGet(t5);
|
|
75
|
+
let t6;
|
|
76
|
+
if ($[9] !== person_ids) {
|
|
77
|
+
t6 = Object.fromEntries(person_ids.map(_temp));
|
|
78
|
+
$[9] = person_ids;
|
|
79
|
+
$[10] = t6;
|
|
80
|
+
} else {
|
|
81
|
+
t6 = $[10];
|
|
82
|
+
}
|
|
83
|
+
const orderById = t6;
|
|
84
|
+
let t7;
|
|
85
|
+
if ($[11] !== members || $[12] !== orderById) {
|
|
86
|
+
let t8;
|
|
87
|
+
if ($[14] !== orderById) {
|
|
88
|
+
t8 = (a, b) => (orderById[a.id] ?? 0) - (orderById[b.id] ?? 0);
|
|
89
|
+
$[14] = orderById;
|
|
90
|
+
$[15] = t8;
|
|
91
|
+
} else {
|
|
92
|
+
t8 = $[15];
|
|
93
|
+
}
|
|
94
|
+
t7 = [...members].sort(t8);
|
|
95
|
+
$[11] = members;
|
|
96
|
+
$[12] = orderById;
|
|
97
|
+
$[13] = t7;
|
|
98
|
+
} else {
|
|
99
|
+
t7 = $[13];
|
|
100
|
+
}
|
|
101
|
+
const sortedMembers = t7;
|
|
102
|
+
let t8;
|
|
103
|
+
if ($[16] !== sortedMembers || $[17] !== styles.contentContainer) {
|
|
104
|
+
t8 = /*#__PURE__*/_jsx(FlatList, {
|
|
105
|
+
data: sortedMembers,
|
|
46
106
|
contentContainerStyle: styles.contentContainer,
|
|
47
|
-
keyExtractor:
|
|
48
|
-
renderItem:
|
|
107
|
+
keyExtractor: _temp2,
|
|
108
|
+
renderItem: _temp3
|
|
49
109
|
});
|
|
50
|
-
$[
|
|
51
|
-
$[
|
|
52
|
-
$[
|
|
110
|
+
$[16] = sortedMembers;
|
|
111
|
+
$[17] = styles.contentContainer;
|
|
112
|
+
$[18] = t8;
|
|
53
113
|
} else {
|
|
54
|
-
|
|
114
|
+
t8 = $[18];
|
|
55
115
|
}
|
|
56
|
-
let
|
|
57
|
-
if ($[
|
|
58
|
-
|
|
116
|
+
let t9;
|
|
117
|
+
if ($[19] !== styles.formSheetContent || $[20] !== t8) {
|
|
118
|
+
t9 = /*#__PURE__*/_jsx(FormSheet.Root, {
|
|
59
119
|
contentStyle: styles.formSheetContent,
|
|
60
|
-
children:
|
|
120
|
+
children: t8
|
|
61
121
|
});
|
|
62
|
-
$[
|
|
63
|
-
$[
|
|
64
|
-
$[
|
|
122
|
+
$[19] = styles.formSheetContent;
|
|
123
|
+
$[20] = t8;
|
|
124
|
+
$[21] = t9;
|
|
65
125
|
} else {
|
|
66
|
-
|
|
126
|
+
t9 = $[21];
|
|
67
127
|
}
|
|
68
|
-
return
|
|
128
|
+
return t9;
|
|
69
129
|
}
|
|
70
|
-
function
|
|
130
|
+
function _temp3(t0) {
|
|
71
131
|
const {
|
|
72
132
|
item: item_0
|
|
73
133
|
} = t0;
|
|
@@ -75,9 +135,12 @@ function _temp2(t0) {
|
|
|
75
135
|
person: item_0
|
|
76
136
|
});
|
|
77
137
|
}
|
|
78
|
-
function
|
|
138
|
+
function _temp2(item) {
|
|
79
139
|
return item.id.toString();
|
|
80
140
|
}
|
|
141
|
+
function _temp(id, i) {
|
|
142
|
+
return [id, i];
|
|
143
|
+
}
|
|
81
144
|
const Person = memo(t0 => {
|
|
82
145
|
const $ = _c(9);
|
|
83
146
|
const {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system_message_people_screen.js","names":["React","memo","Platform","StyleSheet","View","FlatList","useSafeAreaInsets","Avatar","Text","FormSheet","getFormSheetScreenOptions","
|
|
1
|
+
{"version":3,"file":"system_message_people_screen.js","names":["React","memo","Platform","StyleSheet","View","FlatList","useSafeAreaInsets","Avatar","Text","FormSheet","getFormSheetScreenOptions","useSuspenseGet","jsx","_jsx","jsxs","_jsxs","SystemMessagePeopleScreenOptions","sheetAllowedDetents","select","android","default","headerTitle","SystemMessagePeopleScreen","t0","$","_c","route","conversation_id","person_ids","params","styles","useStyles","t1","t2","Symbol","for","Member","t3","id","t4","length","fields","where","limit","t5","url","data","members","t6","Object","fromEntries","map","_temp","orderById","t7","t8","a","b","sort","sortedMembers","contentContainer","contentContainerStyle","keyExtractor","_temp2","renderItem","_temp3","t9","formSheetContent","Root","contentStyle","children","item","item_0","Person","toString","i","person","avatar","sourceUri","size","name","personName","variant","numberOfLines","style","personRow","bottom","create","paddingTop","paddingBottom","flexDirection","alignItems","gap","paddingVertical","paddingHorizontal","flex"],"sources":["../../src/screens/system_message_people_screen.tsx"],"sourcesContent":["import { StaticScreenProps } from '@react-navigation/native'\nimport React, { memo } from 'react'\nimport { Platform, StyleSheet, View } from 'react-native'\nimport { FlatList } from 'react-native-gesture-handler'\nimport { useSafeAreaInsets } from 'react-native-safe-area-context'\nimport { Avatar, Text } from '../components'\nimport FormSheet, { getFormSheetScreenOptions } from '../components/primitive/form_sheet'\nimport { useSuspenseGet } from '../hooks'\nimport { MemberResource } from '../types'\n\nexport const SystemMessagePeopleScreenOptions = getFormSheetScreenOptions({\n sheetAllowedDetents: Platform.select({\n android: [0.5, 0.94],\n default: [0.5, 1],\n }),\n headerTitle: 'People',\n})\n\nexport type SystemMessagePeopleScreenProps = StaticScreenProps<{\n conversation_id: number\n person_ids: number[]\n}>\n\nexport function SystemMessagePeopleScreen({ route }: SystemMessagePeopleScreenProps) {\n const { conversation_id, person_ids } = route.params\n const styles = useStyles()\n\n const { data: members } = useSuspenseGet<MemberResource[]>({\n url: `/me/conversations/${conversation_id}/members`,\n data: {\n fields: {\n Member: ['id', 'name', 'avatar'],\n },\n where: {\n id: person_ids,\n },\n limit: person_ids.length,\n },\n })\n\n const orderById = Object.fromEntries(person_ids.map((id, i) => [id, i]))\n const sortedMembers = [...members].sort((a, b) => (orderById[a.id] ?? 0) - (orderById[b.id] ?? 0))\n\n return (\n <FormSheet.Root contentStyle={styles.formSheetContent}>\n <FlatList\n data={sortedMembers}\n contentContainerStyle={styles.contentContainer}\n keyExtractor={item => item.id.toString()}\n renderItem={({ item }) => <Person person={item} />}\n />\n </FormSheet.Root>\n )\n}\n\ntype PersonProps = Pick<MemberResource, 'id' | 'name' | 'avatar'>\n\nconst Person = memo(({ person }: { person: PersonProps }) => {\n const styles = useStyles()\n\n return (\n <View style={styles.personRow}>\n <Avatar sourceUri={person.avatar} size=\"sm\" />\n <Text variant=\"tertiary\" numberOfLines={2} style={styles.personName}>\n {person.name}\n </Text>\n </View>\n )\n})\n\nconst useStyles = () => {\n const { bottom } = useSafeAreaInsets()\n\n return StyleSheet.create({\n formSheetContent: {\n paddingTop: 16,\n },\n contentContainer: {\n paddingTop: 8,\n paddingBottom: bottom + 24,\n },\n personRow: {\n flexDirection: 'row',\n alignItems: 'center',\n gap: 8,\n paddingVertical: 8,\n paddingHorizontal: 16,\n flex: 1,\n },\n personName: {\n flex: 1,\n },\n })\n}\n"],"mappings":"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","ignoreList":[]}
|
package/build/utils/session.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OAuthToken, OrganizationResource, PersonResource } from '../types';
|
|
2
|
-
export type ENV = 'production' | 'staging' | 'development'
|
|
2
|
+
export type ENV = 'production' | 'staging' | 'development';
|
|
3
3
|
export type OauthType = 'OAuth' | 'ChurchCenterOauth';
|
|
4
4
|
export type PartialToken = Pick<OAuthToken, 'access_token'> & Partial<OAuthToken>;
|
|
5
5
|
export type SessionMeta = {
|
|
@@ -10,7 +10,6 @@ export type SessionMeta = {
|
|
|
10
10
|
};
|
|
11
11
|
export type SessionProps<T extends PartialToken> = {
|
|
12
12
|
env?: ENV;
|
|
13
|
-
prototypeName?: string;
|
|
14
13
|
token?: T;
|
|
15
14
|
type?: OauthType;
|
|
16
15
|
meta?: SessionMeta;
|
|
@@ -23,7 +22,6 @@ type SessionId = string | typeof UNAUTHENTICATED_SESSION_ID;
|
|
|
23
22
|
*/
|
|
24
23
|
export declare class Session<T extends PartialToken = PartialToken> {
|
|
25
24
|
env: ENV;
|
|
26
|
-
prototypeName: string | undefined;
|
|
27
25
|
token: T | undefined;
|
|
28
26
|
type: OauthType;
|
|
29
27
|
meta: Record<string, any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/utils/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAE3E,MAAM,MAAM,GAAG,GAAG,YAAY,GAAG,SAAS,GAAG,aAAa,
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/utils/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAE3E,MAAM,MAAM,GAAG,GAAG,YAAY,GAAG,SAAS,GAAG,aAAa,CAAA;AAC1D,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,mBAAmB,CAAA;AACrD,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AACjF,MAAM,MAAM,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,MAAM,EAAE,cAAc,CAAA;QACtB,YAAY,EAAE,oBAAoB,CAAA;KACnC,CAAA;CACF,CAAA;AACD,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,YAAY,IAAI;IACjD,GAAG,CAAC,EAAE,GAAG,CAAA;IACT,KAAK,CAAC,EAAE,CAAC,CAAA;IACT,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,IAAI,CAAC,EAAE,WAAW,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,0BAA0B,EAAG,iBAA0B,CAAA;AACpE,KAAK,SAAS,GAAG,MAAM,GAAG,OAAO,0BAA0B,CAAA;AAE3D;;;GAGG;AACH,qBAAa,OAAO,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY;IACxD,GAAG,EAAE,GAAG,CAAA;IACR,KAAK,EAAE,CAAC,GAAG,SAAS,CAAA;IACpB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;gBAEb,KAAK,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IAQnC,IAAI,eAAe,YAElB;IAED,IAAI,mBAAmB,YAEtB;IAED,IAAI,EAAE,IAAI,SAAS,CAMlB;IAED,QAAQ;IAKR,SAAS,CAAC,MAAM,EAAE,cAAc;IAIhC,eAAe,CAAC,YAAY,EAAE,oBAAoB;IAIlD,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,aAAa,EAAE,MAAM;CAQ7D"}
|
package/build/utils/session.js
CHANGED
|
@@ -7,13 +7,11 @@ export class Session {
|
|
|
7
7
|
constructor(props) {
|
|
8
8
|
const {
|
|
9
9
|
env = 'production',
|
|
10
|
-
prototypeName,
|
|
11
10
|
token,
|
|
12
11
|
type,
|
|
13
12
|
meta
|
|
14
13
|
} = props || {};
|
|
15
14
|
this.env = env;
|
|
16
|
-
this.prototypeName = env === 'prototype' ? prototypeName : undefined;
|
|
17
15
|
this.token = token;
|
|
18
16
|
this.type = type || 'OAuth';
|
|
19
17
|
this.meta = meta || {};
|
|
@@ -34,7 +32,6 @@ export class Session {
|
|
|
34
32
|
toString() {
|
|
35
33
|
return JSON.stringify({
|
|
36
34
|
env: this.env,
|
|
37
|
-
prototypeName: this.prototypeName,
|
|
38
35
|
token: this.token,
|
|
39
36
|
meta: this.meta
|
|
40
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","names":["UNAUTHENTICATED_SESSION_ID","Session","constructor","props","env","
|
|
1
|
+
{"version":3,"file":"session.js","names":["UNAUTHENTICATED_SESSION_ID","Session","constructor","props","env","token","type","meta","isAuthenticated","Boolean","access_token","isChurchCenterToken","id","tokenStr","slice","toString","JSON","stringify","setPerson","person","setOrganization","organization","hydrate","sessionString","parse","_error"],"sources":["../../src/utils/session.ts"],"sourcesContent":["import { OAuthToken, OrganizationResource, PersonResource } from '../types'\n\nexport type ENV = 'production' | 'staging' | 'development'\nexport type OauthType = 'OAuth' | 'ChurchCenterOauth'\nexport type PartialToken = Pick<OAuthToken, 'access_token'> & Partial<OAuthToken>\nexport type SessionMeta = {\n [key: string]: {\n person: PersonResource\n organization: OrganizationResource\n }\n}\nexport type SessionProps<T extends PartialToken> = {\n env?: ENV\n token?: T\n type?: OauthType\n meta?: SessionMeta\n}\n\nexport const UNAUTHENTICATED_SESSION_ID = 'unauthenticated' as const\ntype SessionId = string | typeof UNAUTHENTICATED_SESSION_ID\n\n/**\n * Session class to track the environment and token\n * Not intended to make network requests or handle authentication\n */\nexport class Session<T extends PartialToken = PartialToken> {\n env: ENV\n token: T | undefined\n type: OauthType\n meta: Record<string, any>\n\n constructor(props?: SessionProps<T>) {\n const { env = 'production', token, type, meta } = props || {}\n this.env = env\n this.token = token\n this.type = type || 'OAuth'\n this.meta = meta || {}\n }\n\n get isAuthenticated() {\n return Boolean(this.token?.access_token)\n }\n\n get isChurchCenterToken() {\n return this.type === 'ChurchCenterOauth'\n }\n\n get id(): SessionId {\n if (!this.isAuthenticated || !this.token?.access_token) {\n return UNAUTHENTICATED_SESSION_ID\n }\n const tokenStr = this.token.access_token\n return tokenStr.slice(-8)\n }\n\n toString() {\n return JSON.stringify({ env: this.env, token: this.token, meta: this.meta })\n }\n\n // Convenience methods to set the person and organization\n setPerson(person: PersonResource) {\n this.meta.person = person\n }\n\n setOrganization(organization: OrganizationResource) {\n this.meta.organization = organization\n }\n\n static hydrate<T extends PartialToken>(sessionString: string) {\n try {\n const props = JSON.parse(sessionString)\n return new Session<T>(props)\n } catch (_error) {\n return new Session<T>()\n }\n }\n}\n"],"mappings":"AAkBA,OAAO,MAAMA,0BAA0B,GAAG,iBAA0B;AAGpE;AACA;AACA;AACA;AACA,OAAO,MAAMC,OAAO,CAAwC;EAM1DC,WAAWA,CAACC,KAAuB,EAAE;IACnC,MAAM;MAAEC,GAAG,GAAG,YAAY;MAAEC,KAAK;MAAEC,IAAI;MAAEC;IAAK,CAAC,GAAGJ,KAAK,IAAI,CAAC,CAAC;IAC7D,IAAI,CAACC,GAAG,GAAGA,GAAG;IACd,IAAI,CAACC,KAAK,GAAGA,KAAK;IAClB,IAAI,CAACC,IAAI,GAAGA,IAAI,IAAI,OAAO;IAC3B,IAAI,CAACC,IAAI,GAAGA,IAAI,IAAI,CAAC,CAAC;EACxB;EAEA,IAAIC,eAAeA,CAAA,EAAG;IACpB,OAAOC,OAAO,CAAC,IAAI,CAACJ,KAAK,EAAEK,YAAY,CAAC;EAC1C;EAEA,IAAIC,mBAAmBA,CAAA,EAAG;IACxB,OAAO,IAAI,CAACL,IAAI,KAAK,mBAAmB;EAC1C;EAEA,IAAIM,EAAEA,CAAA,EAAc;IAClB,IAAI,CAAC,IAAI,CAACJ,eAAe,IAAI,CAAC,IAAI,CAACH,KAAK,EAAEK,YAAY,EAAE;MACtD,OAAOV,0BAA0B;IACnC;IACA,MAAMa,QAAQ,GAAG,IAAI,CAACR,KAAK,CAACK,YAAY;IACxC,OAAOG,QAAQ,CAACC,KAAK,CAAC,CAAC,CAAC,CAAC;EAC3B;EAEAC,QAAQA,CAAA,EAAG;IACT,OAAOC,IAAI,CAACC,SAAS,CAAC;MAAEb,GAAG,EAAE,IAAI,CAACA,GAAG;MAAEC,KAAK,EAAE,IAAI,CAACA,KAAK;MAAEE,IAAI,EAAE,IAAI,CAACA;IAAK,CAAC,CAAC;EAC9E;;EAEA;EACAW,SAASA,CAACC,MAAsB,EAAE;IAChC,IAAI,CAACZ,IAAI,CAACY,MAAM,GAAGA,MAAM;EAC3B;EAEAC,eAAeA,CAACC,YAAkC,EAAE;IAClD,IAAI,CAACd,IAAI,CAACc,YAAY,GAAGA,YAAY;EACvC;EAEA,OAAOC,OAAOA,CAAyBC,aAAqB,EAAE;IAC5D,IAAI;MACF,MAAMpB,KAAK,GAAGa,IAAI,CAACQ,KAAK,CAACD,aAAa,CAAC;MACvC,OAAO,IAAItB,OAAO,CAAIE,KAAK,CAAC;IAC9B,CAAC,CAAC,OAAOsB,MAAM,EAAE;MACf,OAAO,IAAIxB,OAAO,CAAI,CAAC;IACzB;EACF;AACF","ignoreList":[]}
|
|
@@ -10,7 +10,7 @@ export declare class SessionManager {
|
|
|
10
10
|
constructor(props?: SessionManagerProps);
|
|
11
11
|
static hydrate(sessionManagerString: string): SessionManager;
|
|
12
12
|
get currentSession(): Session<OAuthToken>;
|
|
13
|
-
setEnv(env: ENV
|
|
13
|
+
setEnv(env: ENV): void;
|
|
14
14
|
toString(): string;
|
|
15
15
|
removeSession(sessionId: string): void;
|
|
16
16
|
switchSession(sessionId: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session_manager.d.ts","sourceRoot":"","sources":["../../src/utils/session_manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,OAAO,EAA8B,MAAM,WAAW,CAAA;AAEpE,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,qBAAa,cAAc;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,gBAAgB,EAAE,MAAM,CAAA;gBAEZ,KAAK,CAAC,EAAE,mBAAmB;IAMvC,MAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM;IAS3C,IAAI,cAAc,wBAIjB;IAED,MAAM,CAAC,GAAG,EAAE,GAAG
|
|
1
|
+
{"version":3,"file":"session_manager.d.ts","sourceRoot":"","sources":["../../src/utils/session_manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,OAAO,EAA8B,MAAM,WAAW,CAAA;AAEpE,KAAK,mBAAmB,GAAG;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,qBAAa,cAAc;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,gBAAgB,EAAE,MAAM,CAAA;gBAEZ,KAAK,CAAC,EAAE,mBAAmB;IAMvC,MAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM;IAS3C,IAAI,cAAc,wBAIjB;IAED,MAAM,CAAC,GAAG,EAAE,GAAG;IAQf,QAAQ;IAIR,aAAa,CAAC,SAAS,EAAE,MAAM;IAQ/B,aAAa,CAAC,SAAS,EAAE,MAAM;IAQ/B,aAAa,CAAC,OAAO,EAAE,OAAO;IAK9B,kBAAkB,CAAC,KAAK,EAAE,UAAU;CAMrC"}
|
|
@@ -20,11 +20,10 @@ export class SessionManager {
|
|
|
20
20
|
get currentSession() {
|
|
21
21
|
return Session.hydrate(this.sessions[this.currentSessionId] || new Session({}).toString());
|
|
22
22
|
}
|
|
23
|
-
setEnv(env
|
|
23
|
+
setEnv(env) {
|
|
24
24
|
// Get the current session (handles case where it doesn't exist)
|
|
25
25
|
const session = this.currentSession;
|
|
26
26
|
session.env = env;
|
|
27
|
-
session.prototypeName = prototypeName;
|
|
28
27
|
// Store the session with its ID
|
|
29
28
|
this.upsertSession(session);
|
|
30
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session_manager.js","names":["omit","Session","UNAUTHENTICATED_SESSION_ID","SessionManager","constructor","props","sessions","currentSessionId","hydrate","sessionManagerString","JSON","parse","_error","currentSession","toString","setEnv","env","
|
|
1
|
+
{"version":3,"file":"session_manager.js","names":["omit","Session","UNAUTHENTICATED_SESSION_ID","SessionManager","constructor","props","sessions","currentSessionId","hydrate","sessionManagerString","JSON","parse","_error","currentSession","toString","setEnv","env","session","upsertSession","stringify","removeSession","sessionId","switchSession","sessionPresent","Error","id","updateCurrentToken","token"],"sources":["../../src/utils/session_manager.ts"],"sourcesContent":["import { omit } from 'lodash'\nimport { OAuthToken } from '../types'\nimport { ENV, Session, UNAUTHENTICATED_SESSION_ID } from './session'\n\ntype SessionManagerProps = {\n sessions?: Record<string, string>\n currentSessionId?: string\n}\n\nexport class SessionManager {\n sessions: Record<string, string>\n currentSessionId: string\n\n constructor(props?: SessionManagerProps) {\n const { sessions, currentSessionId } = props || {}\n this.sessions = sessions || {}\n this.currentSessionId = currentSessionId || UNAUTHENTICATED_SESSION_ID\n }\n\n static hydrate(sessionManagerString: string) {\n try {\n const props = JSON.parse(sessionManagerString)\n return new SessionManager(props)\n } catch (_error) {\n return new SessionManager()\n }\n }\n\n get currentSession() {\n return Session.hydrate<OAuthToken>(\n this.sessions[this.currentSessionId] || new Session<OAuthToken>({}).toString()\n )\n }\n\n setEnv(env: ENV) {\n // Get the current session (handles case where it doesn't exist)\n const session = this.currentSession\n session.env = env\n // Store the session with its ID\n this.upsertSession(session)\n }\n\n toString() {\n return JSON.stringify({ sessions: this.sessions, currentSessionId: this.currentSessionId })\n }\n\n removeSession(sessionId: string) {\n // if unauthenticated, this is a no-op\n this.sessions = omit(this.sessions, sessionId)\n if (this.currentSessionId === sessionId) {\n this.currentSessionId = UNAUTHENTICATED_SESSION_ID\n }\n }\n\n switchSession(sessionId: string) {\n const sessionPresent = this.sessions[sessionId]\n if (!sessionPresent) {\n throw new Error(`Session ${sessionId} not found`)\n }\n this.currentSessionId = sessionId\n }\n\n upsertSession(session: Session) {\n this.sessions[session.id] = session.toString()\n this.currentSessionId = session.id\n }\n\n updateCurrentToken(token: OAuthToken) {\n const session = this.currentSession\n this.removeSession(session.id)\n session.token = token\n this.upsertSession(session)\n }\n}\n"],"mappings":"AAAA,SAASA,IAAI,QAAQ,QAAQ;AAE7B,SAAcC,OAAO,EAAEC,0BAA0B,QAAQ,WAAW;AAOpE,OAAO,MAAMC,cAAc,CAAC;EAI1BC,WAAWA,CAACC,KAA2B,EAAE;IACvC,MAAM;MAAEC,QAAQ;MAAEC;IAAiB,CAAC,GAAGF,KAAK,IAAI,CAAC,CAAC;IAClD,IAAI,CAACC,QAAQ,GAAGA,QAAQ,IAAI,CAAC,CAAC;IAC9B,IAAI,CAACC,gBAAgB,GAAGA,gBAAgB,IAAIL,0BAA0B;EACxE;EAEA,OAAOM,OAAOA,CAACC,oBAA4B,EAAE;IAC3C,IAAI;MACF,MAAMJ,KAAK,GAAGK,IAAI,CAACC,KAAK,CAACF,oBAAoB,CAAC;MAC9C,OAAO,IAAIN,cAAc,CAACE,KAAK,CAAC;IAClC,CAAC,CAAC,OAAOO,MAAM,EAAE;MACf,OAAO,IAAIT,cAAc,CAAC,CAAC;IAC7B;EACF;EAEA,IAAIU,cAAcA,CAAA,EAAG;IACnB,OAAOZ,OAAO,CAACO,OAAO,CACpB,IAAI,CAACF,QAAQ,CAAC,IAAI,CAACC,gBAAgB,CAAC,IAAI,IAAIN,OAAO,CAAa,CAAC,CAAC,CAAC,CAACa,QAAQ,CAAC,CAC/E,CAAC;EACH;EAEAC,MAAMA,CAACC,GAAQ,EAAE;IACf;IACA,MAAMC,OAAO,GAAG,IAAI,CAACJ,cAAc;IACnCI,OAAO,CAACD,GAAG,GAAGA,GAAG;IACjB;IACA,IAAI,CAACE,aAAa,CAACD,OAAO,CAAC;EAC7B;EAEAH,QAAQA,CAAA,EAAG;IACT,OAAOJ,IAAI,CAACS,SAAS,CAAC;MAAEb,QAAQ,EAAE,IAAI,CAACA,QAAQ;MAAEC,gBAAgB,EAAE,IAAI,CAACA;IAAiB,CAAC,CAAC;EAC7F;EAEAa,aAAaA,CAACC,SAAiB,EAAE;IAC/B;IACA,IAAI,CAACf,QAAQ,GAAGN,IAAI,CAAC,IAAI,CAACM,QAAQ,EAAEe,SAAS,CAAC;IAC9C,IAAI,IAAI,CAACd,gBAAgB,KAAKc,SAAS,EAAE;MACvC,IAAI,CAACd,gBAAgB,GAAGL,0BAA0B;IACpD;EACF;EAEAoB,aAAaA,CAACD,SAAiB,EAAE;IAC/B,MAAME,cAAc,GAAG,IAAI,CAACjB,QAAQ,CAACe,SAAS,CAAC;IAC/C,IAAI,CAACE,cAAc,EAAE;MACnB,MAAM,IAAIC,KAAK,CAAC,WAAWH,SAAS,YAAY,CAAC;IACnD;IACA,IAAI,CAACd,gBAAgB,GAAGc,SAAS;EACnC;EAEAH,aAAaA,CAACD,OAAgB,EAAE;IAC9B,IAAI,CAACX,QAAQ,CAACW,OAAO,CAACQ,EAAE,CAAC,GAAGR,OAAO,CAACH,QAAQ,CAAC,CAAC;IAC9C,IAAI,CAACP,gBAAgB,GAAGU,OAAO,CAACQ,EAAE;EACpC;EAEAC,kBAAkBA,CAACC,KAAiB,EAAE;IACpC,MAAMV,OAAO,GAAG,IAAI,CAACJ,cAAc;IACnC,IAAI,CAACO,aAAa,CAACH,OAAO,CAACQ,EAAE,CAAC;IAC9BR,OAAO,CAACU,KAAK,GAAGA,KAAK;IACrB,IAAI,CAACT,aAAa,CAACD,OAAO,CAAC;EAC7B;AACF","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload_uri.d.ts","sourceRoot":"","sources":["../../src/utils/upload_uri.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;gBAEA,EAAE,OAAO,EAAE,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE;IAI7C,IAAI,MAAM,WAET;IAED,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"upload_uri.d.ts","sourceRoot":"","sources":["../../src/utils/upload_uri.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC;;GAEG;AACH,qBAAa,SAAS;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,MAAM,CAAA;gBAEA,EAAE,OAAO,EAAE,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE;IAI7C,IAAI,MAAM,WAET;IAED,IAAI,IAAI,WAEP;IAED,IAAI,SAAS,gCAOZ;IAED,IAAI,MAAM,IAAI,KAAK,GAAG,sBAAsB,CAE3C;IAED,IAAI,GAAG,mBAON;IAED,IAAI,GAAG,4BAEN;IAED,IAAI,OAAO,WAEV;IAED,IAAI,OAAO;;;;MAMV;CACF"}
|
|
@@ -19,9 +19,6 @@ export class UploadUri {
|
|
|
19
19
|
return 'https';
|
|
20
20
|
}
|
|
21
21
|
get host() {
|
|
22
|
-
if (this.env === 'prototype') {
|
|
23
|
-
return `${this.session.prototypeName}.upload.planningcenter.ninja`;
|
|
24
|
-
}
|
|
25
22
|
return `${this.subdomain}.${this.domain}.${this.tld}`;
|
|
26
23
|
}
|
|
27
24
|
get subdomain() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload_uri.js","names":["DeviceInfo","brand","getBrand","model","getModel","systemName","getSystemName","systemVersion","getSystemVersion","readableVersion","getReadableVersion","appName","getApplicationName","UploadUri","constructor","session","schema","host","
|
|
1
|
+
{"version":3,"file":"upload_uri.js","names":["DeviceInfo","brand","getBrand","model","getModel","systemName","getSystemName","systemVersion","getSystemVersion","readableVersion","getReadableVersion","appName","getApplicationName","UploadUri","constructor","session","schema","host","subdomain","domain","tld","env","baseUrl","headers","Authorization","token","access_token"],"sources":["../../src/utils/upload_uri.ts"],"sourcesContent":["import DeviceInfo from 'react-native-device-info'\nimport { Session } from './session'\nconst brand = DeviceInfo.getBrand()\nconst model = DeviceInfo.getModel()\nconst systemName = DeviceInfo.getSystemName()\nconst systemVersion = DeviceInfo.getSystemVersion()\nconst readableVersion = DeviceInfo.getReadableVersion()\nconst appName = DeviceInfo.getApplicationName()\n\n/**\n * This is for accessing https://github.com/planningcenter/upload\n */\nexport class UploadUri {\n session: Session\n app?: string\n\n constructor({ session }: { session: Session }) {\n this.session = session\n }\n\n get schema() {\n return 'https'\n }\n\n get host() {\n return `${this.subdomain}.${this.domain}.${this.tld}`\n }\n\n get subdomain() {\n switch (this.env) {\n case 'staging':\n return 'upload-staging'\n default:\n return 'upload'\n }\n }\n\n get domain(): 'pco' | 'planningcenteronline' {\n return this.env === 'development' ? 'pco' : 'planningcenteronline'\n }\n\n get tld() {\n switch (this.env) {\n case 'development':\n return 'test'\n default:\n return 'com'\n }\n }\n\n get env() {\n return this.session?.env || 'production'\n }\n\n get baseUrl() {\n return `${this.schema}://${this.host}`\n }\n\n get headers() {\n return {\n 'User-Agent': `${appName}/${readableVersion} (${brand}, ${model}, ${systemName}, ${systemVersion})`,\n Authorization: `Bearer ${this.session.token?.access_token}`,\n 'X-PCO-Moderate-Image': 'true',\n }\n }\n}\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,0BAA0B;AAEjD,MAAMC,KAAK,GAAGD,UAAU,CAACE,QAAQ,CAAC,CAAC;AACnC,MAAMC,KAAK,GAAGH,UAAU,CAACI,QAAQ,CAAC,CAAC;AACnC,MAAMC,UAAU,GAAGL,UAAU,CAACM,aAAa,CAAC,CAAC;AAC7C,MAAMC,aAAa,GAAGP,UAAU,CAACQ,gBAAgB,CAAC,CAAC;AACnD,MAAMC,eAAe,GAAGT,UAAU,CAACU,kBAAkB,CAAC,CAAC;AACvD,MAAMC,OAAO,GAAGX,UAAU,CAACY,kBAAkB,CAAC,CAAC;;AAE/C;AACA;AACA;AACA,OAAO,MAAMC,SAAS,CAAC;EAIrBC,WAAWA,CAAC;IAAEC;EAA8B,CAAC,EAAE;IAC7C,IAAI,CAACA,OAAO,GAAGA,OAAO;EACxB;EAEA,IAAIC,MAAMA,CAAA,EAAG;IACX,OAAO,OAAO;EAChB;EAEA,IAAIC,IAAIA,CAAA,EAAG;IACT,OAAO,GAAG,IAAI,CAACC,SAAS,IAAI,IAAI,CAACC,MAAM,IAAI,IAAI,CAACC,GAAG,EAAE;EACvD;EAEA,IAAIF,SAASA,CAAA,EAAG;IACd,QAAQ,IAAI,CAACG,GAAG;MACd,KAAK,SAAS;QACZ,OAAO,gBAAgB;MACzB;QACE,OAAO,QAAQ;IACnB;EACF;EAEA,IAAIF,MAAMA,CAAA,EAAmC;IAC3C,OAAO,IAAI,CAACE,GAAG,KAAK,aAAa,GAAG,KAAK,GAAG,sBAAsB;EACpE;EAEA,IAAID,GAAGA,CAAA,EAAG;IACR,QAAQ,IAAI,CAACC,GAAG;MACd,KAAK,aAAa;QAChB,OAAO,MAAM;MACf;QACE,OAAO,KAAK;IAChB;EACF;EAEA,IAAIA,GAAGA,CAAA,EAAG;IACR,OAAO,IAAI,CAACN,OAAO,EAAEM,GAAG,IAAI,YAAY;EAC1C;EAEA,IAAIC,OAAOA,CAAA,EAAG;IACZ,OAAO,GAAG,IAAI,CAACN,MAAM,MAAM,IAAI,CAACC,IAAI,EAAE;EACxC;EAEA,IAAIM,OAAOA,CAAA,EAAG;IACZ,OAAO;MACL,YAAY,EAAE,GAAGZ,OAAO,IAAIF,eAAe,KAAKR,KAAK,KAAKE,KAAK,KAAKE,UAAU,KAAKE,aAAa,GAAG;MACnGiB,aAAa,EAAE,UAAU,IAAI,CAACT,OAAO,CAACU,KAAK,EAAEC,YAAY,EAAE;MAC3D,sBAAsB,EAAE;IAC1B,CAAC;EACH;AACF","ignoreList":[]}
|
package/build/utils/uri.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uri.d.ts","sourceRoot":"","sources":["../../src/utils/uri.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,KAAK,KAAK,GAAG,cAAc,GAAG,gBAAgB,CAAA;AAC9C,qBAAa,GAAG;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,KAAK,CAAmB;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAA;gBAEA,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE;IAMtF,IAAI,MAAM,WAET;IAED,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"uri.d.ts","sourceRoot":"","sources":["../../src/utils/uri.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,KAAK,KAAK,GAAG,cAAc,GAAG,gBAAgB,CAAA;AAC9C,qBAAa,GAAG;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,KAAK,CAAmB;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAA;gBAEA,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE;IAMtF,IAAI,MAAM,WAET;IAED,IAAI,IAAI,WAEP;IAED,IAAI,SAAS,0CAOZ;IAED,IAAI,MAAM,IAAI,KAAK,GAAG,sBAAsB,GAAG,cAAc,CAM5D;IAED,IAAI,GAAG,mBAON;IAED,IAAI,cAAc,YAEjB;IAED,IAAI,GAAG,4BAEN;IAED,IAAI,OAAO,WAEV;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,OAAO;;;MAKV;IAED,MAAM,GAAI,MAAM,MAAM,YAIrB;IAED,GAAG,GAAI,MAAM,MAAM,YAIlB;CACF"}
|
package/build/utils/uri.js
CHANGED
|
@@ -20,10 +20,6 @@ export class Uri {
|
|
|
20
20
|
return 'https';
|
|
21
21
|
}
|
|
22
22
|
get host() {
|
|
23
|
-
if (this.env === 'prototype') {
|
|
24
|
-
const graphDomain = this.isChurchCenter ? 'churchcenter' : 'planningcenter';
|
|
25
|
-
return `${this.session.prototypeName}.api.${graphDomain}.ninja`;
|
|
26
|
-
}
|
|
27
23
|
return `${this.subdomain}.${this.domain}.${this.tld}`;
|
|
28
24
|
}
|
|
29
25
|
get subdomain() {
|
package/build/utils/uri.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uri.js","names":["DeviceInfo","brand","getBrand","model","getModel","systemName","getSystemName","systemVersion","getSystemVersion","readableVersion","getReadableVersion","appName","getApplicationName","Uri","graph","constructor","session","app","schema","host","
|
|
1
|
+
{"version":3,"file":"uri.js","names":["DeviceInfo","brand","getBrand","model","getModel","systemName","getSystemName","systemVersion","getSystemVersion","readableVersion","getReadableVersion","appName","getApplicationName","Uri","graph","constructor","session","app","schema","host","subdomain","domain","tld","env","isChurchCenter","isChurchCenterToken","baseUrl","directory","headers","Authorization","token","access_token","appUrl","path","startsWith","api"],"sources":["../../src/utils/uri.ts"],"sourcesContent":["import DeviceInfo from 'react-native-device-info'\nimport { Session } from './session'\nconst brand = DeviceInfo.getBrand()\nconst model = DeviceInfo.getModel()\nconst systemName = DeviceInfo.getSystemName()\nconst systemVersion = DeviceInfo.getSystemVersion()\nconst readableVersion = DeviceInfo.getReadableVersion()\nconst appName = DeviceInfo.getApplicationName()\n\ntype Graph = 'churchcenter' | 'planningcenter'\nexport class Uri {\n session: Session\n graph: Graph = 'planningcenter'\n app?: string\n\n constructor({ session, app, graph }: { session: Session; app?: string; graph?: Graph }) {\n this.session = session\n this.app = app\n this.graph = graph || 'planningcenter'\n }\n\n get schema() {\n return 'https'\n }\n\n get host() {\n return `${this.subdomain}.${this.domain}.${this.tld}`\n }\n\n get subdomain() {\n switch (this.env) {\n case 'staging':\n return this.isChurchCenter ? 'api.staging' : 'api-staging'\n default:\n return 'api'\n }\n }\n\n get domain(): 'pco' | 'planningcenteronline' | 'churchcenter' {\n if (this.isChurchCenter) {\n return 'churchcenter'\n }\n\n return this.env === 'development' ? 'pco' : 'planningcenteronline'\n }\n\n get tld() {\n switch (this.env) {\n case 'development':\n return 'test'\n default:\n return 'com'\n }\n }\n\n get isChurchCenter() {\n return this.session.isChurchCenterToken\n }\n\n get env() {\n return this.session?.env || 'production'\n }\n\n get baseUrl() {\n return `${this.schema}://${this.host}`\n }\n\n get directory() {\n return this.app ? `/${this.app}/v2` : ''\n }\n\n get headers() {\n return {\n 'User-Agent': `${appName}/${readableVersion} (${brand}, ${model}, ${systemName}, ${systemVersion})`,\n Authorization: `Bearer ${this.session.token?.access_token}`,\n }\n }\n\n appUrl = (path: string) => {\n if (path.startsWith(`${this.schema}://`)) return path\n\n return `${this.baseUrl}${this.directory}${path || '/'}`\n }\n\n api = (path: string) => {\n if (path.startsWith(`${this.schema}://`)) return path\n\n return `${this.baseUrl}${path || '/'}`\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@planningcenter/chat-react-native",
|
|
3
|
-
"version": "4.6.4-
|
|
3
|
+
"version": "4.6.4-rc.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@fortawesome/fontawesome-svg-core": "^7.2.0",
|
|
35
35
|
"@fortawesome/react-native-fontawesome": "^0.3.2",
|
|
36
|
-
"@planningcenter/emoji-keyboard": "4.6.
|
|
36
|
+
"@planningcenter/emoji-keyboard": "4.6.0",
|
|
37
37
|
"lodash-inflection": "^1.5.0"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
@@ -84,5 +84,5 @@
|
|
|
84
84
|
"sf-symbols-typescript": "^2.2.0",
|
|
85
85
|
"typescript": "~6.0.3"
|
|
86
86
|
},
|
|
87
|
-
"gitHead": "
|
|
87
|
+
"gitHead": "5b0d4594b5ae704c9543fa2d771025adba33310c"
|
|
88
88
|
}
|
|
@@ -37,18 +37,16 @@ const Probe = () => {
|
|
|
37
37
|
return <Text>{`${status}:${fetchStatus}:${data?.id ?? ''}`}</Text>
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
const Tree = ({ accessToken
|
|
40
|
+
const Tree = ({ accessToken }: { accessToken: string }) => {
|
|
41
41
|
const value = useMemo(() => {
|
|
42
|
-
const
|
|
43
|
-
const session = new Session({ token: { access_token: accessToken }, env, prototypeName })
|
|
42
|
+
const session = new Session({ token: { access_token: accessToken } })
|
|
44
43
|
return {
|
|
45
44
|
session,
|
|
46
45
|
token: session.token,
|
|
47
|
-
env,
|
|
48
|
-
prototypeName,
|
|
46
|
+
env: 'production',
|
|
49
47
|
onUnauthorizedResponse: () => {},
|
|
50
48
|
} as unknown as ChatContextValue
|
|
51
|
-
}, [accessToken
|
|
49
|
+
}, [accessToken])
|
|
52
50
|
|
|
53
51
|
return (
|
|
54
52
|
<ChatContext.Provider value={value}>
|
|
@@ -106,14 +104,3 @@ describe('ApiProvider on access token change', () => {
|
|
|
106
104
|
expect(await screen.findByText('success:idle:42')).toBeTruthy()
|
|
107
105
|
})
|
|
108
106
|
})
|
|
109
|
-
|
|
110
|
-
describe('ApiProvider on Protonova environment change', () => {
|
|
111
|
-
it("drops the old environment's data and refetches", async () => {
|
|
112
|
-
const { rerender } = render(<Tree accessToken="fresh" prototypeName="chat-1" />)
|
|
113
|
-
expect(await screen.findByText('success:idle:42')).toBeTruthy()
|
|
114
|
-
|
|
115
|
-
rerender(<Tree accessToken="fresh" prototypeName="chat-2" />)
|
|
116
|
-
|
|
117
|
-
await waitFor(() => expect(meRequests()).toEqual(['fresh', 'fresh']))
|
|
118
|
-
})
|
|
119
|
-
})
|
|
@@ -14,7 +14,7 @@ import { featuresQueryOptions } from '../hooks/use_features'
|
|
|
14
14
|
import { useJoltForegroundPing } from '../hooks/use_jolt'
|
|
15
15
|
import { RequestQueryKey } from '../hooks/use_suspense_api'
|
|
16
16
|
import { emitAuthRefresh } from '../utils/auth_events'
|
|
17
|
-
import {
|
|
17
|
+
import { ResponseError } from '../utils/response_error'
|
|
18
18
|
import { ChatContext, ChatContextValue } from './chat_context'
|
|
19
19
|
|
|
20
20
|
let apiClient: ApiClient | undefined
|
|
@@ -29,21 +29,14 @@ const defaultQueryFn = ({ queryKey }: { queryKey: QueryKey }) => {
|
|
|
29
29
|
return apiClient[app].get({ url, data, headers })
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
|
|
33
|
-
if (
|
|
32
|
+
const configuredRetry = (failureCount: number, error: any) => {
|
|
33
|
+
if (is429Error(error)) return false
|
|
34
34
|
|
|
35
35
|
return failureCount < 3
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
return status !== undefined && status >= 400 && status < 500
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
const errorStatus = (error: unknown): number | undefined => {
|
|
44
|
-
if (error instanceof ResponseError) return error.status
|
|
45
|
-
if (isResponseLike(error)) return error.status
|
|
46
|
-
return undefined
|
|
38
|
+
const is429Error = (error: any): boolean => {
|
|
39
|
+
return error instanceof ResponseError && error.status === 429
|
|
47
40
|
}
|
|
48
41
|
|
|
49
42
|
export const chatQueryClient = new QueryClient({
|
|
@@ -56,8 +49,8 @@ export const chatQueryClient = new QueryClient({
|
|
|
56
49
|
})
|
|
57
50
|
|
|
58
51
|
export function ApiProvider({ children }: ViewProps) {
|
|
59
|
-
const { token, env,
|
|
60
|
-
const sessionChanged = useSessionChanged({ token, env
|
|
52
|
+
const { token, env, session } = useContext(ChatContext)
|
|
53
|
+
const sessionChanged = useSessionChanged({ token, env })
|
|
61
54
|
|
|
62
55
|
const client = useApiClient()
|
|
63
56
|
|
|
@@ -115,15 +108,9 @@ export function useFocusManager() {
|
|
|
115
108
|
return appState
|
|
116
109
|
}
|
|
117
110
|
|
|
118
|
-
function useSessionChanged(
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
const { token: newToken, env: newEnv, prototypeName: newPrototypeName } = value
|
|
122
|
-
const {
|
|
123
|
-
token: prevToken,
|
|
124
|
-
env: prevEnv,
|
|
125
|
-
prototypeName: prevPrototypeName,
|
|
126
|
-
} = usePrevious<typeof value>(value)
|
|
111
|
+
function useSessionChanged(value: Pick<ChatContextValue, 'token' | 'env'>): boolean {
|
|
112
|
+
const { token: newToken, env: newEnv } = value
|
|
113
|
+
const { token: prevToken, env: prevEnv } = usePrevious<typeof value>(value)
|
|
127
114
|
|
|
128
115
|
const isInitialLogin = !prevToken && !!newToken
|
|
129
116
|
if (isInitialLogin) return false
|
|
@@ -133,9 +120,8 @@ function useSessionChanged(
|
|
|
133
120
|
)
|
|
134
121
|
|
|
135
122
|
const envChanged = Boolean(prevEnv && newEnv !== prevEnv)
|
|
136
|
-
const prototypeChanged = Boolean(prevEnv && newPrototypeName !== prevPrototypeName)
|
|
137
123
|
|
|
138
|
-
return tokenChanged || envChanged
|
|
124
|
+
return tokenChanged || envChanged
|
|
139
125
|
}
|
|
140
126
|
|
|
141
127
|
function usePrevious<T>(value: T): T {
|