featpostgres): allow to use any token

Author: Daniele Briggi

examples/sport-tracker-app/package.json

@@ -13,10 +13,11 @@
     "vite": "^7.0.0"
   },
   "dependencies": {
-    "@sqliteai/sqlite-wasm": "*",
+    "@sqliteai/sqlite-wasm": "dev",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "^4.6.0",
+    "pg": "^8.17.2",
     "react": "^19.1.0",
     "react-dom": "^19.1.0"
   }

examples/sport-tracker-app/sport-tracker-schema-postgres.sql

@@ -0,0 +1,29 @@
+-- PostgreSQL schema
+-- Use this schema to create the remote database on PostgreSQL/PostgREST
+
+CREATE TABLE IF NOT EXISTS users_sport (
+    id TEXT PRIMARY KEY NOT NULL, -- UUID's HIGHLY RECOMMENDED for global uniqueness
+    name TEXT UNIQUE NOT NULL DEFAULT ''
+);
+
+CREATE TABLE IF NOT EXISTS activities (
+    id TEXT PRIMARY KEY NOT NULL, -- UUID's HIGHLY RECOMMENDED for global uniqueness
+    type TEXT NOT NULL DEFAULT 'runnning',
+    duration INTEGER,
+    distance DOUBLE PRECISION,
+    calories INTEGER,
+    date TEXT,
+    notes TEXT,
+    user_id TEXT REFERENCES users_sport (id)
+);
+
+CREATE TABLE IF NOT EXISTS workouts (
+    id TEXT PRIMARY KEY NOT NULL, -- UUID's HIGHLY RECOMMENDED for global uniqueness
+    name TEXT,
+    type TEXT,
+    duration INTEGER,
+    exercises TEXT,
+    date TEXT,
+    completed INTEGER DEFAULT 0,
+    user_id TEXT
+);

examples/sport-tracker-app/sport-tracker-schema.sql

@@ -1,7 +1,7 @@
 -- SQL schema
 -- Use this exact schema to create the remote database on the on SQLite Cloud
 
-CREATE TABLE IF NOT EXISTS users (
+CREATE TABLE IF NOT EXISTS users_sport (
     id TEXT PRIMARY KEY NOT NULL, -- UUID's HIGHLY RECOMMENDED for global uniqueness
     name TEXT UNIQUE NOT NULL DEFAULT ''
 );
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS activities (
     date TEXT,
     notes TEXT,
     user_id TEXT,
-    FOREIGN KEY (user_id) REFERENCES users (id)
+    FOREIGN KEY (user_id) REFERENCES users_sport (id)
 );
 
 CREATE TABLE IF NOT EXISTS workouts (

examples/sport-tracker-app/src/SQLiteSync.ts

@@ -111,21 +111,23 @@ export class SQLiteSync {
 
     const now = new Date();
     if (!token) {
-      console.log("SQLite Sync: No token available, requesting new one from API");
-      const tokenData = await this.fetchNewToken(userId, name);
-      localStorage.setItem(
-        SQLiteSync.TOKEN_KEY_PREFIX,
-        JSON.stringify(tokenData)
+      console.log(
+        "SQLite Sync: No token available, requesting new one from API",
       );
+      const tokenData = await this.fetchNewToken(userId, name);
+      // localStorage.setItem(
+      //   SQLiteSync.TOKEN_KEY_PREFIX,
+      //   JSON.stringify(tokenData),
+      // );
       token = tokenData.token;
       console.log("SQLite Sync: New token obtained and stored in localStorage");
     } else if (tokenExpiry && tokenExpiry <= now) {
       console.warn("SQLite Sync: Token expired, requesting new one from API");
       const tokenData = await this.fetchNewToken(userId, name);
-      localStorage.setItem(
-        SQLiteSync.TOKEN_KEY_PREFIX,
-        JSON.stringify(tokenData)
-      );
+      // localStorage.setItem(
+      //   SQLiteSync.TOKEN_KEY_PREFIX,
+      //   JSON.stringify(tokenData),
+      // );
       token = tokenData.token;
       console.log("SQLite Sync: New token obtained and stored in localStorage");
     } else {
@@ -143,69 +145,18 @@ export class SQLiteSync {
    */
   private async fetchNewToken(
     userId: string,
-    name: string
+    name: string,
   ): Promise<Record<string, any>> {
-    const response = await fetch(
-      `${import.meta.env.VITE_SQLITECLOUD_API_URL}/v2/tokens`,
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${import.meta.env.VITE_SQLITECLOUD_API_KEY}`,
-        },
-        body: JSON.stringify({
-          userId,
-          name,
-          expiresAt: new Date(
-            Date.now() + SQLiteSync.TOKEN_EXPIRY_MINUTES * 60 * 1000
-          ).toISOString(),
-        }),
-      }
-    );
-
-    if (!response.ok) {
-      throw new Error(`Failed to get token: ${response.status}`);
-    }
-
-    const result = await response.json();
-    return result.data;
+    const jwt = await Promise.resolve(import.meta.env.VITE_SQLITECLOUD_API_KEY);
+    return {
+      token: jwt
+    };
   }
 
   /**
    * Checks if a valid token exists in localStorage
    */
   static hasValidToken(): boolean {
-    const storedTokenData = localStorage.getItem(SQLiteSync.TOKEN_KEY_PREFIX);
-
-    if (!storedTokenData) {
-      console.log("SQLite Sync: No token data found in localStorage");
-      return false;
-    }
-
-    try {
-      const parsed: TokenData = JSON.parse(storedTokenData);
-
-      // Check if token exists
-      if (!parsed.token) {
-        console.log("SQLite Sync: Token data exists but no token found");
-        return false;
-      }
-
-      // Check if token is expired
-      if (parsed.expiresAt) {
-        const tokenExpiry = new Date(parsed.expiresAt);
-        const now = new Date();
-        if (tokenExpiry <= now) {
-          console.log("SQLite Sync: Token found but expired");
-          return false;
-        }
-      }
-
-      console.log("SQLite Sync: Valid token found in localStorage");
-      return true;
-    } catch (e) {
-      console.error("SQLite Sync: Failed to parse stored token:", e);
-      return false;
-    }
+    return false;
   }
 }

examples/sport-tracker-app/src/components/UserCreation.tsx

@@ -15,26 +15,22 @@ interface UserCreationProps {
  */
 const fetchRemoteUsers = async (): Promise<User[]> => {
   const response = await fetch(
-    `${import.meta.env.VITE_SQLITECLOUD_API_URL}/v2/weblite/sql`,
+    `${import.meta.env.VITE_SQLITECLOUD_API_URL}/rest/v1/users_sport?select=id,name`,
     {
-      method: "POST",
+      method: "GET",
       headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${import.meta.env.VITE_SQLITECLOUD_API_KEY}`,
+        Accept: "application/json",
+        Authorization: `Bearer ${import.meta.env.VITE_SQLITECLOUD_API_KEY || ""}`,
       },
-      body: JSON.stringify({
-        sql: "SELECT id, name FROM users;",
-        database: import.meta.env.VITE_SQLITECLOUD_DATABASE || "",
-      }),
     }
   );
-
+  
   if (!response.ok) {
     throw new Error(`Failed to fetch users: ${response.status}`);
   }
 
   const result = await response.json();
-  return result.data;
+  return result as User[];
 };
 
 const UserCreation: React.FC<UserCreationProps> = ({
@@ -58,6 +54,7 @@ const UserCreation: React.FC<UserCreationProps> = ({
         setRemoteUsers(users);
       } catch (error) {
         console.error("Failed to load remote users:", error);
+        alert("Failed to load remote users. Error: " + error);
       } finally {
         setIsLoadingRemoteUsers(false);
       }

examples/sport-tracker-app/src/db/databaseOperations.ts

@@ -216,7 +216,7 @@ export const getDatabaseOperations = (db: any) => ({
 
     try {
       db.exec({
-        sql: "INSERT INTO users (id, name) VALUES (?, ?)",
+        sql: "INSERT INTO users_sport (id, name) VALUES (?, ?)",
         bind: [userId, name],
       });
       return { id: userId, name };
@@ -228,7 +228,7 @@ export const getDatabaseOperations = (db: any) => ({
   getUsers() {
     const users: any[] = [];
     db.exec({
-      sql: "SELECT id, name FROM users ORDER BY name",
+      sql: "SELECT id, name FROM users_sport ORDER BY name",
       callback: (row: any) => {
         users.push({
           id: row[0],
@@ -243,7 +243,7 @@ export const getDatabaseOperations = (db: any) => ({
     const { id } = data;
     let user = null;
     db.exec({
-      sql: "SELECT id, name FROM users WHERE id = ?",
+      sql: "SELECT id, name FROM users_sport WHERE id = ?",
       bind: [id],
       callback: (row: any) => {
         user = {
@@ -268,7 +268,7 @@ export const getDatabaseOperations = (db: any) => ({
 
     // Get total counts (always show total for comparison)
     db.exec({
-      sql: "SELECT COUNT(*) FROM users WHERE name != ?",
+      sql: "SELECT COUNT(*) FROM users_sport WHERE name != ?",
       bind: ["coach"],
       callback: (row: any) => (counts.totalUsers = row[0]),
     });
@@ -287,7 +287,7 @@ export const getDatabaseOperations = (db: any) => ({
     if (user_id && !is_coach) {
       // Regular user - count only their data
       db.exec({
-        sql: "SELECT COUNT(*) FROM users WHERE name != ?",
+        sql: "SELECT COUNT(*) FROM users_sport WHERE name != ?",
         bind: ["coach"],
         callback: (row: any) => (counts.users = row[0]),
       });

examples/sport-tracker-app/src/db/sqliteSyncOperations.ts

@@ -26,7 +26,7 @@ export const getSqliteSyncOperations = (db: any) => ({
    * This will push changes to the cloud and check for changes from the cloud.
    * The first attempt may not find anything to apply, but subsequent attempts
    * will find changes if they exist.
-  */
+   */
   sqliteSyncNetworkSync() {
     console.log("SQLite Sync - Starting sync...");
     db.exec("SELECT cloudsync_network_sync(1000, 2);");
@@ -38,7 +38,7 @@ export const getSqliteSyncOperations = (db: any) => ({
    */
   sqliteSyncSendChanges() {
     console.log(
-      "SQLite Sync - Sending changes to your the SQLite Cloud node..."
+      "SQLite Sync - Sending changes to your the SQLite Cloud node...",
     );
     db.exec("SELECT cloudsync_network_send_changes();");
     console.log("SQLite Sync - Changes sent");
@@ -84,7 +84,7 @@ export const initSQLiteSync = (db: any) => {
   }
 
   // Initialize SQLite Sync
-  db.exec(`SELECT cloudsync_init('users');`);
+  db.exec(`SELECT cloudsync_init('users_sport');`);
   db.exec(`SELECT cloudsync_init('activities');`);
   db.exec(`SELECT cloudsync_init('workouts');`);
   // ...or initialize all tables at once