Various fixes and cleanup, regressions from prior commits.

frontend/src/utils/api.js

@@ -315,6 +315,8 @@ export function shouldShowErrorToast(error) {
   // Don't show toast for user cancellations
   if (error instanceof AuthCancelledError) return false
   if (error.name === 'AbortError') return false
+  // Don't show toast for 401/403 errors - the auth iframe will handle these
+  if (error instanceof ApiError && (error.status === 401 || error.status === 403)) return false
   return true
 }
 

frontend/src/utils/awaitable-websocket.js

@@ -5,8 +5,8 @@ class AwaitableWebSocket extends WebSocket {
   #opened = false
 
   constructor(resolve, reject, url, protocols, binaryType) {
-    // Support relative URLs even on old browsers that don't
-    super(new URL(url, location.href.replace(/^http/, 'ws')), protocols)
+    // Support relative URLs even on old browsers that don't natively support them
+    super(new URL(url, document.baseURI.replace(/^http/, 'ws')), protocols)
     this.binaryType = binaryType || 'blob'
     this.onopen = () => {
       this.#opened = true
@@ -51,21 +51,12 @@ class AwaitableWebSocket extends WebSocket {
       console.error("WebSocket received binary data, expected JSON string", data)
       throw new Error("WebSocket received binary data, expected JSON string")
     }
-    let parsed
     try {
-      parsed = JSON.parse(data)
+      return JSON.parse(data)
     } catch (err) {
       console.error("Failed to parse JSON from WebSocket message", data, err)
       throw new Error("Failed to parse JSON from WebSocket message")
     }
-    // Wrap in response-like object with ok based on status field
-    // Status 2xx = ok, 4xx/5xx = not ok, no status = ok (normal response)
-    const status = parsed.status || 200
-    return {
-      ok: status >= 200 && status < 300,
-      status,
-      data: parsed,
-    }
   }
 
   send_json(data) {

frontend/src/utils/passkey.js

@@ -23,28 +23,28 @@ export async function register(resetToken = null, displayName = null, onstartreg
       const res = await ws.receive_json()
 
       // Handle auth errors (401/403) with iframe
-      if ((res.status === 401 || res.status === 403) && res.data.auth?.iframe) {
+      if ((res.status === 401 || res.status === 403) && res.auth?.iframe) {
         ws.close()
-        await showAuthIframe(res.data.auth.iframe)
+        await showAuthIframe(res.auth.iframe)
         continue
       }
 
-      // Handle other errors
-      if (!res.ok) {
-        throw new Error(res.data.detail || `Registration failed: ${res.status}`)
+      // Handle other errors (status field present means error)
+      if (res.status) {
+        throw new Error(res.detail || `Registration failed: ${res.status}`)
       }
 
       // Notify caller that we're about to show the browser prompt
       if (onstartreg) onstartreg()
 
-      const registrationResponse = await startRegistration({ optionsJSON: res.data })
+      const registrationResponse = await startRegistration({ optionsJSON: res })
       ws.send_json(registrationResponse)
 
       const result = await ws.receive_json()
-      if (!result.ok) {
-        throw new Error(result.data.detail || `Registration failed: ${result.status}`)
+      if (result.status) {
+        throw new Error(result.detail || `Registration failed: ${result.status}`)
       }
-      return result.data
+      return result
     } catch (error) {
       ws.close()
       console.error('Registration error:', error)
@@ -58,18 +58,19 @@ export async function authenticate() {
   const ws = await aWebSocket(await makeUrl('/auth/ws/authenticate'))
   try {
     const res = await ws.receive_json()
-    if (!res.ok) {
-      throw new Error(res.data.detail || `Authentication failed: ${res.status}`)
+    // status field present means error
+    if (res.status) {
+      throw new Error(res.detail || `Authentication failed: ${res.status}`)
     }
 
-    const authResponse = await startAuthentication({ optionsJSON: res.data })
+    const authResponse = await startAuthentication({ optionsJSON: res })
     ws.send_json(authResponse)
 
     const result = await ws.receive_json()
-    if (!result.ok) {
-      throw new Error(result.data.detail || `Authentication failed: ${result.status}`)
+    if (result.status) {
+      throw new Error(result.detail || `Authentication failed: ${result.status}`)
     }
-    return result.data
+    return result
   } catch (error) {
     console.error('Authentication error:', error)
     throw Error(error.name === "NotAllowedError" ? 'Passkey authentication cancelled' : error.message)