remove the concept of a plan and just rely on entitlements at the app layer

Author: brendan-kellam

packages/backend/src/ee/syncSearchContexts.ts

@@ -2,7 +2,7 @@ import micromatch from "micromatch";
 import { createLogger } from "@sourcebot/shared";
 import { PrismaClient } from "@sourcebot/db";
 import { repoMetadataSchema, SOURCEBOT_SUPPORT_EMAIL } from "@sourcebot/shared";
-import { getPlan, hasEntitlement } from "../entitlements.js";
+import { hasEntitlement } from "../entitlements.js";
 import { SearchContext } from "@sourcebot/schemas/v3/index.type";
 
 const logger = createLogger('sync-search-contexts');
@@ -18,8 +18,7 @@ export const syncSearchContexts = async (params: SyncSearchContextsParams) => {
 
     if (!await hasEntitlement("search-contexts")) {
         if (contexts) {
-            const plan = await getPlan();
-            logger.warn(`Skipping search context sync. Reason: "Search contexts are not supported in your current plan: ${plan}. If you have a valid enterprise license key, pass it via SOURCEBOT_EE_LICENSE_KEY. For support, contact ${SOURCEBOT_SUPPORT_EMAIL}."`);
+            logger.warn(`Skipping search context sync. Reason: "Search contexts are not supported in your current plan. If you have a valid enterprise license key, pass it via SOURCEBOT_EE_LICENSE_KEY. For support, contact ${SOURCEBOT_SUPPORT_EMAIL}."`);
         }
         return false;
     }

packages/backend/src/entitlements.ts

@@ -1,7 +1,5 @@
 import {
     Entitlement,
-    Plan,
-    getPlan as _getPlan,
     getSeats as _getSeats,
     hasEntitlement as _hasEntitlement,
     getEntitlements as _getEntitlements,
@@ -15,11 +13,6 @@ const getLicense = async () => {
     });
 }
 
-export const getPlan = async (): Promise<Plan> => {
-    const license = await getLicense();
-    return _getPlan(license);
-}
-
 export const getSeats = async (): Promise<number> => {
     const license = await getLicense();
     return _getSeats(license);

…12062214_add_license_table/migration.sql …17011834_add_license_table/migration.sqlpackages/db/prisma/migrations/20260412062214_add_license_table/migration.sql renamed to packages/db/prisma/migrations/20260417011834_add_license_table/migration.sql packages/db/prisma/migrations/20260412062214_add_license_table/migration.sql renamed to packages/db/prisma/migrations/20260417011834_add_license_table/migration.sql

@@ -3,7 +3,7 @@ CREATE TABLE "License" (
     "id" TEXT NOT NULL,
     "orgId" INTEGER NOT NULL,
     "activationCode" TEXT NOT NULL,
-    "plan" TEXT,
+    "entitlements" TEXT[],
     "seats" INTEGER,
     "status" TEXT,
     "lastSyncAt" TIMESTAMP(3),

packages/db/prisma/schema.prisma

@@ -300,7 +300,7 @@ model License {
   orgId           Int      @unique
   org             Org      @relation(fields: [orgId], references: [id])
   activationCode  String
-  plan            String?
+  entitlements    String[]
   seats           Int?
   status          String?
   lastSyncAt      DateTime?

packages/shared/src/entitlements.ts

@@ -20,14 +20,6 @@ const eeLicenseKeyPayloadSchema = z.object({
 
 type LicenseKeyPayload = z.infer<typeof eeLicenseKeyPayloadSchema>;
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const planLabels = {
-    oss: "OSS",
-    "self-hosted:enterprise": "Enterprise (Self-Hosted)",
-    "self-hosted:enterprise-unlimited": "Enterprise (Self-Hosted) Unlimited",
-} as const;
-export type Plan = keyof typeof planLabels;
-
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const entitlements = [
     "search-contexts",
@@ -44,45 +36,10 @@ const entitlements = [
 ] as const;
 export type Entitlement = (typeof entitlements)[number];
 
-const entitlementsByPlan: Record<Plan, Entitlement[]> = {
-    oss: [
-        "anonymous-access",
-    ],
-    "self-hosted:enterprise": [
-        "search-contexts",
-        "sso",
-        "code-nav",
-        "audit",
-        "analytics",
-        "permission-syncing",
-        "github-app",
-        "chat-sharing",
-        "org-management",
-        "oauth",
-    ],
-    "self-hosted:enterprise-unlimited": [
-        "anonymous-access",
-        "search-contexts",
-        "sso",
-        "code-nav",
-        "audit",
-        "analytics",
-        "permission-syncing",
-        "github-app",
-        "chat-sharing",
-        "org-management",
-        "oauth",
-    ],
-} as const;
-
-const isValidPlan = (plan: string): plan is Plan => {
-    return plan in entitlementsByPlan;
-}
-
 const ACTIVE_LICENSE_STATUSES = ['active', 'trialing', 'past_due'] as const;
 
-const isLicenseActive = (license: License | null): boolean => {
-    if (!license?.status) {
+const isLicenseActive = (license: License): boolean => {
+    if (!license.status) {
         return false;
     }
     return ACTIVE_LICENSE_STATUSES.includes(license.status as typeof ACTIVE_LICENSE_STATUSES[number]);
@@ -122,25 +79,6 @@ export const getOfflineLicenseKey = (): LicenseKeyPayload | null => {
     return null;
 }
 
-export const getPlan = (license: License | null): Plan => {
-    const licenseKey = getOfflineLicenseKey();
-    if (licenseKey) {
-        const expiryDate = new Date(licenseKey.expiryDate);
-        if (expiryDate.getTime() < new Date().getTime()) {
-            logger.error(`The provided license key has expired (${expiryDate.toLocaleString()}). Please contact ${SOURCEBOT_SUPPORT_EMAIL} for support.`);
-            process.exit(1);
-        }
-
-        return licenseKey.seats === SOURCEBOT_UNLIMITED_SEATS ? "self-hosted:enterprise-unlimited" : "self-hosted:enterprise";
-    }
-    else if (license?.plan && isValidPlan(license.plan) && isLicenseActive(license)) {
-        return license.plan;
-    }
-    else {
-        return "oss";
-    }
-}
-
 export const getSeats = (license: License | null): number => {
     const licenseKey = getOfflineLicenseKey();
     if (licenseKey) {
@@ -160,6 +98,20 @@ export const hasEntitlement = (entitlement: Entitlement, license: License | null
 }
 
 export const getEntitlements = (license: License | null): Entitlement[] => {
-    const plan = getPlan(license);
-    return entitlementsByPlan[plan];
+    const licenseKey = getOfflineLicenseKey();
+    if (licenseKey) {
+        const expiryDate = new Date(licenseKey.expiryDate);
+        if (expiryDate.getTime() < new Date().getTime()) {
+            logger.error(`The provided license key has expired (${expiryDate.toLocaleString()}). Please contact ${SOURCEBOT_SUPPORT_EMAIL} for support.`);
+            process.exit(1);
+        }
+
+        return entitlements as unknown as Entitlement[];
+    }
+    else if (license && isLicenseActive(license)) {
+        return license.entitlements as unknown as Entitlement[];
+    }
+    else {
+        return [];
+    }
 }

packages/shared/src/index.server.ts

@@ -1,12 +1,10 @@
 export {
     hasEntitlement,
     getOfflineLicenseKey,
-    getPlan,
     getSeats,
     getEntitlements,
 } from "./entitlements.js";
 export type {
-    Plan,
     Entitlement,
 } from "./entitlements.js";
 export type {

packages/web/src/actions.ts

@@ -14,7 +14,7 @@ import { createLogger } from "@sourcebot/shared";
 import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
 import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
 import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
-import { getPlan, hasEntitlement } from "@/lib/entitlements";
+import { hasEntitlement } from "@/lib/entitlements";
 import { StatusCodes } from "http-status-codes";
 import { cookies } from "next/headers";
 import { createTransport } from "nodemailer";
@@ -1200,8 +1200,7 @@ export const setAnonymousAccessStatus = async (enabled: boolean): Promise<Servic
         return await withMinimumOrgRole(role, OrgRole.OWNER, async () => {
             const hasAnonymousAccessEntitlement = await hasEntitlement("anonymous-access");
             if (!hasAnonymousAccessEntitlement) {
-                const plan = await getPlan();
-                console.error(`Anonymous access isn't supported in your current plan: ${plan}. For support, contact ${SOURCEBOT_SUPPORT_EMAIL}.`);
+                console.error(`Anonymous access isn't supported in your current plan. For support, contact ${SOURCEBOT_SUPPORT_EMAIL}.`);
                 return {
                     statusCode: StatusCodes.FORBIDDEN,
                     errorCode: ErrorCode.INSUFFICIENT_PERMISSIONS,

packages/web/src/app/(app)/settings/license/page.tsx

@@ -3,28 +3,25 @@ import { OrgRole } from "@sourcebot/db";
 import { ActivationCodeCard } from "./activationCodeCard";
 import { PurchaseButton } from "./purchaseButton";
 import { ManageSubscriptionButton } from "./manageSubscriptionButton";
-import { BasicSettingsCard } from "../components/settingsCard";
-import { getPlan } from "@/lib/entitlements";
+import { SettingsCard } from "../components/settingsCard";
+import { getEntitlements } from "@/lib/entitlements";
 
 export default authenticatedPage(async ({ prisma, org }) => {
     const license = await prisma.license.findUnique({
         where: { orgId: org.id },
     });
 
-    const plan = await getPlan();
+    const entitlements = await getEntitlements();
 
     return (
         <div className="flex flex-col gap-6">
             <div>
                 <h3 className="text-lg font-medium">License</h3>
                 <p className="text-sm text-muted-foreground">Manage your license.</p>
             </div>
-            <BasicSettingsCard
-                name="Current plan"
-                description="Your active Sourcebot plan."
-            >
-                <span className="text-sm font-medium">{plan}</span>
-            </BasicSettingsCard>
+            <SettingsCard>
+                <span className="text-sm font-medium">{entitlements.join(", ")}</span>
+            </SettingsCard>
             <ActivationCodeCard isActivated={!!license} />
             <div className="flex gap-3">
                 <PurchaseButton />

packages/web/src/ee/features/lighthouse/servicePing.ts

@@ -45,19 +45,19 @@ export const syncWithLighthouse = async (orgId: number) => {
 
     // If we have a license and Lighthouse returned license data, sync it
     if (license && response.license) {
-        const { plan, seats, status } = response.license;
+        const { entitlements, seats, status } = response.license;
 
         await __unsafePrisma.license.update({
             where: { orgId: SINGLE_TENANT_ORG_ID },
             data: {
-                plan,
+                entitlements,
                 seats,
                 status,
                 lastSyncAt: new Date(),
             },
         });
 
-        logger.info(`License synced: plan=${plan}, seats=${seats}, status=${status}`);
+        logger.info(`License synced: entitlements=${entitlements.join(',')}, seats=${seats}, status=${status}`);
     }
 };
 

packages/web/src/ee/features/lighthouse/types.ts

@@ -10,7 +10,7 @@ export type ServicePingRequest = z.infer<typeof servicePingRequestSchema>;
 
 export const servicePingResponseSchema = z.object({
     license: z.object({
-        plan: z.string(),
+        entitlements: z.string().array(),
         seats: z.number(),
         status: z.string(),
     }).optional(),