diff --git a/packages/console/core/src/user.ts b/packages/console/core/src/user.ts
index 63877150..40d74f93 100644
--- a/packages/console/core/src/user.ts
+++ b/packages/console/core/src/user.ts
@@ -11,6 +11,7 @@ import { Account } from "./account"
import { AccountTable } from "./schema/account.sql"
import { Key } from "./key"
import { KeyTable } from "./schema/key.sql"
+import { WorkspaceTable } from "./schema/workspace.sql"
export namespace User {
const assertNotSelf = (id: string) => {
@@ -115,6 +116,21 @@ export namespace User {
// send email, ignore errors
try {
+ const emailInfo = await Database.use((tx) =>
+ tx
+ .select({
+ email: AccountTable.email,
+ workspaceName: WorkspaceTable.name,
+ })
+ .from(UserTable)
+ .innerJoin(AccountTable, eq(UserTable.accountID, AccountTable.id))
+ .innerJoin(WorkspaceTable, eq(WorkspaceTable.id, workspaceID))
+ .where(
+ and(eq(UserTable.workspaceID, workspaceID), eq(UserTable.id, Actor.assert("user").properties.userID)),
+ )
+ .then((rows) => rows[0]),
+ )
+
const { InviteEmail } = await import("@opencode-ai/console-mail/InviteEmail.jsx")
await AWS.sendEmail({
to: email,
@@ -122,8 +138,10 @@ export namespace User {
body: render(
// @ts-ignore
InviteEmail({
+ inviter: emailInfo.email,
assetsUrl: `https://opencode.ai/email`,
- workspace: workspaceID,
+ workspaceID: workspaceID,
+ workspaceName: emailInfo.workspaceName,
}),
),
})
diff --git a/packages/console/mail/emails/components.tsx b/packages/console/mail/emails/components.tsx
index d030b6cb..ff845c8f 100644
--- a/packages/console/mail/emails/components.tsx
+++ b/packages/console/mail/emails/components.tsx
@@ -31,6 +31,10 @@ export function A({ children, ...props }: AProps) {
return React.createElement("a", props, children)
}
+export function B({ children, ...props }: AProps) {
+ return React.createElement("b", props, children)
+}
+
export function Span({ children, ...props }: SpanProps) {
return React.createElement("span", props, children)
}
diff --git a/packages/console/mail/emails/templates/InviteEmail.tsx b/packages/console/mail/emails/templates/InviteEmail.tsx
index 978080a9..5c963022 100644
--- a/packages/console/mail/emails/templates/InviteEmail.tsx
+++ b/packages/console/mail/emails/templates/InviteEmail.tsx
@@ -1,7 +1,7 @@
// @ts-nocheck
import React from "react"
import { Img, Row, Html, Link, Body, Head, Button, Column, Preview, Section, Container } from "@jsx-email/all"
-import { Hr, Text, Fonts, SplitString, Title, A, Span } from "../components"
+import { Hr, Text, Fonts, SplitString, Title, A, Span, B } from "../components"
import {
unit,
body,
@@ -23,17 +23,24 @@ const CONSOLE_URL = "https://opencode.ai/"
const DOC_URL = "https://opencode.ai/docs/zen"
interface InviteEmailProps {
- workspace: string
+ inviter: string
+ workspaceID: string
+ workspaceName: string
assetsUrl: string
}
-export const InviteEmail = ({ workspace, assetsUrl = LOCAL_ASSETS_URL }: InviteEmailProps) => {
- const subject = `Join the ${workspace} workspace`
- const messagePlain = `You've been invited to join the ${workspace} workspace in the OpenCode Zen Console.`
- const url = `${CONSOLE_URL}workspace/${workspace}`
+export const InviteEmail = ({
+ inviter = "test@anoma.ly",
+ workspaceID = "wrk_01K6XFY7V53T8XN0A7X8G9BTN3",
+ workspaceName = "anomaly",
+ assetsUrl = LOCAL_ASSETS_URL,
+}: InviteEmailProps) => {
+ const subject = `You were invited to the OpenCode Console`
+ const messagePlain = `${inviter} invited you to join the ${workspaceName} workspace (${workspaceID}).`
+ const url = `${CONSOLE_URL}workspace/${workspaceID}`
return (
- {`OpenCode Zen — ${messagePlain}`}
+ {`OpenCode — ${messagePlain}`}
{messagePlain}
@@ -42,15 +49,10 @@ export const InviteEmail = ({ workspace, assetsUrl = LOCAL_ASSETS_URL }: InviteE
-
- 
+
+ 
-
-
-
@@ -59,32 +61,26 @@ export const InviteEmail = ({ workspace, assetsUrl = LOCAL_ASSETS_URL }: InviteE
-
-
- OpenCode Zen
- :
- {workspace}
-
-
-
-
-
-
-
- You've been invited to join the{" "}
+ {inviter} invited you to join the{" "}
- {workspace}
+ {workspaceName}
{" "}
- workspace in the{" "}
-
- OpenCode Zen Console
+ workspace ({workspaceID}) in the{" "}
+
+ OpenCode Console
.
+
+
@@ -93,7 +89,7 @@ export const InviteEmail = ({ workspace, assetsUrl = LOCAL_ASSETS_URL }: InviteE
-
+
Console
diff --git a/packages/console/mail/emails/templates/static/logo.png b/packages/console/mail/emails/templates/static/logo.png
new file mode 100644
index 00000000..1d4a3963
Binary files /dev/null and b/packages/console/mail/emails/templates/static/logo.png differ