@darkauth/client 1.19.1 → 1.20.1

package/README.md

@@ -118,7 +118,7 @@ If `tokenStorage: 'localStorage'` or `drkStorage: 'localStorage'` is configured
 
 Refreshes the current session. In default first-party mode, the browser sends the DarkAuth refresh cookie and no JavaScript-readable refresh token is required. For non-ZK sessions, returns `drk` as an empty `Uint8Array`.
 
-Use `{ force: true }` after a hosted organization switch so the app receives tokens for the newly selected DarkAuth session organization even if the current in-memory ID token has not expired.
+Use `{ force: true }` after changing the DarkAuth session organization so the app receives tokens for the newly selected organization even if the current in-memory ID token has not expired.
 
 ### Organization Switching
 
@@ -132,9 +132,9 @@ Returns the current user's organizations for app-owned switcher UI. Use `status`
 
 Returns current first-party session and organization context for app chrome before a fresh OAuth callback is needed.
 
-#### `switchOrganization(organizationId: string, options?: SwitchOrganizationOptions): Promise<void>`
+#### `switchOrganization(organizationId: string, options?: SwitchOrganizationOptions): Promise<AuthSession | null>`
 
-Switches the selected organization. The default `authorize` mode starts a new authorization-code flow. `hosted` mode redirects to DarkAuth's `/switch-org` page.
+Switches the selected organization. The default `silent` mode updates the DarkAuth session organization, forces a token refresh, and returns the refreshed session. `authorize` mode starts a new authorization-code flow. `hosted` mode redirects to DarkAuth's `/switch-org` page.
 
 #### App-owned switcher
 
@@ -143,7 +143,6 @@ Use this pattern when the app owns the workspace rail, menu, or account switcher
 ```typescript
 import {
   getCurrentUser,
-  handleCallback,
   listOrganizations,
   switchOrganization,
 } from '@DarkAuth/client';
@@ -152,17 +151,14 @@ const organizations = await listOrganizations();
 const activeOrganizationId = getCurrentUser()?.org_id;
 
 async function selectOrganization(organizationId: string) {
-  await switchOrganization(organizationId, {
-    mode: 'authorize',
-    returnTo: window.location.href,
-  });
+  const session = await switchOrganization(organizationId);
+  const selectedOrganizationId = getCurrentUser()?.org_id;
 }
-
-const session = await handleCallback();
-const selectedOrganizationId = getCurrentUser()?.org_id;
 ```
 
-After the callback, verify that `selectedOrganizationId` matches the workspace being loaded. Treat the switch as a tenant or workspace state reset: clear tenant-local caches, selected resources, open realtime subscriptions, in-flight requests, and authorization decisions before loading data for the new `org_id`.
+After the refresh, verify that `selectedOrganizationId` matches the workspace being loaded. Treat the switch as a tenant or workspace state reset: clear tenant-local caches, selected resources, open realtime subscriptions, in-flight requests, and authorization decisions before loading data for the new `org_id`.
+
+Use `mode: 'authorize'` when a deployment should re-enter the redirect-based OAuth flow for every organization switch.
 
 #### Hosted switcher
 

package/dist/index.d.ts

@@ -54,7 +54,7 @@ export type InitiateLoginOptions = {
     returnTo?: string;
 };
 export type SwitchOrganizationOptions = {
-    mode?: "authorize" | "hosted";
+    mode?: "silent" | "authorize" | "hosted";
     returnTo?: string;
 };
 export type RefreshSessionOptions = {
@@ -92,6 +92,6 @@ export declare function getStoredSession(): AuthSession | null;
 export declare function refreshSession(options?: RefreshSessionOptions): Promise<AuthSession | null>;
 export declare function listOrganizations(): Promise<DarkAuthOrganization[]>;
 export declare function getSessionInfo(): Promise<DarkAuthSessionInfo>;
-export declare function switchOrganization(organizationId: string, options?: SwitchOrganizationOptions): Promise<void>;
+export declare function switchOrganization(organizationId: string, options?: SwitchOrganizationOptions): Promise<AuthSession | null>;
 export declare function logout(): void;
 export declare function getCurrentUser(): JwtClaims | null;

package/dist/index.js

@@ -686,9 +686,26 @@ export async function getSessionInfo() {
     };
 }
 export async function switchOrganization(organizationId, options = {}) {
-    if ((options.mode || "authorize") === "authorize") {
+    const mode = options.mode || "silent";
+    if (mode === "silent") {
+        const response = await fetch(rootEndpoint("/api/user/session/organization"), {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({
+                organization_id: organizationId,
+                return_to: options.returnTo,
+                client_id: cfg.clientId,
+            }),
+            credentials: fetchCredentials(),
+        });
+        if (!response.ok)
+            throw await errorForResponse(response);
+        await response.json().catch(() => null);
+        return await refreshSession({ force: true });
+    }
+    if (mode === "authorize") {
         await initiateLogin({ organizationId, returnTo: options.returnTo });
-        return;
+        return null;
     }
     const switchUrl = new URL(rootEndpoint("/switch-org"));
     switchUrl.searchParams.set("organization_id", organizationId);
@@ -697,6 +714,7 @@ export async function switchOrganization(organizationId, options = {}) {
         switchUrl.searchParams.set("return_to", options.returnTo);
     }
     location.assign(switchUrl.toString());
+    return null;
 }
 export function logout() {
     memorySession = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkauth/client",
-  "version": "1.19.1",
+  "version": "1.20.1",
   "license": "MIT",
   "repository": {
     "directory": "packages/darkauth-client",