sabha-meetings-react 0.1.5 → 0.1.7

package/dist/index.d.mts

@@ -2,10 +2,11 @@ import * as react from 'react';
 import { ReactNode } from 'react';
 
 type SabhaTokens = {
-    /** Optional bearer token (Postman-style). Live API primarily uses `vm_session` cookie. */
+    /** Bearer access token from login `token` (Postman `accessToken`). */
     accessToken?: string;
+    /** Refresh token from login `refreshToken` (Postman). */
     refreshToken?: string;
-    /** Session cookie value when running outside the browser (Node / RN). */
+    /** Optional legacy `vm_session` cookie / x-sabha-session bridge. */
     sessionCookie?: string;
 };
 type SabhaConfig = {
@@ -19,11 +20,11 @@ type SabhaConfig = {
     /** Optional bearer access token */
     accessToken?: string;
     refreshToken?: string;
-    /** Persist/reuse `vm_session` (also sent as x-sabha-session for proxies). */
+    /** Optional legacy `vm_session` (also sent as x-sabha-session for proxies). */
     sessionCookie?: string;
     /**
-     * Persist `vm_session` in localStorage after login and restore on configure.
-     * Default true in browsers.
+     * Persist access/refresh tokens (and optional vm_session) after login and restore on configure.
+     * Matches Postman collection variables. Default true.
      */
     persistSession?: boolean;
     /** Send cookies (`credentials: "include"`). Default true. */
@@ -347,6 +348,7 @@ declare class SabhaClient {
     getConnection(): MeetingConnection | null;
     leaveMeeting(): Promise<void>;
     private applySession;
+    private persistTokens;
     private persistSessionCookie;
     private tryRefresh;
     private getOrigin;
@@ -435,9 +437,14 @@ declare function normalizeMeeting(raw: unknown): Meeting;
 
 /** Readable session bridge header (browsers cannot set the Cookie request header). */
 declare const SABHA_SESSION_HEADER = "x-sabha-session";
+/** @deprecated Prefer SABHA_TOKENS_STORAGE_KEY — kept for one-time migration. */
 declare const SABHA_SESSION_STORAGE_KEY = "sabha_vm_session";
+/** Persists Postman-style `accessToken` / `refreshToken` (+ optional vm_session). */
+declare const SABHA_TOKENS_STORAGE_KEY = "sabha_auth_tokens";
+declare function readStoredTokens(): SabhaTokens | null;
+declare function writeStoredTokens(tokens: SabhaTokens | null): void;
 declare function readStoredSessionCookie(): string | null;
 declare function writeStoredSessionCookie(value: string | null): void;
 
-export { ContentProtection, DEFAULT_BASE_URL, DEFAULT_MEDIA_POLICY, MediaController, MeetingConnection, SABHA_SESSION_HEADER, SABHA_SESSION_STORAGE_KEY, SabhaClient, SabhaError, SabhaProvider, createSabhaClient, normalizeMeeting, readStoredSessionCookie, toSabhaError, useSabha, useSabhaMeetings, writeStoredSessionCookie };
+export { ContentProtection, DEFAULT_BASE_URL, DEFAULT_MEDIA_POLICY, MediaController, MeetingConnection, SABHA_SESSION_HEADER, SABHA_SESSION_STORAGE_KEY, SABHA_TOKENS_STORAGE_KEY, SabhaClient, SabhaError, SabhaProvider, createSabhaClient, normalizeMeeting, readStoredSessionCookie, readStoredTokens, toSabhaError, useSabha, useSabhaMeetings, writeStoredSessionCookie, writeStoredTokens };
 export type { AuthSession, AuthUser, CaptureAttemptType, CreateMeetingInput, LocalMediaState, LoginInput, MediaPolicy, MediaTrackKind, Meeting, MeetingConnectionOptions, MeetingConnectionState, MeetingInvitee, MeetingOrganizer, MeetingParticipant, MeetingRoomEventMap, RegisterInput, SabhaClientStatus, SabhaConfig, SabhaContextValue, SabhaOrg, SabhaProviderProps, SabhaSocketEvents, SabhaTokens, UpdateMeetingInput, VerifyEmailInput };

package/dist/index.d.ts

@@ -2,10 +2,11 @@ import * as react from 'react';
 import { ReactNode } from 'react';
 
 type SabhaTokens = {
-    /** Optional bearer token (Postman-style). Live API primarily uses `vm_session` cookie. */
+    /** Bearer access token from login `token` (Postman `accessToken`). */
     accessToken?: string;
+    /** Refresh token from login `refreshToken` (Postman). */
     refreshToken?: string;
-    /** Session cookie value when running outside the browser (Node / RN). */
+    /** Optional legacy `vm_session` cookie / x-sabha-session bridge. */
     sessionCookie?: string;
 };
 type SabhaConfig = {
@@ -19,11 +20,11 @@ type SabhaConfig = {
     /** Optional bearer access token */
     accessToken?: string;
     refreshToken?: string;
-    /** Persist/reuse `vm_session` (also sent as x-sabha-session for proxies). */
+    /** Optional legacy `vm_session` (also sent as x-sabha-session for proxies). */
     sessionCookie?: string;
     /**
-     * Persist `vm_session` in localStorage after login and restore on configure.
-     * Default true in browsers.
+     * Persist access/refresh tokens (and optional vm_session) after login and restore on configure.
+     * Matches Postman collection variables. Default true.
      */
     persistSession?: boolean;
     /** Send cookies (`credentials: "include"`). Default true. */
@@ -347,6 +348,7 @@ declare class SabhaClient {
     getConnection(): MeetingConnection | null;
     leaveMeeting(): Promise<void>;
     private applySession;
+    private persistTokens;
     private persistSessionCookie;
     private tryRefresh;
     private getOrigin;
@@ -435,9 +437,14 @@ declare function normalizeMeeting(raw: unknown): Meeting;
 
 /** Readable session bridge header (browsers cannot set the Cookie request header). */
 declare const SABHA_SESSION_HEADER = "x-sabha-session";
+/** @deprecated Prefer SABHA_TOKENS_STORAGE_KEY — kept for one-time migration. */
 declare const SABHA_SESSION_STORAGE_KEY = "sabha_vm_session";
+/** Persists Postman-style `accessToken` / `refreshToken` (+ optional vm_session). */
+declare const SABHA_TOKENS_STORAGE_KEY = "sabha_auth_tokens";
+declare function readStoredTokens(): SabhaTokens | null;
+declare function writeStoredTokens(tokens: SabhaTokens | null): void;
 declare function readStoredSessionCookie(): string | null;
 declare function writeStoredSessionCookie(value: string | null): void;
 
-export { ContentProtection, DEFAULT_BASE_URL, DEFAULT_MEDIA_POLICY, MediaController, MeetingConnection, SABHA_SESSION_HEADER, SABHA_SESSION_STORAGE_KEY, SabhaClient, SabhaError, SabhaProvider, createSabhaClient, normalizeMeeting, readStoredSessionCookie, toSabhaError, useSabha, useSabhaMeetings, writeStoredSessionCookie };
+export { ContentProtection, DEFAULT_BASE_URL, DEFAULT_MEDIA_POLICY, MediaController, MeetingConnection, SABHA_SESSION_HEADER, SABHA_SESSION_STORAGE_KEY, SABHA_TOKENS_STORAGE_KEY, SabhaClient, SabhaError, SabhaProvider, createSabhaClient, normalizeMeeting, readStoredSessionCookie, readStoredTokens, toSabhaError, useSabha, useSabhaMeetings, writeStoredSessionCookie, writeStoredTokens };
 export type { AuthSession, AuthUser, CaptureAttemptType, CreateMeetingInput, LocalMediaState, LoginInput, MediaPolicy, MediaTrackKind, Meeting, MeetingConnectionOptions, MeetingConnectionState, MeetingInvitee, MeetingOrganizer, MeetingParticipant, MeetingRoomEventMap, RegisterInput, SabhaClientStatus, SabhaConfig, SabhaContextValue, SabhaOrg, SabhaProviderProps, SabhaSocketEvents, SabhaTokens, UpdateMeetingInput, VerifyEmailInput };

package/dist/index.js

@@ -166,6 +166,59 @@ function toSabhaError(error, fallback = "Sabha request failed") {
 // src/session.ts
 var SABHA_SESSION_HEADER = "x-sabha-session";
 var SABHA_SESSION_STORAGE_KEY = "sabha_vm_session";
+var SABHA_TOKENS_STORAGE_KEY = "sabha_auth_tokens";
+function readJson(key) {
+  try {
+    if (typeof localStorage === "undefined") return null;
+    const raw = localStorage.getItem(key);
+    if (!raw) return null;
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+function writeJson(key, value) {
+  try {
+    if (typeof localStorage === "undefined") return;
+    if (value == null) localStorage.removeItem(key);
+    else localStorage.setItem(key, JSON.stringify(value));
+  } catch {
+  }
+}
+function readStoredTokens() {
+  const parsed = readJson(SABHA_TOKENS_STORAGE_KEY);
+  if (parsed && typeof parsed === "object") {
+    const record = parsed;
+    const tokens = {
+      accessToken: typeof record.accessToken === "string" ? record.accessToken : void 0,
+      refreshToken: typeof record.refreshToken === "string" ? record.refreshToken : void 0,
+      sessionCookie: typeof record.sessionCookie === "string" ? record.sessionCookie : void 0
+    };
+    if (tokens.accessToken || tokens.refreshToken || tokens.sessionCookie) {
+      return tokens;
+    }
+  }
+  const legacy = readStoredSessionCookie();
+  if (legacy) {
+    const migrated = { sessionCookie: legacy };
+    writeStoredTokens(migrated);
+    return migrated;
+  }
+  return null;
+}
+function writeStoredTokens(tokens) {
+  if (!tokens || !tokens.accessToken && !tokens.refreshToken && !tokens.sessionCookie) {
+    writeJson(SABHA_TOKENS_STORAGE_KEY, null);
+    writeStoredSessionCookie(null);
+    return;
+  }
+  writeJson(SABHA_TOKENS_STORAGE_KEY, {
+    accessToken: tokens.accessToken,
+    refreshToken: tokens.refreshToken,
+    sessionCookie: tokens.sessionCookie
+  });
+  writeStoredSessionCookie(tokens.sessionCookie ?? null);
+}
 function readStoredSessionCookie() {
   try {
     if (typeof localStorage === "undefined") return null;
@@ -872,16 +925,19 @@ var SabhaClient = class {
       ...DEFAULT_MEDIA_POLICY,
       ...this.config.mediaPolicy
     };
-    const stored = this.config.persistSession !== false ? readStoredSessionCookie() : null;
+    const stored = this.config.persistSession !== false ? readStoredTokens() : null;
     this.tokens = {
-      accessToken: config.accessToken ?? this.tokens?.accessToken,
-      refreshToken: config.refreshToken ?? this.tokens?.refreshToken,
-      sessionCookie: config.sessionCookie ?? this.tokens?.sessionCookie ?? stored ?? void 0
+      accessToken: config.accessToken ?? this.tokens?.accessToken ?? stored?.accessToken,
+      refreshToken: config.refreshToken ?? this.tokens?.refreshToken ?? stored?.refreshToken,
+      sessionCookie: config.sessionCookie ?? this.tokens?.sessionCookie ?? stored?.sessionCookie ?? void 0
     };
     const hasAnyToken = Boolean(
       this.tokens.accessToken || this.tokens.sessionCookie || this.tokens.refreshToken
     );
     if (!hasAnyToken) this.tokens = null;
+    else if (this.config.persistSession !== false) {
+      this.persistTokens(this.tokens);
+    }
     this.http = new HttpClient({
       baseUrl,
       withCredentials: this.config.withCredentials !== false,
@@ -889,6 +945,9 @@ var SabhaClient = class {
       getTokens: () => this.tokens,
       setTokens: (tokens) => {
         this.tokens = tokens;
+        if (this.config.persistSession !== false) {
+          this.persistTokens(tokens);
+        }
       },
       onSessionCookie: (cookie) => {
         this.persistSessionCookie(cookie);
@@ -928,27 +987,24 @@ var SabhaClient = class {
   }
   setTokens(tokens) {
     this.ensureConfigured();
-    this.tokens = tokens;
+    this.persistTokens(tokens);
   }
   clearSession() {
     this.tokens = null;
     this.user = null;
-    this.persistSessionCookie(null);
+    this.persistTokens(null);
     this.activeConnection?.disconnect();
     this.activeConnection = null;
   }
   async login(input) {
     const session = await this.auth().login(input);
     this.applySession(session);
-    if (session.accessToken) {
-      this.persistSessionCookie(this.tokens?.sessionCookie ?? null);
-    } else if (session.sessionCookie || this.tokens?.sessionCookie) {
-      this.persistSessionCookie(session.sessionCookie ?? this.tokens?.sessionCookie ?? null);
-    }
     try {
       const me = await this.auth().me();
       this.user = me;
       session.user = me;
+      session.accessToken = this.tokens?.accessToken;
+      session.refreshToken = this.tokens?.refreshToken;
       session.sessionCookie = this.tokens?.sessionCookie;
       return session;
     } catch (error) {
@@ -958,7 +1014,7 @@ var SabhaClient = class {
       if (!hasCredential) {
         this.clearSession();
         throw new SabhaError(
-          "Login returned a user profile but no auth credential. Need JWT `token` from /api/auth/login (Postman) or Set-Cookie vm_session (exposed to the app as x-sabha-session via /sabha proxy). Without that, POST /api/meetings returns 401 Sign in first.",
+          "Login returned a user profile but no auth credential. Need JWT `token` (+ optional `refreshToken`) from /api/auth/login as in Sabha-API Postman (Auth \u2192 Login). Without that, POST /api/meetings returns 401 Sign in first.",
           {
             code: "SESSION_NOT_ESTABLISHED",
             status: 401,
@@ -975,7 +1031,7 @@ var SabhaClient = class {
       return await this.me();
     } catch (error) {
       throw new SabhaError(
-        "Not signed in to Sabha. Call login() first, and ensure the `vm_session` cookie is sent (credentials: 'include', CORS allow-credentials, allow-listed Origin).",
+        "Not signed in to Sabha. Call login() first so Authorization: Bearer <accessToken> is sent (Postman Auth \u2192 Login stores json.token).",
         {
           code: "UNAUTHENTICATED",
           status: 401,
@@ -1097,30 +1153,36 @@ var SabhaClient = class {
       refreshToken: session.refreshToken ?? this.tokens?.refreshToken,
       sessionCookie: session.sessionCookie ?? this.tokens?.sessionCookie
     };
-    if (this.tokens.sessionCookie) {
-      this.persistSessionCookie(this.tokens.sessionCookie);
+    this.persistTokens(this.tokens);
+  }
+  persistTokens(tokens) {
+    this.tokens = tokens;
+    if (this.config.persistSession !== false) {
+      writeStoredTokens(tokens);
     }
   }
   persistSessionCookie(cookie) {
     if (cookie) {
-      this.tokens = {
+      this.persistTokens({
         ...this.tokens ?? {},
         sessionCookie: cookie
-      };
-    } else if (this.tokens) {
-      const { sessionCookie: _removed, ...rest } = this.tokens;
-      this.tokens = Object.keys(rest).length ? rest : null;
+      });
+      return;
     }
-    if (this.config.persistSession !== false) {
-      writeStoredSessionCookie(cookie ?? null);
+    if (!this.tokens) {
+      this.persistTokens(null);
+      return;
     }
+    const { sessionCookie: _removed, ...rest } = this.tokens;
+    this.persistTokens(Object.keys(rest).length ? rest : null);
   }
   async tryRefresh() {
     if (!this.tokens?.refreshToken) return false;
     if (this.refreshPromise) return this.refreshPromise;
     this.refreshPromise = (async () => {
       try {
-        await this.refreshSession();
+        const tokens = await this.refreshSession();
+        this.persistTokens({ ...this.tokens ?? {}, ...tokens });
         return true;
       } catch {
         return false;
@@ -1201,8 +1263,10 @@ function SabhaProvider({
   const [error, setError] = react.useState(null);
   react.useEffect(() => {
     client.configure(resolvedConfig);
-    setAuthenticated(client.getStatus().authenticated);
-    setUser(client.getUser());
+    setAuthenticated(false);
+    setUser(null);
+    setError(null);
+    setMeetings([]);
     setReady(true);
   }, [
     client,
@@ -1245,12 +1309,26 @@ function SabhaProvider({
   }, [client]);
   react.useEffect(() => {
     if (!ready || !autoLoadMeetings) return;
-    void client.me().then((me) => {
+    let cancelled = false;
+    void client.me().then(async (me) => {
+      if (cancelled) return;
       setUser(me);
       setAuthenticated(true);
-      return refreshMeetings();
+      try {
+        await refreshMeetings();
+      } catch {
+      }
     }).catch(() => {
+      if (cancelled) return;
+      client.clearSession();
+      setAuthenticated(false);
+      setUser(null);
+      setMeetings([]);
+      setError(null);
     });
+    return () => {
+      cancelled = true;
+    };
   }, [ready, autoLoadMeetings, client, refreshMeetings]);
   const createMeeting = react.useCallback(
     async (input) => {
@@ -1516,15 +1594,18 @@ exports.MediaController = MediaController;
 exports.MeetingConnection = MeetingConnection;
 exports.SABHA_SESSION_HEADER = SABHA_SESSION_HEADER;
 exports.SABHA_SESSION_STORAGE_KEY = SABHA_SESSION_STORAGE_KEY;
+exports.SABHA_TOKENS_STORAGE_KEY = SABHA_TOKENS_STORAGE_KEY;
 exports.SabhaClient = SabhaClient;
 exports.SabhaError = SabhaError;
 exports.SabhaProvider = SabhaProvider;
 exports.createSabhaClient = createSabhaClient;
 exports.normalizeMeeting = normalizeMeeting;
 exports.readStoredSessionCookie = readStoredSessionCookie;
+exports.readStoredTokens = readStoredTokens;
 exports.toSabhaError = toSabhaError;
 exports.useSabha = useSabha;
 exports.useSabhaMeetings = useSabhaMeetings;
 exports.writeStoredSessionCookie = writeStoredSessionCookie;
+exports.writeStoredTokens = writeStoredTokens;
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map