@basictech/react 0.7.0 → 0.8.0-beta.2

package/src/core/db/RemoteCollection.ts

@@ -59,23 +59,26 @@ export class RemoteCollection<T extends { id: string } = Record<string, any> & {
 
     this.log(`${method} ${url}`, body ? JSON.stringify(body) : '')
 
+    const headers: Record<string, string> = {
+      'Authorization': `Bearer ${token}`
+    }
+    if (body) {
+      headers['Content-Type'] = 'application/json'
+    }
+
     const response = await fetch(url, {
       method,
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${token}`
-      },
+      headers,
       ...(body ? { body: JSON.stringify(body) } : {})
     })
 
     const responseData = await response.json().catch(() => ({}))
 
     if (!response.ok) {
-      // Handle 401 Unauthorized - token may have expired
+      // Handle 401 Unauthorized - force refresh then retry once
       if (response.status === 401 && !isRetry) {
-        this.log('Got 401, retrying with fresh token...')
-        // getToken() should refresh the token if expired
-        // Retry the request once
+        this.log('Got 401, forcing token refresh and retrying...')
+        await this.config.getToken({ forceRefresh: true })
         return this.request<R>(method, path, body, true)
       }
 
@@ -83,16 +86,27 @@ export class RemoteCollection<T extends { id: string } = Record<string, any> & {
         console.error(`[RemoteDB] Error ${response.status}:`, responseData)
       }
       
-      // Call onAuthError callback if provided and this is an auth error
-      if (response.status === 401 && this.config.onAuthError) {
-        this.config.onAuthError({
-          status: response.status,
-          message: 'Authentication failed',
-          response: responseData
-        })
+      // Call onAuthError callback for auth/authz errors
+      if (this.config.onAuthError) {
+        if (response.status === 401) {
+          this.config.onAuthError({
+            status: response.status,
+            message: 'Authentication failed',
+            response: responseData,
+            errorType: 'expired',
+            afterRetry: isRetry,
+          })
+        } else if (response.status === 403) {
+          this.config.onAuthError({
+            status: response.status,
+            message: responseData.message || 'Forbidden - insufficient permissions or missing scope',
+            response: responseData,
+            errorType: 'forbidden',
+            afterRetry: isRetry,
+          })
+        }
       }
 
-      // Try different error message fields that APIs commonly use
       const errorMessage = responseData.message || responseData.error || responseData.detail || 
         (typeof responseData === 'string' ? responseData : `API request failed: ${response.status}`)
       throw new RemoteDBError(errorMessage, response.status, responseData)

package/src/core/db/index.ts

@@ -1,5 +1,5 @@
 // Core DB exports
-export type { Collection, BasicDB, DBMode, RemoteDBConfig } from './types'
+export type { Collection, BasicDB, DBMode, RemoteDBConfig, GetTokenOptions } from './types'
 export type { AuthError } from './types'
 export { RemoteDBError } from './types'
 export { RemoteDB } from './RemoteDB'

package/src/core/db/types.ts

@@ -91,6 +91,10 @@ export interface AuthError {
   status: number
   message: string
   response?: any
+  /** Classifies the error for UI display (e.g. "session expired" vs "forbidden") */
+  errorType: 'expired' | 'forbidden' | 'revoked' | 'network' | 'unknown'
+  /** True if this error occurred after a retry with a refreshed token */
+  afterRetry: boolean
 }
 
 /**
@@ -109,13 +113,21 @@ export class RemoteDBError extends Error {
   }
 }
 
+/**
+ * Options for getToken (e.g. force refresh after 401)
+ */
+export interface GetTokenOptions {
+  /** When true, refresh the access token before returning (e.g. after server returned 401) */
+  forceRefresh?: boolean
+}
+
 /**
  * Configuration for RemoteDB
  */
 export interface RemoteDBConfig {
   serverUrl: string
   projectId: string
-  getToken: () => Promise<string>
+  getToken: (options?: GetTokenOptions) => Promise<string>
   schema?: any
   /** Enable debug logging (default: false) */
   debug?: boolean