@oxy.so/core 1.11.0 → 1.12.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.
@@ -488,6 +488,46 @@ export class AccountDialogController {
488
488
  this.activatingContextId = null;
489
489
  }, () => this.sessionClient.activateContext(contextId));
490
490
  }
491
+ /**
492
+ * A device account row was chosen — the one entry point for "use this
493
+ * account", whether or not anybody is signed in here.
494
+ *
495
+ * Signed in, it is a switch: the active row is already the answer
496
+ * (`'current'`), any other row is {@link activateContext}.
497
+ *
498
+ * Signed out, it is NOT a switch. The row is on the list because the DEVICE
499
+ * still holds that identity (Commons' shared identity, or a sibling app's
500
+ * session), not because this app does, so there is no bearer to activate a
501
+ * context with — and the active-row short-circuit used to read that stale
502
+ * "active" as "already signed in" and close the sheet on a signed-out app
503
+ * (OxyHQ/oxy#1375 item 20). Choosing the row is "Continue as @handle": the
504
+ * same {@link signInWithOxy} path as the "Continue with Oxy" button, which
505
+ * mints silently from the shared identity and otherwise falls back to the
506
+ * request. When that silent mint lands on a different pair from the one
507
+ * chosen (a device holding more than one person, or an organization row), the
508
+ * chosen row is then activated under the new bearer, so the press ends where
509
+ * it pointed.
510
+ */
511
+ async chooseContext(contextId) {
512
+ if (this.isDeviceMutationInFlight())
513
+ return 'busy';
514
+ if (this.hasSession()) {
515
+ if (contextId === this.snapshot.activeContext?.contextId)
516
+ return 'current';
517
+ return (await this.activateContext(contextId)) ? 'switched' : 'failed';
518
+ }
519
+ await this.signInWithOxy();
520
+ // Only a sign-in that finished here (the silent shared-identity mint) can be
521
+ // steered to the chosen row; a request still waiting on approval belongs to
522
+ // whoever approves it.
523
+ if (this.signIn.phase !== 'completed' || !this.hasSession())
524
+ return 'signing-in';
525
+ const directory = this.sessionClient.getDirectory();
526
+ const offered = directory?.principals.some((principal) => principal.contexts.some((context) => context.id === contextId));
527
+ if (!offered || resolveActiveContext(directory)?.contextId === contextId)
528
+ return 'signing-in';
529
+ return (await this.activateContext(contextId)) ? 'switched' : 'signing-in';
530
+ }
491
531
  /**
492
532
  * Remove ONE `principal → account` pair, and only that pair.
493
533
  *
@@ -1332,6 +1372,7 @@ export class AccountDialogController {
1332
1372
  return {
1333
1373
  view,
1334
1374
  backView: backViewOf(view, hasSession),
1375
+ hasSession,
1335
1376
  directory,
1336
1377
  activeContext: resolveActiveContext(directory),
1337
1378
  loading: this.loading,