Merge pull request #230 from pubpub/tfk/config

tsconfig/base.json → config/tsconfig/base.json

@@ -12,7 +12,8 @@
 		"noUnusedParameters": false,
 		"preserveWatchOutput": true,
 		"skipLibCheck": true,
-		"strict": true
+		"strict": true,
+		"incremental": true
 	},
 	"exclude": ["node_modules"]
 }

tsconfig/nextjs.json → config/tsconfig/nextjs.json

@@ -17,7 +17,8 @@
 		"resolveJsonModule": true,
 		"isolatedModules": true,
 		"jsx": "preserve",
-		"downlevelIteration": true
+		"downlevelIteration": true,
+		"moduleResolution": "Bundler"
 	},
 	"include": ["src", "next-env.d.ts"],
 	"exclude": ["node_modules"]

core/.env.development

@@ -0,0 +1,14 @@
+MAILGUN_SMTP_HOST=localhost
+MAILGUN_SMTP_PORT=54325
+API_KEY="super_secret_key"
+DATABASE_URL="postgresql://postgres:postgres@localhost:54322/postgres"
+NEXT_PUBLIC_SUPABASE_URL="http://localhost:54321"
+NEXT_PUBLIC_PUBPUB_URL="http://localhost:3000"
+ASSETS_BUCKET_NAME="assets.v7.pubpub.org"
+ASSETS_REGION="us-east-1"
+
+SUPABASE_WEBHOOKS_API_KEY="xxx"
+ASSETS_UPLOAD_KEY="xxx"
+ASSETS_UPLOAD_SECRET_KEY="xxx"
+MAILGUN_SMTP_PASSWORD="xxx"
+MAILGUN_SMTP_USERNAME="xxx"

core/.env.template

@@ -1,16 +1,4 @@
-## Dev
-API_KEY="super_secret_key"
-DATABASE_URL="postgresql://postgres:postgres@localhost:54322/postgres"
-NEXT_PUBLIC_SUPABASE_URL="http://localhost:54321"
-MAILGUN_SMTP_USERNAME=
-MAILGUN_SMTP_PASSWORD=
-ASSETS_UPLOAD_KEY=""
-ASSETS_UPLOAD_SECRET_KEY=""
-ASSETS_BUCKET_NAME="assets.v7.pubpub.org"
-ASSETS_REGION="us-east-1"
-## ------
 ## These values are copied from the output of `supabase start`
 NEXT_PUBLIC_SUPABASE_PUBLIC_KEY=""
 SUPABASE_SERVICE_ROLE_KEY=""
 JWT_SECRET=""
-## ------

core/app/(user)/settings/SettingsForm.tsx

@@ -180,6 +180,7 @@ export default function SettingsForm({
 								<Link
 									href={`/c/${community.slug}`}
 									className="cursor-pointer hover:bg-gray-50"
+									key={community.id}
 								>
 									<Button variant="outline">
 										<div className="flex items-center">

core/app/api/supabase-webhooks/user/route.ts

@@ -2,6 +2,7 @@ import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library";
 import { captureException } from "@sentry/nextjs";
 import { NextRequest, NextResponse } from "next/server";
 import { compareAPIKeys, getBearerToken } from "~/lib/auth/api";
+import { env } from "~/lib/env/env.mjs";
 import { BadRequestError, UnauthorizedError, handleErrors } from "~/lib/server/errors";
 import prisma from "~/prisma/db";
 
@@ -10,46 +11,52 @@ import prisma from "~/prisma/db";
 // user when they change and confirm their email.
 // For debugging, the responses sent by this handler are stored in supabase under net._http_response
 export async function POST(req: NextRequest) {
-    return await handleErrors(async () => {
-        const serverKey = process.env.SUPABASE_WEBHOOKS_API_KEY!
-        const authHeader = req.headers.get('authorization')
-        if (!authHeader) {
-            throw new UnauthorizedError("Authorization header missing")
-        }
-        compareAPIKeys(getBearerToken(authHeader), serverKey)
+	return await handleErrors(async () => {
+		const serverKey = env.SUPABASE_WEBHOOKS_API_KEY;
+		const authHeader = req.headers.get("authorization");
+		if (!authHeader) {
+			throw new UnauthorizedError("Authorization header missing");
+		}
+		compareAPIKeys(getBearerToken(authHeader), serverKey);
 
-        const body = await req.json();
-        if (!body.record || !body.old_record) {
-            console.error("unexpected webhook payload:", body)
-            throw new BadRequestError("Unexpected webhook payload")
-        }
+		const body = await req.json();
+		if (!body.record || !body.old_record) {
+			console.error("unexpected webhook payload:", body);
+			throw new BadRequestError("Unexpected webhook payload");
+		}
 
-        const oldEmail = body.old_record.email
-        const newEmail = body.record.email
+		const oldEmail = body.old_record.email;
+		const newEmail = body.record.email;
 
-        if (newEmail && newEmail !== oldEmail) {
-            try {
-                await prisma.user.update({
-                    where: {
-                        supabaseId: body.record.id
-                    },
-                    data: {
-                        email: newEmail
-                    }
-                });
-            } catch (error) {
-                if (error instanceof PrismaClientKnownRequestError) {
-                    if (error.code === "P2002") { // Unique constraint violated (email already exists)
-                        const newErr = new BadRequestError(`User changed supabase email from ${oldEmail} to ${newEmail} but another account exists for ${newEmail}`)
-                        captureException(newErr)
-                        throw newErr
-                    }
-                }
-                throw error
-            }
-            return NextResponse.json({ message: `User ${body.record.id} updated email to ${body.record.email}`}, { status: 200 });
-        }
+		if (newEmail && newEmail !== oldEmail) {
+			try {
+				await prisma.user.update({
+					where: {
+						supabaseId: body.record.id,
+					},
+					data: {
+						email: newEmail,
+					},
+				});
+			} catch (error) {
+				if (error instanceof PrismaClientKnownRequestError) {
+					if (error.code === "P2002") {
+						// Unique constraint violated (email already exists)
+						const newErr = new BadRequestError(
+							`User changed supabase email from ${oldEmail} to ${newEmail} but another account exists for ${newEmail}`
+						);
+						captureException(newErr);
+						throw newErr;
+					}
+				}
+				throw error;
+			}
+			return NextResponse.json(
+				{ message: `User ${body.record.id} updated email to ${body.record.email}` },
+				{ status: 200 }
+			);
+		}
 
-        return NextResponse.json({ message: "No action taken" }, { status: 200 });
-    })
-};
+		return NextResponse.json({ message: "No action taken" }, { status: 200 });
+	});
+}

core/app/api/user/route.ts

@@ -6,6 +6,7 @@ import { generateHash, getSlugSuffix, slugifyString } from "lib/string";
 import { getSupabaseId } from "lib/auth/loginId";
 import { BadRequestError, ForbiddenError, UnauthorizedError, handleErrors } from "~/lib/server";
 import { captureException } from "@sentry/nextjs";
+import { env } from "~/lib/env/env.mjs";
 
 export type UserPostBody = {
 	firstName: string;
@@ -40,12 +41,12 @@ export async function POST(req: NextRequest) {
 			email,
 			password,
 			options: {
-				emailRedirectTo: `${process.env.NEXT_PUBLIC_PUBPUB_URL}/login`,
+				emailRedirectTo: `${env.NEXT_PUBLIC_PUBPUB_URL}/login`,
 				data: {
 					firstName,
 					lastName,
-					canAdmin: true
-				}
+					canAdmin: true,
+				},
 			},
 		});
 		/* Supabase returns:
@@ -75,7 +76,7 @@ export async function POST(req: NextRequest) {
 		}
 
 		if (existingUser) {
-			// TODO: create community membership here, update name, slug etc. 
+			// TODO: create community membership here, update name, slug etc.
 			// await prisma.user.update({
 			// 	where: {
 			// 		email,
@@ -97,7 +98,7 @@ export async function POST(req: NextRequest) {
 					email,
 				},
 			});
-			return NextResponse.json({message: "New user created"}, { status: 201 });
+			return NextResponse.json({ message: "New user created" }, { status: 201 });
 		}
 	});
 }

core/app/c/[communitySlug]/integrations/IntegrationsList.tsx

@@ -49,7 +49,7 @@ const IntegrationList: React.FC<Props> = function ({ instances, token }) {
 								<div className="mt-4">
 									{instance.pubs.map((pub) => {
 										return (
-											<div className="text-sm">
+											<div key={pub.id} className="text-sm">
 												Attached to pub:{" "}
 												<span className="font-bold">{getTitle(pub)}</span>
 											</div>

core/app/page.tsx

@@ -26,7 +26,7 @@ export default async function Page() {
 			redirect("/login");
 		}
 	} else {
-		redirect("/login")
+		redirect("/login");
 	}
 	return <>Home...</>;
 }

core/lib/auth/loginId.ts

@@ -4,15 +4,14 @@ import jwt from "jsonwebtoken";
 import { getRefreshCookie, getTokenCookie } from "~/lib/auth/cookies";
 import { getServerSupabase } from "~/lib/supabaseServer";
 import type { UserAppMetadata, UserMetadata } from "@supabase/supabase-js";
-
-const JWT_SECRET: string = process.env.JWT_SECRET || "";
+import { env } from "../env/env.mjs";
 
 /* This is only called from API calls */
 /* When rendering server components, use getLoginData from loginData.ts */
 export async function getSupabaseId(req: NextRequest): Promise<string> {
 	const sessionJWT = getTokenCookie(req);
 	if (!sessionJWT) {
-		return ""
+		return "";
 	}
 	const refreshToken = getRefreshCookie(req);
 	return await getSupabaseIdFromJWT(sessionJWT, refreshToken);
@@ -23,51 +22,53 @@ export async function getSupabaseIdFromJWT(sessionJWT?: string, refreshToken?: s
 		return "";
 	}
 
-	const user = await getUserInfoFromJWT(sessionJWT, refreshToken)
+	const user = await getUserInfoFromJWT(sessionJWT, refreshToken);
 
 	if (!user?.id) {
-		return ""
+		return "";
 	}
 
 	return user.id;
 }
 
 type jwtUser = {
-	id: string,
-	email?: string,
-	aud: string,
-	app_metadata: UserAppMetadata,
-	user_metadata: UserMetadata,
-	role?: string,
-}
+	id: string;
+	email?: string;
+	aud: string;
+	app_metadata: UserAppMetadata;
+	user_metadata: UserMetadata;
+	role?: string;
+};
 
-export async function getUserInfoFromJWT(sessionJWT: string, refreshToken?: string): Promise<jwtUser | null> {
-		try {
-			const decoded = await jwt.verify(sessionJWT, JWT_SECRET);
-			if (typeof decoded === 'string' || !decoded.sub) {
-				throw new Error('Invalid jwt payload')
-			}
-			// TODO: actually validate the JWT payload!
-			// Rename `sub` to `id` for a consistent return type with the User that the
-			// refreshSession method below returns
-			return { id: decoded.sub, ...decoded} as jwtUser
+export async function getUserInfoFromJWT(
+	sessionJWT: string,
+	refreshToken?: string
+): Promise<jwtUser | null> {
+	try {
+		const decoded = await jwt.verify(sessionJWT, env.JWT_SECRET);
+		if (typeof decoded === "string" || !decoded.sub) {
+			throw new Error("Invalid jwt payload");
+		}
+		// TODO: actually validate the JWT payload!
+		// Rename `sub` to `id` for a consistent return type with the User that the
+		// refreshSession method below returns
+		return { id: decoded.sub, ...decoded } as jwtUser;
+	} catch (jwtError) {
+		console.error("Error verifying jwt", jwtError);
+		/* We may get a jwtError if it has expired. In which case, */
+		/* we try to use the refreshToken to sign back in before   */
+		/* waiting for the client to that after initial page load. */
+		const supabase = getServerSupabase();
+		const { data, error } = await supabase.auth.refreshSession({
+			refresh_token: refreshToken || "",
+		});
+		if (error) {
+			console.error("Error refreshing session:", error.message);
+			return null;
 		}
-		catch (jwtError) {
-			console.error("Error verifying jwt", jwtError);
-			/* We may get a jwtError if it has expired. In which case, */
-			/* we try to use the refreshToken to sign back in before   */
-			/* waiting for the client to that after initial page load. */
-			const supabase = getServerSupabase();
-			const { data, error } = await supabase.auth.refreshSession({
-				refresh_token: refreshToken || "",
-			});
-			if (error) {
-				console.error("Error refreshing session:", error.message)
-				return null;
-			}
-			if (!data.user?.id) {
-				return null;
-			}
-			return data.user;
+		if (!data.user?.id) {
+			return null;
 		}
+		return data.user;
+	}
 }

core/lib/env/env.mjs

@@ -0,0 +1,38 @@
+// @ts-check
+
+import { createEnv } from "@t3-oss/env-nextjs";
+import { z } from "zod";
+
+export const env = createEnv({
+	shared: {
+		NODE_ENV: z.enum(["development", "production", "test"]).optional(),
+	},
+	server: {
+		API_KEY: z.string(),
+		ASSETS_BUCKET_NAME: z.string(),
+		ASSETS_REGION: z.string(),
+		ASSETS_UPLOAD_KEY: z.string(),
+		ASSETS_UPLOAD_SECRET_KEY: z.string(),
+		DATABASE_URL: z.string().url(),
+		JWT_SECRET: z.string(),
+		MAILGUN_SMTP_PASSWORD: z.string(),
+		MAILGUN_SMTP_USERNAME: z.string(),
+		SUPABASE_SERVICE_ROLE_KEY: z.string(),
+		SUPABASE_WEBHOOKS_API_KEY: z.string(),
+		MAILGUN_SMTP_HOST: z.string(),
+		MAILGUN_SMTP_PORT: z.string(),
+	},
+	client: {
+		NEXT_PUBLIC_PUBPUB_URL: z.string().url(),
+		NEXT_PUBLIC_SUPABASE_PUBLIC_KEY: z.string(),
+		NEXT_PUBLIC_SUPABASE_URL: z.string().url(),
+	},
+	experimental__runtimeEnv: {
+		NODE_ENV: process.env.NODE_ENV,
+		NEXT_PUBLIC_PUBPUB_URL: process.env.NEXT_PUBLIC_PUBPUB_URL,
+		NEXT_PUBLIC_SUPABASE_PUBLIC_KEY: process.env.NEXT_PUBLIC_SUPABASE_PUBLIC_KEY,
+		NEXT_PUBLIC_SUPABASE_URL: process.env.NEXT_PUBLIC_SUPABASE_URL,
+	},
+	skipValidation: Boolean(process.env.SKIP_VALIDATION),
+	emptyStringAsUndefined: true,
+});

core/lib/server/assets.ts

@@ -1,14 +1,13 @@
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { S3Client, PutObjectCommand } from "@aws-sdk/client-s3";
+import { env } from "../env/env.mjs";
 
 export const generateSignedAssetUploadUrl = async (pubId: string, fileName: string) => {
-	const region = process.env.ASSETS_REGION;
-	const key = process.env.ASSETS_UPLOAD_KEY;
-	const secret = process.env.ASSETS_UPLOAD_SECRET_KEY;
-	const bucket = process.env.ASSETS_BUCKET_NAME;
-	if (!region || !key || !secret || !bucket) {
-		throw new Error("Missing assets upload paramters");
-	}
+	const region = env.ASSETS_REGION;
+	const key = env.ASSETS_UPLOAD_KEY;
+	const secret = env.ASSETS_UPLOAD_SECRET_KEY;
+	const bucket = env.ASSETS_BUCKET_NAME;
+
 	const client = new S3Client({
 		region: region,
 		credentials: {