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

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
 
 
-> @basictech/react@0.6.0-beta.0 build
+> @basictech/react@0.7.0-beta.3 build
 > tsup
 
 CLI Building entry: src/index.ts
@@ -11,13 +11,13 @@
 CLI Cleaning output folder
 CJS Build start
 ESM Build start
-ESM dist/index.mjs     26.88 KB
-ESM dist/index.mjs.map 60.43 KB
-ESM ⚡️ Build success in 15ms
-CJS dist/index.js     29.13 KB
-CJS dist/index.js.map 60.46 KB
-CJS ⚡️ Build success in 15ms
+CJS dist/index.js     41.20 KB
+CJS dist/index.js.map 82.45 KB
+CJS ⚡️ Build success in 17ms
+ESM dist/index.mjs     39.45 KB
+ESM dist/index.mjs.map 82.44 KB
+ESM ⚡️ Build success in 18ms
 DTS Build start
-DTS ⚡️ Build success in 854ms
-DTS dist/index.d.ts  1008.00 B
-DTS dist/index.d.mts 1008.00 B
+DTS ⚡️ Build success in 905ms
+DTS dist/index.d.ts  1.76 KB
+DTS dist/index.d.mts 1.76 KB

package/changelog.md

@@ -1,5 +1,11 @@
 # 1.3.4
 
+## 0.7.0-beta.4
+
+### Patch Changes
+
+- fix: provider props
+
 ## 0.7.0-beta.3
 
 ### Patch Changes

package/dist/index.d.mts

@@ -7,7 +7,24 @@ interface BasicStorage {
     set(key: string, value: string): Promise<void>;
     remove(key: string): Promise<void>;
 }
+declare class LocalStorageAdapter implements BasicStorage {
+    get(key: string): Promise<string | null>;
+    set(key: string, value: string): Promise<void>;
+    remove(key: string): Promise<void>;
+}
 
+type AuthConfig = {
+    scopes?: string | string[];
+    server_url?: string;
+};
+type BasicProviderProps = {
+    children: React.ReactNode;
+    project_id?: string;
+    schema?: any;
+    debug?: boolean;
+    storage?: BasicStorage;
+    auth?: AuthConfig;
+};
 declare enum DBStatus {
     LOADING = "LOADING",
     OFFLINE = "OFFLINE",
@@ -25,13 +42,7 @@ type User = {
     };
     fullName?: string;
 };
-declare function BasicProvider({ children, project_id, schema, debug, storage }: {
-    children: React.ReactNode;
-    project_id?: string;
-    schema?: any;
-    debug?: boolean;
-    storage?: BasicStorage;
-}): react_jsx_runtime.JSX.Element;
+declare function BasicProvider({ children, project_id, schema, debug, storage, auth }: BasicProviderProps): react_jsx_runtime.JSX.Element;
 declare function useBasic(): {
     unicorn: string;
     isAuthReady: boolean;
@@ -49,4 +60,4 @@ declare function useBasic(): {
     dbStatus: DBStatus;
 };
 
-export { BasicProvider, useBasic };
+export { AuthConfig, BasicProvider, BasicProviderProps, BasicStorage, LocalStorageAdapter, useBasic };

package/dist/index.d.ts

@@ -7,7 +7,24 @@ interface BasicStorage {
     set(key: string, value: string): Promise<void>;
     remove(key: string): Promise<void>;
 }
+declare class LocalStorageAdapter implements BasicStorage {
+    get(key: string): Promise<string | null>;
+    set(key: string, value: string): Promise<void>;
+    remove(key: string): Promise<void>;
+}
 
+type AuthConfig = {
+    scopes?: string | string[];
+    server_url?: string;
+};
+type BasicProviderProps = {
+    children: React.ReactNode;
+    project_id?: string;
+    schema?: any;
+    debug?: boolean;
+    storage?: BasicStorage;
+    auth?: AuthConfig;
+};
 declare enum DBStatus {
     LOADING = "LOADING",
     OFFLINE = "OFFLINE",
@@ -25,13 +42,7 @@ type User = {
     };
     fullName?: string;
 };
-declare function BasicProvider({ children, project_id, schema, debug, storage }: {
-    children: React.ReactNode;
-    project_id?: string;
-    schema?: any;
-    debug?: boolean;
-    storage?: BasicStorage;
-}): react_jsx_runtime.JSX.Element;
+declare function BasicProvider({ children, project_id, schema, debug, storage, auth }: BasicProviderProps): react_jsx_runtime.JSX.Element;
 declare function useBasic(): {
     unicorn: string;
     isAuthReady: boolean;
@@ -49,4 +60,4 @@ declare function useBasic(): {
     dbStatus: DBStatus;
 };
 
-export { BasicProvider, useBasic };
+export { AuthConfig, BasicProvider, BasicProviderProps, BasicStorage, LocalStorageAdapter, useBasic };

package/dist/index.js

@@ -279,7 +279,7 @@ var BasicSync = class extends import_dexie2.Dexie {
 };
 
 // package.json
-var version = "0.7.0-beta.2";
+var version = "0.7.0-beta.3";
 
 // src/updater/versionUpdater.ts
 var VersionUpdater = class {
@@ -422,6 +422,7 @@ var STORAGE_KEYS = {
   REFRESH_TOKEN: "basic_refresh_token",
   USER_INFO: "basic_user_info",
   AUTH_STATE: "basic_auth_state",
+  REDIRECT_URI: "basic_redirect_uri",
   DEBUG: "basic_debug"
 };
 function getCookie(name) {
@@ -619,6 +620,10 @@ 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"
+};
 var BasicContext = (0, import_react.createContext)({
   unicorn: "\u{1F984}",
   isAuthReady: false,
@@ -639,7 +644,8 @@ function BasicProvider({
   project_id,
   schema,
   debug = false,
-  storage
+  storage,
+  auth
 }) {
   const [isAuthReady, setIsAuthReady] = (0, import_react.useState)(false);
   const [isSignedIn, setIsSignedIn] = (0, import_react.useState)(false);
@@ -653,6 +659,11 @@ function BasicProvider({
   const [pendingRefresh, setPendingRefresh] = (0, import_react.useState)(false);
   const syncRef = (0, import_react.useRef)(null);
   const storageAdapter = storage || new LocalStorageAdapter();
+  const authConfig = {
+    scopes: auth?.scopes || DEFAULT_AUTH_CONFIG.scopes,
+    server_url: auth?.server_url || DEFAULT_AUTH_CONFIG.server_url
+  };
+  const scopesString = Array.isArray(authConfig.scopes) ? authConfig.scopes.join(" ") : authConfig.scopes;
   const isDevMode = () => isDevelopment(debug);
   const cleanOAuthParams = () => cleanOAuthParamsFromUrl();
   (0, import_react.useEffect)(() => {
@@ -820,7 +831,7 @@ function BasicProvider({
   (0, import_react.useEffect)(() => {
     async function fetchUser(acc_token) {
       console.info("fetching user");
-      const user2 = await fetch("https://api.basic.tech/auth/userInfo", {
+      const user2 = await fetch(`${authConfig.server_url}/auth/userInfo`, {
         method: "GET",
         headers: {
           "Authorization": `Bearer ${acc_token}`
@@ -884,13 +895,15 @@ function BasicProvider({
       if (!redirectUrl || !redirectUrl.startsWith("http://") && !redirectUrl.startsWith("https://")) {
         throw new Error("Invalid redirect URI provided");
       }
-      let baseUrl = "https://api.basic.tech/auth/authorize";
+      await storageAdapter.set(STORAGE_KEYS.REDIRECT_URI, redirectUrl);
+      log("Stored redirect_uri for token exchange:", redirectUrl);
+      let baseUrl = `${authConfig.server_url}/auth/authorize`;
       baseUrl += `?client_id=${project_id}`;
       baseUrl += `&redirect_uri=${encodeURIComponent(redirectUrl)}`;
       baseUrl += `&response_type=code`;
-      baseUrl += `&scope=profile`;
+      baseUrl += `&scope=${encodeURIComponent(scopesString)}`;
       baseUrl += `&state=${randomState}`;
-      log("Generated sign-in link successfully");
+      log("Generated sign-in link successfully with scopes:", scopesString);
       return baseUrl;
     } catch (error2) {
       log("Error generating sign-in link:", error2);
@@ -963,6 +976,7 @@ function BasicProvider({
     await storageAdapter.remove(STORAGE_KEYS.AUTH_STATE);
     await storageAdapter.remove(STORAGE_KEYS.REFRESH_TOKEN);
     await storageAdapter.remove(STORAGE_KEYS.USER_INFO);
+    await storageAdapter.remove(STORAGE_KEYS.REDIRECT_URI);
     if (syncRef.current) {
       (async () => {
         try {
@@ -1033,14 +1047,33 @@ function BasicProvider({
         setPendingRefresh(true);
         throw new Error("Network offline - refresh will be retried when online");
       }
-      const requestBody = isRefreshToken ? {
-        grant_type: "refresh_token",
-        refresh_token: codeOrRefreshToken
-      } : {
-        grant_type: "authorization_code",
-        code: codeOrRefreshToken
-      };
-      const token2 = await fetch("https://api.basic.tech/auth/token", {
+      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"
@@ -1062,6 +1095,7 @@ function BasicProvider({
         }
         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({});
@@ -1076,6 +1110,10 @@ function BasicProvider({
           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 });
         log("Updated access token in cookie");
       }
@@ -1085,6 +1123,7 @@ function BasicProvider({
       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({});