@basictech/react 0.7.0-beta.4 → 0.7.0-beta.5

package/changelog.md

@@ -1,5 +1,11 @@
 # 1.3.4
 
+## 0.7.0-beta.5
+
+### Patch Changes
+
+- config server url & token patch
+
 ## 0.7.0-beta.4
 
 ### Patch Changes

package/dist/index.d.mts

@@ -16,6 +16,7 @@ declare class LocalStorageAdapter implements BasicStorage {
 type AuthConfig = {
     scopes?: string | string[];
     server_url?: string;
+    ws_url?: string;
 };
 type BasicProviderProps = {
     children: React.ReactNode;

package/dist/index.d.ts

@@ -16,6 +16,7 @@ declare class LocalStorageAdapter implements BasicStorage {
 type AuthConfig = {
     scopes?: string | string[];
     server_url?: string;
+    ws_url?: string;
 };
 type BasicProviderProps = {
     children: React.ReactNode;

package/dist/index.js

@@ -167,15 +167,15 @@ var BasicSync = class extends import_dexie2.Dexie {
     this.version(2).stores({});
     this.Collection.prototype.get = this.Collection.prototype.toArray;
   }
-  async connect({ access_token }) {
-    const WS_URL = `wss://pds.basic.id/ws`;
+  async connect({ access_token, ws_url }) {
+    const WS_URL = ws_url || "wss://pds.basic.id/ws";
     log("Connecting to", WS_URL);
     await this.updateSyncNodes();
     log("Starting connection...");
     return this.syncable.connect("websocket", WS_URL, { authToken: access_token, schema: this.basic_schema });
   }
-  async disconnect() {
-    const WS_URL = `wss://pds.basic.id/ws`;
+  async disconnect({ ws_url } = {}) {
+    const WS_URL = ws_url || "wss://pds.basic.id/ws";
     return this.syncable.disconnect(WS_URL);
   }
   async updateSyncNodes() {
@@ -279,7 +279,7 @@ var BasicSync = class extends import_dexie2.Dexie {
 };
 
 // package.json
-var version = "0.7.0-beta.3";
+var version = "0.7.0-beta.4";
 
 // src/updater/versionUpdater.ts
 var VersionUpdater = class {
@@ -423,6 +423,7 @@ var STORAGE_KEYS = {
   USER_INFO: "basic_user_info",
   AUTH_STATE: "basic_auth_state",
   REDIRECT_URI: "basic_redirect_uri",
+  SERVER_URL: "basic_server_url",
   DEBUG: "basic_debug"
 };
 function getCookie(name) {
@@ -621,8 +622,9 @@ async function validateAndCheckSchema(schema) {
 // src/AuthContext.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 var DEFAULT_AUTH_CONFIG = {
-  scopes: "profile email app:admin",
-  server_url: "https://api.basic.tech"
+  scopes: "profile,email,app:admin",
+  server_url: "https://api.basic.tech",
+  ws_url: "wss://pds.basic.id/ws"
 };
 var BasicContext = (0, import_react.createContext)({
   unicorn: "\u{1F984}",
@@ -661,9 +663,11 @@ function BasicProvider({
   const storageAdapter = storage || new LocalStorageAdapter();
   const authConfig = {
     scopes: auth?.scopes || DEFAULT_AUTH_CONFIG.scopes,
-    server_url: auth?.server_url || DEFAULT_AUTH_CONFIG.server_url
+    server_url: auth?.server_url || DEFAULT_AUTH_CONFIG.server_url,
+    ws_url: auth?.ws_url || DEFAULT_AUTH_CONFIG.ws_url
   };
   const scopesString = Array.isArray(authConfig.scopes) ? authConfig.scopes.join(" ") : authConfig.scopes;
+  const refreshPromiseRef = (0, import_react.useRef)(null);
   const isDevMode = () => isDevelopment(debug);
   const cleanOAuthParams = () => cleanOAuthParamsFromUrl();
   (0, import_react.useEffect)(() => {
@@ -751,7 +755,10 @@ function BasicProvider({
           return;
         }
         log("connecting to db...");
-        syncRef.current?.connect({ access_token: tok }).catch((e) => {
+        syncRef.current?.connect({
+          access_token: tok,
+          ws_url: authConfig.ws_url
+        }).catch((e) => {
           log("error connecting to db", e);
         });
       }
@@ -761,6 +768,17 @@ function BasicProvider({
   (0, import_react.useEffect)(() => {
     const initializeAuth = async () => {
       await storageAdapter.set(STORAGE_KEYS.DEBUG, debug ? "true" : "false");
+      const storedServerUrl = await storageAdapter.get(STORAGE_KEYS.SERVER_URL);
+      if (storedServerUrl && storedServerUrl !== authConfig.server_url) {
+        log("Server URL changed, clearing stored tokens");
+        await storageAdapter.remove(STORAGE_KEYS.REFRESH_TOKEN);
+        await storageAdapter.remove(STORAGE_KEYS.USER_INFO);
+        await storageAdapter.remove(STORAGE_KEYS.AUTH_STATE);
+        await storageAdapter.remove(STORAGE_KEYS.REDIRECT_URI);
+        clearCookie("basic_token");
+        clearCookie("basic_access_token");
+      }
+      await storageAdapter.set(STORAGE_KEYS.SERVER_URL, authConfig.server_url);
       try {
         const versionUpdater = createVersionUpdater(storageAdapter, version, getMigrations());
         const updateResult = await versionUpdater.checkAndUpdate();
@@ -831,16 +849,21 @@ function BasicProvider({
   (0, import_react.useEffect)(() => {
     async function fetchUser(acc_token) {
       console.info("fetching user");
-      const user2 = await fetch(`${authConfig.server_url}/auth/userInfo`, {
-        method: "GET",
-        headers: {
-          "Authorization": `Bearer ${acc_token}`
+      try {
+        const response = await fetch(`${authConfig.server_url}/auth/userInfo`, {
+          method: "GET",
+          headers: {
+            "Authorization": `Bearer ${acc_token}`
+          }
+        });
+        if (!response.ok) {
+          throw new Error(`Failed to fetch user info: ${response.status}`);
+        }
+        const user2 = await response.json();
+        if (user2.error) {
+          log("error fetching user", user2.error);
+          throw new Error(`User info error: ${user2.error}`);
         }
-      }).then((response) => response.json()).catch((error2) => log("Error:", error2));
-      if (user2.error) {
-        log("error fetching user", user2.error);
-        return;
-      } else {
         if (token?.refresh_token) {
           await storageAdapter.set(STORAGE_KEYS.REFRESH_TOKEN, token.refresh_token);
         }
@@ -851,6 +874,9 @@ function BasicProvider({
         setUser(user2);
         setIsSignedIn(true);
         setIsAuthReady(true);
+      } catch (error2) {
+        log("Failed to fetch user info:", error2);
+        setIsAuthReady(true);
       }
     }
     async function checkToken() {
@@ -860,7 +886,8 @@ function BasicProvider({
         return;
       }
       const decoded = (0, import_jwt_decode.jwtDecode)(token?.access_token);
-      const isExpired = decoded.exp && decoded.exp < Date.now() / 1e3;
+      const expirationBuffer = 5;
+      const isExpired = decoded.exp && decoded.exp < Date.now() / 1e3 + expirationBuffer;
       if (isExpired) {
         log("token is expired - refreshing ...");
         try {
@@ -919,7 +946,9 @@ function BasicProvider({
       }
       const signInLink = await getSignInLink();
       log("Generated sign-in link:", signInLink);
-      if (!signInLink || !signInLink.startsWith("https://")) {
+      try {
+        new URL(signInLink);
+      } catch {
         log("Error: Invalid sign-in link generated");
         throw new Error("Failed to generate valid sign-in URL");
       }
@@ -977,6 +1006,7 @@ function BasicProvider({
     await storageAdapter.remove(STORAGE_KEYS.REFRESH_TOKEN);
     await storageAdapter.remove(STORAGE_KEYS.USER_INFO);
     await storageAdapter.remove(STORAGE_KEYS.REDIRECT_URI);
+    await storageAdapter.remove(STORAGE_KEYS.SERVER_URL);
     if (syncRef.current) {
       (async () => {
         try {
@@ -996,6 +1026,18 @@ function BasicProvider({
       const refreshToken = await storageAdapter.get(STORAGE_KEYS.REFRESH_TOKEN);
       if (refreshToken) {
         log("No token in memory, attempting to refresh from storage");
+        if (refreshPromiseRef.current) {
+          log("Token refresh already in progress, waiting...");
+          try {
+            const newToken = await refreshPromiseRef.current;
+            if (newToken?.access_token) {
+              return newToken.access_token;
+            }
+          } catch (error2) {
+            log("In-flight refresh failed:", error2);
+            throw error2;
+          }
+        }
         try {
           const newToken = await fetchToken(refreshToken, true);
           if (newToken?.access_token) {
@@ -1018,9 +1060,24 @@ function BasicProvider({
       throw new Error("no token found");
     }
     const decoded = (0, import_jwt_decode.jwtDecode)(token?.access_token);
-    const isExpired = decoded.exp && decoded.exp < Date.now() / 1e3;
+    const expirationBuffer = 5;
+    const isExpired = decoded.exp && decoded.exp < Date.now() / 1e3 + expirationBuffer;
     if (isExpired) {
       log("token is expired - refreshing ...");
+      if (refreshPromiseRef.current) {
+        log("Token refresh already in progress, waiting...");
+        try {
+          const newToken = await refreshPromiseRef.current;
+          return newToken?.access_token || "";
+        } catch (error2) {
+          log("In-flight refresh failed:", error2);
+          if (error2.message.includes("offline") || error2.message.includes("Network")) {
+            log("Network issue - using expired token until network is restored");
+            return token.access_token;
+          }
+          throw error2;
+        }
+      }
       const refreshToken = token?.refresh_token || await storageAdapter.get(STORAGE_KEYS.REFRESH_TOKEN);
       if (refreshToken) {
         try {
@@ -1041,98 +1098,117 @@ function BasicProvider({
     return token?.access_token || "";
   };
   const fetchToken = async (codeOrRefreshToken, isRefreshToken = false) => {
-    try {
-      if (!isOnline) {
-        log("Network is offline, marking refresh as pending");
-        setPendingRefresh(true);
-        throw new Error("Network offline - refresh will be retried when online");
-      }
-      let requestBody;
-      if (isRefreshToken) {
-        requestBody = {
-          grant_type: "refresh_token",
-          refresh_token: codeOrRefreshToken
-        };
-        if (project_id) {
-          requestBody.client_id = project_id;
-        }
-      } else {
-        requestBody = {
-          grant_type: "authorization_code",
-          code: codeOrRefreshToken
-        };
-        const storedRedirectUri = await storageAdapter.get(STORAGE_KEYS.REDIRECT_URI);
-        if (storedRedirectUri) {
-          requestBody.redirect_uri = storedRedirectUri;
-          log("Including redirect_uri in token exchange:", storedRedirectUri);
-        } else {
-          log("Warning: No redirect_uri found in storage for token exchange");
-        }
-        if (project_id) {
-          requestBody.client_id = project_id;
-        }
-      }
-      log("Token exchange request body:", { ...requestBody, refresh_token: isRefreshToken ? "[REDACTED]" : void 0, code: !isRefreshToken ? "[REDACTED]" : void 0 });
-      const token2 = await fetch(`${authConfig.server_url}/auth/token`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(requestBody)
-      }).then((response) => response.json()).catch((error2) => {
-        log("Network error fetching token:", error2);
+    if (isRefreshToken && refreshPromiseRef.current) {
+      log("Reusing in-flight refresh token request");
+      return refreshPromiseRef.current;
+    }
+    const refreshPromise = (async () => {
+      try {
         if (!isOnline) {
+          log("Network is offline, marking refresh as pending");
           setPendingRefresh(true);
           throw new Error("Network offline - refresh will be retried when online");
         }
-        throw new Error("Network error during token refresh");
-      });
-      if (token2.error) {
-        log("error fetching token", token2.error);
-        if (token2.error.includes("network") || token2.error.includes("timeout")) {
-          setPendingRefresh(true);
-          throw new Error("Network issue - refresh will be retried when online");
+        let requestBody;
+        if (isRefreshToken) {
+          requestBody = {
+            grant_type: "refresh_token",
+            refresh_token: codeOrRefreshToken
+          };
+          if (project_id) {
+            requestBody.client_id = project_id;
+          }
+        } else {
+          requestBody = {
+            grant_type: "authorization_code",
+            code: codeOrRefreshToken
+          };
+          const storedRedirectUri = await storageAdapter.get(STORAGE_KEYS.REDIRECT_URI);
+          if (storedRedirectUri) {
+            requestBody.redirect_uri = storedRedirectUri;
+            log("Including redirect_uri in token exchange:", storedRedirectUri);
+          } else {
+            log("Warning: No redirect_uri found in storage for token exchange");
+          }
+          if (project_id) {
+            requestBody.client_id = project_id;
+          }
         }
-        await storageAdapter.remove(STORAGE_KEYS.REFRESH_TOKEN);
-        await storageAdapter.remove(STORAGE_KEYS.USER_INFO);
-        await storageAdapter.remove(STORAGE_KEYS.REDIRECT_URI);
-        clearCookie("basic_token");
-        clearCookie("basic_access_token");
-        setUser({});
-        setIsSignedIn(false);
-        setToken(null);
-        setIsAuthReady(true);
-        throw new Error(`Token refresh failed: ${token2.error}`);
-      } else {
-        setToken(token2);
-        setPendingRefresh(false);
-        if (token2.refresh_token) {
-          await storageAdapter.set(STORAGE_KEYS.REFRESH_TOKEN, token2.refresh_token);
-          log("Updated refresh token in storage");
+        log("Token exchange request body:", { ...requestBody, refresh_token: isRefreshToken ? "[REDACTED]" : void 0, code: !isRefreshToken ? "[REDACTED]" : void 0 });
+        const token2 = await fetch(`${authConfig.server_url}/auth/token`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify(requestBody)
+        }).then((response) => response.json()).catch((error2) => {
+          log("Network error fetching token:", error2);
+          if (!isOnline) {
+            setPendingRefresh(true);
+            throw new Error("Network offline - refresh will be retried when online");
+          }
+          throw new Error("Network error during token refresh");
+        });
+        if (token2.error) {
+          log("error fetching token", token2.error);
+          if (token2.error.includes("network") || token2.error.includes("timeout")) {
+            setPendingRefresh(true);
+            throw new Error("Network issue - refresh will be retried when online");
+          }
+          await storageAdapter.remove(STORAGE_KEYS.REFRESH_TOKEN);
+          await storageAdapter.remove(STORAGE_KEYS.USER_INFO);
+          await storageAdapter.remove(STORAGE_KEYS.REDIRECT_URI);
+          await storageAdapter.remove(STORAGE_KEYS.SERVER_URL);
+          clearCookie("basic_token");
+          clearCookie("basic_access_token");
+          setUser({});
+          setIsSignedIn(false);
+          setToken(null);
+          setIsAuthReady(true);
+          throw new Error(`Token refresh failed: ${token2.error}`);
+        } else {
+          setToken(token2);
+          setPendingRefresh(false);
+          if (token2.refresh_token) {
+            await storageAdapter.set(STORAGE_KEYS.REFRESH_TOKEN, token2.refresh_token);
+            log("Updated refresh token in storage");
+          }
+          if (!isRefreshToken) {
+            await storageAdapter.remove(STORAGE_KEYS.REDIRECT_URI);
+            log("Cleaned up redirect_uri from storage after successful exchange");
+          }
+          setCookie("basic_access_token", token2.access_token, { httpOnly: false });
+          setCookie("basic_token", JSON.stringify(token2));
+          log("Updated access token and full token in cookies");
         }
-        if (!isRefreshToken) {
+        return token2;
+      } catch (error2) {
+        log("Token refresh error:", error2);
+        if (!error2.message.includes("offline") && !error2.message.includes("Network")) {
+          await storageAdapter.remove(STORAGE_KEYS.REFRESH_TOKEN);
+          await storageAdapter.remove(STORAGE_KEYS.USER_INFO);
           await storageAdapter.remove(STORAGE_KEYS.REDIRECT_URI);
-          log("Cleaned up redirect_uri from storage after successful exchange");
+          await storageAdapter.remove(STORAGE_KEYS.SERVER_URL);
+          clearCookie("basic_token");
+          clearCookie("basic_access_token");
+          setUser({});
+          setIsSignedIn(false);
+          setToken(null);
+          setIsAuthReady(true);
         }
-        setCookie("basic_access_token", token2.access_token, { httpOnly: false });
-        log("Updated access token in cookie");
+        throw error2;
       }
-      return token2;
-    } catch (error2) {
-      log("Token refresh error:", error2);
-      if (!error2.message.includes("offline") && !error2.message.includes("Network")) {
-        await storageAdapter.remove(STORAGE_KEYS.REFRESH_TOKEN);
-        await storageAdapter.remove(STORAGE_KEYS.USER_INFO);
-        await storageAdapter.remove(STORAGE_KEYS.REDIRECT_URI);
-        clearCookie("basic_token");
-        clearCookie("basic_access_token");
-        setUser({});
-        setIsSignedIn(false);
-        setToken(null);
-        setIsAuthReady(true);
-      }
-      throw error2;
+    })();
+    if (isRefreshToken) {
+      refreshPromiseRef.current = refreshPromise;
+      refreshPromise.finally(() => {
+        if (refreshPromiseRef.current === refreshPromise) {
+          refreshPromiseRef.current = null;
+          log("Cleared refresh promise reference");
+        }
+      });
     }
+    return refreshPromise;
   };
   const noDb = {
     collection: () => {