More fixes

stack-auth · Feb 6, 2025 · 0b21631 · 0b21631
1 parent 8fc7e0f
commit 0b21631
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/apps/backend/src/app/api/latest/integrations/neon/projects/transfer/initiate/route.tsx b/apps/backend/src/app/api/latest/integrations/neon/projects/transfer/initiate/route.tsx
@@ -1,5 +1,5 @@
 import { getProject } from "@/lib/projects";
-import { getDefaultTenancyFromProject } from "@/lib/tenancies";
+import { getSoleTenancyFromProject } from "@/lib/tenancies";
 import { prismaClient } from "@/prisma-client";
 import { createSmartRouteHandler } from "@/route-handlers/smart-route-handler";
 import { neonAuthorizationHeaderSchema, urlSchema, yupNumber, yupObject, yupString, yupTuple } from "@stackframe/stack-shared/dist/schema-fields";
@@ -43,7 +43,7 @@ export const POST = createSmartRouteHandler({
     }
 
     const transferCodeObj = await neonIntegrationProjectTransferCodeHandler.createCode({
-      tenancy: await getDefaultTenancyFromProject(internalProject.id),
+      tenancy: await getSoleTenancyFromProject(internalProject.id),
       method: {},
       data: {
         project_id: neonProvisionedProject.projectId,

diff --git a/apps/backend/src/lib/tenancies.tsx b/apps/backend/src/lib/tenancies.tsx
@@ -29,7 +29,7 @@ export type Tenancy = Awaited<ReturnType<typeof tenancyPrismaToCrud>>;
   * @deprecated This is a temporary function for the situation where every project has exactly one tenancy. Later,
   * we will support multiple tenancies per project, and all uses of this function will be refactored.
   */
-export async function getDefaultTenancyFromProject(projectId: string) {
+export async function getSoleTenancyFromProject(projectId: string) {
   const tenancy = await getTenancyFromProject(projectId, 'main', null);
   if (!tenancy) {
     throw new StackAssertionError("No tenancy found for project", { projectId });

diff --git a/apps/backend/src/route-handlers/crud-handler.tsx b/apps/backend/src/route-handlers/crud-handler.tsx
@@ -1,6 +1,6 @@
 import "../polyfills";
 
-import { Tenancy, getDefaultTenancyFromProject } from "@/lib/tenancies";
+import { Tenancy, getSoleTenancyFromProject } from "@/lib/tenancies";
 import { traceSpan } from "@/utils/telemetry";
 import { CrudSchema, CrudTypeOf, CrudlOperation } from "@stackframe/stack-shared/dist/crud";
 import { ProjectsCrud } from "@stackframe/stack-shared/dist/interface/crud/projects";
@@ -253,7 +253,7 @@ export function createCrudHandlers<
                 } else if (tenancy) {
                   project = tenancy.project;
                 } else if (project) {
-                  tenancy = await getDefaultTenancyFromProject(project.id);
+                  tenancy = await getSoleTenancyFromProject(project.id);
                 } else {
                   throw new StackAssertionError("Must specify either project or tenancy");
                 }

diff --git a/apps/backend/src/route-handlers/smart-request.tsx b/apps/backend/src/route-handlers/smart-request.tsx
@@ -3,7 +3,7 @@ import "../polyfills";
 import { getUser, getUserQuery } from "@/app/api/latest/users/crud";
 import { checkApiKeySet, checkApiKeySetQuery } from "@/lib/api-keys";
 import { getProjectQuery, listManagedProjectIds } from "@/lib/projects";
-import { Tenancy } from "@/lib/tenancies";
+import { Tenancy, getSoleTenancyFromProject } from "@/lib/tenancies";
 import { decodeAccessToken } from "@/lib/tokens";
 import { rawQueryAll } from "@/prisma-client";
 import { withTraceSpan } from "@/utils/telemetry";
@@ -260,6 +260,7 @@ const parseAuth = withTraceSpan('smart request parseAuth', async (req: NextReque
 
   return {
     project,
+    tenancy: await getSoleTenancyFromProject(project.id),
     user: queriesResults.user ?? undefined,
     type: requestType,
   };