Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

feat: add jwt token instead of full visible url with many params

Marc Seitz0792d693e421
diff --git a/app/(auth)/verify/invitation/page.tsx b/app/(auth)/verify/invitation/page.tsx
index a8f7c2ea..165c65ff 100644
--- a/app/(auth)/verify/invitation/page.tsx
+++ b/app/(auth)/verify/invitation/page.tsx
@@ -6,6 +6,7 @@ import { format } from "date-fns";
import { ClockIcon, MailIcon } from "lucide-react";
import { generateChecksum } from "@/lib/utils/generate-checksum";
+import { verifyJWT } from "@/lib/utils/generate-jwt";
import AcceptInvitationButton from "./AcceptInvitationButton";
@@ -47,40 +48,26 @@ export default function VerifyInvitationPage({
searchParams,
}: {
searchParams: {
- verification_url?: string;
- checksum?: string;
- type?: string;
- teamId?: string;
token?: string;
- email?: string;
- expiresAt?: string;
};
}) {
- const { verification_url, checksum, type, teamId, token, email, expiresAt } =
- searchParams;
+ const { token: jwtToken } = searchParams;
- if (type !== "invitation") {
+ if (!jwtToken) {
return <NotFound />;
}
- // Validate required parameters
- if (!verification_url || !checksum || !teamId || !token || !email) {
+ // verify JWT token
+ const payload = verifyJWT(jwtToken);
+
+ if (!payload) {
return <NotFound />;
}
- // Server-side validation
- const isValidVerificationUrl = (url: string, checksum: string): boolean => {
- try {
- const urlObj = new URL(url);
- if (urlObj.origin !== process.env.NEXTAUTH_URL) return false;
- const expectedChecksum = generateChecksum(url);
- return checksum === expectedChecksum;
- } catch {
- return false;
- }
- };
+ const { verification_url, teamId, token, email, expiresAt } = payload;
- if (!isValidVerificationUrl(verification_url, checksum)) {
+ // Validate required parameters
+ if (!verification_url || !teamId || !token || !email) {
return <NotFound />;
}
diff --git a/lib/utils/generate-jwt.ts b/lib/utils/generate-jwt.ts
new file mode 100644
index 00000000..22555bad
--- /dev/null
+++ b/lib/utils/generate-jwt.ts
@@ -0,0 +1,41 @@
+import jwt from "jsonwebtoken";
+
+const JWT_SECRET = process.env.NEXT_PRIVATE_UNSUBSCRIBE_JWT_SECRET as string;
+
+type JWTPayload = {
+ [key: string]: any;
+ exp?: number; // Expiration timestamp
+};
+
+/**
+ * Generates a JWT token with the provided payload
+ * @param payload The data to encode in the JWT
+ * @param expiresInSeconds Optional expiration time in seconds (default: 24 hours)
+ * @returns The signed JWT token
+ */
+export function generateJWT(
+ payload: JWTPayload,
+ expiresInSeconds: number = 60 * 60 * 24,
+): string {
+ console.log("Generating JWT token with payload:", payload);
+ // Add expiration if not already present
+ const tokenPayload = {
+ ...payload,
+ exp: payload.exp || Math.floor(Date.now() / 1000) + expiresInSeconds,
+ };
+
+ return jwt.sign(tokenPayload, JWT_SECRET);
+}
+
+/**
+ * Verifies a JWT token and returns the decoded payload
+ * @param token The JWT token to verify
+ * @returns The decoded payload or null if invalid
+ */
+export function verifyJWT<T = JWTPayload>(token: string): T | null {
+ try {
+ return jwt.verify(token, JWT_SECRET) as T;
+ } catch (error) {
+ return null;
+ }
+}
diff --git a/pages/api/teams/[teamId]/invitations/resend.ts b/pages/api/teams/[teamId]/invitations/resend.ts
index 8fd5b4d6..8b165cd4 100644
--- a/pages/api/teams/[teamId]/invitations/resend.ts
+++ b/pages/api/teams/[teamId]/invitations/resend.ts
@@ -9,6 +9,7 @@ import { errorhandler } from "@/lib/errorHandler";
import prisma from "@/lib/prisma";
import { CustomUser } from "@/lib/types";
import { generateChecksum } from "@/lib/utils/generate-checksum";
+import { generateJWT } from "@/lib/utils/generate-jwt";
export default async function handle(
req: NextApiRequest,
@@ -105,7 +106,7 @@ export default async function handle(
const invitationUrl = `/api/teams/${teamId}/invitations/accept?token=${invitation.token}&email=${email}`;
const fullInvitationUrl = `${process.env.NEXT_PUBLIC_BASE_URL}${invitationUrl}`;
- // magic link
+ // magic link
const magicLinkParams = new URLSearchParams({
email,
token: invitation.token,
@@ -123,10 +124,11 @@ export default async function handle(
expiresAt: expiresAt.toISOString(),
});
- const checksum = generateChecksum(magicLink);
- verifyParams.append("checksum", checksum);
+ const verifyParamsObject = Object.fromEntries(verifyParams.entries());
- const verifyUrl = `${process.env.NEXT_PUBLIC_BASE_URL}/verify/invitation?${verifyParams.toString()}`;
+ const jwtToken = generateJWT(verifyParamsObject);
+
+ const verifyUrl = `${process.env.NEXT_PUBLIC_BASE_URL}/verify/invitation?token=${jwtToken}`;
sendTeammateInviteEmail({
senderName: sender.name || "",
diff --git a/pages/api/teams/[teamId]/invite.ts b/pages/api/teams/[teamId]/invite.ts
index 8c73601f..3b5d922f 100644
--- a/pages/api/teams/[teamId]/invite.ts
+++ b/pages/api/teams/[teamId]/invite.ts
@@ -9,9 +9,10 @@ import { errorhandler } from "@/lib/errorHandler";
import { newId } from "@/lib/id-helper";
import prisma from "@/lib/prisma";
import { CustomUser } from "@/lib/types";
+import { generateChecksum } from "@/lib/utils/generate-checksum";
+import { generateJWT } from "@/lib/utils/generate-jwt";
import { authOptions } from "../../auth/[...nextauth]";
-import { generateChecksum } from "@/lib/utils/generate-checksum";
export default async function handle(
req: NextApiRequest,
@@ -136,7 +137,7 @@ export default async function handle(
const invitationUrl = `/api/teams/${teamId}/invitations/accept?token=${token}&email=${email}`;
const fullInvitationUrl = `${process.env.NEXT_PUBLIC_BASE_URL}${invitationUrl}`;
- // magic link
+ // magic link
const magicLinkParams = new URLSearchParams({
email,
token,
@@ -154,10 +155,11 @@ export default async function handle(
expiresAt: expiresAt.toISOString(),
});
- const checksum = generateChecksum(magicLink);
- verifyParams.append("checksum", checksum);
+ const verifyParamsObject = Object.fromEntries(verifyParams.entries());
+
+ const jwtToken = generateJWT(verifyParamsObject);
- const verifyUrl = `${process.env.NEXT_PUBLIC_BASE_URL}/verify/invitation?${verifyParams.toString()}`;
+ const verifyUrl = `${process.env.NEXT_PUBLIC_BASE_URL}/verify/invitation?token=${jwtToken}`;
sendTeammateInviteEmail({
senderName: sender.name || "",