Skip to content

Open source CapCut alternative.

TypeScript

refactor(site): super-user lookup in its own module

David Le647f39215b90
diff --git a/site/src/app/api/account/feature-flags/route.ts b/site/src/app/api/account/feature-flags/route.ts
index 0c897dfd..ec01e812 100644
--- a/site/src/app/api/account/feature-flags/route.ts
+++ b/site/src/app/api/account/feature-flags/route.ts
@@ -1,10 +1,10 @@
import { NextResponse } from "next/server";
import {
- isDonkeySuperUser,
withDonkeyAuth,
type DonkeyAuthenticatedRequest,
} from "@/lib/donkey-api-auth";
+import { isDonkeySuperUser } from "@/lib/super-user";
import { featureFlagsFor } from "@/lib/feature-flags";
import { accountFlags } from "@/lib/feature-flags-server";
import { prisma } from "@/lib/prisma";
diff --git a/site/src/cut/server/cloud/limits.ts b/site/src/cut/server/cloud/limits.ts
index b6652da7..0e341797 100644
--- a/site/src/cut/server/cloud/limits.ts
+++ b/site/src/cut/server/cloud/limits.ts
@@ -1,5 +1,5 @@
import { getActiveProSubscription } from "@/lib/billing/pro-subscription";
-import { isDonkeySuperUser } from "@/lib/donkey-api-auth";
+import { isDonkeySuperUser } from "@/lib/super-user";
import { prisma } from "@/lib/prisma";
// Cut web mode's cost ceilings by account tier. Storage bounds R2; the daily
diff --git a/site/src/cut/server/cloud/routes.ts b/site/src/cut/server/cloud/routes.ts
index a3d55795..37bdae1a 100644
--- a/site/src/cut/server/cloud/routes.ts
+++ b/site/src/cut/server/cloud/routes.ts
@@ -5,7 +5,8 @@ import { librarySharing } from "@/cut/server/cloud/librarySharing";
// cloud-only presign/job routes. Auth happens in the Next catch-all
// (withDonkeyAuth); every handler receives the session's userId and scopes
// every query by it.
-import { type DonkeyAuthenticatedRequest, isDonkeySuperUser } from "@/lib/donkey-api-auth";
+import { type DonkeyAuthenticatedRequest } from "@/lib/donkey-api-auth";
+import { isDonkeySuperUser } from "@/lib/super-user";
import { matchRouteTable, type RouteEntry } from "../http/match";
import { captionsCloud } from "./captions";
import { chatsCloud } from "./chats";
diff --git a/site/src/lib/donkey-api-auth.ts b/site/src/lib/donkey-api-auth.ts
index a60106c4..984fc4bc 100644
--- a/site/src/lib/donkey-api-auth.ts
+++ b/site/src/lib/donkey-api-auth.ts
@@ -3,6 +3,7 @@ import { createHash, timingSafeEqual } from "node:crypto";
import { type NextRequest, NextResponse } from "next/server";
import { auth } from "@/lib/auth";
+import { isDonkeySuperUser } from "@/lib/super-user";
import { prisma } from "@/lib/prisma";
export type DonkeyAuthContext = {
@@ -292,16 +293,3 @@ export function withSuperUser<
) {
return withDonkeyAuth(handler, { ...options, role: "SUPER_USER" });
}
-
-export async function isDonkeySuperUser(userId: string) {
- const user = await prisma.user.findUnique({
- select: {
- superUser: true,
- },
- where: {
- id: userId,
- },
- });
-
- return user?.superUser === true;
-}
diff --git a/site/src/lib/feature-flags-server.ts b/site/src/lib/feature-flags-server.ts
index 071e8b1b..b81bf8c9 100644
--- a/site/src/lib/feature-flags-server.ts
+++ b/site/src/lib/feature-flags-server.ts
@@ -1,5 +1,5 @@
import { ACCOUNT_FEATURE_FLAGS, featureFlagsFor } from "@/lib/feature-flags";
-import { isDonkeySuperUser } from "@/lib/donkey-api-auth";
+import { isDonkeySuperUser } from "@/lib/super-user";
import { prisma } from "@/lib/prisma";
/** Whether an account flag is on for a user: the account's own row, or the
diff --git a/site/src/lib/super-user.ts b/site/src/lib/super-user.ts
new file mode 100644
index 00000000..bbb171ca
--- /dev/null
+++ b/site/src/lib/super-user.ts
@@ -0,0 +1,8 @@
+import { prisma } from "@/lib/prisma";
+
+/** Whether the account is a super user. On its own so the worker bundle, which
+ * needs this for quota checks, never pulls the auth module in with it. */
+export async function isDonkeySuperUser(userId: string) {
+ const user = await prisma.user.findUnique({ select: { superUser: true }, where: { id: userId } });
+ return user?.superUser === true;
+}