Error messages, correction to removing token from url

Author: maparent

apps/obsidian/src/components/AdminPanelSettings.tsx

@@ -50,15 +50,21 @@ export const AdminPanelSettings = () => {
       return;
     }
     const sessionData = await client.auth.getSession();
-    if (!sessionData.data.session) return;
+    if (!sessionData.data.session) {
+      new Notice("Failed to connect to the database", 3000);
+      return;
+    }
     /* eslint-disable @typescript-eslint/naming-convention */
     const { access_token, refresh_token } = sessionData.data.session;
     const { data, error } = await client.rpc("create_secret_token", {
       v_payload: JSON.stringify({ access_token, refresh_token }),
       expiry_interval: "45s",
     });
     /* eslint-enable @typescript-eslint/naming-convention */
-    if (error || typeof data !== "string") return;
+    if (error || typeof data !== "string") {
+      new Notice("Failed to connect to the database", 3000);
+      return;
+    }
     if (data) window.open(`${nextRoot()}/auth/token?t=${data}&url=/`, "_blank");
   };
 

apps/roam/src/components/settings/AdminPanel.tsx

@@ -12,6 +12,7 @@ import {
   Tabs,
 } from "@blueprintjs/core";
 import { Select } from "@blueprintjs/select";
+import { render as renderToast } from "roamjs-components/components/Toast";
 import {
   getSupabaseContext,
   getLoggedInClient,
@@ -35,6 +36,7 @@ import {
 import { FeatureFlagPanel } from "./components/BlockPropSettingPanels";
 import type { FeatureFlags } from "./utils/zodSchema";
 import { nextRoot } from "@repo/utils/execContext";
+import { useDroppableMeasuring } from "@dnd-kit/core/dist/hooks/utilities";
 
 const NodeRow = ({ node }: { node: PConceptFull }) => {
   return (
@@ -295,17 +297,38 @@ const FeatureFlagsTab = (): React.ReactElement => {
 
   const handleLoginHandoff = async () => {
     const client = await getLoggedInClient();
-    if (!client) return;
+    if (!client) {
+      renderToast({
+        content: "Could not connect to database",
+        intent: Intent.DANGER,
+        id: "client-access",
+      });
+      return;
+    }
     const sessionData = await client.auth.getSession();
-    if (!sessionData.data.session) return;
+    if (!sessionData.data.session) {
+      internalError({
+        error: "Client w/o session",
+        type: "database-login",
+        userMessage: "Could not connect to database",
+      });
+      return;
+    }
     /* eslint-disable @typescript-eslint/naming-convention */
     const { access_token, refresh_token } = sessionData.data.session;
     const { data, error } = await client.rpc("create_secret_token", {
       v_payload: JSON.stringify({ access_token, refresh_token }),
       expiry_interval: "45s",
     });
     /* eslint-enable @typescript-eslint/naming-convention */
-    if (error || typeof data !== "string") return;
+    if (error || typeof data !== "string") {
+      internalError({
+        error: "Call to create-secret-token",
+        type: "create-secret-token",
+        userMessage: "Could not connect to database",
+      });
+      return;
+    }
     if (data) window.open(`${nextRoot()}/auth/token?t=${data}&url=/`, "_blank");
   };
 

apps/website/app/components/auth/LoginWithToken.tsx

@@ -3,20 +3,20 @@
 import { createClient } from "~/utils/supabase/client";
 import { useRouter, useSearchParams } from "next/navigation";
 import { useState, useEffect, useCallback, useRef } from "react";
+import internalError from "~/utils/internalError";
 
 export const LoginWithToken = () => {
   const loginAttempted = useRef(false);
   const searchParams = useSearchParams();
   const router = useRouter();
-  const [secretToken] = useState(() => {
-    const t = searchParams.get("t");
-    if (t && typeof window !== "undefined") {
+  const [secretToken] = useState(() => searchParams.get("t"));
+  useEffect(() => {
+    if (secretToken && typeof window !== "undefined") {
       const url = new URL(window.location.href);
       url.searchParams.delete("t");
       window.history.replaceState({}, "", url);
     }
-    return t;
-  });
+  }, [secretToken]);
   const [url] = useState(searchParams.get("url"));
   const [done, setDone] = useState(false);
   const [error, setError] = useState<string | null>(
@@ -30,15 +30,23 @@ export const LoginWithToken = () => {
         token: secretToken!,
       });
       if (result.error) {
-        setError(result.error.message);
+        setError("Could not connect to DiscourseGraphs");
+        internalError({ error: result.error, type: "get-secret-token" });
         return;
       }
       if (result.data == null) {
-        setError("This token does not exist");
+        setError("Could not retrieve information, please try again.");
+        internalError({ error: "missing token", type: "get-secret-token" });
         return;
       }
       if (typeof result.data !== "string") {
-        setError("Payload is not a string");
+        setError(
+          "DiscourseGraphs configuration error, the team has been warned",
+        );
+        internalError({
+          error: "payload-not-string",
+          type: "get-secret-token",
+        });
         return;
       }
       const data = JSON.parse(result.data) as {
@@ -53,7 +61,10 @@ export const LoginWithToken = () => {
         !data.access_token ||
         !data.refresh_token
       ) {
-        setError("Malformed token information");
+        setError(
+          "DiscourseGraphs configuration error, the team has been warned",
+        );
+        internalError({ error: "misshaped-payload", type: "get-secret-token" });
         return;
       }
       const response = await client.auth.setSession(data);
@@ -63,9 +74,8 @@ export const LoginWithToken = () => {
         router.replace(url);
       }
     } catch (error) {
-      setError(
-        error instanceof Error ? error.message : "Unknown error occurred",
-      );
+      setError("Unkown error while logging you in.");
+      internalError({ error, type: "token-login-exception" });
     } finally {
       setDone(true);
     }