redo the auth so that only one user acc is created

Author: trangdoan982

apps/obsidian/src/utils/supabaseContext.ts

@@ -19,11 +19,12 @@ export type SupabaseContext = {
 let contextCache: SupabaseContext | null = null;
 
 const generateAccountLocalId = (vaultName: string): string => {
-  const randomSuffix = Math.random()
-    .toString(36)
-    .substring(2, 8)
-    .toUpperCase();
-  return `${vaultName}-${randomSuffix}`;
+  const randomSuffix = Math.random().toString(36).substring(2, 8).toUpperCase();
+  const sanitizedVaultName = vaultName
+    .replace(/\s+/g, "")
+    .replace(/[^a-zA-Z0-9]/g, "")
+    .replace(/-+/g, "-");
+  return `${sanitizedVaultName}${randomSuffix}`;
 };
 
 const getOrCreateSpacePassword = async (
@@ -32,7 +33,6 @@ const getOrCreateSpacePassword = async (
   if (plugin.settings.spacePassword) {
     return plugin.settings.spacePassword;
   }
-  // Generate UUID using crypto.randomUUID()
   const password = crypto.randomUUID();
   plugin.settings.spacePassword = password;
   await plugin.saveSettings();
@@ -62,7 +62,6 @@ export const getSupabaseContext = async (
       const spacePassword = await getOrCreateSpacePassword(plugin);
       const accountLocalId = await getOrCreateAccountLocalId(plugin, vaultName);
 
-      // Space URL format: "space" + accountLocalId
       const url = `space${accountLocalId}`;
       const platform: Platform = "Obsidian";
 
@@ -83,7 +82,7 @@ export const getSupabaseContext = async (
         platform: "Obsidian",
         accountLocalId,
         name: vaultName,
-        email: undefined,
+        email: accountLocalId,
         spaceId,
         password: spacePassword,
       });
@@ -109,17 +108,47 @@ export const getLoggedInClient = async (
 ): Promise<DGSupabaseClient | null> => {
   if (loggedInClient === null) {
     const context = await getSupabaseContext(plugin);
-    if (context === null) throw new Error("Could not create context");
-    loggedInClient = await createLoggedInClient(
-      context.platform,
-      context.spaceId,
-      context.spacePassword,
-    );
+    if (context === null) {
+      throw new Error("Could not create Supabase context");
+    }
+    try {
+      loggedInClient = await createLoggedInClient({
+        platform: context.platform,
+        spaceId: context.spaceId,
+        password: context.spacePassword,
+      });
+      if (!loggedInClient) {
+        throw new Error(
+          "Failed to create Supabase client - check environment variables",
+        );
+      }
+    } catch (error) {
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      console.error("Failed to create logged-in client:", errorMessage);
+      throw new Error(`Supabase authentication failed: ${errorMessage}`);
+    }
   } else {
     // renew session
     const { error } = await loggedInClient.auth.getSession();
     if (error) {
+      console.warn("Session renewal failed, re-authenticating:", error);
       loggedInClient = null;
+      const context = await getSupabaseContext(plugin);
+      if (context === null) {
+        throw new Error(
+          "Could not create Supabase context for re-authentication",
+        );
+      }
+
+      loggedInClient = await createLoggedInClient({
+        platform: context.platform,
+        spaceId: context.spaceId,
+        password: context.spacePassword,
+      });
+      if (!loggedInClient) {
+        throw new Error("Failed to re-authenticate Supabase client");
+      }
     }
   }
   return loggedInClient;

apps/roam/src/utils/supabaseContext.ts

@@ -96,11 +96,11 @@ export const getLoggedInClient = async (): Promise<DGSupabaseClient | null> => {
   if (_loggedInClient === null) {
     const context = await getSupabaseContext();
     if (context === null) throw new Error("Could not create context");
-    _loggedInClient = await createLoggedInClient(
-      context.platform,
-      context.spaceId,
-      context.spacePassword,
-    );
+    _loggedInClient = await createLoggedInClient({
+      platform: context.platform,
+      spaceId: context.spaceId,
+      password: context.spacePassword,
+    });
   } else {
     // renew session
     const { error } = await _loggedInClient.auth.getSession();

packages/database/src/lib/contextFunctions.ts

@@ -123,15 +123,20 @@ export const fetchOrCreateSpaceDirect = async (
   };
 };
 
-export const createLoggedInClient = async (
-  platform: Platform,
-  spaceId: number,
-  password: string,
-): Promise<DGSupabaseClient | null> => {
+export const createLoggedInClient = async ({
+  platform,
+  spaceId,
+  password,
+}: {
+  platform: Platform;
+  spaceId: number;
+  password: string;
+}): Promise<DGSupabaseClient | null> => {
   const loggedInClient: DGSupabaseClient | null = createClient();
   if (!loggedInClient) return null;
+  const email = spaceAnonUserEmail(platform, spaceId);
   const { error } = await loggedInClient.auth.signInWithPassword({
-    email: spaceAnonUserEmail(platform, spaceId),
+    email,
     password: password,
   });
   if (error) {
@@ -155,7 +160,11 @@ export const fetchOrCreatePlatformAccount = async ({
   spaceId: number;
   password: string;
 }): Promise<number> => {
-  const supabase = await createLoggedInClient(platform, spaceId, password);
+  const supabase = await createLoggedInClient({
+    platform,
+    spaceId,
+    password,
+  });
   if (!supabase) throw Error("Missing database connection");
 
   const result = await supabase.rpc("create_account_in_space", {

packages/database/supabase/functions/create-space/index.ts

@@ -260,4 +260,4 @@ Deno.serve(async (req) => {
     --header 'Content-Type: application/json' \
     --data '{ "url":"https://roamresearch.com/#/app/abc", "name":"abc","platform":"Roam", "password": "abcdefgh" }'
 
-*/
+*/