redo the auth so that only one user acc is created

trangdoan982 · trangdoan982 · commit ee79a54cbaf8 · 2026-01-08T15:00:36.000-05:00
diff --git a/apps/obsidian/src/components/AdminPanelSettings.tsx b/apps/obsidian/src/components/AdminPanelSettings.tsx
@@ -1,20 +1,57 @@
-import { useState } from "react";
+import { useState, useCallback } from "react";
 import { usePlugin } from "./PluginContext";
 import { Notice } from "obsidian";
+import { initializeSupabaseSync } from "~/utils/syncDgNodesToSupabase";
 
 export const AdminPanelSettings = () => {
   const plugin = usePlugin();
+  const [syncModeEnabled, setSyncModeEnabled] = useState<boolean>(
+    plugin.settings.syncModeEnabled ?? false,
+  );
   const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
 
+  const handleSyncModeToggle = useCallback((newValue: boolean) => {
+    setSyncModeEnabled(newValue);
+    setHasUnsavedChanges(true);
+  }, []);
+
   const handleSave = async () => {
+    plugin.settings.syncModeEnabled = syncModeEnabled;
     await plugin.saveSettings();
     new Notice("Admin panel settings saved");
     setHasUnsavedChanges(false);
+
+    if (syncModeEnabled) {
+      try {
+        await initializeSupabaseSync(plugin);
+        new Notice("Sync mode initialized successfully");
+      } catch (error) {
+        console.error("Failed to initialize sync mode:", error);
+        new Notice(
+          `Failed to initialize sync mode: ${error instanceof Error ? error.message : String(error)}`,
+        );
+      }
+    }
   };
 
   return (
     <div className="general-settings">
-      {/* Add more admin panel settings sections here */}
+      <div className="setting-item">
+        <div className="setting-item-info">
+          <div className="setting-item-name">(BETA) Sync mode enable</div>
+          <div className="setting-item-description">
+            Enable synchronization with Discourse Graph database
+          </div>
+        </div>
+        <div className="setting-item-control">
+          <div
+            className={`checkbox-container ${syncModeEnabled ? "is-enabled" : ""}`}
+            onClick={() => handleSyncModeToggle(!syncModeEnabled)}
+          >
+            <input type="checkbox" checked={syncModeEnabled} />
+          </div>
+        </div>
+      </div>
 
       <div className="setting-item">
         <button
diff --git a/apps/obsidian/src/components/GeneralSettings.tsx b/apps/obsidian/src/components/GeneralSettings.tsx
@@ -3,7 +3,6 @@ import { usePlugin } from "./PluginContext";
 import { Notice, setIcon } from "obsidian";
 import SuggestInput from "./SuggestInput";
 import { SLACK_LOGO, WHITE_LOGO_SVG } from "~/icons";
-import { initializeSupabaseSync } from "~/utils/syncDgNodesToSupabase";
 
 const DOCS_URL = "https://discoursegraphs.com/docs/obsidian";
 const COMMUNITY_URL =
@@ -158,9 +157,6 @@ const GeneralSettings = () => {
   const [nodeTagHotkey, setNodeTagHotkey] = useState<string>(
     plugin.settings.nodeTagHotkey,
   );
-  const [syncModeEnabled, setSyncModeEnabled] = useState<boolean>(
-    plugin.settings.syncModeEnabled ?? false,
-  );
   const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
 
   const handleToggleChange = (newValue: boolean) => {
@@ -194,11 +190,6 @@ const GeneralSettings = () => {
     }
   }, []);
 
-  const handleSyncModeToggle = useCallback((newValue: boolean) => {
-    setSyncModeEnabled(newValue);
-    setHasUnsavedChanges(true);
-  }, []);
-
   const handleSave = async () => {
     const trimmedNodesFolderPath = nodesFolderPath.trim();
     const trimmedCanvasFolderPath = canvasFolderPath.trim();
@@ -210,25 +201,12 @@ const GeneralSettings = () => {
     plugin.settings.canvasAttachmentsFolderPath =
       trimmedCanvasAttachmentsFolderPath;
     plugin.settings.nodeTagHotkey = nodeTagHotkey || "";
-    plugin.settings.syncModeEnabled = syncModeEnabled;
     setNodesFolderPath(trimmedNodesFolderPath);
     setCanvasFolderPath(trimmedCanvasFolderPath);
     setCanvasAttachmentsFolderPath(trimmedCanvasAttachmentsFolderPath);
     await plugin.saveSettings();
     new Notice("General settings saved");
     setHasUnsavedChanges(false);
-
-    if (syncModeEnabled) {
-      try {
-        await initializeSupabaseSync(plugin);
-        new Notice("Sync mode initialized successfully");
-      } catch (error) {
-        console.error("Failed to initialize sync mode:", error);
-        new Notice(
-          `Failed to initialize sync mode: ${error instanceof Error ? error.message : String(error)}`,
-        );
-      }
-    }
   };
 
   return (
@@ -333,23 +311,6 @@ const GeneralSettings = () => {
         </div>
       </div>
 
-      <div className="setting-item">
-        <div className="setting-item-info">
-          <div className="setting-item-name">(BETA) Sync mode enable</div>
-          <div className="setting-item-description">
-            Enable synchronization with Discourse Graph database
-          </div>
-        </div>
-        <div className="setting-item-control">
-          <div
-            className={`checkbox-container ${syncModeEnabled ? "is-enabled" : ""}`}
-            onClick={() => handleSyncModeToggle(!syncModeEnabled)}
-          >
-            <input type="checkbox" checked={syncModeEnabled} />
-          </div>
-        </div>
-      </div>
-
       <div className="setting-item">
         <button
           onClick={() => void handleSave()}
diff --git a/apps/obsidian/src/utils/supabaseContext.ts b/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();
@@ -52,18 +52,30 @@ const getOrCreateAccountLocalId = async (
   return accountLocalId;
 };
 
+/**
+ * Gets the unique vault ID from Obsidian's internal API.
+ * @see https://help.obsidian.md/Extending+Obsidian/Obsidian+URI
+ */
+const getVaultId = (app: DiscourseGraphPlugin["app"]): string => {
+  return (app as unknown as { appId: string }).appId;
+};
+
+const canonicalObsidianUrl = (vaultId: string): string => {
+  return `obsidian:${vaultId}`;
+};
+
 export const getSupabaseContext = async (
   plugin: DiscourseGraphPlugin,
 ): Promise<SupabaseContext | null> => {
   if (contextCache === null) {
     try {
       const vaultName = plugin.app.vault.getName() || "obsidian-vault";
+      const vaultId = getVaultId(plugin.app);
 
       const spacePassword = await getOrCreateSpacePassword(plugin);
       const accountLocalId = await getOrCreateAccountLocalId(plugin, vaultName);
 
-      // Space URL format: "space" + accountLocalId
-      const url = `space${accountLocalId}`;
+      const url = canonicalObsidianUrl(vaultId);
       const platform: Platform = "Obsidian";
 
       const spaceResult = await fetchOrCreateSpaceDirect({
@@ -83,7 +95,7 @@ export const getSupabaseContext = async (
         platform: "Obsidian",
         accountLocalId,
         name: vaultName,
-        email: undefined,
+        email: accountLocalId,
         spaceId,
         password: spacePassword,
       });
@@ -109,17 +121,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;
diff --git a/apps/roam/src/utils/supabaseContext.ts b/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();
diff --git a/packages/database/src/lib/contextFunctions.ts b/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", {
diff --git a/packages/database/supabase/functions/create-space/index.ts b/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" }'
 
-*/
+*/
