fix: remove non-standard fields that would cause prisma validation errors

apps/documentation/pages/developers/_meta.json

@@ -14,4 +14,4 @@
   "public-api": "Public API",
   "embedding": "Embedding",
   "webhooks": "Webhooks"
-}
+}

apps/documentation/pages/users/signing-documents/index.mdx

@@ -85,13 +85,12 @@ You can also set the recipient's role, which determines their actions and permis
 
 Documenso has 4 roles for recipients with different permissions and actions.
 
-|   Role    |                                    Function                                     | Action required | Signature |
-| :-------: | :-----------------------------------------------------------------------------: | :-------------: | :-------: |
-|  Signer   |                Needs to sign signatures fields assigned to them.                |       Yes       |    Yes    |
-| Approver  |          Needs to approve the document as a whole. Signature optional.          |       Yes       | Optional  |
-|  Viewer   |                   Needs to confirm they viewed the document.                    |       Yes       |    No     |
-| Assistant | Can help prepare the document by filling in fields on behalf of other signers.  |       Yes       |    No     |
-|    CC     | Receives a copy of the signed document after completion. No action is required. |       No        |    No     |
+|   Role   |                                    Function                                     | Action required | Signature |
+| :------: | :-----------------------------------------------------------------------------: | :-------------: | :-------: |
+|  Signer  |                Needs to sign signatures fields assigned to them.                |       Yes       |    Yes    |
+| Approver |          Needs to approve the document as a whole. Signature optional.          |       Yes       | Optional  |
+|  Viewer  |                   Needs to confirm they viewed the document.                    |       Yes       |    No     |
+|   BCC    | Receives a copy of the signed document after completion. No action is required. |       No        |    No     |
 
 ### Fields
 

apps/web/src/app/(dashboard)/admin/leaderboard/data-table-leaderboard.tsx

@@ -16,13 +16,9 @@ import { Input } from '@documenso/ui/primitives/input';
 export type SigningVolume = {
   id: number;
   name: string;
-  email: string;
   signingVolume: number;
   createdAt: Date;
   planId: string;
-  userId?: number | null;
-  teamId?: number | null;
-  isTeam: boolean;
 };
 
 type LeaderboardTableProps = {

apps/web/src/app/(dashboard)/admin/leaderboard/page.tsx

@@ -4,7 +4,7 @@ import { setupI18nSSR } from '@documenso/lib/client-only/providers/i18n.server';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
 import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';
 
-import { LeaderboardTable, type SigningVolume } from './data-table-leaderboard';
+import { LeaderboardTable } from './data-table-leaderboard';
 import { search } from './fetch-leaderboard.actions';
 
 type AdminLeaderboardProps = {
@@ -32,7 +32,7 @@ export default async function Leaderboard({ searchParams = {} }: AdminLeaderboar
   const sortBy = searchParams.sortBy || 'signingVolume';
   const sortOrder = searchParams.sortOrder || 'desc';
 
-  const { leaderboard, totalPages } = await search({
+  const { leaderboard: signingVolume, totalPages } = await search({
     search: searchString,
     page,
     perPage,
@@ -40,22 +40,14 @@ export default async function Leaderboard({ searchParams = {} }: AdminLeaderboar
     sortOrder,
   });
 
-  const typedSigningVolume: SigningVolume[] = leaderboard.map((item) => ({
-    ...item,
-    name: item.name || '',
-    createdAt: item.createdAt || new Date(),
-  }));
-
   return (
     <div>
-      <div className="flex items-center">
-        <h2 className="text-4xl font-semibold">
-          <Trans>Signing Volume</Trans>
-        </h2>
-      </div>
+      <h2 className="text-4xl font-semibold">
+        <Trans>Signing Volume</Trans>
+      </h2>
       <div className="mt-8">
         <LeaderboardTable
-          signingVolume={typedSigningVolume}
+          signingVolume={signingVolume}
           totalPages={totalPages}
           page={page}
           perPage={perPage}

packages/lib/next-auth/auth-options.ts

@@ -193,7 +193,15 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {
       idToken: true,
       allowDangerousEmailAccountLinking: true,
 
-      profile(profile) {
+      profile(profile, tokens) {
+        if (tokens && 'refresh_expires_in' in tokens) {
+          delete tokens.refresh_expires_in;
+        }
+
+        if (tokens && 'not-before-policy' in tokens) {
+          delete tokens['not-before-policy'];
+        }
+
         return {
           id: profile.sub,
           email: profile.email || profile.preferred_username,

packages/lib/server-only/admin/get-signing-volume.ts

@@ -1,7 +1,15 @@
-import { prisma } from '@documenso/prisma';
+import { kyselyPrisma, sql } from '@documenso/prisma';
 import { DocumentStatus, SubscriptionStatus } from '@documenso/prisma/client';
 
-type GetSigningVolumeOptions = {
+export type SigningVolume = {
+  id: number;
+  name: string;
+  signingVolume: number;
+  createdAt: Date;
+  planId: string;
+};
+
+export type GetSigningVolumeOptions = {
   search?: string;
   page?: number;
   perPage?: number;
@@ -9,187 +17,85 @@ type GetSigningVolumeOptions = {
   sortOrder?: 'asc' | 'desc';
 };
 
-export const getSigningVolume = async ({
+export async function getSigningVolume({
   search = '',
   page = 1,
   perPage = 10,
   sortBy = 'signingVolume',
   sortOrder = 'desc',
-}: GetSigningVolumeOptions) => {
-  const validPage = Math.max(1, page);
-  const validPerPage = Math.max(1, perPage);
-  const skip = (validPage - 1) * validPerPage;
+}: GetSigningVolumeOptions) {
+  const offset = Math.max(page - 1, 0) * perPage;
 
-  const activeSubscriptions = await prisma.subscription.findMany({
-    where: {
-      status: SubscriptionStatus.ACTIVE,
-    },
-    select: {
-      id: true,
-      planId: true,
-      userId: true,
-      teamId: true,
-      createdAt: true,
-      user: {
-        select: {
-          id: true,
-          name: true,
-          email: true,
-          createdAt: true,
-        },
-      },
-      team: {
-        select: {
-          id: true,
-          name: true,
-          teamEmail: {
-            select: {
-              email: true,
-            },
-          },
-          createdAt: true,
-        },
-      },
-    },
-  });
+  let findQuery = kyselyPrisma.$kysely
+    .selectFrom('Subscription as s')
+    .leftJoin('User as u', 's.userId', 'u.id')
+    .leftJoin('Team as t', 's.teamId', 't.id')
+    .leftJoin('Document as ud', (join) =>
+      join
+        .onRef('u.id', '=', 'ud.userId')
+        .on('ud.status', '=', sql.lit(DocumentStatus.COMPLETED))
+        .on('ud.deletedAt', 'is', null)
+        .on('ud.teamId', 'is', null),
+    )
+    .leftJoin('Document as td', (join) =>
+      join
+        .onRef('t.id', '=', 'td.teamId')
+        .on('td.status', '=', sql.lit(DocumentStatus.COMPLETED))
+        .on('td.deletedAt', 'is', null),
+    )
+    // @ts-expect-error - Raw SQL enum casting not properly typed by Kysely
+    .where(sql`s.status = ${SubscriptionStatus.ACTIVE}::"SubscriptionStatus"`)
+    .where((eb) =>
+      eb.or([
+        eb('u.name', 'ilike', `%${search}%`),
+        eb('u.email', 'ilike', `%${search}%`),
+        eb('t.name', 'ilike', `%${search}%`),
+      ]),
+    )
+    .select([
+      's.id as id',
+      's.createdAt as createdAt',
+      's.planId as planId',
+      sql<string>`COALESCE(u.name, t.name, u.email, 'Unknown')`.as('name'),
+      sql<number>`COUNT(DISTINCT ud.id) + COUNT(DISTINCT td.id)`.as('signingVolume'),
+    ])
+    .groupBy(['s.id', 'u.name', 't.name', 'u.email']);
 
-  const userSubscriptionsMap = new Map();
-  const teamSubscriptionsMap = new Map();
+  switch (sortBy) {
+    case 'name':
+      findQuery = findQuery.orderBy('name', sortOrder);
+      break;
+    case 'createdAt':
+      findQuery = findQuery.orderBy('createdAt', sortOrder);
+      break;
+    case 'signingVolume':
+      findQuery = findQuery.orderBy('signingVolume', sortOrder);
+      break;
+    default:
+      findQuery = findQuery.orderBy('signingVolume', 'desc');
+  }
 
-  activeSubscriptions.forEach((subscription) => {
-    const isTeam = !!subscription.teamId;
+  findQuery = findQuery.limit(perPage).offset(offset);
 
-    if (isTeam && subscription.teamId) {
-      if (!teamSubscriptionsMap.has(subscription.teamId)) {
-        teamSubscriptionsMap.set(subscription.teamId, {
-          id: subscription.id,
-          planId: subscription.planId,
-          teamId: subscription.teamId,
-          name: subscription.team?.name || '',
-          email: subscription.team?.teamEmail?.email || `Team ${subscription.team?.id}`,
-          createdAt: subscription.team?.createdAt,
-          isTeam: true,
-          subscriptionIds: [subscription.id],
-        });
-      } else {
-        const existingTeam = teamSubscriptionsMap.get(subscription.teamId);
-        existingTeam.subscriptionIds.push(subscription.id);
-      }
-    } else if (subscription.userId) {
-      if (!userSubscriptionsMap.has(subscription.userId)) {
-        userSubscriptionsMap.set(subscription.userId, {
-          id: subscription.id,
-          planId: subscription.planId,
-          userId: subscription.userId,
-          name: subscription.user?.name || '',
-          email: subscription.user?.email || '',
-          createdAt: subscription.user?.createdAt,
-          isTeam: false,
-          subscriptionIds: [subscription.id],
-        });
-      } else {
-        const existingUser = userSubscriptionsMap.get(subscription.userId);
-        existingUser.subscriptionIds.push(subscription.id);
-      }
-    }
-  });
+  const countQuery = kyselyPrisma.$kysely
+    .selectFrom('Subscription as s')
+    .leftJoin('User as u', 's.userId', 'u.id')
+    .leftJoin('Team as t', 's.teamId', 't.id')
+    // @ts-expect-error - Raw SQL enum casting not properly typed by Kysely
+    .where(sql`s.status = ${SubscriptionStatus.ACTIVE}::"SubscriptionStatus"`)
+    .where((eb) =>
+      eb.or([
+        eb('u.name', 'ilike', `%${search}%`),
+        eb('u.email', 'ilike', `%${search}%`),
+        eb('t.name', 'ilike', `%${search}%`),
+      ]),
+    )
+    .select(({ fn }) => [fn.countAll().as('count')]);
 
-  const subscriptions = [
-    ...Array.from(userSubscriptionsMap.values()),
-    ...Array.from(teamSubscriptionsMap.values()),
-  ];
-
-  const filteredSubscriptions = search
-    ? subscriptions.filter((sub) => {
-        const searchLower = search.toLowerCase();
-        return (
-          sub.name?.toLowerCase().includes(searchLower) ||
-          sub.email?.toLowerCase().includes(searchLower)
-        );
-      })
-    : subscriptions;
-
-  const signingVolume = await Promise.all(
-    filteredSubscriptions.map(async (subscription) => {
-      let signingVolume = 0;
-
-      if (subscription.userId && !subscription.isTeam) {
-        const personalCount = await prisma.document.count({
-          where: {
-            userId: subscription.userId,
-            status: DocumentStatus.COMPLETED,
-            teamId: null,
-          },
-        });
-
-        signingVolume += personalCount;
-
-        const userTeams = await prisma.teamMember.findMany({
-          where: {
-            userId: subscription.userId,
-          },
-          select: {
-            teamId: true,
-          },
-        });
-
-        if (userTeams.length > 0) {
-          const teamIds = userTeams.map((team) => team.teamId);
-          const teamCount = await prisma.document.count({
-            where: {
-              teamId: {
-                in: teamIds,
-              },
-              status: DocumentStatus.COMPLETED,
-            },
-          });
-
-          signingVolume += teamCount;
-        }
-      }
-
-      if (subscription.teamId) {
-        const teamCount = await prisma.document.count({
-          where: {
-            teamId: subscription.teamId,
-            status: DocumentStatus.COMPLETED,
-          },
-        });
-
-        signingVolume += teamCount;
-      }
-
-      return {
-        ...subscription,
-        signingVolume,
-      };
-    }),
-  );
-
-  const sortedResults = [...signingVolume].sort((a, b) => {
-    if (sortBy === 'name') {
-      return sortOrder === 'asc'
-        ? (a.name || '').localeCompare(b.name || '')
-        : (b.name || '').localeCompare(a.name || '');
-    }
-
-    if (sortBy === 'createdAt') {
-      const dateA = a.createdAt ? new Date(a.createdAt).getTime() : 0;
-      const dateB = b.createdAt ? new Date(b.createdAt).getTime() : 0;
-      return sortOrder === 'asc' ? dateA - dateB : dateB - dateA;
-    }
-
-    return sortOrder === 'asc'
-      ? a.signingVolume - b.signingVolume
-      : b.signingVolume - a.signingVolume;
-  });
-
-  const paginatedResults = sortedResults.slice(skip, skip + validPerPage);
-
-  const totalPages = Math.ceil(sortedResults.length / validPerPage);
+  const [results, [{ count }]] = await Promise.all([findQuery.execute(), countQuery.execute()]);
 
   return {
-    leaderboard: paginatedResults,
-    totalPages,
+    leaderboard: results,
+    totalPages: Math.ceil(Number(count) / perPage),
   };
-};
+}

packages/prisma/migrations/20250217120859_add_session_fields/migration.sql

@@ -1,18 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the column `expires` on the `Session` table. All the data in the column will be lost.
-  - Added the required column `expiresAt` to the `Session` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `updatedAt` to the `Session` table without a default value. This is not possible if the table is not empty.
-
-*/
--- AlterTable
-ALTER TABLE "Account" ADD COLUMN     "password" TEXT;
-
--- AlterTable
-ALTER TABLE "Session" DROP COLUMN "expires",
-ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-ADD COLUMN     "expiresAt" TIMESTAMP(3) NOT NULL,
-ADD COLUMN     "ipAddress" TEXT,
-ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL,
-ADD COLUMN     "userAgent" TEXT;

packages/prisma/schema.prisma

@@ -270,25 +270,18 @@ model Account {
   scope             String?
   id_token          String? @db.Text
   session_state     String?
-  password          String?
 
-  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
+  user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@unique([provider, providerAccountId])
 }
 
 model Session {
-  id           String @id @default(cuid())
-  sessionToken String @unique
+  id           String   @id @default(cuid())
+  sessionToken String   @unique
   userId       Int
-
-  ipAddress String?
-  userAgent String?
-  expiresAt DateTime
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
+  expires      DateTime
+  user         User?    @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
 enum DocumentStatus {

packages/prisma/seed/initial-seed.ts

@@ -5,18 +5,6 @@ import { hashSync } from '@documenso/lib/server-only/auth/hash';
 
 import { prisma } from '..';
 import { DocumentDataType, DocumentSource, Role, TeamMemberRole } from '../client';
-import { seedPendingDocument } from './documents';
-import { seedDirectTemplate, seedTemplate } from './templates';
-
-const createDocumentData = async ({ documentData }: { documentData: string }) => {
-  return prisma.documentData.create({
-    data: {
-      type: DocumentDataType.BYTES_64,
-      data: documentData,
-      initialData: documentData,
-    },
-  });
-};
 
 export const seedDatabase = async () => {
   const examplePdf = fs
@@ -51,80 +39,35 @@ export const seedDatabase = async () => {
     update: {},
   });
 
-  for (let i = 1; i <= 4; i++) {
-    const documentData = await createDocumentData({ documentData: examplePdf });
-
-    await prisma.document.create({
-      data: {
-        source: DocumentSource.DOCUMENT,
-        title: `Example Document ${i}`,
-        documentDataId: documentData.id,
-        userId: exampleUser.id,
-        recipients: {
-          create: {
-            name: String(adminUser.name),
-            email: adminUser.email,
-            token: Math.random().toString(36).slice(2, 9),
-          },
-        },
-      },
-    });
-  }
-
-  for (let i = 1; i <= 4; i++) {
-    const documentData = await createDocumentData({ documentData: examplePdf });
-
-    await prisma.document.create({
-      data: {
-        source: DocumentSource.DOCUMENT,
-        title: `Document ${i}`,
-        documentDataId: documentData.id,
-        userId: adminUser.id,
-        recipients: {
-          create: {
-            name: String(exampleUser.name),
-            email: exampleUser.email,
-            token: Math.random().toString(36).slice(2, 9),
-          },
-        },
-      },
-    });
-  }
-
-  await seedPendingDocument(exampleUser, [adminUser], {
-    key: 'example-pending',
-    createDocumentOptions: {
-      title: 'Pending Document',
+  const examplePdfData = await prisma.documentData.upsert({
+    where: {
+      id: 'clmn0kv5k0000pe04vcqg5zla',
     },
+    create: {
+      id: 'clmn0kv5k0000pe04vcqg5zla',
+      type: DocumentDataType.BYTES_64,
+      data: examplePdf,
+      initialData: examplePdf,
+    },
+    update: {},
   });
 
-  await seedPendingDocument(adminUser, [exampleUser], {
-    key: 'admin-pending',
-    createDocumentOptions: {
-      title: 'Pending Document',
+  await prisma.document.create({
+    data: {
+      source: DocumentSource.DOCUMENT,
+      title: 'Example Document',
+      documentDataId: examplePdfData.id,
+      userId: exampleUser.id,
+      recipients: {
+        create: {
+          name: String(adminUser.name),
+          email: adminUser.email,
+          token: Math.random().toString(36).slice(2, 9),
+        },
+      },
     },
   });
 
-  await Promise.all([
-    seedTemplate({
-      title: 'Template 1',
-      userId: exampleUser.id,
-    }),
-    seedDirectTemplate({
-      title: 'Direct Template 1',
-      userId: exampleUser.id,
-    }),
-
-    seedTemplate({
-      title: 'Template 1',
-      userId: adminUser.id,
-    }),
-    seedDirectTemplate({
-      title: 'Direct Template 1',
-      userId: adminUser.id,
-    }),
-  ]);
-
   const testUsers = [
     'test@documenso.com',
     'test2@documenso.com',