From a8341e2b8be40f93aa4dddf5349a420a03966fcf Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 2 Oct 2025 17:55:54 -0400 Subject: wip: zen --- packages/console/app/src/context/auth.ts | 22 ++++++++-------------- packages/console/app/src/entry-server.tsx | 2 +- packages/console/app/src/routes/index.tsx | 2 +- packages/console/app/src/routes/workspace.tsx | 2 +- .../app/src/routes/workspace/member-section.tsx | 4 ++-- 5 files changed, 13 insertions(+), 19 deletions(-) (limited to 'packages/console/app/src') diff --git a/packages/console/app/src/context/auth.ts b/packages/console/app/src/context/auth.ts index 079f05c9c..eff005c53 100644 --- a/packages/console/app/src/context/auth.ts +++ b/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 => { } 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, }, } } diff --git a/packages/console/app/src/entry-server.tsx b/packages/console/app/src/entry-server.tsx index d5fca6aa5..e05133147 100644 --- a/packages/console/app/src/entry-server.tsx +++ b/packages/console/app/src/entry-server.tsx @@ -9,7 +9,7 @@ export default createHandler( - + {assets} diff --git a/packages/console/app/src/routes/index.tsx b/packages/console/app/src/routes/index.tsx index 95a24268b..281cec099 100644 --- a/packages/console/app/src/routes/index.tsx +++ b/packages/console/app/src/routes/index.tsx @@ -56,7 +56,7 @@ export default function Home() {
OpenCode | The AI coding agent built for the terminal - +
diff --git a/packages/console/app/src/routes/workspace.tsx b/packages/console/app/src/routes/workspace.tsx index 3aa3f20d3..9a90fb9a9 100644 --- a/packages/console/app/src/routes/workspace.tsx +++ b/packages/console/app/src/routes/workspace.tsx @@ -38,7 +38,7 @@ const logout = action(async () => { event!.locals.actor = undefined return val }) - throw redirect("/") + throw redirect("/zen") }) export default function WorkspaceLayout(props: RouteSectionProps) { diff --git a/packages/console/app/src/routes/workspace/member-section.tsx b/packages/console/app/src/routes/workspace/member-section.tsx index 7dc893346..4bd45a153 100644 --- a/packages/console/app/src/routes/workspace/member-section.tsx +++ b/packages/console/app/src/routes/workspace/member-section.tsx @@ -169,7 +169,7 @@ function MemberRow(props: { member: any; workspaceID: string; currentUserID: str when={editing()} fallback={ - {props.member.email} + {props.member.accountEmail ?? props.member.email} {props.member.role} }> invited @@ -192,7 +192,7 @@ function MemberRow(props: { member: any; workspaceID: string; currentUserID: str
-
{props.member.email}
+
{props.member.accountEmail ?? props.member.email}
Role: {props.member.role}
}> -- cgit v1.2.3