wip: zen

packages/console/app/src/context/auth.ts

@@ -1,9 +1,7 @@
 import { getRequestEvent } from "solid-js/web"
 import { and, Database, eq, inArray, sql } from "@opencode/console-core/drizzle/index.js"
-import { WorkspaceTable } from "@opencode/console-core/schema/workspace.sql.js"
 import { UserTable } from "@opencode/console-core/schema/user.sql.js"
 import { redirect } from "@solidjs/router"
-import { AccountTable } from "@opencode/console-core/schema/account.sql.js"
 import { Actor } from "@opencode/console-core/actor.js"
 
 import { createClient } from "@openauthjs/openauth/client"
@@ -54,31 +52,27 @@ export const getActor = async (workspace?: string): Promise<Actor.Info> => {
     }
     const accounts = Object.keys(auth.data.account ?? {})
     if (accounts.length) {
-      const result = await Database.use((tx) =>
+      const user = await Database.use((tx) =>
         tx
-          .select({
-            user: UserTable,
-          })
-          .from(AccountTable)
-          .innerJoin(UserTable, and(eq(UserTable.email, AccountTable.email)))
-          .innerJoin(WorkspaceTable, eq(WorkspaceTable.id, UserTable.workspaceID))
-          .where(and(inArray(AccountTable.id, accounts), eq(WorkspaceTable.id, workspace)))
+          .select()
+          .from(UserTable)
+          .where(and(eq(UserTable.workspaceID, workspace), inArray(UserTable.accountID, accounts)))
           .limit(1)
           .execute()
           .then((x) => x[0]),
       )
-      if (result) {
+      if (user) {
         await Database.use((tx) =>
           tx
             .update(UserTable)
             .set({ timeSeen: sql`now()` })
-            .where(eq(UserTable.id, result.user.id)),
+            .where(and(eq(UserTable.workspaceID, workspace), eq(UserTable.id, user.id))),
         )
         return {
           type: "user",
           properties: {
-            userID: result.user.id,
-            workspaceID: result.user.workspaceID,
+            userID: user.id,
+            workspaceID: user.workspaceID,
           },
         }
       }