aljaz/opencode
1
0
Fork 0
mirror of https://github.com/aljazceru/opencode.git synced 2025-12-20 17:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

wip: zen

Browse Source
This commit is contained in:
Frank
2025-10-02 17:55:54 -04:00
parent 73115efab1
commit a8341e2b8b
10 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/console/app/src/context/auth.ts
View File

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

2
packages/console/app/src/entry-server.tsx
View File

@@ -9,7 +9,7 @@ export default createHandler(
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" href="/favicon.svg" /> <link rel="icon" href="/favicon-zen.svg" />
<meta property="og:image" content="/social-share.png" /> <meta property="og:image" content="/social-share.png" />
<meta property="twitter:image" content="/social-share.png" /> <meta property="twitter:image" content="/social-share.png" />
{assets} {assets}

2
packages/console/app/src/routes/index.tsx
View File

@@ -56,7 +56,7 @@ export default function Home() {
<main data-page="opencode"> <main data-page="opencode">
<HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" /> <HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />
<Title>OpenCode | The AI coding agent built for the terminal</Title> <Title>OpenCode | The AI coding agent built for the terminal</Title>
<Link rel="icon" type="image/svg+xml" href="/favicon.svg" /> <Link rel="icon" type="image/svg+xml" href="/favicon-zen.svg" />
<Meta property="og:image" content="/social-share.png" /> <Meta property="og:image" content="/social-share.png" />
<Meta name="twitter:image" content="/social-share.png" /> <Meta name="twitter:image" content="/social-share.png" />
<div data-component="container"> <div data-component="container">

2
packages/console/app/src/routes/workspace.tsx
View File

@@ -38,7 +38,7 @@ const logout = action(async () => {
event!.locals.actor = undefined event!.locals.actor = undefined
return val return val
}) })
throw redirect("/") throw redirect("/zen")
}) })
export default function WorkspaceLayout(props: RouteSectionProps) { export default function WorkspaceLayout(props: RouteSectionProps) {

4
packages/console/app/src/routes/workspace/member-section.tsx
View File

@@ -169,7 +169,7 @@ function MemberRow(props: { member: any; workspaceID: string; currentUserID: str
when={editing()} when={editing()}
fallback={ fallback={
<tr> <tr>
<td data-slot="member-email">{props.member.email}</td> <td data-slot="member-email">{props.member.accountEmail ?? props.member.email}</td>
<td data-slot="member-role">{props.member.role}</td> <td data-slot="member-role">{props.member.role}</td>
<Show when={!props.member.timeSeen} fallback={<td data-slot="member-joined"></td>}> <Show when={!props.member.timeSeen} fallback={<td data-slot="member-joined"></td>}>
<td data-slot="member-joined">invited</td> <td data-slot="member-joined">invited</td>
@@ -192,7 +192,7 @@ function MemberRow(props: { member: any; workspaceID: string; currentUserID: str
<tr> <tr>
<td colspan="4"> <td colspan="4">
<form action={updateMemberRole} method="post"> <form action={updateMemberRole} method="post">
<div data-slot="edit-member-email">{props.member.email}</div> <div data-slot="edit-member-email">{props.member.accountEmail ?? props.member.email}</div>
<input type="hidden" name="id" value={props.member.id} /> <input type="hidden" name="id" value={props.member.id} />
<input type="hidden" name="workspaceID" value={props.workspaceID} /> <input type="hidden" name="workspaceID" value={props.workspaceID} />
<Show when={!isCurrentUser()} fallback={<div data-slot="current-user-role">Role: {props.member.role}</div>}> <Show when={!isCurrentUser()} fallback={<div data-slot="current-user-role">Role: {props.member.role}</div>}>

2
packages/console/core/src/account.ts
View File

@@ -54,7 +54,7 @@ export namespace Account {
.select(getTableColumns(WorkspaceTable)) .select(getTableColumns(WorkspaceTable))
.from(WorkspaceTable) .from(WorkspaceTable)
.innerJoin(UserTable, eq(UserTable.workspaceID, WorkspaceTable.id)) .innerJoin(UserTable, eq(UserTable.workspaceID, WorkspaceTable.id))
.where(and(eq(UserTable.email, actor.properties.email), isNull(WorkspaceTable.timeDeleted))) .where(and(eq(UserTable.accountID, actor.properties.accountID), isNull(WorkspaceTable.timeDeleted)))
.execute(), .execute(),
) )
} }

8
packages/console/core/src/schema/user.sql.ts
View File

@@ -1,6 +1,7 @@
import { mysqlTable, uniqueIndex, varchar, int, mysqlEnum } from "drizzle-orm/mysql-core" import { mysqlTable, uniqueIndex, varchar, int, mysqlEnum, foreignKey } from "drizzle-orm/mysql-core"
import { timestamps, ulid, utc, workspaceColumns } from "../drizzle/types" import { timestamps, ulid, utc, workspaceColumns } from "../drizzle/types"
import { workspaceIndexes } from "./workspace.sql" import { workspaceIndexes } from "./workspace.sql"
import { AccountTable } from "./account.sql"
export const UserRole = ["admin", "member"] as const export const UserRole = ["admin", "member"] as const
@@ -22,5 +23,10 @@ export const UserTable = mysqlTable(
...workspaceIndexes(table), ...workspaceIndexes(table),
uniqueIndex("user_account_id").on(table.workspaceID, table.accountID), uniqueIndex("user_account_id").on(table.workspaceID, table.accountID),
uniqueIndex("user_email").on(table.workspaceID, table.email), uniqueIndex("user_email").on(table.workspaceID, table.email),
foreignKey({
columns: [table.accountID],
foreignColumns: [AccountTable.id],
name: "global_account_id",
}),
], ],
) )

30
packages/console/core/src/user.ts
View File

@@ -1,5 +1,5 @@
import { z } from "zod" import { z } from "zod"
import { and, eq, isNull, sql } from "drizzle-orm" import { and, eq, getTableColumns, isNull, sql } from "drizzle-orm"
import { fn } from "./util/fn" import { fn } from "./util/fn"
import { Database } from "./drizzle" import { Database } from "./drizzle"
import { UserRole, UserTable } from "./schema/user.sql" import { UserRole, UserTable } from "./schema/user.sql"
@@ -9,6 +9,7 @@ import { render } from "@jsx-email/render"
import { InviteEmail } from "@opencode/console-mail/InviteEmail.jsx" import { InviteEmail } from "@opencode/console-mail/InviteEmail.jsx"
import { AWS } from "./aws" import { AWS } from "./aws"
import { Account } from "./account" import { Account } from "./account"
import { AccountTable } from "./schema/account.sql"
export namespace User { export namespace User {
const assertAdmin = async () => { const assertAdmin = async () => {
@@ -29,8 +30,12 @@ export namespace User {
export const list = fn(z.void(), () => export const list = fn(z.void(), () =>
Database.use((tx) => Database.use((tx) =>
tx tx
.select() .select({
...getTableColumns(UserTable),
accountEmail: AccountTable.email,
})
.from(UserTable) .from(UserTable)
.leftJoin(AccountTable, eq(UserTable.accountID, AccountTable.id))
.where(and(eq(UserTable.workspaceID, Actor.workspace()), isNull(UserTable.timeDeleted))), .where(and(eq(UserTable.workspaceID, Actor.workspace()), isNull(UserTable.timeDeleted))),
), ),
) )
@@ -159,19 +164,22 @@ export namespace User {
await assertAdmin() await assertAdmin()
assertNotSelf(id) assertNotSelf(id)
return await Database.use(async (tx) => { return await Database.transaction(async (tx) => {
const email = await tx const user = await fromID(id)
.select({ email: UserTable.email }) if (!user) throw new Error("User not found")
.from(UserTable)
.where(and(eq(UserTable.id, id), eq(UserTable.workspaceID, Actor.workspace())))
.then((rows) => rows[0]?.email)
if (!email) throw new Error("User not found")
await tx await tx
.update(UserTable) .update(UserTable)
.set({ .set({
oldEmail: email, ...(user.email
email: null, ? {
oldEmail: user.email,
email: null,
}
: {
oldAccountID: user.accountID,
accountID: null,
}),
timeDeleted: sql`now()`, timeDeleted: sql`now()`,
}) })
.where(and(eq(UserTable.id, id), eq(UserTable.workspaceID, Actor.workspace()))) .where(and(eq(UserTable.id, id), eq(UserTable.workspaceID, Actor.workspace())))

7
packages/console/core/src/workspace.ts
View File

@@ -1,7 +1,7 @@
import { z } from "zod" import { z } from "zod"
import { fn } from "./util/fn" import { fn } from "./util/fn"
import { Actor } from "./actor" import { Actor } from "./actor"
import { Database, sql } from "./drizzle" import { Database } from "./drizzle"
import { Identifier } from "./identifier" import { Identifier } from "./identifier"
import { UserTable } from "./schema/user.sql" import { UserTable } from "./schema/user.sql"
import { BillingTable } from "./schema/billing.sql" import { BillingTable } from "./schema/billing.sql"
@@ -20,7 +20,6 @@ export namespace Workspace {
workspaceID, workspaceID,
id: Identifier.create("user"), id: Identifier.create("user"),
accountID: account.properties.accountID, accountID: account.properties.accountID,
email: account.properties.email,
name: "", name: "",
role: "admin", role: "admin",
}) })
@@ -35,9 +34,7 @@ export namespace Workspace {
{ {
workspaceID, workspaceID,
}, },
async () => { () => Key.create({ name: "Default API Key" }),
await Key.create({ name: "Default API Key" })
},
) )
return workspaceID return workspaceID
}) })

2
packages/console/function/src/auth.ts
View File

@@ -29,7 +29,7 @@ export const subjects = createSubjects({
const MY_THEME: Theme = { const MY_THEME: Theme = {
...THEME_OPENAUTH, ...THEME_OPENAUTH,
logo: "https://opencode.ai/favicon.svg", logo: "https://opencode.ai/favicon-zen.svg",
} }
export default { export default {