Browse Source

wip: console

Frank 5 months ago
parent
commit
93f2805bc2

+ 1 - 1
cloud/app/src/context/auth.session.ts

@@ -1,7 +1,7 @@
 import { useSession } from "vinxi/http"
 
 export interface AuthSession {
-  account: Record<
+  account?: Record<
     string,
     {
       id: string

+ 1 - 4
cloud/app/src/context/auth.ts

@@ -20,13 +20,10 @@ export const getActor = async (): Promise<Actor.Info> => {
   if (!evt) throw new Error("No request event")
   const url = new URL(evt.request.headers.has("x-server-id") ? evt.request.headers.get("referer")! : evt.request.url)
   const auth = await useAuthSession()
+  auth.data.account = auth.data.account ?? {}
   const splits = url.pathname.split("/").filter(Boolean)
   if (splits[0] !== "workspace") {
-    // TODO
-    console.log("before current")
-    console.log(`current: ${auth.data.current}`)
     const current = auth.data.account[auth.data.current ?? ""]
-    console.log("after current")
     if (current) {
       return {
         type: "account",

+ 0 - 2
cloud/app/src/routes/index.tsx

@@ -24,8 +24,6 @@ function CopyStatus() {
 const isLoggedIn = query(async () => {
   "use server"
   const actor = await getActor()
-  // TODO
-  console.log(actor)
   if (actor.type === "account") {
     const workspaces = await withActor(() => Account.workspaces())
     return workspaces[0].id

+ 6 - 4
cloud/app/src/routes/workspace.tsx

@@ -22,8 +22,8 @@ const logout = action(async () => {
   const current = auth.data.current
   if (current)
     await auth.update((val) => {
-      delete val.account[current]
-      const first = Object.keys(val.account)[0]
+      delete val.account?.[current]
+      const first = Object.keys(val.account ?? {})[0]
       val.current = first
       return val
     })
@@ -43,8 +43,10 @@ export default function WorkspaceLayout(props: RouteSectionProps) {
         </div>
         <div data-slot="header-actions">
           <span>{userInfo()?.user.email}</span>
-          <form onSubmit={() => location.href = "/"} action={logout} method="post">
-            <button type="submit" formaction={logout}>Logout</button>
+          <form onSubmit={() => (location.href = "/")} action={logout} method="post">
+            <button type="submit" formaction={logout}>
+              Logout
+            </button>
           </form>
         </div>
       </header>