@oxy.so/core 1.8.1 → 1.9.0

package/dist/cjs/i18n/locales/en-US.json

@@ -1850,6 +1850,7 @@
             "switch": {
                 "title": "Switch account",
                 "count": "{{count}} accounts",
+                "countOne": "{{count}} account",
                 "empty": "Accounts you own or share"
             }
         },
@@ -1970,7 +1971,8 @@
             "loading": "Loading sessions…",
             "empty": "No active sessions",
             "signOutAllOnThisDevice": "Sign out of all other devices",
-            "signOutAllSubtitle": "End {{count}} other device session(s)"
+            "signOutAllSubtitle": "End {{count}} other device session(s)",
+            "otherSession": "Another session"
         },
         "confirms": {
             "removeDeviceTitle": "Remove device",

package/dist/cjs/i18n/locales/es-ES.json

@@ -1850,6 +1850,7 @@
             "switch": {
                 "title": "Cambiar de cuenta",
                 "count": "{{count}} cuentas",
+                "countOne": "{{count}} cuenta",
                 "empty": "Cuentas que posees o compartes"
             }
         },
@@ -1970,7 +1971,8 @@
             "loading": "Cargando sesiones…",
             "empty": "No hay sesiones activas",
             "signOutAllOnThisDevice": "Cerrar sesión en los demás dispositivos",
-            "signOutAllSubtitle": "Finalizar {{count}} sesión(es) de otros dispositivos"
+            "signOutAllSubtitle": "Finalizar {{count}} sesión(es) de otros dispositivos",
+            "otherSession": "Otra sesión"
         },
         "confirms": {
             "removeDeviceTitle": "Eliminar dispositivo",

package/dist/cjs/i18n/locales/locales/en-US.json

@@ -1850,6 +1850,7 @@
       "switch": {
         "title": "Switch account",
         "count": "{{count}} accounts",
+        "countOne": "{{count}} account",
         "empty": "Accounts you own or share"
       }
     },
@@ -1970,7 +1971,8 @@
       "loading": "Loading sessions…",
       "empty": "No active sessions",
       "signOutAllOnThisDevice": "Sign out of all other devices",
-      "signOutAllSubtitle": "End {{count}} other device session(s)"
+      "signOutAllSubtitle": "End {{count}} other device session(s)",
+      "otherSession": "Another session"
     },
     "confirms": {
       "removeDeviceTitle": "Remove device",

package/dist/cjs/i18n/locales/locales/es-ES.json

@@ -1850,6 +1850,7 @@
       "switch": {
         "title": "Cambiar de cuenta",
         "count": "{{count}} cuentas",
+        "countOne": "{{count}} cuenta",
         "empty": "Cuentas que posees o compartes"
       }
     },
@@ -1970,7 +1971,8 @@
       "loading": "Cargando sesiones…",
       "empty": "No hay sesiones activas",
       "signOutAllOnThisDevice": "Cerrar sesión en los demás dispositivos",
-      "signOutAllSubtitle": "Finalizar {{count}} sesión(es) de otros dispositivos"
+      "signOutAllSubtitle": "Finalizar {{count}} sesión(es) de otros dispositivos",
+      "otherSession": "Otra sesión"
     },
     "confirms": {
       "removeDeviceTitle": "Eliminar dispositivo",

package/dist/cjs/session/accountDialogController.js

@@ -58,6 +58,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountDialogController = void 0;
+exports.backViewOf = backViewOf;
 exports.createAccountDialogController = createAccountDialogController;
 const logger_1 = require("../logger");
 const errorUtils_1 = require("../utils/errorUtils");
@@ -333,16 +334,25 @@ class AccountDialogController {
         }
         // Signed out. The directory is bearer-read and `SessionClient` drops the one
         // it holds when the device empties, so there is nothing to clear here — only
-        // the in-flight bookkeeping, which no longer describes anything.
+        // the in-flight bookkeeping, which no longer describes anything. The account
+        // menu described the account that just left, so it gives way to the entry.
         this.error = null;
         this.loading = false;
+        this.view = this.resolveView(this.view);
         this.emit();
     }
     // =========================================================================
     // View actions
     // =========================================================================
-    /** Set the dialog view directly. */
-    setView(view) {
+    /**
+     * Set the dialog view directly.
+     *
+     * `'accounts'` is only honoured with a session. Signed out it lands on the
+     * sign-in entry instead — the menu it would open holds "Switch account",
+     * storage and "Sign out" for an account that does not exist.
+     */
+    setView(requested) {
+        const view = this.resolveView(requested);
         if (this.view === view)
             return;
         this.view = view;
@@ -355,6 +365,37 @@ class AccountDialogController {
         }
         this.emit();
     }
+    /**
+     * Go back one step: `signup` and `qr` return to the sign-in entry, and the
+     * entry returns to the account menu when somebody is signed in.
+     *
+     * Returns `false` — changing nothing — when the current view is the dialog's
+     * first one, so the host closes the dialog instead. Leaving an active
+     * request withdraws it; otherwise its authorize code stays approvable until
+     * it expires.
+     */
+    back() {
+        const target = backViewOf(this.view, this.hasSession());
+        if (target === null)
+            return false;
+        if (this.signIn.phase === 'starting' || this.signIn.phase === 'waiting') {
+            this.cancelSignIn();
+        }
+        this.setView(target);
+        return true;
+    }
+    /** `'accounts'` needs a session; without one the sign-in entry stands in for it. */
+    resolveView(view) {
+        return view === 'accounts' && !this.hasSession() ? 'signin' : view;
+    }
+    /**
+     * Whether an account is signed in here — the precondition of the account
+     * menu. The bearer, not the directory: the directory is bearer-read, and the
+     * menu's content (hero, storage, sign-out) is all about the bearer's account.
+     */
+    hasSession() {
+        return this.isAuthenticated();
+    }
     /** Switch to the "add account" view (the sign-in entry chooser). */
     add() {
         this.setView('add');
@@ -1289,8 +1330,13 @@ class AccountDialogController {
     }
     computeSnapshot() {
         const directory = this.sessionClient.getDirectory();
+        const hasSession = this.hasSession();
+        // Resolved here as well as in `setView`: the controller is constructed on
+        // `'accounts'` before anyone knows whether a bearer exists.
+        const view = this.resolveView(this.view);
         return {
-            view: this.view,
+            view,
+            backView: backViewOf(view, hasSession),
             directory,
             activeContext: (0, deviceDirectory_1.resolveActiveContext)(directory),
             loading: this.loading,
@@ -1316,6 +1362,29 @@ class AccountDialogController {
     }
 }
 exports.AccountDialogController = AccountDialogController;
+/**
+ * The view one step back from `view`, or `null` when `view` is the dialog's
+ * first view.
+ *
+ * The sign-in entry is `'add'` ("add another account") when somebody is signed
+ * in and `'signin'` when nobody is; `signup` and `qr` are reached FROM that
+ * entry, so they return to it. The entry itself returns to the account menu —
+ * which exists only with a session. This used to be a host-side
+ * "back = accounts" that assumed a signed-in origin, so a signed-out Back from
+ * "Create your account" opened a menu holding "Sign out" for nobody.
+ */
+function backViewOf(view, hasSession) {
+    switch (view) {
+        case 'signup':
+        case 'qr':
+            return hasSession ? 'add' : 'signin';
+        case 'add':
+            return hasSession ? 'accounts' : null;
+        case 'signin':
+        case 'accounts':
+            return null;
+    }
+}
 /** Factory mirroring `createSessionClient`, for ergonomic wiring by consumers. */
 function createAccountDialogController(options) {
     return new AccountDialogController(options);