@oxy.so/services 4.0.4 → 4.0.6
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/android/src/main/java/so/oxy/identity/OxyIdentityStore.kt +8 -7
- package/android/src/main/java/so/oxy/storage/OxyEncryptedPrefs.kt +41 -97
- package/lib/commonjs/ui/components/OxyAccountDialogScreen.js +5 -3
- package/lib/commonjs/ui/components/OxyAccountDialogScreen.js.map +1 -1
- package/lib/commonjs/ui/components/OxyAuthChooser.js +33 -23
- package/lib/commonjs/ui/components/OxyAuthChooser.js.map +1 -1
- package/lib/commonjs/ui/components/authChooser/SignInEntryView.js +9 -0
- package/lib/commonjs/ui/components/authChooser/SignInEntryView.js.map +1 -1
- package/lib/commonjs/ui/components/authChooser/primitives.js +16 -7
- package/lib/commonjs/ui/components/authChooser/primitives.js.map +1 -1
- package/lib/commonjs/ui/components/modals/DeleteAccountModal.js +6 -11
- package/lib/commonjs/ui/components/modals/DeleteAccountModal.js.map +1 -1
- package/lib/commonjs/ui/hooks/accountDialogSnapshot.js +1 -0
- package/lib/commonjs/ui/hooks/accountDialogSnapshot.js.map +1 -1
- package/lib/commonjs/ui/screens/ManageAccountScreen.js +17 -2
- package/lib/commonjs/ui/screens/ManageAccountScreen.js.map +1 -1
- package/lib/commonjs/ui/utils/accountDeletionHandoff.js +99 -0
- package/lib/commonjs/ui/utils/accountDeletionHandoff.js.map +1 -0
- package/lib/module/ui/components/OxyAccountDialogScreen.js +5 -3
- package/lib/module/ui/components/OxyAccountDialogScreen.js.map +1 -1
- package/lib/module/ui/components/OxyAuthChooser.js +33 -23
- package/lib/module/ui/components/OxyAuthChooser.js.map +1 -1
- package/lib/module/ui/components/authChooser/SignInEntryView.js +9 -0
- package/lib/module/ui/components/authChooser/SignInEntryView.js.map +1 -1
- package/lib/module/ui/components/authChooser/primitives.js +16 -7
- package/lib/module/ui/components/authChooser/primitives.js.map +1 -1
- package/lib/module/ui/components/modals/DeleteAccountModal.js +6 -11
- package/lib/module/ui/components/modals/DeleteAccountModal.js.map +1 -1
- package/lib/module/ui/hooks/accountDialogSnapshot.js +1 -0
- package/lib/module/ui/hooks/accountDialogSnapshot.js.map +1 -1
- package/lib/module/ui/screens/ManageAccountScreen.js +17 -2
- package/lib/module/ui/screens/ManageAccountScreen.js.map +1 -1
- package/lib/module/ui/utils/accountDeletionHandoff.js +95 -0
- package/lib/module/ui/utils/accountDeletionHandoff.js.map +1 -0
- package/lib/typescript/commonjs/ui/components/OxyAccountDialogScreen.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/OxyAuthChooser.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/authChooser/SignInEntryView.d.ts +6 -0
- package/lib/typescript/commonjs/ui/components/authChooser/SignInEntryView.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/authChooser/primitives.d.ts +8 -0
- package/lib/typescript/commonjs/ui/components/authChooser/primitives.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/components/modals/DeleteAccountModal.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/accountDialogSnapshot.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/hooks/mutations/useAccountMutations.d.ts +1 -0
- package/lib/typescript/commonjs/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/screens/ManageAccountScreen.d.ts.map +1 -1
- package/lib/typescript/commonjs/ui/utils/accountDeletionHandoff.d.ts +35 -0
- package/lib/typescript/commonjs/ui/utils/accountDeletionHandoff.d.ts.map +1 -0
- package/lib/typescript/module/ui/components/OxyAccountDialogScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/OxyAuthChooser.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/authChooser/SignInEntryView.d.ts +6 -0
- package/lib/typescript/module/ui/components/authChooser/SignInEntryView.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/authChooser/primitives.d.ts +8 -0
- package/lib/typescript/module/ui/components/authChooser/primitives.d.ts.map +1 -1
- package/lib/typescript/module/ui/components/modals/DeleteAccountModal.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/accountDialogSnapshot.d.ts.map +1 -1
- package/lib/typescript/module/ui/hooks/mutations/useAccountMutations.d.ts +1 -0
- package/lib/typescript/module/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/module/ui/screens/ManageAccountScreen.d.ts.map +1 -1
- package/lib/typescript/module/ui/utils/accountDeletionHandoff.d.ts +35 -0
- package/lib/typescript/module/ui/utils/accountDeletionHandoff.d.ts.map +1 -0
- package/package.json +4 -4
- package/src/ui/components/OxyAccountDialogScreen.tsx +5 -3
- package/src/ui/components/OxyAuthChooser.tsx +33 -23
- package/src/ui/components/authChooser/SignInEntryView.tsx +13 -0
- package/src/ui/components/authChooser/primitives.tsx +20 -8
- package/src/ui/components/modals/DeleteAccountModal.tsx +5 -9
- package/src/ui/hooks/accountDialogSnapshot.ts +1 -0
- package/src/ui/screens/ManageAccountScreen.tsx +16 -1
- package/src/ui/utils/accountDeletionHandoff.ts +115 -0
|
@@ -31,15 +31,16 @@ internal object OxyIdentityStore {
|
|
|
31
31
|
const val KEY_PUBLIC = "pub"
|
|
32
32
|
|
|
33
33
|
/**
|
|
34
|
-
* [RecoveryPolicy.
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
*
|
|
34
|
+
* [RecoveryPolicy.RebuildFileOnly], like every other store (OxyHQ/oxy#1388).
|
|
35
|
+
* This store used to regenerate the UID-shared androidx master key when its
|
|
36
|
+
* keyset could not be rebuilt, which made every other Oxy app's encrypted prefs
|
|
37
|
+
* unreadable. It never needs to: this slot is a DERIVED copy that Commons
|
|
38
|
+
* re-populates from the primary identity on every launch
|
|
39
|
+
* (`KeyManager.syncSharedIdentity`), so an empty or unavailable slot costs
|
|
40
|
+
* nothing that a relaunch of Commons does not restore.
|
|
40
41
|
*/
|
|
41
42
|
private fun prefs(context: Context): SharedPreferences =
|
|
42
|
-
OxyEncryptedPrefs.open(context, PREFS_NAME, RecoveryPolicy.
|
|
43
|
+
OxyEncryptedPrefs.open(context, PREFS_NAME, RecoveryPolicy.RebuildFileOnly)
|
|
43
44
|
|
|
44
45
|
/** Read the stored keypair as (privateKey, publicKey), or null when absent/blank. */
|
|
45
46
|
fun read(context: Context): Pair<String, String>? {
|
|
@@ -7,38 +7,30 @@ import androidx.security.crypto.EncryptedSharedPreferences
|
|
|
7
7
|
import androidx.security.crypto.MasterKey
|
|
8
8
|
import java.io.IOException
|
|
9
9
|
import java.security.GeneralSecurityException
|
|
10
|
-
import java.security.KeyStore
|
|
11
10
|
|
|
12
11
|
/**
|
|
13
12
|
* How far [OxyEncryptedPrefs.open] may go to recover a file whose keyset it
|
|
14
13
|
* cannot read.
|
|
15
14
|
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
*
|
|
15
|
+
* There is exactly one answer now: rebuild this file, and if that fails, give up.
|
|
16
|
+
* The enum stays a required argument so every store keeps stating it at its
|
|
17
|
+
* call site, where a reviewer sees it.
|
|
18
|
+
*
|
|
19
|
+
* It used to have a second value, `RegenerateSharedMasterKey`, which deleted the
|
|
20
|
+
* androidx master key (`_androidx_security_master_key_`) when a rebuild failed.
|
|
21
|
+
* That key is ONE Keystore entry for the whole `so.oxy.shared` UID and wraps the
|
|
22
|
+
* keyset of every Oxy prefs file in every Oxy app, so deleting it let one app
|
|
23
|
+
* make every sibling's encrypted prefs unreadable. It was removed for
|
|
24
|
+
* OxyHQ/oxy#1388 and must not come back: no store in any Oxy app deletes a
|
|
25
|
+
* UID-shared key.
|
|
19
26
|
*/
|
|
20
27
|
internal enum class RecoveryPolicy {
|
|
21
28
|
/**
|
|
22
29
|
* Wipe and rebuild only this file. If that still fails, GIVE UP — propagate the
|
|
23
|
-
* failure and touch nothing shared.
|
|
24
|
-
*
|
|
25
|
-
* The right policy for any store holding DISPOSABLE data, i.e. data some other
|
|
26
|
-
* authority can re-create. "No data" is then a complete, cost-free recovery, and
|
|
27
|
-
* paying for it with a UID-wide key reset would be trading someone else's
|
|
28
|
-
* irreplaceable data for something we can simply ask for again.
|
|
30
|
+
* failure and touch nothing shared. Every caller degrades to "absent" and its
|
|
31
|
+
* owner re-creates the data (see each store for who that is).
|
|
29
32
|
*/
|
|
30
33
|
RebuildFileOnly,
|
|
31
|
-
|
|
32
|
-
/**
|
|
33
|
-
* Wipe and rebuild this file, and if that still fails, regenerate the UID-shared
|
|
34
|
-
* master key and rebuild again.
|
|
35
|
-
*
|
|
36
|
-
* Only defensible for a store whose loss is ALREADY catastrophic, because the
|
|
37
|
-
* reset invalidates every other Oxy prefs file wrapped by that key (see
|
|
38
|
-
* [OxyEncryptedPrefs]). Do not choose this to make a store more robust — it makes
|
|
39
|
-
* every OTHER store less so.
|
|
40
|
-
*/
|
|
41
|
-
RegenerateSharedMasterKey,
|
|
42
34
|
}
|
|
43
35
|
|
|
44
36
|
/**
|
|
@@ -53,9 +45,8 @@ internal enum class RecoveryPolicy {
|
|
|
53
45
|
* to get wrong, and the failure mode of getting it wrong is silent (every read
|
|
54
46
|
* degrades to "absent" with no exception at the call site).
|
|
55
47
|
*
|
|
56
|
-
*
|
|
57
|
-
*
|
|
58
|
-
* cannot be inherited by accident.
|
|
48
|
+
* Each caller still names its [RecoveryPolicy] at the call site. There is only
|
|
49
|
+
* one policy, and it never touches a key another app depends on.
|
|
59
50
|
*
|
|
60
51
|
* ## One memoized instance per file (CRITICAL)
|
|
61
52
|
*
|
|
@@ -84,21 +75,20 @@ internal enum class RecoveryPolicy {
|
|
|
84
75
|
* `IOException`) on EVERY read/write, and `EncryptedSharedPreferences` never
|
|
85
76
|
* self-heals — the slot stays permanently dead.
|
|
86
77
|
*
|
|
87
|
-
* Recovery is bounded and has no retry loop:
|
|
88
|
-
*
|
|
89
|
-
*
|
|
90
|
-
*
|
|
91
|
-
*
|
|
92
|
-
* still cannot be built the master key itself is unusable, so delete its
|
|
93
|
-
* keystore alias to force a new one, wipe the file again, and rebuild.
|
|
78
|
+
* Recovery is bounded and has no retry loop: delete only the affected file (the
|
|
79
|
+
* stale wrapped keyset) and rebuild against the current master key. This heals
|
|
80
|
+
* the rotation case without touching the master key, so other files keep their
|
|
81
|
+
* keysets. If a fresh keyset still cannot be built, the failure propagates and
|
|
82
|
+
* the `runCatching {}` at every call site degrades to "absent".
|
|
94
83
|
*
|
|
95
|
-
*
|
|
96
|
-
*
|
|
97
|
-
*
|
|
98
|
-
*
|
|
99
|
-
*
|
|
100
|
-
*
|
|
101
|
-
*
|
|
84
|
+
* The master key itself is NEVER deleted here. It is shared by the whole UID, so
|
|
85
|
+
* deleting it would make every other Oxy app's prefs file unreadable (and each
|
|
86
|
+
* would then wipe itself on its next open). When the master key is gone — the
|
|
87
|
+
* Keystore of the UID was wiped because some Oxy app's storage was cleared —
|
|
88
|
+
* androidx creates a new one on the next `MasterKey.Builder.build()` and each
|
|
89
|
+
* file heals itself through the file-only rebuild above. What was IN those
|
|
90
|
+
* files is lost with the Keystore either way; for the self-custody identity,
|
|
91
|
+
* the keystore-independent device backup brings it back (docs/identity/device-backup.md).
|
|
102
92
|
*
|
|
103
93
|
* None of this touches the app's device session, which lives in expo-secure-store
|
|
104
94
|
* under a DISTINCT prefs file ("SecureStore") and DISTINCT keystore aliases
|
|
@@ -106,7 +96,6 @@ internal enum class RecoveryPolicy {
|
|
|
106
96
|
*/
|
|
107
97
|
internal object OxyEncryptedPrefs {
|
|
108
98
|
private const val TAG = "OxyEncryptedPrefs"
|
|
109
|
-
private const val ANDROID_KEYSTORE = "AndroidKeyStore"
|
|
110
99
|
|
|
111
100
|
/** Memoized instances, keyed by prefs file name. Guarded by [lock]. */
|
|
112
101
|
private val instances = mutableMapOf<String, SharedPreferences>()
|
|
@@ -114,10 +103,10 @@ internal object OxyEncryptedPrefs {
|
|
|
114
103
|
|
|
115
104
|
/**
|
|
116
105
|
* The process-wide instance for [prefsName], creating (and recovering) it on
|
|
117
|
-
* first use. [recovery]
|
|
118
|
-
*
|
|
106
|
+
* first use. [recovery] is stated by every caller — see [RecoveryPolicy]; there
|
|
107
|
+
* is no default, on purpose.
|
|
119
108
|
*
|
|
120
|
-
* Throws when the file cannot be built
|
|
109
|
+
* Throws when the file cannot be built after a file-only rebuild; callers wrap in
|
|
121
110
|
* `runCatching {}` and degrade to "absent".
|
|
122
111
|
*/
|
|
123
112
|
fun open(context: Context, prefsName: String, recovery: RecoveryPolicy): SharedPreferences {
|
|
@@ -143,9 +132,8 @@ internal object OxyEncryptedPrefs {
|
|
|
143
132
|
}
|
|
144
133
|
|
|
145
134
|
/**
|
|
146
|
-
*
|
|
147
|
-
*
|
|
148
|
-
* policy, not this function's decision.
|
|
135
|
+
* Wipe ONLY this file (which holds the stale wrapped keyset) and rebuild
|
|
136
|
+
* against the current master key.
|
|
149
137
|
*/
|
|
150
138
|
private fun healKeyset(
|
|
151
139
|
appContext: Context,
|
|
@@ -162,68 +150,24 @@ internal object OxyEncryptedPrefs {
|
|
|
162
150
|
return try {
|
|
163
151
|
build(appContext, prefsName)
|
|
164
152
|
} catch (stillCorrupt: GeneralSecurityException) {
|
|
165
|
-
|
|
153
|
+
giveUp(prefsName, recovery, stillCorrupt)
|
|
166
154
|
} catch (stillCorrupt: IOException) {
|
|
167
|
-
|
|
155
|
+
giveUp(prefsName, recovery, stillCorrupt)
|
|
168
156
|
}
|
|
169
157
|
}
|
|
170
158
|
|
|
171
159
|
/**
|
|
172
|
-
* The
|
|
173
|
-
*
|
|
174
|
-
*
|
|
175
|
-
* [RecoveryPolicy.RebuildFileOnly] rethrows: this file stays unavailable, which
|
|
176
|
-
* its owner can recover from, and no shared key is touched. Anything else would
|
|
177
|
-
* let a disposable store destroy an irreplaceable one.
|
|
160
|
+
* The file is still unreadable after a file reset. Give up: this file stays
|
|
161
|
+
* unavailable, which its owner recovers from, and no shared key is touched.
|
|
178
162
|
*/
|
|
179
|
-
private fun
|
|
180
|
-
appContext: Context,
|
|
181
|
-
prefsName: String,
|
|
182
|
-
recovery: RecoveryPolicy,
|
|
183
|
-
cause: Exception,
|
|
184
|
-
): SharedPreferences {
|
|
185
|
-
if (recovery == RecoveryPolicy.RebuildFileOnly) {
|
|
186
|
-
Log.w(
|
|
187
|
-
TAG,
|
|
188
|
-
"'$prefsName' is still unreadable after a file reset. Giving up rather than " +
|
|
189
|
-
"regenerating the UID-shared master key, which would wipe every other Oxy " +
|
|
190
|
-
"store including the self-custody identity. Its owner re-creates it instead.",
|
|
191
|
-
cause
|
|
192
|
-
)
|
|
193
|
-
throw cause
|
|
194
|
-
}
|
|
195
|
-
return regenerateMasterKeyAndRebuild(appContext, prefsName, cause)
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
/**
|
|
199
|
-
* Stage 2, reachable ONLY via [RecoveryPolicy.RegenerateSharedMasterKey]: the
|
|
200
|
-
* androidx master key itself is unusable, so delete its keystore alias to force a
|
|
201
|
-
* fresh one, wipe the now-stale file again, and rebuild.
|
|
202
|
-
*
|
|
203
|
-
* See the UID-wide collateral note in [OxyEncryptedPrefs] — this is destructive
|
|
204
|
-
* to every other store sharing the alias. The alias is used ONLY by androidx
|
|
205
|
-
* EncryptedSharedPreferences, so it never touches expo-secure-store's aliases. A
|
|
206
|
-
* throw here propagates to the call-site `runCatching {}`.
|
|
207
|
-
*/
|
|
208
|
-
private fun regenerateMasterKeyAndRebuild(
|
|
209
|
-
appContext: Context,
|
|
210
|
-
prefsName: String,
|
|
211
|
-
cause: Exception
|
|
212
|
-
): SharedPreferences {
|
|
163
|
+
private fun giveUp(prefsName: String, recovery: RecoveryPolicy, cause: Exception): Nothing {
|
|
213
164
|
Log.w(
|
|
214
165
|
TAG,
|
|
215
|
-
"
|
|
216
|
-
"
|
|
166
|
+
"'$prefsName' is still unreadable after a file reset ($recovery). Giving up " +
|
|
167
|
+
"without touching the UID-shared master key; its owner re-creates it.",
|
|
217
168
|
cause
|
|
218
169
|
)
|
|
219
|
-
|
|
220
|
-
load(null)
|
|
221
|
-
if (containsAlias(MasterKey.DEFAULT_MASTER_KEY_ALIAS)) {
|
|
222
|
-
deleteEntry(MasterKey.DEFAULT_MASTER_KEY_ALIAS)
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
appContext.deleteSharedPreferences(prefsName)
|
|
226
|
-
return build(appContext, prefsName)
|
|
170
|
+
throw cause
|
|
227
171
|
}
|
|
228
172
|
|
|
229
173
|
private fun build(appContext: Context, prefsName: String): SharedPreferences {
|
|
@@ -80,9 +80,11 @@ const OxyAccountDialogScreen = ({
|
|
|
80
80
|
const {
|
|
81
81
|
view
|
|
82
82
|
} = snapshot;
|
|
83
|
-
// Names the entry view "Add another account" rather than "Sign in" when
|
|
84
|
-
//
|
|
85
|
-
|
|
83
|
+
// Names the entry view "Add another account" rather than "Sign in" only when
|
|
84
|
+
// THIS app is signed in. Not the directory's size: the device can go on
|
|
85
|
+
// listing a shared identity (Commons') after the app signed out, and that
|
|
86
|
+
// titled a signed-out sheet "Add another account" (OxyHQ/oxy#1375 item 21).
|
|
87
|
+
const hasSignedInAccounts = snapshot.hasSession;
|
|
86
88
|
// Where back leads is the CONTROLLER's answer (`snapshot.backView`), never a
|
|
87
89
|
// table here: a host-side "back = accounts" assumed a signed-in origin and
|
|
88
90
|
// opened the account menu for nobody on a signed-out Back from sign-up.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNative","_OxyContext","_useI18n","_useSurfaceHeader","_LogoText","_interopRequireDefault","_OxyAuthChooser","_accountDialogSnapshot","_jsxRuntime","e","__esModule","default","NAV_LOGO","jsx","height","OxyAccountDialogScreen","canGoBack","accountDialogController","controller","closeAccountDialog","useOxy","t","useI18n","subscribe","useCallback","listener","undefined","getSnapshot","EMPTY_ACCOUNT_DIALOG_SNAPSHOT","snapshot","useSyncExternalStore","view","hasSignedInAccounts","
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNative","_OxyContext","_useI18n","_useSurfaceHeader","_LogoText","_interopRequireDefault","_OxyAuthChooser","_accountDialogSnapshot","_jsxRuntime","e","__esModule","default","NAV_LOGO","jsx","height","OxyAccountDialogScreen","canGoBack","accountDialogController","controller","closeAccountDialog","useOxy","t","useI18n","subscribe","useCallback","listener","undefined","getSnapshot","EMPTY_ACCOUNT_DIALOG_SNAPSHOT","snapshot","useSyncExternalStore","view","hasSignedInAccounts","hasSession","showBack","backView","goBack","back","backsToHost","copy","headerCopy","useSurfaceHeader","titleContent","title","subtitle","onBack","View","style","styles","bodyContent","children","onComplete","SCREEN_MARGIN","StyleSheet","create","paddingTop","paddingBottom","paddingHorizontal","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAccountDialogScreen.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -149,30 +149,40 @@ const OxyAuthChooser = ({
|
|
|
149
149
|
const consumerHooks = (0, _react.useSyncExternalStore)(_accountDialogManager.subscribeToAccountDialogConsumerHooks, _accountDialogManager.getAccountDialogConsumerHooks, () => null);
|
|
150
150
|
const handleActivate = (0, _react.useCallback)(async contextId => {
|
|
151
151
|
if (!controller) return;
|
|
152
|
-
//
|
|
153
|
-
//
|
|
154
|
-
|
|
155
|
-
//
|
|
156
|
-
//
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
152
|
+
// The controller decides what choosing a row MEANS. Signed in it is a
|
|
153
|
+
// switch; signed out it is "Continue as @handle" — the same sign-in
|
|
154
|
+
// "Continue with Oxy" runs. The signed-out case is why this is not a
|
|
155
|
+
// host-side "already active → close": the device can list an identity
|
|
156
|
+
// (Commons') as active while THIS app holds no session, and closing on it
|
|
157
|
+
// left the app signed out behind a sheet that looked done (#1375 item 20).
|
|
158
|
+
const outcome = await controller.chooseContext(contextId).catch(() => 'failed');
|
|
159
|
+
switch (outcome) {
|
|
160
|
+
// Another switch or removal is already changing this device: the press
|
|
161
|
+
// is dropped, not queued — and it is not a failure to report.
|
|
162
|
+
case 'busy':
|
|
163
|
+
return;
|
|
164
|
+
// The sign-in flow owns the rest: its own view while it runs, and the
|
|
165
|
+
// dialog's close (through `onSignedIn`) when it completes.
|
|
166
|
+
case 'signing-in':
|
|
167
|
+
return;
|
|
168
|
+
// Already live: activating it again bumps nothing server-side, so treat
|
|
169
|
+
// the press as "yes, this one" and close.
|
|
170
|
+
case 'current':
|
|
171
|
+
onComplete?.();
|
|
172
|
+
return;
|
|
173
|
+
// The controller's own verdict on the SWITCH — never `snapshot.error`,
|
|
174
|
+
// which the directory re-read after a successful switch can also set.
|
|
175
|
+
case 'failed':
|
|
176
|
+
_toast.toast.error(t('accountSwitcher.toasts.activateFailed'));
|
|
177
|
+
return;
|
|
178
|
+
case 'switched':
|
|
179
|
+
// The subject changed, so every account-scoped query is now about
|
|
180
|
+
// somebody else. The runtime resets its own caches between the bearer
|
|
181
|
+
// commit and the notify; this drops the Query cache the same way.
|
|
182
|
+
queryClient.invalidateQueries();
|
|
183
|
+
onComplete?.();
|
|
184
|
+
return;
|
|
160
185
|
}
|
|
161
|
-
// The controller's own verdict on the SWITCH — never `snapshot.error`,
|
|
162
|
-
// which the directory re-read after a successful switch can also set.
|
|
163
|
-
// Reading that as "the switch failed" left the dialog open on a false
|
|
164
|
-
// error with the previous account's queries still cached.
|
|
165
|
-
const switched = await controller.activateContext(contextId).catch(() => false);
|
|
166
|
-
if (!switched) {
|
|
167
|
-
_toast.toast.error(t('accountSwitcher.toasts.activateFailed'));
|
|
168
|
-
return;
|
|
169
|
-
}
|
|
170
|
-
// The subject changed, so every account-scoped query is now about
|
|
171
|
-
// somebody else. The runtime resets its own caches between the bearer
|
|
172
|
-
// commit and the notify; this drops the Query cache the same way the
|
|
173
|
-
// account switch did.
|
|
174
|
-
queryClient.invalidateQueries();
|
|
175
|
-
onComplete?.();
|
|
176
186
|
}, [controller, onComplete, queryClient, t]);
|
|
177
187
|
|
|
178
188
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNative","_toast","_surfaces","_theme","_core","_reactQuery","_OxyContext","_useDeviceSwitcher","_useI18n","_accountDialogManager","_isWebBrowser","_commonsStoreLinks","_useServicesQueries","_AccountsMenuView","_interopRequireDefault","_SignInEntryView","_SignInRequestView","_SignUpView","_signInFailureMessage","_types","_accountDialogSnapshot","_jsxRuntime","e","__esModule","default","COMMONS_CREATE_IDENTITY_URL","ACCOUNTS_APP_URL","toastedFailureAttempt","WeakMap","OxyAuthChooser","onComplete","accountDialogController","controller","showBottomSheet","oxyServices","logout","openAvatarPicker","user","useOxy","theme","useTheme","t","useI18n","queryClient","useQueryClient","principals","useDeviceSwitcher","passkeyMode","useMemo","isWebBrowser","subscribe","useCallback","listener","undefined","maybeToastSignInError","signIn","getSnapshot","phase","get","attempt","set","message","signInFailureMessage","failure","toast","error","EMPTY_ACCOUNT_DIALOG_SNAPSHOT","snapshot","useSyncExternalStore","view","consumerHooks","subscribeToAccountDialogConsumerHooks","getAccountDialogConsumerHooks","handleActivate","contextId","isDeviceMutationInFlight","activeContext","switched","activateContext","catch","invalidateQueries","handleRemoveContext","group","find","principal","contexts","some","context","row","confirmed","surfaces","confirm","title","description","person","displayName","account","confirmLabel","cancelLabel","destructive","removed","signOutContext","success","handleRemovePrincipal","principalId","name","signOutPrincipal","handleSignOut","outcome","runDeviceMutation","ran","value","status","openExternal","url","Promise","resolve","then","Linking","openURL","handleManage","onNavigateManage","handleAdd","onAddAccount","add","handlers","onActivate","onRemoveContext","onRemovePrincipal","onAdd","onManage","onEditAvatar","hero","buildHero","colors","primary","alternatives","passkeyAvailable","onSignInWithPasskey","startPasskeyHubSignIn","onShowQr","showQr","onGetCommons","getCommonsAcquisitionUrl","Platform","OS","onCreateAccount","startSignup","showsAccountMenu","storageQuery","useAccountStorageUsage","enabled","storage","data","usedBytes","totalUsedBytes","limitBytes","totalLimitBytes","accountMenu","openUrl","openSheet","config","onOpenSettings","onOpenData","onManageStorage","onUpgradeStorage","onHelp","onPrivacy","screen","props","initialStep","onTerms","onSignOut","onOpenIdentity","IDENTITY_WEB_ORIGIN","customItems","menuItems","map","item","onPress","jsx","menu","onRetry","retrySignIn","onOpenHub","onCreateIdentityInCommons","onBackToSignIn","setView","onContinueWithOxy","signInWithOxy","fallbackAccent","handle","getNormalizedUserHandle","trim","addressLine","email","toLowerCase","endsWith","avatarUrl","avatar","getFileDownloadUrl","accentHex","resolveAccentHex","color","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAuthChooser.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNative","_toast","_surfaces","_theme","_core","_reactQuery","_OxyContext","_useDeviceSwitcher","_useI18n","_accountDialogManager","_isWebBrowser","_commonsStoreLinks","_useServicesQueries","_AccountsMenuView","_interopRequireDefault","_SignInEntryView","_SignInRequestView","_SignUpView","_signInFailureMessage","_types","_accountDialogSnapshot","_jsxRuntime","e","__esModule","default","COMMONS_CREATE_IDENTITY_URL","ACCOUNTS_APP_URL","toastedFailureAttempt","WeakMap","OxyAuthChooser","onComplete","accountDialogController","controller","showBottomSheet","oxyServices","logout","openAvatarPicker","user","useOxy","theme","useTheme","t","useI18n","queryClient","useQueryClient","principals","useDeviceSwitcher","passkeyMode","useMemo","isWebBrowser","subscribe","useCallback","listener","undefined","maybeToastSignInError","signIn","getSnapshot","phase","get","attempt","set","message","signInFailureMessage","failure","toast","error","EMPTY_ACCOUNT_DIALOG_SNAPSHOT","snapshot","useSyncExternalStore","view","consumerHooks","subscribeToAccountDialogConsumerHooks","getAccountDialogConsumerHooks","handleActivate","contextId","outcome","chooseContext","catch","invalidateQueries","handleRemoveContext","isDeviceMutationInFlight","group","find","principal","contexts","some","context","row","confirmed","surfaces","confirm","title","description","person","displayName","account","confirmLabel","cancelLabel","destructive","removed","signOutContext","success","handleRemovePrincipal","principalId","name","signOutPrincipal","handleSignOut","runDeviceMutation","ran","value","status","openExternal","url","Promise","resolve","then","Linking","openURL","handleManage","onNavigateManage","handleAdd","onAddAccount","add","handlers","onActivate","onRemoveContext","onRemovePrincipal","onAdd","onManage","onEditAvatar","hero","buildHero","colors","primary","alternatives","passkeyAvailable","onSignInWithPasskey","startPasskeyHubSignIn","onShowQr","showQr","onGetCommons","getCommonsAcquisitionUrl","Platform","OS","onCreateAccount","startSignup","showsAccountMenu","storageQuery","useAccountStorageUsage","enabled","storage","data","usedBytes","totalUsedBytes","limitBytes","totalLimitBytes","accountMenu","openUrl","openSheet","config","onOpenSettings","onOpenData","onManageStorage","onUpgradeStorage","onHelp","onPrivacy","screen","props","initialStep","onTerms","onSignOut","onOpenIdentity","IDENTITY_WEB_ORIGIN","customItems","menuItems","map","item","onPress","jsx","menu","onRetry","retrySignIn","onOpenHub","onCreateIdentityInCommons","onBackToSignIn","setView","onContinueWithOxy","signInWithOxy","fallbackAccent","handle","getNormalizedUserHandle","trim","addressLine","email","toLowerCase","endsWith","avatarUrl","avatar","getFileDownloadUrl","accentHex","resolveAccentHex","color","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAuthChooser.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -28,6 +28,12 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
|
|
|
28
28
|
*
|
|
29
29
|
* Existing accounts still render ABOVE the CTA: "continue as one of these" is a
|
|
30
30
|
* choice of WHO, not of HOW.
|
|
31
|
+
*
|
|
32
|
+
* Signed in (the "Add another account" entry), a row is an account to switch
|
|
33
|
+
* to, and the current one carries its check. Signed out, nothing here is
|
|
34
|
+
* current: the device may still list an identity it holds (Commons' shared
|
|
35
|
+
* one), but THIS app has no session, so each row reads "Continue as @handle"
|
|
36
|
+
* and choosing it signs in (OxyHQ/oxy#1375 items 20 and 21).
|
|
31
37
|
*/
|
|
32
38
|
|
|
33
39
|
const SignInEntryView = ({
|
|
@@ -77,6 +83,9 @@ const SignInEntryView = ({
|
|
|
77
83
|
}) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_primitives.AccountRow, {
|
|
78
84
|
context: context,
|
|
79
85
|
operatedBy: operatedBy,
|
|
86
|
+
continueAsLabel: snapshot.hasSession ? null : t('signin.chooser.continueAs', {
|
|
87
|
+
name: context.handle ? `@${context.handle}` : context.displayName
|
|
88
|
+
}),
|
|
80
89
|
theme: theme,
|
|
81
90
|
activating: snapshot.activatingContextId === context.contextId,
|
|
82
91
|
disabled: snapshot.activatingContextId !== null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","_button","_typography","_core","_TroubleDisclosure","_interopRequireDefault","_primitives","_styles","_jsxRuntime","e","__esModule","default","SignInEntryView","snapshot","principals","theme","t","handlers","onContinueWithOxy","alternatives","web","passkeyAvailable","troubleActions","key","label","onPress","onGetCommons","onShowQr","namesTheOperator","showsPrincipalHeaders","rows","flatMap","principal","contexts","map","context","operatedBy","isDelegated","name","displayName","jsxs","View","style","styles","signInBlock","children","length","jsx","AccountRow","activating","activatingContextId","contextId","disabled","onActivate","Dividerish","Text","mutedText","color","colors","textSecondary","Button","appearance","tone","size","onSignInWithPasskey","primaryButton","testID","SubtleLink","onCreateAccount","actions","revealed","_default","exports"],"sourceRoot":"../../../../../src","sources":["ui/components/authChooser/SignInEntryView.tsx"],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"names":["_reactNative","require","_button","_typography","_core","_TroubleDisclosure","_interopRequireDefault","_primitives","_styles","_jsxRuntime","e","__esModule","default","SignInEntryView","snapshot","principals","theme","t","handlers","onContinueWithOxy","alternatives","web","passkeyAvailable","troubleActions","key","label","onPress","onGetCommons","onShowQr","namesTheOperator","showsPrincipalHeaders","rows","flatMap","principal","contexts","map","context","operatedBy","isDelegated","name","displayName","jsxs","View","style","styles","signInBlock","children","length","jsx","AccountRow","continueAsLabel","hasSession","handle","activating","activatingContextId","contextId","disabled","onActivate","Dividerish","Text","mutedText","color","colors","textSecondary","Button","appearance","tone","size","onSignInWithPasskey","primaryButton","testID","SubtleLink","onCreateAccount","actions","revealed","_default","exports"],"sourceRoot":"../../../../../src","sources":["ui/components/authChooser/SignInEntryView.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -109,11 +109,18 @@ const Dividerish = ({
|
|
|
109
109
|
* directory), not from the theme and not from whoever is signed in. This surface
|
|
110
110
|
* is where a device holding two people is most visible, and it is reached while
|
|
111
111
|
* signed out — so there is no "current user" whose colour could stand in.
|
|
112
|
+
*
|
|
113
|
+
* `continueAsLabel` is the signed-out form. The device can list an identity
|
|
114
|
+
* (and even mark it active) while this app holds no session, so a check there
|
|
115
|
+
* would claim a sign-in that has not happened. Given a label, the row never
|
|
116
|
+
* reads as current: its first line is "Continue as @handle", the account's
|
|
117
|
+
* name moves to the second line, and it ends in a chevron like any other row.
|
|
112
118
|
*/
|
|
113
119
|
exports.Dividerish = Dividerish;
|
|
114
120
|
const AccountRow = ({
|
|
115
121
|
context,
|
|
116
122
|
operatedBy,
|
|
123
|
+
continueAsLabel = null,
|
|
117
124
|
theme,
|
|
118
125
|
activating,
|
|
119
126
|
disabled,
|
|
@@ -121,26 +128,28 @@ const AccountRow = ({
|
|
|
121
128
|
}) => {
|
|
122
129
|
const accent = (0, _types.resolveAccentHex)(context.color, theme.colors.primary);
|
|
123
130
|
const rowDisabled = disabled || !context.canActivate;
|
|
124
|
-
const
|
|
131
|
+
const current = continueAsLabel === null && context.isActive;
|
|
132
|
+
const primary = continueAsLabel ?? context.displayName;
|
|
133
|
+
const secondary = operatedBy ?? (continueAsLabel !== null ? context.displayName : context.handle ? `@${context.handle}` : null);
|
|
125
134
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_theme.BloomColorScope, {
|
|
126
135
|
colorPreset: (0, _types.toPreset)(context.color),
|
|
127
136
|
asChild: true,
|
|
128
137
|
children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Pressable, {
|
|
129
138
|
style: [_styles.authChooserStyles.accountRow, {
|
|
130
|
-
borderColor:
|
|
139
|
+
borderColor: current ? accent : theme.colors.border,
|
|
131
140
|
backgroundColor: theme.colors.card
|
|
132
141
|
}, rowDisabled && !activating ? _styles.authChooserStyles.rowDisabled : null],
|
|
133
142
|
onPress: onPress,
|
|
134
143
|
disabled: rowDisabled,
|
|
135
144
|
accessibilityRole: "button",
|
|
136
145
|
accessibilityState: {
|
|
137
|
-
selected:
|
|
146
|
+
selected: current,
|
|
138
147
|
disabled: rowDisabled
|
|
139
148
|
},
|
|
140
|
-
accessibilityLabel:
|
|
149
|
+
accessibilityLabel: primary,
|
|
141
150
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.View, {
|
|
142
151
|
style: [_styles.authChooserStyles.avatarRing, {
|
|
143
|
-
borderColor:
|
|
152
|
+
borderColor: current ? accent : 'transparent'
|
|
144
153
|
}],
|
|
145
154
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_avatar.Avatar, {
|
|
146
155
|
source: context.avatarUrl ?? undefined,
|
|
@@ -155,7 +164,7 @@ const AccountRow = ({
|
|
|
155
164
|
color: theme.colors.text
|
|
156
165
|
}],
|
|
157
166
|
numberOfLines: 1,
|
|
158
|
-
children:
|
|
167
|
+
children: primary
|
|
159
168
|
}), secondary ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.Text, {
|
|
160
169
|
style: [_styles.authChooserStyles.rowHandle, {
|
|
161
170
|
color: theme.colors.textSecondary
|
|
@@ -167,7 +176,7 @@ const AccountRow = ({
|
|
|
167
176
|
name: "loading",
|
|
168
177
|
size: 20,
|
|
169
178
|
color: accent
|
|
170
|
-
}) :
|
|
179
|
+
}) : current ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_MaterialCommunityIcons.default, {
|
|
171
180
|
name: "check-circle",
|
|
172
181
|
size: 20,
|
|
173
182
|
color: accent
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_components","_MaterialCommunityIcons","_interopRequireDefault","_avatar","_theme","_typography","_styles","_types","_jsxRuntime","e","__esModule","default","ROW_AVATAR_SIZE","HoverPressable","baseClassName","hoverClassName","rest","hovered","setHovered","useState","jsx","Pressable","className","onHoverIn","onHoverOut","exports","SubtleLink","label","theme","onPress","disabled","testID","accessibilityRole","accessibilityLabel","style","styles","footerLink","children","Text","linkText","color","colors","textSecondary","Dividerish","jsxs","View","dividerRow","dividerLine","backgroundColor","border","dividerText","AccountRow","context","operatedBy","activating","accent","resolveAccentHex","primary","rowDisabled","canActivate","secondary","handle","BloomColorScope","colorPreset","toPreset","asChild","accountRow","borderColor","
|
|
1
|
+
{"version":3,"names":["_react","require","_components","_MaterialCommunityIcons","_interopRequireDefault","_avatar","_theme","_typography","_styles","_types","_jsxRuntime","e","__esModule","default","ROW_AVATAR_SIZE","HoverPressable","baseClassName","hoverClassName","rest","hovered","setHovered","useState","jsx","Pressable","className","onHoverIn","onHoverOut","exports","SubtleLink","label","theme","onPress","disabled","testID","accessibilityRole","accessibilityLabel","style","styles","footerLink","children","Text","linkText","color","colors","textSecondary","Dividerish","jsxs","View","dividerRow","dividerLine","backgroundColor","border","dividerText","AccountRow","context","operatedBy","continueAsLabel","activating","accent","resolveAccentHex","primary","rowDisabled","canActivate","current","isActive","displayName","secondary","handle","BloomColorScope","colorPreset","toPreset","asChild","accountRow","borderColor","card","accessibilityState","selected","avatarRing","Avatar","source","avatarUrl","undefined","variant","name","size","rowMeta","rowName","text","numberOfLines","rowHandle"],"sourceRoot":"../../../../../src","sources":["ui/components/authChooser/primitives.tsx"],"mappings":"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","ignoreList":[]}
|