summaryrefslogtreecommitdiffhomepage
path: root/packages/console/core/src
diff options
context:
space:
mode:
Diffstat (limited to 'packages/console/core/src')
-rw-r--r--packages/console/core/src/aws.ts53
-rw-r--r--packages/console/core/src/drizzle/index.ts10
-rw-r--r--packages/console/core/src/key.ts10
-rw-r--r--packages/console/core/src/provider.ts11
-rw-r--r--packages/console/core/src/schema/auth.sql.ts9
-rw-r--r--packages/console/core/src/schema/model.sql.ts5
-rw-r--r--packages/console/core/src/schema/provider.sql.ts5
-rw-r--r--packages/console/core/src/schema/user.sql.ts10
-rw-r--r--packages/console/core/src/user.ts28
9 files changed, 101 insertions, 40 deletions
diff --git a/packages/console/core/src/aws.ts b/packages/console/core/src/aws.ts
index e87ada6ef..ce4a20f44 100644
--- a/packages/console/core/src/aws.ts
+++ b/packages/console/core/src/aws.ts
@@ -24,37 +24,40 @@ export namespace AWS {
body: z.string(),
}),
async (input) => {
- const res = await createClient().fetch("https://email.us-east-1.amazonaws.com/v2/email/outbound-emails", {
- method: "POST",
- headers: {
- "X-Amz-Target": "SES.SendEmail",
- "Content-Type": "application/json",
- },
- body: JSON.stringify({
- FromEmailAddress: `OpenCode Zen <[email protected]>`,
- Destination: {
- ToAddresses: [input.to],
+ const res = await createClient().fetch(
+ "https://email.us-east-1.amazonaws.com/v2/email/outbound-emails",
+ {
+ method: "POST",
+ headers: {
+ "X-Amz-Target": "SES.SendEmail",
+ "Content-Type": "application/json",
},
- Content: {
- Simple: {
- Subject: {
- Charset: "UTF-8",
- Data: input.subject,
- },
- Body: {
- Text: {
+ body: JSON.stringify({
+ FromEmailAddress: `OpenCode Zen <[email protected]>`,
+ Destination: {
+ ToAddresses: [input.to],
+ },
+ Content: {
+ Simple: {
+ Subject: {
Charset: "UTF-8",
- Data: input.body,
+ Data: input.subject,
},
- Html: {
- Charset: "UTF-8",
- Data: input.body,
+ Body: {
+ Text: {
+ Charset: "UTF-8",
+ Data: input.body,
+ },
+ Html: {
+ Charset: "UTF-8",
+ Data: input.body,
+ },
},
},
},
- },
- }),
- })
+ }),
+ },
+ )
if (!res.ok) {
throw new Error(`Failed to send email: ${res.statusText}`)
}
diff --git a/packages/console/core/src/drizzle/index.ts b/packages/console/core/src/drizzle/index.ts
index f0f065de4..8b37b1f9c 100644
--- a/packages/console/core/src/drizzle/index.ts
+++ b/packages/console/core/src/drizzle/index.ts
@@ -5,7 +5,10 @@ import { Client } from "@planetscale/database"
import { MySqlTransaction, type MySqlTransactionConfig } from "drizzle-orm/mysql-core"
import type { ExtractTablesWithRelations } from "drizzle-orm"
-import type { PlanetScalePreparedQueryHKT, PlanetscaleQueryResultHKT } from "drizzle-orm/planetscale-serverless"
+import type {
+ PlanetScalePreparedQueryHKT,
+ PlanetscaleQueryResultHKT,
+} from "drizzle-orm/planetscale-serverless"
import { Context } from "../context"
import { memo } from "../util/memo"
@@ -67,7 +70,10 @@ export namespace Database {
}
}
- export async function transaction<T>(callback: (tx: TxOrDb) => Promise<T>, config?: MySqlTransactionConfig) {
+ export async function transaction<T>(
+ callback: (tx: TxOrDb) => Promise<T>,
+ config?: MySqlTransactionConfig,
+ ) {
try {
const { tx } = TransactionContext.use()
return callback(tx)
diff --git a/packages/console/core/src/key.ts b/packages/console/core/src/key.ts
index 688f19b3d..6396fd0b8 100644
--- a/packages/console/core/src/key.ts
+++ b/packages/console/core/src/key.ts
@@ -20,8 +20,14 @@ export namespace Key {
email: AuthTable.subject,
})
.from(KeyTable)
- .innerJoin(UserTable, and(eq(KeyTable.userID, UserTable.id), eq(KeyTable.workspaceID, UserTable.workspaceID)))
- .innerJoin(AuthTable, and(eq(UserTable.accountID, AuthTable.accountID), eq(AuthTable.provider, "email")))
+ .innerJoin(
+ UserTable,
+ and(eq(KeyTable.userID, UserTable.id), eq(KeyTable.workspaceID, UserTable.workspaceID)),
+ )
+ .innerJoin(
+ AuthTable,
+ and(eq(UserTable.accountID, AuthTable.accountID), eq(AuthTable.provider, "email")),
+ )
.where(
and(
...[
diff --git a/packages/console/core/src/provider.ts b/packages/console/core/src/provider.ts
index cf2040b59..0af642f71 100644
--- a/packages/console/core/src/provider.ts
+++ b/packages/console/core/src/provider.ts
@@ -11,7 +11,9 @@ export namespace Provider {
tx
.select()
.from(ProviderTable)
- .where(and(eq(ProviderTable.workspaceID, Actor.workspace()), isNull(ProviderTable.timeDeleted))),
+ .where(
+ and(eq(ProviderTable.workspaceID, Actor.workspace()), isNull(ProviderTable.timeDeleted)),
+ ),
),
)
@@ -50,7 +52,12 @@ export namespace Provider {
return Database.transaction((tx) =>
tx
.delete(ProviderTable)
- .where(and(eq(ProviderTable.provider, provider), eq(ProviderTable.workspaceID, Actor.workspace()))),
+ .where(
+ and(
+ eq(ProviderTable.provider, provider),
+ eq(ProviderTable.workspaceID, Actor.workspace()),
+ ),
+ ),
)
},
)
diff --git a/packages/console/core/src/schema/auth.sql.ts b/packages/console/core/src/schema/auth.sql.ts
index 27c926d6f..d55e605aa 100644
--- a/packages/console/core/src/schema/auth.sql.ts
+++ b/packages/console/core/src/schema/auth.sql.ts
@@ -1,4 +1,11 @@
-import { index, mysqlEnum, mysqlTable, primaryKey, uniqueIndex, varchar } from "drizzle-orm/mysql-core"
+import {
+ index,
+ mysqlEnum,
+ mysqlTable,
+ primaryKey,
+ uniqueIndex,
+ varchar,
+} from "drizzle-orm/mysql-core"
import { id, timestamps, ulid } from "../drizzle/types"
export const AuthProvider = ["email", "github", "google"] as const
diff --git a/packages/console/core/src/schema/model.sql.ts b/packages/console/core/src/schema/model.sql.ts
index 1c032aad2..343b0c4f3 100644
--- a/packages/console/core/src/schema/model.sql.ts
+++ b/packages/console/core/src/schema/model.sql.ts
@@ -9,5 +9,8 @@ export const ModelTable = mysqlTable(
...timestamps,
model: varchar("model", { length: 64 }).notNull(),
},
- (table) => [...workspaceIndexes(table), uniqueIndex("model_workspace_model").on(table.workspaceID, table.model)],
+ (table) => [
+ ...workspaceIndexes(table),
+ uniqueIndex("model_workspace_model").on(table.workspaceID, table.model),
+ ],
)
diff --git a/packages/console/core/src/schema/provider.sql.ts b/packages/console/core/src/schema/provider.sql.ts
index 11be5b4d7..04d11e2e5 100644
--- a/packages/console/core/src/schema/provider.sql.ts
+++ b/packages/console/core/src/schema/provider.sql.ts
@@ -10,5 +10,8 @@ export const ProviderTable = mysqlTable(
provider: varchar("provider", { length: 64 }).notNull(),
credentials: text("credentials").notNull(),
},
- (table) => [...workspaceIndexes(table), uniqueIndex("workspace_provider").on(table.workspaceID, table.provider)],
+ (table) => [
+ ...workspaceIndexes(table),
+ uniqueIndex("workspace_provider").on(table.workspaceID, table.provider),
+ ],
)
diff --git a/packages/console/core/src/schema/user.sql.ts b/packages/console/core/src/schema/user.sql.ts
index 7fd7f5e1e..ce5b6c53e 100644
--- a/packages/console/core/src/schema/user.sql.ts
+++ b/packages/console/core/src/schema/user.sql.ts
@@ -1,4 +1,12 @@
-import { mysqlTable, uniqueIndex, varchar, int, mysqlEnum, index, bigint } from "drizzle-orm/mysql-core"
+import {
+ mysqlTable,
+ uniqueIndex,
+ varchar,
+ int,
+ mysqlEnum,
+ index,
+ bigint,
+} from "drizzle-orm/mysql-core"
import { timestamps, ulid, utc, workspaceColumns } from "../drizzle/types"
import { workspaceIndexes } from "./workspace.sql"
diff --git a/packages/console/core/src/user.ts b/packages/console/core/src/user.ts
index 8b7a96f44..cbb1ac827 100644
--- a/packages/console/core/src/user.ts
+++ b/packages/console/core/src/user.ts
@@ -26,7 +26,10 @@ export namespace User {
authEmail: AuthTable.subject,
})
.from(UserTable)
- .leftJoin(AuthTable, and(eq(UserTable.accountID, AuthTable.accountID), eq(AuthTable.provider, "email")))
+ .leftJoin(
+ AuthTable,
+ and(eq(UserTable.accountID, AuthTable.accountID), eq(AuthTable.provider, "email")),
+ )
.where(and(eq(UserTable.workspaceID, Actor.workspace()), isNull(UserTable.timeDeleted))),
),
)
@@ -36,7 +39,13 @@ export namespace User {
tx
.select()
.from(UserTable)
- .where(and(eq(UserTable.workspaceID, Actor.workspace()), eq(UserTable.id, id), isNull(UserTable.timeDeleted)))
+ .where(
+ and(
+ eq(UserTable.workspaceID, Actor.workspace()),
+ eq(UserTable.id, id),
+ isNull(UserTable.timeDeleted),
+ ),
+ )
.then((rows) => rows[0]),
),
)
@@ -48,7 +57,10 @@ export namespace User {
email: AuthTable.subject,
})
.from(UserTable)
- .leftJoin(AuthTable, and(eq(UserTable.accountID, AuthTable.accountID), eq(AuthTable.provider, "email")))
+ .leftJoin(
+ AuthTable,
+ and(eq(UserTable.accountID, AuthTable.accountID), eq(AuthTable.provider, "email")),
+ )
.where(and(eq(UserTable.workspaceID, Actor.workspace()), eq(UserTable.id, id)))
.then((rows) => rows[0]?.email),
),
@@ -130,10 +142,16 @@ export namespace User {
workspaceName: WorkspaceTable.name,
})
.from(UserTable)
- .innerJoin(AuthTable, and(eq(UserTable.accountID, AuthTable.accountID), eq(AuthTable.provider, "email")))
+ .innerJoin(
+ AuthTable,
+ and(eq(UserTable.accountID, AuthTable.accountID), eq(AuthTable.provider, "email")),
+ )
.innerJoin(WorkspaceTable, eq(WorkspaceTable.id, workspaceID))
.where(
- and(eq(UserTable.workspaceID, workspaceID), eq(UserTable.id, Actor.assert("user").properties.userID)),
+ and(
+ eq(UserTable.workspaceID, workspaceID),
+ eq(UserTable.id, Actor.assert("user").properties.userID),
+ ),
)
.then((rows) => rows[0]),
)