fix: login state

Author: fengkx

components/Editor/adapters/AdapterContext.tsx

@@ -9,9 +9,24 @@ const AdapterContext = createContext<IAdapter>(memoryAdapter);
 export type PropsType = {
   adapter?: IAdapter;
 };
+export function getParameterByName(name: string, url?: string): string | null {
+  if (!url) url = window.location.href;
+  name = name.replace(/[\[\]]/g, "\\$&");
+  var regex = new RegExp("[?&#]" + name + "(=([^&#]*)|&|#|$)"),
+    results = regex.exec(url);
+  if (!results) return null;
+  if (!results[2]) return "";
+  return decodeURIComponent(results[2].replace(/\+/g, " "));
+}
+
 export const AdapterProvider: React.FC<PropsType> = ({ children, adapter }) => {
   if (!adapter) {
     if (hasSupabase) {
+      const access_token =
+        typeof window !== "undefined" && getParameterByName("access_token");
+      if (access_token) {
+        supabase.auth.setAuth(access_token);
+      }
       const session = supabase.auth.session();
       console.log(session, Boolean(session));
       adapter = Boolean(session) ? supbaseAdapter : memoryAdapter;
@@ -24,10 +39,10 @@ export const AdapterProvider: React.FC<PropsType> = ({ children, adapter }) => {
   useEffect(() => {
     if (hasSupabase) {
       const session = supabase.auth.session();
-
-      setAdapterState(Boolean(session) ? supbaseAdapter : memoryAdapter);
+      const adapter = Boolean(session) ? supbaseAdapter : memoryAdapter;
+      setAdapterState(adapter);
     }
-  }, []);
+  });
   return (
     <AdapterContext.Provider value={adapterState}>
       {children}

components/Editor/adapters/memory.ts

@@ -314,6 +314,7 @@ const gotoPageAtom = atom<null, todayPageUpdate>(null, (get, set, update) => {
 });
 
 export const memoryAdapter = {
+  $$type: "memory" as "memory" | "supabase",
   pageFamily,
   pageIdAtom,
   pagesAtom,

components/Editor/adapters/supabase.ts

@@ -404,6 +404,7 @@ const gotoPageAtom = atom<null, todayPageUpdate>(
 );
 
 export const supbaseAdapter: TSupabaseAdapter = {
+  $$type: "supabase",
   isStaleAtom,
   newPageAtom,
   newBlockAtom,

components/LeftAside/index.tsx

@@ -9,7 +9,8 @@ import { ToolButton } from "./ToolButton";
 import { DotFlashing } from "../Loading";
 import { hasSupabase, supabase } from "../../db";
 import clsx from "clsx";
-import { useMountEffect, useToggle } from "@react-hookz/web";
+import { useToggle } from "@react-hookz/web";
+
 export const LeftAside: React.FC = () => {
   const router = useRouter();
   const { gotoPageAtom, loadNotesAtom, saveNotesAtom } = useAdapter();
@@ -92,7 +93,7 @@ export const LeftAside: React.FC = () => {
                   imgHeight={24}
                   onClick={async () => {
                     await supabase.auth.signOut();
-                    router.reload();
+                    setTimeout(router.reload, 0);
                   }}
                 />
               ) : (