fix: wip

packages/lib/server-only/public-api/create-api-token.ts

@@ -16,7 +16,7 @@ type TimeConstants = typeof timeConstants & {
 
 type CreateApiTokenInput = {
   userId: number;
-  teamId?: number;
+  teamId: number;
   tokenName: string;
   expiresIn: string | null;
 };

packages/lib/server-only/public-api/delete-api-token-by-id.ts

@@ -5,7 +5,7 @@ import { prisma } from '@documenso/prisma';
 export type DeleteTokenByIdOptions = {
   id: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const deleteTokenById = async ({ id, userId, teamId }: DeleteTokenByIdOptions) => {

packages/lib/server-only/public-api/get-api-tokens.ts

@@ -2,30 +2,19 @@ import { TeamMemberRole } from '@prisma/client';
 
 import { prisma } from '@documenso/prisma';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type GetApiTokensOptions = {
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const getApiTokens = async ({ userId, teamId }: GetApiTokensOptions) => {
   return await prisma.apiToken.findMany({
     where: {
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                  role: TeamMemberRole.ADMIN,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      userId,
+      // Todo: Orgs check that this was how it originally works (admin required)
+      team: buildTeamWhereQuery(teamId, userId, [TeamMemberRole.ADMIN]),
     },
     select: {
       id: true,