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

package/dist/index.mjs

@@ -250,363 +250,8 @@ var BasicSync = class extends Dexie2 {
   }
 };
 
-// src/db_ts.ts
-var DBError = class extends Error {
-  constructor(message, status, response, originalError) {
-    super(message);
-    this.status = status;
-    this.response = response;
-    this.originalError = originalError;
-    this.name = "DBError";
-  }
-};
-var QueryBuilder = class {
-  constructor(tableClient, tableSchema) {
-    this.tableClient = tableClient;
-    this.tableSchema = tableSchema;
-  }
-  params = {};
-  // Reserved fields that are always allowed
-  reservedFields = ["created_at", "updated_at", "id"];
-  // Validate field existence in schema
-  validateField(field) {
-    if (this.tableSchema && !this.reservedFields.includes(field)) {
-      if (!this.tableSchema.fields || !(field in this.tableSchema.fields)) {
-        throw new Error(`Invalid field: "${field}". Field does not exist in table schema.`);
-      }
-    }
-  }
-  // Validate operator based on field type
-  validateOperator(field, operator, value) {
-    if (!this.tableSchema || this.reservedFields.includes(field)) {
-      return;
-    }
-    const fieldInfo = this.tableSchema.fields[field];
-    if (!fieldInfo)
-      return;
-    switch (operator) {
-      case "gt":
-      case "gte":
-      case "lt":
-      case "lte":
-        if (fieldInfo.type !== "number" && fieldInfo.type !== "string") {
-          throw new Error(`Operator "${operator}" can only be used with number or string fields. Field "${field}" is type "${fieldInfo.type}".`);
-        }
-        break;
-      case "like":
-      case "ilike":
-        if (fieldInfo.type !== "string") {
-          throw new Error(`Operator "${operator}" can only be used with string fields. Field "${field}" is type "${fieldInfo.type}".`);
-        }
-        if (typeof value !== "string") {
-          throw new Error(`Operator "${operator}" requires a string value. Received: ${typeof value}`);
-        }
-        break;
-      case "in":
-        if (!Array.isArray(value)) {
-          throw new Error(`Operator "in" requires an array value. Received: ${typeof value}`);
-        }
-        break;
-      case "is":
-        if (value !== null && typeof value !== "boolean") {
-          throw new Error(`Operator "is" requires null or boolean. Received: ${typeof value}`);
-        }
-        break;
-    }
-  }
-  // Add ordering to query with schema validation
-  order(field, direction = "asc") {
-    this.validateField(field);
-    this.params.order = `${field}.${direction}`;
-    return this;
-  }
-  // Add filtering to query
-  filter(conditions) {
-    if (!this.params.filters) {
-      this.params.filters = {};
-    }
-    for (const [field, condition] of Object.entries(conditions)) {
-      this.validateField(field);
-      if (condition === null || typeof condition !== "object") {
-        this.params.filters[field] = condition;
-      } else {
-        this.params.filters[field] = condition;
-      }
-    }
-    return this;
-  }
-  // Add limit to query
-  limit(count) {
-    this.params.limit = count;
-    return this;
-  }
-  // Add offset to query for pagination
-  offset(count) {
-    this.params.offset = count;
-    return this;
-  }
-  // Auto-execute when awaited
-  then(onfulfilled, onrejected) {
-    return this.tableClient.executeQuery(this.params).then(onfulfilled, onrejected);
-  }
-  // Auto-execute when awaited with catch
-  catch(onrejected) {
-    return this.tableClient.executeQuery(this.params).catch(onrejected);
-  }
-  // Auto-execute when awaited with finally
-  finally(onfinally) {
-    return this.tableClient.executeQuery(this.params).finally(onfinally);
-  }
-};
-var TableClient = class {
-  constructor(baseUrl, projectId, token, table, getToken, schema) {
-    this.baseUrl = baseUrl;
-    this.projectId = projectId;
-    this.token = token;
-    this.table = table;
-    this.getToken = getToken;
-    this.schema = schema;
-    if (schema && schema.tables && schema.tables[table]) {
-      this.tableSchema = schema.tables[table];
-    }
-  }
-  tableSchema;
-  async headers() {
-    const token = await this.getToken();
-    return {
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json"
-    };
-  }
-  async handleRequest(request) {
-    try {
-      const res = await request;
-      if (!res.ok) {
-        let errorMessage = `Request failed with status ${res.status}`;
-        let errorData;
-        try {
-          const json2 = await res.json();
-          errorData = json2;
-          if (json2.error || json2.message) {
-            const errorDetails = typeof json2.error === "object" ? JSON.stringify(json2.error) : json2.error;
-            const messageDetails = typeof json2.message === "object" ? JSON.stringify(json2.message) : json2.message;
-            errorMessage = `${res.status} ${res.statusText}: ${messageDetails || errorDetails || "Unknown error"}`;
-          }
-        } catch (e) {
-          console.log("Failed to parse error response:", e);
-          errorMessage = `${res.status} ${res.statusText}`;
-        }
-        throw new DBError(
-          errorMessage,
-          res.status,
-          errorData
-        );
-      }
-      const json = await res.json();
-      return json.data;
-    } catch (error) {
-      console.log("Caught error:", error);
-      if (error instanceof Error) {
-        console.log("Error type:", error.constructor.name);
-        console.log("Error stack:", error.stack);
-      }
-      if (error instanceof DBError) {
-        throw error;
-      }
-      if (error instanceof TypeError && error.message === "Network request failed") {
-        throw new DBError(
-          "Network request failed. Please check your internet connection and try again.",
-          void 0,
-          void 0,
-          error
-        );
-      }
-      throw new DBError(
-        `Unexpected error: ${error instanceof Error ? error.message : "Unknown error"}`,
-        void 0,
-        void 0,
-        error instanceof Error ? error : void 0
-      );
-    }
-  }
-  // Build query string from query options
-  buildQueryParams(query) {
-    if (!query)
-      return "";
-    const params = [];
-    if (query.id) {
-      params.push(`id=${query.id}`);
-    }
-    if (query.filters) {
-      for (const [field, condition] of Object.entries(query.filters)) {
-        this.addFilterParam(params, field, condition);
-      }
-    }
-    if (query.order) {
-      params.push(`order=${query.order}`);
-    }
-    if (query.limit !== void 0 && query.limit >= 0) {
-      params.push(`limit=${query.limit}`);
-    }
-    if (query.offset !== void 0 && query.offset >= 0) {
-      params.push(`offset=${query.offset}`);
-    }
-    return params.length > 0 ? `?${params.join("&")}` : "";
-  }
-  // Helper method to build filter parameters
-  addFilterParam(params, field, condition, negate = false) {
-    if (condition === null || typeof condition !== "object") {
-      if (condition === null) {
-        params.push(`${field}=${negate ? "not." : ""}is.null`);
-      } else if (typeof condition === "boolean") {
-        params.push(`${field}=${negate ? "not." : ""}is.${condition}`);
-      } else if (typeof condition === "number") {
-        params.push(`${field}=${negate ? "not." : ""}eq.${condition}`);
-      } else {
-        params.push(`${field}=${negate ? "not." : ""}eq.${encodeURIComponent(String(condition))}`);
-      }
-      return;
-    }
-    const operatorObj = condition;
-    if (operatorObj.not) {
-      this.addFilterParam(params, field, operatorObj.not, true);
-      return;
-    }
-    for (const [op, value] of Object.entries(operatorObj)) {
-      if (op === "not")
-        continue;
-      const operator = op;
-      if (value === null) {
-        params.push(`${field}=${negate ? "not." : ""}is.null`);
-      } else if (operator === "in" && Array.isArray(value)) {
-        params.push(`${field}=${negate ? "not." : ""}in.${value.join(",")}`);
-      } else if (operator === "is") {
-        if (typeof value === "boolean") {
-          params.push(`${field}=${negate ? "not." : ""}is.${value}`);
-        } else {
-          params.push(`${field}=${negate ? "not." : ""}is.null`);
-        }
-      } else {
-        const paramValue = typeof value === "string" ? encodeURIComponent(value) : String(value);
-        params.push(`${field}=${negate ? "not." : ""}${operator}.${paramValue}`);
-      }
-    }
-  }
-  // Internal method to execute a query with options
-  async executeQuery(options) {
-    const params = this.buildQueryParams(options);
-    const headers = await this.headers();
-    return this.handleRequest(
-      fetch(`${this.baseUrl}/account/${this.projectId}/db/${this.table}${params}`, {
-        headers
-      })
-    );
-  }
-  // Public method to start building a query
-  getAll() {
-    return new QueryBuilder(this, this.tableSchema);
-  }
-  // Get a specific item by ID
-  async get(id) {
-    const headers = await this.headers();
-    return this.handleRequest(
-      fetch(`${this.baseUrl}/account/${this.projectId}/db/${this.table}/${id}`, {
-        headers
-      })
-    );
-  }
-  async create(value) {
-    const headers = await this.headers();
-    return this.handleRequest(
-      fetch(`${this.baseUrl}/account/${this.projectId}/db/${this.table}`, {
-        method: "POST",
-        headers,
-        body: JSON.stringify({ value })
-      })
-    );
-  }
-  async update(id, value) {
-    const headers = await this.headers();
-    return this.handleRequest(
-      fetch(`${this.baseUrl}/account/${this.projectId}/db/${this.table}/${id}`, {
-        method: "PATCH",
-        headers,
-        body: JSON.stringify({ value })
-      })
-    );
-  }
-  async replace(id, value) {
-    const headers = await this.headers();
-    return this.handleRequest(
-      fetch(`${this.baseUrl}/account/${this.projectId}/db/${this.table}/${id}`, {
-        method: "PUT",
-        headers,
-        body: JSON.stringify({ value })
-      })
-    );
-  }
-  async delete(id) {
-    const token = await this.getToken();
-    const headers = {
-      Authorization: `Bearer ${token}`
-    };
-    return this.handleRequest(
-      fetch(`${this.baseUrl}/account/${this.projectId}/db/${this.table}/${id}`, {
-        method: "DELETE",
-        headers
-      })
-    );
-  }
-};
-var BasicDBSDK = class {
-  projectId;
-  getToken;
-  baseUrl;
-  schema;
-  tableNames;
-  constructor(config) {
-    this.projectId = config.project_id;
-    if (config.getToken) {
-      this.getToken = config.getToken;
-    } else if (config.token) {
-      this.getToken = async () => config.token;
-    } else {
-      throw new Error("Either token or getToken must be provided");
-    }
-    this.baseUrl = config.baseUrl || "https://api.basic.tech";
-    this.schema = config.schema;
-    this.tableNames = Object.keys(this.schema.tables);
-  }
-  // Primary method - table access
-  table(name) {
-    if (!this.tableNames.includes(name)) {
-      throw new Error(`Table '${name}' not found in schema. Available tables: ${this.tableNames.join(", ")}`);
-    }
-    return new TableClient(
-      this.baseUrl,
-      this.projectId,
-      "",
-      // Empty placeholder, will be replaced in headers() method
-      name,
-      this.getToken,
-      this.schema
-      // Pass the entire schema to the TableClient
-    );
-  }
-  get tables() {
-    return {};
-  }
-  fields(table) {
-    const tableSchema = this.schema.tables[table];
-    if (!tableSchema) {
-      throw new Error(`Table '${table}' not found in schema`);
-    }
-    return Object.keys(tableSchema.fields);
-  }
-};
-
 // package.json
-var version = "0.7.0-beta.1";
+var version = "0.7.0-beta.3";
 
 // src/updater/versionUpdater.ts
 var VersionUpdater = class {
@@ -749,6 +394,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) {
@@ -946,6 +592,10 @@ async function validateAndCheckSchema(schema) {
 
 // src/AuthContext.tsx
 import { jsx, jsxs } from "react/jsx-runtime";
+var DEFAULT_AUTH_CONFIG = {
+  scopes: "profile email app:admin",
+  server_url: "https://api.basic.tech"
+};
 var BasicContext = createContext({
   unicorn: "\u{1F984}",
   isAuthReady: false,
@@ -959,7 +609,6 @@ var BasicContext = createContext({
   }),
   getSignInLink: () => Promise.resolve(""),
   db: {},
-  remoteDb: {},
   dbStatus: "LOADING" /* LOADING */
 });
 function BasicProvider({
@@ -967,7 +616,8 @@ function BasicProvider({
   project_id,
   schema,
   debug = false,
-  storage
+  storage,
+  auth
 }) {
   const [isAuthReady, setIsAuthReady] = useState(false);
   const [isSignedIn, setIsSignedIn] = useState(false);
@@ -980,8 +630,12 @@ function BasicProvider({
   const [isOnline, setIsOnline] = useState(navigator.onLine);
   const [pendingRefresh, setPendingRefresh] = useState(false);
   const syncRef = useRef(null);
-  const remoteDbRef = 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();
   useEffect(() => {
@@ -994,7 +648,7 @@ function BasicProvider({
         if (token) {
           const refreshToken = token.refresh_token || localStorage.getItem("basic_refresh_token");
           if (refreshToken) {
-            fetchToken(refreshToken).catch((error2) => {
+            fetchToken(refreshToken, true).catch((error2) => {
               log("Retry refresh failed:", error2);
             });
           }
@@ -1076,17 +730,6 @@ function BasicProvider({
     }
     connectToDb();
   }, [isSignedIn, shouldConnect]);
-  useEffect(() => {
-    if (project_id && schema && token?.access_token && !remoteDbRef.current) {
-      log("Initializing Remote DB SDK");
-      remoteDbRef.current = new BasicDBSDK({
-        project_id,
-        schema,
-        getToken: () => getToken(),
-        baseUrl: "https://api.basic.tech"
-      });
-    }
-  }, [token, project_id, schema]);
   useEffect(() => {
     const initializeAuth = async () => {
       await storageAdapter.set(STORAGE_KEYS.DEBUG, debug ? "true" : "false");
@@ -1117,14 +760,14 @@ function BasicProvider({
           }
           await storageAdapter.remove(STORAGE_KEYS.AUTH_STATE);
           cleanOAuthParams();
-          fetchToken(code).catch((error2) => {
+          fetchToken(code, false).catch((error2) => {
             log("Error fetching token:", error2);
           });
         } else {
           const refreshToken = await storageAdapter.get(STORAGE_KEYS.REFRESH_TOKEN);
           if (refreshToken) {
             log("Found refresh token in storage, attempting to refresh access token");
-            fetchToken(refreshToken).catch((error2) => {
+            fetchToken(refreshToken, true).catch((error2) => {
               log("Error fetching refresh token:", error2);
             });
           } else {
@@ -1160,7 +803,7 @@ function BasicProvider({
   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}`
@@ -1193,7 +836,7 @@ function BasicProvider({
       if (isExpired) {
         log("token is expired - refreshing ...");
         try {
-          const newToken = await fetchToken(token?.refresh_token || "");
+          const newToken = await fetchToken(token?.refresh_token || "", true);
           fetchUser(newToken?.access_token || "");
         } catch (error2) {
           log("Failed to refresh token in checkToken:", error2);
@@ -1224,13 +867,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);
@@ -1278,7 +923,7 @@ function BasicProvider({
       }
       await storageAdapter.remove(STORAGE_KEYS.AUTH_STATE);
       cleanOAuthParams();
-      const token2 = await fetchToken(code);
+      const token2 = await fetchToken(code, false);
       if (token2) {
         log("signinWithCode successful");
         return { success: true };
@@ -1303,6 +948,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 {
@@ -1323,7 +969,7 @@ function BasicProvider({
       if (refreshToken) {
         log("No token in memory, attempting to refresh from storage");
         try {
-          const newToken = await fetchToken(refreshToken);
+          const newToken = await fetchToken(refreshToken, true);
           if (newToken?.access_token) {
             return newToken.access_token;
           }
@@ -1350,7 +996,7 @@ function BasicProvider({
       const refreshToken = token?.refresh_token || await storageAdapter.get(STORAGE_KEYS.REFRESH_TOKEN);
       if (refreshToken) {
         try {
-          const newToken = await fetchToken(refreshToken);
+          const newToken = await fetchToken(refreshToken, true);
           return newToken?.access_token || "";
         } catch (error2) {
           log("Failed to refresh expired token:", error2);
@@ -1366,19 +1012,45 @@ function BasicProvider({
     }
     return token?.access_token || "";
   };
-  const fetchToken = async (code) => {
+  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");
       }
-      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"
         },
-        body: JSON.stringify({ code })
+        body: JSON.stringify(requestBody)
       }).then((response) => response.json()).catch((error2) => {
         log("Network error fetching token:", error2);
         if (!isOnline) {
@@ -1395,6 +1067,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({});
@@ -1409,6 +1082,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");
       }
@@ -1418,6 +1095,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({});
@@ -1444,7 +1122,6 @@ function BasicProvider({
     getToken,
     getSignInLink,
     db: syncRef.current ? syncRef.current : noDb,
-    remoteDb: remoteDbRef.current ? remoteDbRef.current : noDb,
     dbStatus
   }, children: [
     error && isDevMode() && /* @__PURE__ */ jsx(ErrorDisplay, { error }),
@@ -1481,7 +1158,6 @@ function useBasic() {
 // src/index.ts
 import { useLiveQuery as useQuery } from "dexie-react-hooks";
 export {
-  BasicDBSDK,
   BasicProvider,
   useBasic,
   useQuery