chore: bump drizzle to beta-16
Some checks failed
Release Workflow / determine-release-type (push) Has been cancelled
Release Workflow / checks (push) Has been cancelled
Release Workflow / e2e-tests (push) Has been cancelled
Release Workflow / build-images (push) Has been cancelled
Release Workflow / publish-release (push) Has been cancelled
Some checks failed
Release Workflow / determine-release-type (push) Has been cancelled
Release Workflow / checks (push) Has been cancelled
Release Workflow / e2e-tests (push) Has been cancelled
Release Workflow / build-images (push) Has been cancelled
Release Workflow / publish-release (push) Has been cancelled
This commit is contained in:
Nicolas Meienberger
parent
c2ed9e3693
commit
1c2bd02512
5 changed files with 77 additions and 63 deletions
|
|
@ -57,7 +57,7 @@ async function createDefaultOrganizationMembership(user: User) {
|
|||
logger.debug("Creating default organization for user", { userId: user.id });
|
||||
const organizationData = await buildDefaultOrganizationData(user);
|
||||
|
||||
await db.transaction(async (tx) => {
|
||||
db.transaction((tx) => {
|
||||
tx.insert(organization).values(organizationData).run();
|
||||
|
||||
tx.insert(member)
|
||||
|
|
|
|||
|
|
@ -87,22 +87,26 @@ export class AuthService {
|
|||
return;
|
||||
}
|
||||
|
||||
await db.transaction(async (tx) => {
|
||||
const membersInDeletedOrgs = await tx
|
||||
.select({ userId: member.userId })
|
||||
.from(member)
|
||||
.where(and(inArray(member.organizationId, orgIds), ne(member.userId, userId)));
|
||||
db.transaction((tx) => {
|
||||
const membersInDeletedOrgs = tx.query.member
|
||||
.findMany({
|
||||
where: {
|
||||
AND: [{ organizationId: { in: orgIds } }, { userId: { ne: userId } }],
|
||||
},
|
||||
columns: { userId: true },
|
||||
})
|
||||
.sync();
|
||||
|
||||
const affectedUserIds = [...new Set(membersInDeletedOrgs.map((r) => r.userId))];
|
||||
|
||||
if (affectedUserIds.length > 0) {
|
||||
const memberships = await tx
|
||||
.select({
|
||||
userId: member.userId,
|
||||
organizationId: member.organizationId,
|
||||
const memberships = tx.query.member
|
||||
.findMany({
|
||||
where: {
|
||||
userId: { in: affectedUserIds },
|
||||
},
|
||||
})
|
||||
.from(member)
|
||||
.where(inArray(member.userId, affectedUserIds));
|
||||
.sync();
|
||||
|
||||
const orgIdSet = new Set(orgIds);
|
||||
const fallbackOrgByUser = new Map<string, string | null>(affectedUserIds.map((id) => [id, null]));
|
||||
|
|
@ -114,19 +118,19 @@ export class AuthService {
|
|||
}
|
||||
|
||||
for (const [affectedUserId, fallbackOrgId] of fallbackOrgByUser) {
|
||||
await tx
|
||||
.update(sessionsTable)
|
||||
tx.update(sessionsTable)
|
||||
.set({ activeOrganizationId: fallbackOrgId })
|
||||
.where(and(eq(sessionsTable.userId, affectedUserId), inArray(sessionsTable.activeOrganizationId, orgIds)));
|
||||
.where(and(eq(sessionsTable.userId, affectedUserId), inArray(sessionsTable.activeOrganizationId, orgIds)))
|
||||
.run();
|
||||
}
|
||||
}
|
||||
|
||||
await tx.delete(organization).where(inArray(organization.id, orgIds));
|
||||
tx.delete(organization).where(inArray(organization.id, orgIds)).run();
|
||||
|
||||
await tx
|
||||
.update(sessionsTable)
|
||||
tx.update(sessionsTable)
|
||||
.set({ activeOrganizationId: null })
|
||||
.where(inArray(sessionsTable.activeOrganizationId, orgIds));
|
||||
.where(inArray(sessionsTable.activeOrganizationId, orgIds))
|
||||
.run();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -216,29 +220,31 @@ export class AuthService {
|
|||
return { found: true, isOwner: true } as const;
|
||||
}
|
||||
|
||||
await db.transaction(async (tx) => {
|
||||
const fallbackMembership = await tx.query.member.findFirst({
|
||||
where: {
|
||||
AND: [{ userId: targetMember.userId }, { organizationId: { ne: organizationId } }],
|
||||
},
|
||||
columns: { organizationId: true },
|
||||
});
|
||||
db.transaction((tx) => {
|
||||
const fallbackMembership = tx.query.member
|
||||
.findFirst({
|
||||
where: {
|
||||
AND: [{ userId: targetMember.userId }, { organizationId: { ne: organizationId } }],
|
||||
},
|
||||
columns: { organizationId: true },
|
||||
})
|
||||
.sync();
|
||||
|
||||
await tx.delete(member).where(eq(member.id, memberId));
|
||||
tx.delete(member).where(eq(member.id, memberId)).run();
|
||||
|
||||
if (fallbackMembership?.organizationId) {
|
||||
await tx
|
||||
.update(sessionsTable)
|
||||
tx.update(sessionsTable)
|
||||
.set({
|
||||
activeOrganizationId: fallbackMembership.organizationId,
|
||||
})
|
||||
.where(
|
||||
and(eq(sessionsTable.userId, targetMember.userId), eq(sessionsTable.activeOrganizationId, organizationId)),
|
||||
);
|
||||
)
|
||||
.run();
|
||||
return;
|
||||
}
|
||||
|
||||
await tx.delete(sessionsTable).where(eq(sessionsTable.userId, targetMember.userId));
|
||||
tx.delete(sessionsTable).where(eq(sessionsTable.userId, targetMember.userId)).run();
|
||||
});
|
||||
|
||||
return { found: true, isOwner: false } as const;
|
||||
|
|
@ -261,29 +267,33 @@ export class AuthService {
|
|||
* Delete a single account for a user, refusing if it is the last one
|
||||
*/
|
||||
async deleteUserAccount(userId: string, accountId: string) {
|
||||
return db.transaction(async (tx) => {
|
||||
const [targetAccount] = await tx
|
||||
.select({ id: account.id })
|
||||
.from(account)
|
||||
.where(and(eq(account.id, accountId), eq(account.userId, userId)))
|
||||
.limit(1);
|
||||
return db.transaction((tx) => {
|
||||
const targetAccount = tx.query.account
|
||||
.findFirst({
|
||||
where: {
|
||||
AND: [{ id: accountId }, { userId }],
|
||||
},
|
||||
})
|
||||
.sync();
|
||||
|
||||
if (!targetAccount) {
|
||||
return { lastAccount: false, notFound: true };
|
||||
}
|
||||
|
||||
const userAccounts = await tx.query.account.findMany({
|
||||
where: { userId },
|
||||
columns: { id: true },
|
||||
});
|
||||
const userAccounts = tx.query.account
|
||||
.findMany({
|
||||
where: { userId },
|
||||
columns: { id: true },
|
||||
})
|
||||
.sync();
|
||||
|
||||
if (userAccounts.length <= 1) {
|
||||
return { lastAccount: true, notFound: false };
|
||||
}
|
||||
|
||||
await tx.delete(account).where(and(eq(account.id, accountId), eq(account.userId, userId)));
|
||||
// Sessions cannot be tied to a specific account/provider with the current schema,
|
||||
// so keep active sessions intact when unlinking a single account.
|
||||
tx.delete(account)
|
||||
.where(and(eq(account.id, accountId), eq(account.userId, userId)))
|
||||
.run();
|
||||
|
||||
return { lastAccount: false, notFound: false };
|
||||
});
|
||||
|
|
|
|||
|
|
@ -68,32 +68,36 @@ export class SsoService {
|
|||
* Delete an SSO provider and its associated accounts
|
||||
*/
|
||||
async deleteSsoProvider(providerId: string, organizationId: string) {
|
||||
return db.transaction(async (tx) => {
|
||||
const provider = await tx.query.ssoProvider.findFirst({
|
||||
where: { AND: [{ providerId }, { organizationId }] },
|
||||
columns: { id: true, providerId: true },
|
||||
});
|
||||
return db.transaction((tx) => {
|
||||
const provider = tx.query.ssoProvider
|
||||
.findFirst({
|
||||
where: { AND: [{ providerId }, { organizationId }] },
|
||||
columns: { id: true, providerId: true },
|
||||
})
|
||||
.sync();
|
||||
|
||||
if (!provider) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isReservedSsoProviderId(provider.providerId)) {
|
||||
await tx.delete(ssoProvider).where(eq(ssoProvider.id, provider.id));
|
||||
tx.delete(ssoProvider).where(eq(ssoProvider.id, provider.id)).run();
|
||||
return true;
|
||||
}
|
||||
|
||||
const affectedAccounts = await tx.query.account.findMany({
|
||||
where: { providerId: provider.providerId },
|
||||
columns: { userId: true },
|
||||
});
|
||||
const affectedAccounts = tx.query.account
|
||||
.findMany({
|
||||
where: { providerId: provider.providerId },
|
||||
columns: { userId: true },
|
||||
})
|
||||
.sync();
|
||||
const affectedUserIds = [...new Set(affectedAccounts.map((row) => row.userId))];
|
||||
|
||||
await tx.delete(account).where(eq(account.providerId, provider.providerId));
|
||||
await tx.delete(ssoProvider).where(eq(ssoProvider.id, provider.id));
|
||||
tx.delete(account).where(eq(account.providerId, provider.providerId)).run();
|
||||
tx.delete(ssoProvider).where(eq(ssoProvider.id, provider.id)).run();
|
||||
|
||||
if (affectedUserIds.length > 0) {
|
||||
await tx.delete(sessionsTable).where(inArray(sessionsTable.userId, affectedUserIds));
|
||||
tx.delete(sessionsTable).where(inArray(sessionsTable.userId, affectedUserIds)).run();
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
|
|||
8
bun.lock
8
bun.lock
|
|
@ -45,7 +45,7 @@
|
|||
"date-fns": "^4.1.0",
|
||||
"dither-plugin": "^1.1.1",
|
||||
"dotenv": "^17.3.1",
|
||||
"drizzle-orm": "^1.0.0-beta.12-a5629fb",
|
||||
"drizzle-orm": "^1.0.0-beta.16-ea816b6",
|
||||
"es-toolkit": "^1.45.0",
|
||||
"hono": "^4.12.4",
|
||||
"hono-openapi": "^1.3.0",
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
"@vitejs/plugin-react": "^5.1.4",
|
||||
"babel-plugin-react-compiler": "^1.0.0",
|
||||
"dotenv-cli": "^11.0.0",
|
||||
"drizzle-kit": "^1.0.0-beta.15-859cf75",
|
||||
"drizzle-kit": "^1.0.0-beta.16-ea816b6",
|
||||
"lefthook": "^2.1.2",
|
||||
"lightningcss": "^1.31.1",
|
||||
"nitro": "^3.0.1-alpha.2",
|
||||
|
|
@ -1166,9 +1166,9 @@
|
|||
|
||||
"dotenv-expand": ["dotenv-expand@12.0.3", "", { "dependencies": { "dotenv": "^16.4.5" } }, "sha512-uc47g4b+4k/M/SeaW1y4OApx+mtLWl92l5LMPP0GNXctZqELk+YGgOPIIC5elYmUH4OuoK3JLhuRUYegeySiFA=="],
|
||||
|
||||
"drizzle-kit": ["drizzle-kit@1.0.0-beta.9-e89174b", "", { "dependencies": { "@drizzle-team/brocli": "^0.11.0", "@js-temporal/polyfill": "^0.5.1", "esbuild": "^0.25.10", "tsx": "^4.20.6" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-Xrw3k8E2CbSZr+kqe3k5W4oxd2fbEyczjKtyGIkAq0x9Wqpa/VtAT6Mkh83sIzqG4OSN7lOoUafsDxSE/AR7RA=="],
|
||||
"drizzle-kit": ["drizzle-kit@1.0.0-beta.16-ea816b6", "", { "dependencies": { "@drizzle-team/brocli": "^0.11.0", "@js-temporal/polyfill": "^0.5.1", "esbuild": "^0.25.10", "jiti": "^2.6.1" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-GiJQqCNPZP8Kk+i7/sFa3rtXbq26tLDNi3LbMx9aoLuwF2ofk8CS7cySUGdI+r4J3q0a568quC8FZeaFTCw4IA=="],
|
||||
|
||||
"drizzle-orm": ["drizzle-orm@1.0.0-beta.9-e89174b", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@effect/sql": "^0.48.5", "@effect/sql-pg": "^0.49.7", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@sqlitecloud/drivers": ">=1.0.653", "@tidbcloud/serverless": "*", "@tursodatabase/database": ">=0.2.1", "@tursodatabase/database-common": ">=0.2.1", "@tursodatabase/database-wasm": ">=0.2.1", "@types/better-sqlite3": "*", "@types/mssql": "^9.1.4", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "better-sqlite3": ">=9.3.0", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "mssql": "^11.0.1", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@effect/sql", "@effect/sql-pg", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@sqlitecloud/drivers", "@tidbcloud/serverless", "@tursodatabase/database", "@tursodatabase/database-common", "@tursodatabase/database-wasm", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "mysql2", "pg", "postgres", "sql.js", "sqlite3"] }, "sha512-B5KR/qYMZ0JMOurK+0xi1ObpOQcgrjaC9wHUiU2eTJjLemuh2CoQIw6yur68NxZG6Xcd0b9qghUNC/78/bEfbg=="],
|
||||
"drizzle-orm": ["drizzle-orm@1.0.0-beta.16-ea816b6", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@effect/sql": "^0.48.5", "@effect/sql-pg": "^0.49.7", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@sinclair/typebox": ">=0.34.8", "@sqlitecloud/drivers": ">=1.0.653", "@tidbcloud/serverless": "*", "@tursodatabase/database": ">=0.2.1", "@tursodatabase/database-common": ">=0.2.1", "@tursodatabase/database-wasm": ">=0.2.1", "@types/better-sqlite3": "*", "@types/mssql": "^9.1.4", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "arktype": ">=2.0.0", "better-sqlite3": ">=9.3.0", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "mssql": "^11.0.1", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5", "typebox": ">=1.0.0", "valibot": ">=1.0.0-beta.7", "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@effect/sql", "@effect/sql-pg", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@sinclair/typebox", "@sqlitecloud/drivers", "@tidbcloud/serverless", "@tursodatabase/database", "@tursodatabase/database-common", "@tursodatabase/database-wasm", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "arktype", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "mysql2", "pg", "postgres", "sql.js", "sqlite3", "typebox", "valibot", "zod"] }, "sha512-k9gT4f0O9Qvah5YK/zL+FZonQ8TPyVxcG/ojN4dzO0fHP8hs8tBno8lqmJo53g0JLWv3Q2nsTUoyBRKM2TljFw=="],
|
||||
|
||||
"ecdsa-sig-formatter": ["ecdsa-sig-formatter@1.0.11", "", { "dependencies": { "safe-buffer": "^5.0.1" } }, "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="],
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
"date-fns": "^4.1.0",
|
||||
"dither-plugin": "^1.1.1",
|
||||
"dotenv": "^17.3.1",
|
||||
"drizzle-orm": "^1.0.0-beta.12-a5629fb",
|
||||
"drizzle-orm": "^1.0.0-beta.16-ea816b6",
|
||||
"es-toolkit": "^1.45.0",
|
||||
"hono": "^4.12.4",
|
||||
"hono-openapi": "^1.3.0",
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
"@vitejs/plugin-react": "^5.1.4",
|
||||
"babel-plugin-react-compiler": "^1.0.0",
|
||||
"dotenv-cli": "^11.0.0",
|
||||
"drizzle-kit": "^1.0.0-beta.15-859cf75",
|
||||
"drizzle-kit": "^1.0.0-beta.16-ea816b6",
|
||||
"lefthook": "^2.1.2",
|
||||
"lightningcss": "^1.31.1",
|
||||
"nitro": "^3.0.1-alpha.2",
|
||||
|
|
|
|||
Loading…
Reference in a new issue