summaryrefslogtreecommitdiffhomepage
path: root/packages/console/core
diff options
context:
space:
mode:
Diffstat (limited to 'packages/console/core')
-rw-r--r--packages/console/core/script/lookup-user.ts13
-rw-r--r--packages/console/core/script/reset-db.ts10
-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/model.ts4
-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
12 files changed, 45 insertions, 123 deletions
diff --git a/packages/console/core/script/lookup-user.ts b/packages/console/core/script/lookup-user.ts
index af9bcc3a1..1ae18c4dd 100644
--- a/packages/console/core/script/lookup-user.ts
+++ b/packages/console/core/script/lookup-user.ts
@@ -8,22 +8,15 @@ if (!email) {
process.exit(1)
}
-const authData = await printTable("Auth", (tx) =>
- tx.select().from(AuthTable).where(eq(AuthTable.subject, email)),
-)
+const authData = await printTable("Auth", (tx) => tx.select().from(AuthTable).where(eq(AuthTable.subject, email)))
if (authData.length === 0) {
console.error("User not found")
process.exit(1)
}
-await printTable("Auth", (tx) =>
- tx.select().from(AuthTable).where(eq(AuthTable.accountID, authData[0].accountID)),
-)
+await printTable("Auth", (tx) => tx.select().from(AuthTable).where(eq(AuthTable.accountID, authData[0].accountID)))
-function printTable(
- title: string,
- callback: (tx: Database.TxOrDb) => Promise<any[]>,
-): Promise<any[]> {
+function printTable(title: string, callback: (tx: Database.TxOrDb) => Promise<any[]>): Promise<any[]> {
return Database.use(async (tx) => {
const data = await callback(tx)
console.log(`== ${title} ==`)
diff --git a/packages/console/core/script/reset-db.ts b/packages/console/core/script/reset-db.ts
index bd00e1962..02d498901 100644
--- a/packages/console/core/script/reset-db.ts
+++ b/packages/console/core/script/reset-db.ts
@@ -8,14 +8,6 @@ import { KeyTable } from "../src/schema/key.sql.js"
if (Resource.App.stage !== "frank") throw new Error("This script is only for frank")
-for (const table of [
- AccountTable,
- BillingTable,
- KeyTable,
- PaymentTable,
- UsageTable,
- UserTable,
- WorkspaceTable,
-]) {
+for (const table of [AccountTable, BillingTable, KeyTable, PaymentTable, UsageTable, UserTable, WorkspaceTable]) {
await Database.use((tx) => tx.delete(table))
}
diff --git a/packages/console/core/src/aws.ts b/packages/console/core/src/aws.ts
index ce4a20f44..e87ada6ef 100644
--- a/packages/console/core/src/aws.ts
+++ b/packages/console/core/src/aws.ts
@@ -24,40 +24,37 @@ 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",
+ 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],
},
- body: JSON.stringify({
- FromEmailAddress: `OpenCode Zen <[email protected]>`,
- Destination: {
- ToAddresses: [input.to],
- },
- Content: {
- Simple: {
- Subject: {
+ Content: {
+ Simple: {
+ Subject: {
+ Charset: "UTF-8",
+ Data: input.subject,
+ },
+ Body: {
+ Text: {
Charset: "UTF-8",
- Data: input.subject,
+ Data: input.body,
},
- Body: {
- Text: {
- Charset: "UTF-8",
- Data: input.body,
- },
- Html: {
- 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 8b37b1f9c..f0f065de4 100644
--- a/packages/console/core/src/drizzle/index.ts
+++ b/packages/console/core/src/drizzle/index.ts
@@ -5,10 +5,7 @@ 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"
@@ -70,10 +67,7 @@ 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 6396fd0b8..688f19b3d 100644
--- a/packages/console/core/src/key.ts
+++ b/packages/console/core/src/key.ts
@@ -20,14 +20,8 @@ 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/model.ts b/packages/console/core/src/model.ts
index 30cc15e45..ea719534d 100644
--- a/packages/console/core/src/model.ts
+++ b/packages/console/core/src/model.ts
@@ -60,9 +60,7 @@ export namespace Model {
export const enable = fn(z.object({ model: z.string() }), ({ model }) => {
Actor.assertAdmin()
return Database.use((db) =>
- db
- .delete(ModelTable)
- .where(and(eq(ModelTable.workspaceID, Actor.workspace()), eq(ModelTable.model, model))),
+ db.delete(ModelTable).where(and(eq(ModelTable.workspaceID, Actor.workspace()), eq(ModelTable.model, model))),
)
})
diff --git a/packages/console/core/src/provider.ts b/packages/console/core/src/provider.ts
index 0af642f71..cf2040b59 100644
--- a/packages/console/core/src/provider.ts
+++ b/packages/console/core/src/provider.ts
@@ -11,9 +11,7 @@ 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))),
),
)
@@ -52,12 +50,7 @@ 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 d55e605aa..27c926d6f 100644
--- a/packages/console/core/src/schema/auth.sql.ts
+++ b/packages/console/core/src/schema/auth.sql.ts
@@ -1,11 +1,4 @@
-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 343b0c4f3..1c032aad2 100644
--- a/packages/console/core/src/schema/model.sql.ts
+++ b/packages/console/core/src/schema/model.sql.ts
@@ -9,8 +9,5 @@ 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 04d11e2e5..11be5b4d7 100644
--- a/packages/console/core/src/schema/provider.sql.ts
+++ b/packages/console/core/src/schema/provider.sql.ts
@@ -10,8 +10,5 @@ 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 ce5b6c53e..7fd7f5e1e 100644
--- a/packages/console/core/src/schema/user.sql.ts
+++ b/packages/console/core/src/schema/user.sql.ts
@@ -1,12 +1,4 @@
-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 cbb1ac827..8b7a96f44 100644
--- a/packages/console/core/src/user.ts
+++ b/packages/console/core/src/user.ts
@@ -26,10 +26,7 @@ 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))),
),
)
@@ -39,13 +36,7 @@ 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]),
),
)
@@ -57,10 +48,7 @@ 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),
),
@@ -142,16 +130,10 @@ 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]),
)
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-29 07:18:40 +0000