@oxyhq/services 13.1.0 → 13.1.2

package/src/ui/utils/activeAuthuser.ts

@@ -30,22 +30,8 @@ import {
 
 const ACTIVE_AUTHUSER_KEY = 'oxy_active_authuser';
 
-/**
- * Safely resolve `window.localStorage`, returning `null` when it is
- * unavailable. The PROPERTY ACCESS itself (`window.localStorage`) can throw a
- * `SecurityError` synchronously in opaque-origin / sandboxed iframes or when
- * storage is disabled — even `typeof window.localStorage` evaluates the getter
- * and throws. Every read/write in this module routes through here so the getter
- * throw is caught once, at the source, and callers stay clean. Returns `null`
- * off-web and on any access failure (fail safe).
- */
-function getLocalStorage(): Storage | null {
-  if (typeof window === 'undefined') return null;
-  try {
-    return window.localStorage ?? null;
-  } catch {
-    return null;
-  }
+function hasLocalStorage(): boolean {
+  return typeof window !== 'undefined' && typeof window.localStorage !== 'undefined';
 }
 
 function getSessionStorage(): Storage | null {
@@ -65,12 +51,11 @@ function getSessionStorage(): Storage | null {
  * fall back to deterministic selection (lowest authuser).
  */
 export function readActiveAuthuser(): number | null {
-  const storage = getLocalStorage();
-  if (!storage) {
+  if (!hasLocalStorage()) {
     return null;
   }
   try {
-    const raw = storage.getItem(ACTIVE_AUTHUSER_KEY);
+    const raw = window.localStorage.getItem(ACTIVE_AUTHUSER_KEY);
     if (raw === null) return null;
     const parsed = Number.parseInt(raw, 10);
     if (!Number.isFinite(parsed) || parsed < 0) return null;
@@ -86,11 +71,10 @@ export function readActiveAuthuser(): number | null {
  * this succeeding — it is best-effort UX persistence, not authoritative.
  */
 export function writeActiveAuthuser(authuser: number): void {
+  if (!hasLocalStorage()) return;
   if (!Number.isFinite(authuser) || authuser < 0) return;
-  const storage = getLocalStorage();
-  if (!storage) return;
   try {
-    storage.setItem(ACTIVE_AUTHUSER_KEY, String(authuser));
+    window.localStorage.setItem(ACTIVE_AUTHUSER_KEY, String(authuser));
   } catch {
     // Best-effort persistence; swallow QuotaExceededError / SecurityError.
   }
@@ -102,10 +86,9 @@ export function writeActiveAuthuser(authuser: number): void {
  * cleared slot.
  */
 export function clearActiveAuthuser(): void {
-  const storage = getLocalStorage();
-  if (!storage) return;
+  if (!hasLocalStorage()) return;
   try {
-    storage.removeItem(ACTIVE_AUTHUSER_KEY);
+    window.localStorage.removeItem(ACTIVE_AUTHUSER_KEY);
   } catch {
     // Best-effort.
   }
@@ -120,10 +103,9 @@ export function clearActiveAuthuser(): void {
  * failure (best-effort).
  */
 export function markSignedOut(): void {
-  const storage = getLocalStorage();
-  if (!storage) return;
+  if (!hasLocalStorage()) return;
   try {
-    storage.setItem(ssoSignedOutKey(window.location.origin), '1');
+    window.localStorage.setItem(ssoSignedOutKey(window.location.origin), '1');
   } catch {
     // Best-effort; swallow QuotaExceededError / SecurityError (private mode).
   }
@@ -136,10 +118,9 @@ export function markSignedOut(): void {
  * state. No-ops on native / storage failure.
  */
 export function clearSignedOut(): void {
-  const storage = getLocalStorage();
-  if (!storage) return;
+  if (!hasLocalStorage()) return;
   try {
-    storage.removeItem(ssoSignedOutKey(window.location.origin));
+    window.localStorage.removeItem(ssoSignedOutKey(window.location.origin));
   } catch {
     // Best-effort.
   }
@@ -153,9 +134,8 @@ export function clearSignedOut(): void {
  * `fedcm-silent` and `silent-iframe` cold-boot steps.
  */
 export function isSilentRestoreSuppressed(): boolean {
-  const storage = getLocalStorage();
-  if (!storage) return false;
-  return silentRestoreSuppressed(storage, window.location.origin);
+  if (!hasLocalStorage()) return false;
+  return silentRestoreSuppressed(window.localStorage, window.location.origin);
 }
 
 /**

package/src/ui/utils/__tests__/activeAuthuser.test.ts

@@ -1,75 +0,0 @@
-/**
- * Fail-safe guarantees for the web `activeAuthuser` storage helpers.
- *
- * The PROPERTY ACCESS `window.localStorage` can throw a `SecurityError`
- * synchronously in opaque-origin / sandboxed iframes or when storage is
- * disabled — not just `getItem`/`setItem`. These helpers run during cold boot
- * (and feed render-phase gate values in the providers), so they MUST never
- * propagate that throw: reads fail safe to a benign default and writes no-op.
- */
-
-import {
-  readActiveAuthuser,
-  writeActiveAuthuser,
-  clearActiveAuthuser,
-  markSignedOut,
-  clearSignedOut,
-  isSilentRestoreSuppressed,
-} from '../activeAuthuser';
-
-describe('activeAuthuser helpers — localStorage fail-safe', () => {
-  const realDescriptor = Object.getOwnPropertyDescriptor(window, 'localStorage');
-
-  afterEach(() => {
-    if (realDescriptor) {
-      Object.defineProperty(window, 'localStorage', realDescriptor);
-    }
-    window.localStorage?.clear?.();
-  });
-
-  /** Replace the `localStorage` accessor so reading the property throws. */
-  function makeLocalStorageGetterThrow(): void {
-    Object.defineProperty(window, 'localStorage', {
-      configurable: true,
-      get() {
-        throw new DOMException('denied', 'SecurityError');
-      },
-    });
-  }
-
-  it('readActiveAuthuser returns null (never throws) when the getter throws', () => {
-    makeLocalStorageGetterThrow();
-    expect(() => readActiveAuthuser()).not.toThrow();
-    expect(readActiveAuthuser()).toBeNull();
-  });
-
-  it('isSilentRestoreSuppressed returns false (never throws) when the getter throws', () => {
-    makeLocalStorageGetterThrow();
-    expect(() => isSilentRestoreSuppressed()).not.toThrow();
-    expect(isSilentRestoreSuppressed()).toBe(false);
-  });
-
-  it('writeActiveAuthuser / clearActiveAuthuser / markSignedOut / clearSignedOut no-op when the getter throws', () => {
-    makeLocalStorageGetterThrow();
-    expect(() => {
-      writeActiveAuthuser(2);
-      clearActiveAuthuser();
-      markSignedOut();
-      clearSignedOut();
-    }).not.toThrow();
-  });
-
-  it('round-trips normally when storage works (zero behavior change)', () => {
-    writeActiveAuthuser(3);
-    expect(readActiveAuthuser()).toBe(3);
-
-    expect(isSilentRestoreSuppressed()).toBe(false);
-    markSignedOut();
-    expect(isSilentRestoreSuppressed()).toBe(true);
-    clearSignedOut();
-    expect(isSilentRestoreSuppressed()).toBe(false);
-
-    clearActiveAuthuser();
-    expect(readActiveAuthuser()).toBeNull();
-  });
-});