@oxy.so/services 4.0.3 → 4.0.5
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/hooks/accountDialogSnapshot.js +1 -0
- package/lib/commonjs/ui/hooks/accountDialogSnapshot.js.map +1 -1
- package/lib/commonjs/ui/runtime/createOxyRuntime.js +16 -0
- package/lib/commonjs/ui/runtime/createOxyRuntime.js.map +1 -1
- 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/hooks/accountDialogSnapshot.js +1 -0
- package/lib/module/ui/hooks/accountDialogSnapshot.js.map +1 -1
- package/lib/module/ui/runtime/createOxyRuntime.js +16 -0
- package/lib/module/ui/runtime/createOxyRuntime.js.map +1 -1
- 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/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/runtime/createOxyRuntime.d.ts +7 -2
- package/lib/typescript/commonjs/ui/runtime/createOxyRuntime.d.ts.map +1 -1
- 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/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/runtime/createOxyRuntime.d.ts +7 -2
- package/lib/typescript/module/ui/runtime/createOxyRuntime.d.ts.map +1 -1
- 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/hooks/accountDialogSnapshot.ts +1 -0
- package/src/ui/runtime/createOxyRuntime.ts +23 -2
|
@@ -104,6 +104,14 @@ function createOxyRuntime(config) {
|
|
|
104
104
|
let dirty = false;
|
|
105
105
|
/** The subject as it stood when the OUTERMOST transition opened. */
|
|
106
106
|
let subjectAtEntry = null;
|
|
107
|
+
/**
|
|
108
|
+
* Bumped by every local teardown. A projection captures it before its first
|
|
109
|
+
* await and discards itself if it moved: the revision guard alone cannot see
|
|
110
|
+
* a sign-out, because a local teardown (the token-null lane, a `logoutAll`
|
|
111
|
+
* whose device call already failed) leaves `SessionClient` holding the SAME
|
|
112
|
+
* state, at the same revision, that the projection was started for.
|
|
113
|
+
*/
|
|
114
|
+
let sessionGeneration = 0;
|
|
107
115
|
function buildSnapshot() {
|
|
108
116
|
const activeContext = (0, _core.resolveActiveContext)(facts.directory);
|
|
109
117
|
return Object.freeze({
|
|
@@ -239,6 +247,7 @@ function createOxyRuntime(config) {
|
|
|
239
247
|
// profile fetch if a fresher state has landed — last-writer-wins, so two
|
|
240
248
|
// overlapping projections can never publish in the wrong order.
|
|
241
249
|
const capturedRevision = state.revision;
|
|
250
|
+
const capturedGeneration = sessionGeneration;
|
|
242
251
|
// Resolve the pin BEFORE the fetch (memoised: one storage + keychain read
|
|
243
252
|
// per boot) so the first pass over a freshly applied state is already bound.
|
|
244
253
|
// Deferring it would let a sibling app's switch render once as this
|
|
@@ -252,6 +261,12 @@ function createOxyRuntime(config) {
|
|
|
252
261
|
logger('Failed to resolve account profiles during the device projection', fetchError);
|
|
253
262
|
return;
|
|
254
263
|
}
|
|
264
|
+
if (capturedGeneration !== sessionGeneration) {
|
|
265
|
+
// Signed out while the profiles were in flight. Committing now would put
|
|
266
|
+
// the account back on a device with no bearer — the "Hi <old user>"
|
|
267
|
+
// greeting to a signed-out visitor.
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
255
270
|
const latest = sessionClient.getState();
|
|
256
271
|
if (!latest || latest.revision !== capturedRevision) {
|
|
257
272
|
return;
|
|
@@ -417,6 +432,7 @@ function createOxyRuntime(config) {
|
|
|
417
432
|
});
|
|
418
433
|
},
|
|
419
434
|
clearSession() {
|
|
435
|
+
sessionGeneration += 1;
|
|
420
436
|
transition(() => {
|
|
421
437
|
setSessions(EMPTY_SESSIONS);
|
|
422
438
|
setActiveSessionIdFact(null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_core","require","EMPTY_SESSIONS","deriveStatus","facts","authResolved","account","error","deriveTokenStatus","hasAccessToken","tokenReady","derivePrincipal","activeContext","profiles","get","actor","userId","createOxyRuntime","config","oxyServices","sessionClient","sessionClientHost","identity","onSubjectChange","onDeviceEmpty","onSessionsProjected","onIdentityUnbound","logger","deviceState","directory","Map","sessions","activeSessionId","pinnedAccountId","isLoading","storageReady","Boolean","getAccessToken","switching","listeners","Set","snapshot","buildSnapshot","depth","dirty","subjectAtEntry","resolveActiveContext","Object","freeze","status","device","principal","tokenStatus","message","code","notify","listener","transition","mutate","id","nextSubject","previous","next","touch","setSessions","sessionsArraysEqual","setActiveSessionIdFact","sessionId","setAccountFact","user","normalizeUserIdentity","reconcileFromClient","state","getState","accounts","length","setCurrentAccountId","capturedRevision","revision","ensurePinnedAccountId","ids","accountIdsOf","users","getUsersByIds","fetchError","latest","activeSessionIdOf","getDirectory","resolved","set","projected","normalizeAndSortSessions","deviceStateToClientSessions","map","session","activeUser","activeUserOf","activeAccountId","getSnapshot","subscribe","add","delete","start","catch","batch","activateContext","contextId","setSwitching","signOutContext","signOutPrincipal","principalId","refreshDirectory","setAccount","setLoading","loading","setError","setStorageReady","ready","setTokenReady","setHasAccessToken","has","markAuthResolved","mergeSessions","incoming","options","processed","merge","mergeSessionLists","preserveSessionIds","setActiveSessionId","clearSession"],"sourceRoot":"../../../../src","sources":["ui/runtime/createOxyRuntime.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_core","require","EMPTY_SESSIONS","deriveStatus","facts","authResolved","account","error","deriveTokenStatus","hasAccessToken","tokenReady","derivePrincipal","activeContext","profiles","get","actor","userId","createOxyRuntime","config","oxyServices","sessionClient","sessionClientHost","identity","onSubjectChange","onDeviceEmpty","onSessionsProjected","onIdentityUnbound","logger","deviceState","directory","Map","sessions","activeSessionId","pinnedAccountId","isLoading","storageReady","Boolean","getAccessToken","switching","listeners","Set","snapshot","buildSnapshot","depth","dirty","subjectAtEntry","sessionGeneration","resolveActiveContext","Object","freeze","status","device","principal","tokenStatus","message","code","notify","listener","transition","mutate","id","nextSubject","previous","next","touch","setSessions","sessionsArraysEqual","setActiveSessionIdFact","sessionId","setAccountFact","user","normalizeUserIdentity","reconcileFromClient","state","getState","accounts","length","setCurrentAccountId","capturedRevision","revision","capturedGeneration","ensurePinnedAccountId","ids","accountIdsOf","users","getUsersByIds","fetchError","latest","activeSessionIdOf","getDirectory","resolved","set","projected","normalizeAndSortSessions","deviceStateToClientSessions","map","session","activeUser","activeUserOf","activeAccountId","getSnapshot","subscribe","add","delete","start","catch","batch","activateContext","contextId","setSwitching","signOutContext","signOutPrincipal","principalId","refreshDirectory","setAccount","setLoading","loading","setError","setStorageReady","ready","setTokenReady","setHasAccessToken","has","markAuthResolved","mergeSessions","incoming","options","processed","merge","mergeSessionLists","preserveSessionIds","setActiveSessionId","clearSession"],"sourceRoot":"../../../../src","sources":["ui/runtime/createOxyRuntime.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -75,9 +75,11 @@ const OxyAccountDialogScreen = ({
|
|
|
75
75
|
const {
|
|
76
76
|
view
|
|
77
77
|
} = snapshot;
|
|
78
|
-
// Names the entry view "Add another account" rather than "Sign in" when
|
|
79
|
-
//
|
|
80
|
-
|
|
78
|
+
// Names the entry view "Add another account" rather than "Sign in" only when
|
|
79
|
+
// THIS app is signed in. Not the directory's size: the device can go on
|
|
80
|
+
// listing a shared identity (Commons') after the app signed out, and that
|
|
81
|
+
// titled a signed-out sheet "Add another account" (OxyHQ/oxy#1375 item 21).
|
|
82
|
+
const hasSignedInAccounts = snapshot.hasSession;
|
|
81
83
|
// Where back leads is the CONTROLLER's answer (`snapshot.backView`), never a
|
|
82
84
|
// table here: a host-side "back = accounts" assumed a signed-in origin and
|
|
83
85
|
// opened the account menu for nobody on a signed-out Back from sign-up.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useSyncExternalStore","StyleSheet","View","useOxy","useI18n","useSurfaceHeader","LogoText","OxyAuthChooser","EMPTY_ACCOUNT_DIALOG_SNAPSHOT","jsx","_jsx","NAV_LOGO","height","OxyAccountDialogScreen","canGoBack","accountDialogController","controller","closeAccountDialog","t","subscribe","listener","undefined","getSnapshot","snapshot","view","hasSignedInAccounts","
|
|
1
|
+
{"version":3,"names":["useCallback","useSyncExternalStore","StyleSheet","View","useOxy","useI18n","useSurfaceHeader","LogoText","OxyAuthChooser","EMPTY_ACCOUNT_DIALOG_SNAPSHOT","jsx","_jsx","NAV_LOGO","height","OxyAccountDialogScreen","canGoBack","accountDialogController","controller","closeAccountDialog","t","subscribe","listener","undefined","getSnapshot","snapshot","view","hasSignedInAccounts","hasSession","showBack","backView","goBack","back","backsToHost","copy","headerCopy","titleContent","title","subtitle","onBack","style","styles","bodyContent","children","onComplete","SCREEN_MARGIN","create","paddingTop","paddingBottom","paddingHorizontal"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAccountDialogScreen.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -146,30 +146,40 @@ const OxyAuthChooser = ({
|
|
|
146
146
|
const consumerHooks = useSyncExternalStore(subscribeToAccountDialogConsumerHooks, getAccountDialogConsumerHooks, () => null);
|
|
147
147
|
const handleActivate = useCallback(async contextId => {
|
|
148
148
|
if (!controller) return;
|
|
149
|
-
//
|
|
150
|
-
//
|
|
151
|
-
|
|
152
|
-
//
|
|
153
|
-
//
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
149
|
+
// The controller decides what choosing a row MEANS. Signed in it is a
|
|
150
|
+
// switch; signed out it is "Continue as @handle" — the same sign-in
|
|
151
|
+
// "Continue with Oxy" runs. The signed-out case is why this is not a
|
|
152
|
+
// host-side "already active → close": the device can list an identity
|
|
153
|
+
// (Commons') as active while THIS app holds no session, and closing on it
|
|
154
|
+
// left the app signed out behind a sheet that looked done (#1375 item 20).
|
|
155
|
+
const outcome = await controller.chooseContext(contextId).catch(() => 'failed');
|
|
156
|
+
switch (outcome) {
|
|
157
|
+
// Another switch or removal is already changing this device: the press
|
|
158
|
+
// is dropped, not queued — and it is not a failure to report.
|
|
159
|
+
case 'busy':
|
|
160
|
+
return;
|
|
161
|
+
// The sign-in flow owns the rest: its own view while it runs, and the
|
|
162
|
+
// dialog's close (through `onSignedIn`) when it completes.
|
|
163
|
+
case 'signing-in':
|
|
164
|
+
return;
|
|
165
|
+
// Already live: activating it again bumps nothing server-side, so treat
|
|
166
|
+
// the press as "yes, this one" and close.
|
|
167
|
+
case 'current':
|
|
168
|
+
onComplete?.();
|
|
169
|
+
return;
|
|
170
|
+
// The controller's own verdict on the SWITCH — never `snapshot.error`,
|
|
171
|
+
// which the directory re-read after a successful switch can also set.
|
|
172
|
+
case 'failed':
|
|
173
|
+
toast.error(t('accountSwitcher.toasts.activateFailed'));
|
|
174
|
+
return;
|
|
175
|
+
case 'switched':
|
|
176
|
+
// The subject changed, so every account-scoped query is now about
|
|
177
|
+
// somebody else. The runtime resets its own caches between the bearer
|
|
178
|
+
// commit and the notify; this drops the Query cache the same way.
|
|
179
|
+
queryClient.invalidateQueries();
|
|
180
|
+
onComplete?.();
|
|
181
|
+
return;
|
|
157
182
|
}
|
|
158
|
-
// The controller's own verdict on the SWITCH — never `snapshot.error`,
|
|
159
|
-
// which the directory re-read after a successful switch can also set.
|
|
160
|
-
// Reading that as "the switch failed" left the dialog open on a false
|
|
161
|
-
// error with the previous account's queries still cached.
|
|
162
|
-
const switched = await controller.activateContext(contextId).catch(() => false);
|
|
163
|
-
if (!switched) {
|
|
164
|
-
toast.error(t('accountSwitcher.toasts.activateFailed'));
|
|
165
|
-
return;
|
|
166
|
-
}
|
|
167
|
-
// The subject changed, so every account-scoped query is now about
|
|
168
|
-
// somebody else. The runtime resets its own caches between the bearer
|
|
169
|
-
// commit and the notify; this drops the Query cache the same way the
|
|
170
|
-
// account switch did.
|
|
171
|
-
queryClient.invalidateQueries();
|
|
172
|
-
onComplete?.();
|
|
173
183
|
}, [controller, onComplete, queryClient, t]);
|
|
174
184
|
|
|
175
185
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useMemo","useSyncExternalStore","Linking","Platform","toast","surfaces","useTheme","IDENTITY_WEB_ORIGIN","getNormalizedUserHandle","useQueryClient","useOxy","useDeviceSwitcher","useI18n","getAccountDialogConsumerHooks","subscribeToAccountDialogConsumerHooks","isWebBrowser","getCommonsAcquisitionUrl","useAccountStorageUsage","AccountsMenuView","SignInEntryView","SignInRequestView","SignUpView","signInFailureMessage","resolveAccentHex","EMPTY_ACCOUNT_DIALOG_SNAPSHOT","jsx","_jsx","COMMONS_CREATE_IDENTITY_URL","ACCOUNTS_APP_URL","toastedFailureAttempt","WeakMap","OxyAuthChooser","onComplete","accountDialogController","controller","showBottomSheet","oxyServices","logout","openAvatarPicker","user","theme","t","queryClient","principals","passkeyMode","subscribe","listener","undefined","maybeToastSignInError","signIn","getSnapshot","phase","get","attempt","set","message","failure","error","snapshot","view","consumerHooks","handleActivate","contextId","isDeviceMutationInFlight","activeContext","switched","activateContext","catch","invalidateQueries","handleRemoveContext","group","find","principal","contexts","some","context","row","confirmed","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","openURL","handleManage","onNavigateManage","handleAdd","onAddAccount","add","handlers","onActivate","onRemoveContext","onRemovePrincipal","onAdd","onManage","onEditAvatar","hero","buildHero","colors","primary","alternatives","passkeyAvailable","onSignInWithPasskey","startPasskeyHubSignIn","onShowQr","showQr","onGetCommons","OS","onCreateAccount","startSignup","showsAccountMenu","storageQuery","enabled","storage","data","usedBytes","totalUsedBytes","limitBytes","totalLimitBytes","accountMenu","openUrl","openSheet","config","onOpenSettings","onOpenData","onManageStorage","onUpgradeStorage","onHelp","onPrivacy","screen","props","initialStep","onTerms","onSignOut","onOpenIdentity","customItems","menuItems","map","item","onPress","menu","onRetry","retrySignIn","onOpenHub","onCreateIdentityInCommons","onBackToSignIn","setView","onContinueWithOxy","signInWithOxy","fallbackAccent","handle","trim","addressLine","email","toLowerCase","endsWith","avatarUrl","avatar","getFileDownloadUrl","accentHex","color"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAuthChooser.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["useCallback","useMemo","useSyncExternalStore","Linking","Platform","toast","surfaces","useTheme","IDENTITY_WEB_ORIGIN","getNormalizedUserHandle","useQueryClient","useOxy","useDeviceSwitcher","useI18n","getAccountDialogConsumerHooks","subscribeToAccountDialogConsumerHooks","isWebBrowser","getCommonsAcquisitionUrl","useAccountStorageUsage","AccountsMenuView","SignInEntryView","SignInRequestView","SignUpView","signInFailureMessage","resolveAccentHex","EMPTY_ACCOUNT_DIALOG_SNAPSHOT","jsx","_jsx","COMMONS_CREATE_IDENTITY_URL","ACCOUNTS_APP_URL","toastedFailureAttempt","WeakMap","OxyAuthChooser","onComplete","accountDialogController","controller","showBottomSheet","oxyServices","logout","openAvatarPicker","user","theme","t","queryClient","principals","passkeyMode","subscribe","listener","undefined","maybeToastSignInError","signIn","getSnapshot","phase","get","attempt","set","message","failure","error","snapshot","view","consumerHooks","handleActivate","contextId","outcome","chooseContext","catch","invalidateQueries","handleRemoveContext","isDeviceMutationInFlight","group","find","principal","contexts","some","context","row","confirmed","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","openURL","handleManage","onNavigateManage","handleAdd","onAddAccount","add","handlers","onActivate","onRemoveContext","onRemovePrincipal","onAdd","onManage","onEditAvatar","hero","buildHero","colors","primary","alternatives","passkeyAvailable","onSignInWithPasskey","startPasskeyHubSignIn","onShowQr","showQr","onGetCommons","OS","onCreateAccount","startSignup","showsAccountMenu","storageQuery","enabled","storage","data","usedBytes","totalUsedBytes","limitBytes","totalLimitBytes","accountMenu","openUrl","openSheet","config","onOpenSettings","onOpenData","onManageStorage","onUpgradeStorage","onHelp","onPrivacy","screen","props","initialStep","onTerms","onSignOut","onOpenIdentity","customItems","menuItems","map","item","onPress","menu","onRetry","retrySignIn","onOpenHub","onCreateIdentityInCommons","onBackToSignIn","setView","onContinueWithOxy","signInWithOxy","fallbackAccent","handle","trim","addressLine","email","toLowerCase","endsWith","avatarUrl","avatar","getFileDownloadUrl","accentHex","color"],"sourceRoot":"../../../../src","sources":["ui/components/OxyAuthChooser.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -15,6 +15,12 @@
|
|
|
15
15
|
*
|
|
16
16
|
* Existing accounts still render ABOVE the CTA: "continue as one of these" is a
|
|
17
17
|
* choice of WHO, not of HOW.
|
|
18
|
+
*
|
|
19
|
+
* Signed in (the "Add another account" entry), a row is an account to switch
|
|
20
|
+
* to, and the current one carries its check. Signed out, nothing here is
|
|
21
|
+
* current: the device may still list an identity it holds (Commons' shared
|
|
22
|
+
* one), but THIS app has no session, so each row reads "Continue as @handle"
|
|
23
|
+
* and choosing it signs in (OxyHQ/oxy#1375 items 20 and 21).
|
|
18
24
|
*/
|
|
19
25
|
|
|
20
26
|
import { View } from 'react-native';
|
|
@@ -72,6 +78,9 @@ const SignInEntryView = ({
|
|
|
72
78
|
}) => /*#__PURE__*/_jsx(AccountRow, {
|
|
73
79
|
context: context,
|
|
74
80
|
operatedBy: operatedBy,
|
|
81
|
+
continueAsLabel: snapshot.hasSession ? null : t('signin.chooser.continueAs', {
|
|
82
|
+
name: context.handle ? `@${context.handle}` : context.displayName
|
|
83
|
+
}),
|
|
75
84
|
theme: theme,
|
|
76
85
|
activating: snapshot.activatingContextId === context.contextId,
|
|
77
86
|
disabled: snapshot.activatingContextId !== null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["View","Button","Text","showsPrincipalHeaders","TroubleDisclosure","AccountRow","Dividerish","SubtleLink","authChooserStyles","styles","jsx","_jsx","jsxs","_jsxs","SignInEntryView","snapshot","principals","theme","t","handlers","onContinueWithOxy","alternatives","web","passkeyAvailable","troubleActions","key","label","onPress","onGetCommons","onShowQr","namesTheOperator","rows","flatMap","principal","contexts","map","context","operatedBy","isDelegated","name","displayName","style","signInBlock","children","length","activating","activatingContextId","contextId","disabled","onActivate","mutedText","color","colors","textSecondary","appearance","tone","size","onSignInWithPasskey","primaryButton","testID","onCreateAccount","actions","revealed"],"sourceRoot":"../../../../../src","sources":["ui/components/authChooser/SignInEntryView.tsx"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAGA,SAASA,IAAI,QAAQ,cAAc;AACnC,SAASC,MAAM,QAAQ,sBAAsB;AAC7C,SAASC,IAAI,QAAQ,0BAA0B;AAC/C,SACEC,qBAAqB,QAGhB,cAAc;AACrB,OAAOC,iBAAiB,MAAM,wBAAqB;AACnD,SAASC,UAAU,EAAEC,UAAU,EAAEC,UAAU,QAAQ,iBAAc;AACjE,SAASC,iBAAiB,IAAIC,MAAM,QAAQ,aAAU;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAqBvD,MAAMC,eAA+C,GAAGA,CAAC;EACvDC,QAAQ;EACRC,UAAU;EACVC,KAAK;EACLC,CAAC;EACDC,QAAQ;EACRC,iBAAiB;EACjBC;AACF,CAAC,KAAK;EACJ,MAAMC,GAAG,GAAGD,YAAY,CAACE,gBAAgB;;EAEzC;EACA;EACA,MAAMC,cAAwC,GAAGF,GAAG,GAChD,CAAC;IAAEG,GAAG,EAAE,kBAAkB;IAAEC,KAAK,EAAER,CAAC,CAAC,4BAA4B,CAAC;IAAES,OAAO,EAAEN,YAAY,CAACO;EAAa,CAAC,CAAC,GACzG,CACE;IAAEH,GAAG,EAAE,cAAc;IAAEC,KAAK,EAAER,CAAC,CAAC,wBAAwB,CAAC;IAAES,OAAO,EAAEN,YAAY,CAACQ;EAAS,CAAC,EAC3F;IAAEJ,GAAG,EAAE,kBAAkB;IAAEC,KAAK,EAAER,CAAC,CAAC,4BAA4B,CAAC;IAAES,OAAO,EAAEN,YAAY,CAACO;EAAa,CAAC,CACxG;;EAEL;EACA;EACA;EACA,MAAME,gBAAgB,GAAG3B,qBAAqB,CAACa,UAAU,CAAC;EAC1D,MAAMe,IAAI,GAAGf,UAAU,CAACgB,OAAO,CAAEC,SAAS,IACxCA,SAAS,CAACC,QAAQ,CAACC,GAAG,CAAEC,OAAO,KAAM;IACnCA,OAAO;IACPC,UAAU,EACRP,gBAAgB,IAAIM,OAAO,CAACE,WAAW,GACnCpB,CAAC,CAAC,oCAAoC,EAAE;MAAEqB,IAAI,EAAEN,SAAS,CAACO;IAAY,CAAC,CAAC,GACxE;EACR,CAAC,CAAC,CACJ,CAAC;EAED,oBACE3B,KAAA,CAACb,IAAI;IAACyC,KAAK,EAAEhC,MAAM,CAACiC,WAAY;IAAAC,QAAA,GAC7BZ,IAAI,CAACa,MAAM,GAAG,CAAC,gBACd/B,KAAA,CAACb,IAAI;MAACyC,KAAK,EAAEhC,MAAM,CAACsB,IAAK;MAAAY,QAAA,GACtBZ,IAAI,CAACI,GAAG,CAAC,CAAC;QAAEC,OAAO;QAAEC;MAAW,CAAC,kBAChC1B,IAAA,CAACN,UAAU;QAET+B,OAAO,EAAEA,OAAQ;QACjBC,UAAU,EAAEA,UAAW;
|
|
1
|
+
{"version":3,"names":["View","Button","Text","showsPrincipalHeaders","TroubleDisclosure","AccountRow","Dividerish","SubtleLink","authChooserStyles","styles","jsx","_jsx","jsxs","_jsxs","SignInEntryView","snapshot","principals","theme","t","handlers","onContinueWithOxy","alternatives","web","passkeyAvailable","troubleActions","key","label","onPress","onGetCommons","onShowQr","namesTheOperator","rows","flatMap","principal","contexts","map","context","operatedBy","isDelegated","name","displayName","style","signInBlock","children","length","continueAsLabel","hasSession","handle","activating","activatingContextId","contextId","disabled","onActivate","mutedText","color","colors","textSecondary","appearance","tone","size","onSignInWithPasskey","primaryButton","testID","onCreateAccount","actions","revealed"],"sourceRoot":"../../../../../src","sources":["ui/components/authChooser/SignInEntryView.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -104,10 +104,17 @@ export const Dividerish = ({
|
|
|
104
104
|
* directory), not from the theme and not from whoever is signed in. This surface
|
|
105
105
|
* is where a device holding two people is most visible, and it is reached while
|
|
106
106
|
* signed out — so there is no "current user" whose colour could stand in.
|
|
107
|
+
*
|
|
108
|
+
* `continueAsLabel` is the signed-out form. The device can list an identity
|
|
109
|
+
* (and even mark it active) while this app holds no session, so a check there
|
|
110
|
+
* would claim a sign-in that has not happened. Given a label, the row never
|
|
111
|
+
* reads as current: its first line is "Continue as @handle", the account's
|
|
112
|
+
* name moves to the second line, and it ends in a chevron like any other row.
|
|
107
113
|
*/
|
|
108
114
|
export const AccountRow = ({
|
|
109
115
|
context,
|
|
110
116
|
operatedBy,
|
|
117
|
+
continueAsLabel = null,
|
|
111
118
|
theme,
|
|
112
119
|
activating,
|
|
113
120
|
disabled,
|
|
@@ -115,26 +122,28 @@ export const AccountRow = ({
|
|
|
115
122
|
}) => {
|
|
116
123
|
const accent = resolveAccentHex(context.color, theme.colors.primary);
|
|
117
124
|
const rowDisabled = disabled || !context.canActivate;
|
|
118
|
-
const
|
|
125
|
+
const current = continueAsLabel === null && context.isActive;
|
|
126
|
+
const primary = continueAsLabel ?? context.displayName;
|
|
127
|
+
const secondary = operatedBy ?? (continueAsLabel !== null ? context.displayName : context.handle ? `@${context.handle}` : null);
|
|
119
128
|
return /*#__PURE__*/_jsx(BloomColorScope, {
|
|
120
129
|
colorPreset: toPreset(context.color),
|
|
121
130
|
asChild: true,
|
|
122
131
|
children: /*#__PURE__*/_jsxs(Pressable, {
|
|
123
132
|
style: [styles.accountRow, {
|
|
124
|
-
borderColor:
|
|
133
|
+
borderColor: current ? accent : theme.colors.border,
|
|
125
134
|
backgroundColor: theme.colors.card
|
|
126
135
|
}, rowDisabled && !activating ? styles.rowDisabled : null],
|
|
127
136
|
onPress: onPress,
|
|
128
137
|
disabled: rowDisabled,
|
|
129
138
|
accessibilityRole: "button",
|
|
130
139
|
accessibilityState: {
|
|
131
|
-
selected:
|
|
140
|
+
selected: current,
|
|
132
141
|
disabled: rowDisabled
|
|
133
142
|
},
|
|
134
|
-
accessibilityLabel:
|
|
143
|
+
accessibilityLabel: primary,
|
|
135
144
|
children: [/*#__PURE__*/_jsx(View, {
|
|
136
145
|
style: [styles.avatarRing, {
|
|
137
|
-
borderColor:
|
|
146
|
+
borderColor: current ? accent : 'transparent'
|
|
138
147
|
}],
|
|
139
148
|
children: /*#__PURE__*/_jsx(Avatar, {
|
|
140
149
|
source: context.avatarUrl ?? undefined,
|
|
@@ -149,7 +158,7 @@ export const AccountRow = ({
|
|
|
149
158
|
color: theme.colors.text
|
|
150
159
|
}],
|
|
151
160
|
numberOfLines: 1,
|
|
152
|
-
children:
|
|
161
|
+
children: primary
|
|
153
162
|
}), secondary ? /*#__PURE__*/_jsx(Text, {
|
|
154
163
|
style: [styles.rowHandle, {
|
|
155
164
|
color: theme.colors.textSecondary
|
|
@@ -161,7 +170,7 @@ export const AccountRow = ({
|
|
|
161
170
|
name: "loading",
|
|
162
171
|
size: 20,
|
|
163
172
|
color: accent
|
|
164
|
-
}) :
|
|
173
|
+
}) : current ? /*#__PURE__*/_jsx(MaterialCommunityIcons, {
|
|
165
174
|
name: "check-circle",
|
|
166
175
|
size: 20,
|
|
167
176
|
color: accent
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useState","Pressable","View","MaterialCommunityIcons","Avatar","BloomColorScope","Text","authChooserStyles","styles","resolveAccentHex","toPreset","jsx","_jsx","jsxs","_jsxs","ROW_AVATAR_SIZE","HoverPressable","baseClassName","hoverClassName","rest","hovered","setHovered","className","onHoverIn","onHoverOut","SubtleLink","label","theme","onPress","disabled","testID","accessibilityRole","accessibilityLabel","style","footerLink","children","linkText","color","colors","textSecondary","Dividerish","dividerRow","dividerLine","backgroundColor","border","dividerText","AccountRow","context","operatedBy","activating","accent","primary","rowDisabled","canActivate","secondary","handle","colorPreset","asChild","accountRow","borderColor","
|
|
1
|
+
{"version":3,"names":["useState","Pressable","View","MaterialCommunityIcons","Avatar","BloomColorScope","Text","authChooserStyles","styles","resolveAccentHex","toPreset","jsx","_jsx","jsxs","_jsxs","ROW_AVATAR_SIZE","HoverPressable","baseClassName","hoverClassName","rest","hovered","setHovered","className","onHoverIn","onHoverOut","SubtleLink","label","theme","onPress","disabled","testID","accessibilityRole","accessibilityLabel","style","footerLink","children","linkText","color","colors","textSecondary","Dividerish","dividerRow","dividerLine","backgroundColor","border","dividerText","AccountRow","context","operatedBy","continueAsLabel","activating","accent","primary","rowDisabled","canActivate","current","isActive","displayName","secondary","handle","colorPreset","asChild","accountRow","borderColor","card","accessibilityState","selected","avatarRing","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":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["EMPTY_ACCOUNT_DIALOG_SNAPSHOT","view","backView","directory","activeContext","activatingContextId","removingContextId","removingPrincipalId","loading","error","signIn","phase","authorizeCode","qrPayload","expiresAt","failure","route","routeFailed","pushSentAt","openedAt","progress","attempt","commonsAvailability"],"sourceRoot":"../../../../src","sources":["ui/hooks/accountDialogSnapshot.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,6BAAoD,GAAG;EAClEC,IAAI,EAAE,UAAU;EAChBC,QAAQ,EAAE,IAAI;EACdC,SAAS,EAAE,IAAI;EACfC,aAAa,EAAE,IAAI;EACnBC,mBAAmB,EAAE,IAAI;EACzBC,iBAAiB,EAAE,IAAI;EACvBC,mBAAmB,EAAE,IAAI;EACzBC,OAAO,EAAE,KAAK;EACdC,KAAK,EAAE,IAAI;EACXC,MAAM,EAAE;IACNC,KAAK,EAAE,MAAM;IACbC,aAAa,EAAE,IAAI;IACnBC,SAAS,EAAE,IAAI;IACfC,SAAS,EAAE,IAAI;IACfL,KAAK,EAAE,IAAI;IACXM,OAAO,EAAE,IAAI;IACbC,KAAK,EAAE,IAAI;IACXC,WAAW,EAAE,KAAK;IAClBC,UAAU,EAAE,IAAI;IAChBC,QAAQ,EAAE,IAAI;IACdC,QAAQ,EAAE,MAAM;IAChBC,OAAO,EAAE;EACX,CAAC;EACDC,mBAAmB,EAAE;AACvB,CAAC","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["EMPTY_ACCOUNT_DIALOG_SNAPSHOT","view","backView","hasSession","directory","activeContext","activatingContextId","removingContextId","removingPrincipalId","loading","error","signIn","phase","authorizeCode","qrPayload","expiresAt","failure","route","routeFailed","pushSentAt","openedAt","progress","attempt","commonsAvailability"],"sourceRoot":"../../../../src","sources":["ui/hooks/accountDialogSnapshot.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,6BAAoD,GAAG;EAClEC,IAAI,EAAE,UAAU;EAChBC,QAAQ,EAAE,IAAI;EACdC,UAAU,EAAE,KAAK;EACjBC,SAAS,EAAE,IAAI;EACfC,aAAa,EAAE,IAAI;EACnBC,mBAAmB,EAAE,IAAI;EACzBC,iBAAiB,EAAE,IAAI;EACvBC,mBAAmB,EAAE,IAAI;EACzBC,OAAO,EAAE,KAAK;EACdC,KAAK,EAAE,IAAI;EACXC,MAAM,EAAE;IACNC,KAAK,EAAE,MAAM;IACbC,aAAa,EAAE,IAAI;IACnBC,SAAS,EAAE,IAAI;IACfC,SAAS,EAAE,IAAI;IACfL,KAAK,EAAE,IAAI;IACXM,OAAO,EAAE,IAAI;IACbC,KAAK,EAAE,IAAI;IACXC,WAAW,EAAE,KAAK;IAClBC,UAAU,EAAE,IAAI;IAChBC,QAAQ,EAAE,IAAI;IACdC,QAAQ,EAAE,MAAM;IAChBC,OAAO,EAAE;EACX,CAAC;EACDC,mBAAmB,EAAE;AACvB,CAAC","ignoreList":[]}
|
|
@@ -101,6 +101,14 @@ export function createOxyRuntime(config) {
|
|
|
101
101
|
let dirty = false;
|
|
102
102
|
/** The subject as it stood when the OUTERMOST transition opened. */
|
|
103
103
|
let subjectAtEntry = null;
|
|
104
|
+
/**
|
|
105
|
+
* Bumped by every local teardown. A projection captures it before its first
|
|
106
|
+
* await and discards itself if it moved: the revision guard alone cannot see
|
|
107
|
+
* a sign-out, because a local teardown (the token-null lane, a `logoutAll`
|
|
108
|
+
* whose device call already failed) leaves `SessionClient` holding the SAME
|
|
109
|
+
* state, at the same revision, that the projection was started for.
|
|
110
|
+
*/
|
|
111
|
+
let sessionGeneration = 0;
|
|
104
112
|
function buildSnapshot() {
|
|
105
113
|
const activeContext = resolveActiveContext(facts.directory);
|
|
106
114
|
return Object.freeze({
|
|
@@ -236,6 +244,7 @@ export function createOxyRuntime(config) {
|
|
|
236
244
|
// profile fetch if a fresher state has landed — last-writer-wins, so two
|
|
237
245
|
// overlapping projections can never publish in the wrong order.
|
|
238
246
|
const capturedRevision = state.revision;
|
|
247
|
+
const capturedGeneration = sessionGeneration;
|
|
239
248
|
// Resolve the pin BEFORE the fetch (memoised: one storage + keychain read
|
|
240
249
|
// per boot) so the first pass over a freshly applied state is already bound.
|
|
241
250
|
// Deferring it would let a sibling app's switch render once as this
|
|
@@ -249,6 +258,12 @@ export function createOxyRuntime(config) {
|
|
|
249
258
|
logger('Failed to resolve account profiles during the device projection', fetchError);
|
|
250
259
|
return;
|
|
251
260
|
}
|
|
261
|
+
if (capturedGeneration !== sessionGeneration) {
|
|
262
|
+
// Signed out while the profiles were in flight. Committing now would put
|
|
263
|
+
// the account back on a device with no bearer — the "Hi <old user>"
|
|
264
|
+
// greeting to a signed-out visitor.
|
|
265
|
+
return;
|
|
266
|
+
}
|
|
252
267
|
const latest = sessionClient.getState();
|
|
253
268
|
if (!latest || latest.revision !== capturedRevision) {
|
|
254
269
|
return;
|
|
@@ -414,6 +429,7 @@ export function createOxyRuntime(config) {
|
|
|
414
429
|
});
|
|
415
430
|
},
|
|
416
431
|
clearSession() {
|
|
432
|
+
sessionGeneration += 1;
|
|
417
433
|
transition(() => {
|
|
418
434
|
setSessions(EMPTY_SESSIONS);
|
|
419
435
|
setActiveSessionIdFact(null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["accountIdsOf","activeSessionIdOf","activeUserOf","deviceStateToClientSessions","mergeSessions","mergeSessionLists","normalizeAndSortSessions","normalizeUserIdentity","resolveActiveContext","sessionsArraysEqual","EMPTY_SESSIONS","deriveStatus","facts","authResolved","account","error","deriveTokenStatus","hasAccessToken","tokenReady","derivePrincipal","activeContext","profiles","get","actor","userId","createOxyRuntime","config","oxyServices","sessionClient","sessionClientHost","identity","onSubjectChange","onDeviceEmpty","onSessionsProjected","onIdentityUnbound","logger","deviceState","directory","Map","sessions","activeSessionId","pinnedAccountId","isLoading","storageReady","Boolean","getAccessToken","switching","listeners","Set","snapshot","buildSnapshot","depth","dirty","subjectAtEntry","Object","freeze","status","device","principal","tokenStatus","message","code","notify","listener","transition","mutate","id","nextSubject","previous","next","touch","setSessions","setActiveSessionIdFact","sessionId","setAccountFact","user","reconcileFromClient","state","getState","accounts","length","setCurrentAccountId","capturedRevision","revision","ensurePinnedAccountId","ids","users","getUsersByIds","fetchError","latest","getDirectory","resolved","set","projected","map","session","activeUser","activeAccountId","getSnapshot","subscribe","add","delete","start","catch","batch","activateContext","contextId","setSwitching","signOutContext","signOutPrincipal","principalId","refreshDirectory","setAccount","setLoading","loading","setError","setStorageReady","ready","setTokenReady","setHasAccessToken","has","markAuthResolved","incoming","options","processed","merge","preserveSessionIds","setActiveSessionId","clearSession"],"sourceRoot":"../../../../src","sources":["ui/runtime/createOxyRuntime.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["accountIdsOf","activeSessionIdOf","activeUserOf","deviceStateToClientSessions","mergeSessions","mergeSessionLists","normalizeAndSortSessions","normalizeUserIdentity","resolveActiveContext","sessionsArraysEqual","EMPTY_SESSIONS","deriveStatus","facts","authResolved","account","error","deriveTokenStatus","hasAccessToken","tokenReady","derivePrincipal","activeContext","profiles","get","actor","userId","createOxyRuntime","config","oxyServices","sessionClient","sessionClientHost","identity","onSubjectChange","onDeviceEmpty","onSessionsProjected","onIdentityUnbound","logger","deviceState","directory","Map","sessions","activeSessionId","pinnedAccountId","isLoading","storageReady","Boolean","getAccessToken","switching","listeners","Set","snapshot","buildSnapshot","depth","dirty","subjectAtEntry","sessionGeneration","Object","freeze","status","device","principal","tokenStatus","message","code","notify","listener","transition","mutate","id","nextSubject","previous","next","touch","setSessions","setActiveSessionIdFact","sessionId","setAccountFact","user","reconcileFromClient","state","getState","accounts","length","setCurrentAccountId","capturedRevision","revision","capturedGeneration","ensurePinnedAccountId","ids","users","getUsersByIds","fetchError","latest","getDirectory","resolved","set","projected","map","session","activeUser","activeAccountId","getSnapshot","subscribe","add","delete","start","catch","batch","activateContext","contextId","setSwitching","signOutContext","signOutPrincipal","principalId","refreshDirectory","setAccount","setLoading","loading","setError","setStorageReady","ready","setTokenReady","setHasAccessToken","has","markAuthResolved","incoming","options","processed","merge","preserveSessionIds","setActiveSessionId","clearSession"],"sourceRoot":"../../../../src","sources":["ui/runtime/createOxyRuntime.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxyAccountDialogScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/OxyAccountDialogScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAe3D;;;;;;;;;;;;GAYG;AACH,QAAA,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"OxyAccountDialogScreen.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/OxyAccountDialogScreen.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAe3D;;;;;;;;;;;;GAYG;AACH,QAAA,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA6DrD,CAAC;AAyDF,eAAe,sBAAsB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxyAuthChooser.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/OxyAuthChooser.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAsD/B,MAAM,WAAW,mBAAmB;IAClC,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED;;;;GAIG;AACH,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"OxyAuthChooser.d.ts","sourceRoot":"","sources":["../../../../../src/ui/components/OxyAuthChooser.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAsD/B,MAAM,WAAW,mBAAmB;IAClC,4DAA4D;IAC5D,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED;;;;GAIG;AACH,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAgYjD,CAAC;AA8BF,eAAe,cAAc,CAAC"}
|
|
@@ -13,6 +13,12 @@
|
|
|
13
13
|
*
|
|
14
14
|
* Existing accounts still render ABOVE the CTA: "continue as one of these" is a
|
|
15
15
|
* choice of WHO, not of HOW.
|
|
16
|
+
*
|
|
17
|
+
* Signed in (the "Add another account" entry), a row is an account to switch
|
|
18
|
+
* to, and the current one carries its check. Signed out, nothing here is
|
|
19
|
+
* current: the device may still list an identity it holds (Commons' shared
|
|
20
|
+
* one), but THIS app has no session, so each row reads "Continue as @handle"
|
|
21
|
+
* and choosing it signs in (OxyHQ/oxy#1375 items 20 and 21).
|
|
16
22
|
*/
|
|
17
23
|
import type React from 'react';
|
|
18
24
|
import { type AccountDialogSnapshot, type SwitcherPrincipalRow } from '@oxy.so/core';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SignInEntryView.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/components/authChooser/SignInEntryView.tsx"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"SignInEntryView.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/components/authChooser/SignInEntryView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAC1B,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,EACV,sBAAsB,EAEtB,kBAAkB,EAClB,KAAK,EACL,SAAS,EACV,MAAM,SAAS,CAAC;AAEjB,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,mEAAmE;IACnE,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,KAAK,EAAE,KAAK,CAAC;IACb,CAAC,EAAE,SAAS,CAAC;IACb,QAAQ,EAAE,sBAAsB,CAAC;IACjC,0FAA0F;IAC1F,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,YAAY,EAAE,kBAAkB,CAAC;CAClC;AAED,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAmGnD,CAAC;AAEF,eAAe,eAAe,CAAC"}
|