unmark searchParams as optional, destructure searchParams

Author: waalbert

apps/site/src/app/(main)/apply/Hacker.tsx

@@ -6,7 +6,7 @@ export const revalidate = 60;
 export default async function Hacker({
 	searchParams,
 }: {
-	searchParams?: {
+	searchParams: {
 		prefaceAccepted?: string;
 	};
 }) {

apps/site/src/app/(main)/guest-login/GuestLogin.tsx

@@ -6,25 +6,24 @@ import getUserIdentity from "@/lib/utils/getUserIdentity";
 async function GuestLogin({
 	searchParams,
 }: {
-	searchParams?: {
+	searchParams: {
 		email?: string;
 		return_to?: string;
 	};
 }) {
+	const { email, return_to } = searchParams;
+
 	const identity = await getUserIdentity();
 	if (identity.uid !== null) {
-		redirect(searchParams?.return_to ?? "/portal");
+		redirect(return_to ?? "/portal");
 	}
 
 	return (
 		<div className="min-h-screen flex flex-col items-center justify-center">
 			<h1 className="font-display text-3xl md:text-5xl mb-20">
 				Enter Passphrase
 			</h1>
-			<GuestLoginVerificationForm
-				email={searchParams?.email}
-				return_to={searchParams?.return_to}
-			/>
+			<GuestLoginVerificationForm email={email} return_to={return_to} />
 		</div>
 	);
 }

apps/site/src/app/(main)/login/Login.tsx

@@ -5,21 +5,23 @@ import LoginForm from "./components/LoginForm";
 async function Login({
 	searchParams,
 }: {
-	searchParams?: {
+	searchParams: {
 		return_to?: string;
 	};
 }) {
+	const { return_to } = searchParams;
+
 	const identity = await getUserIdentity();
 	if (identity.uid !== null) {
-		redirect(searchParams?.return_to ?? "/portal");
+		redirect(return_to ?? "/portal");
 	}
 
 	return (
 		<div className="min-h-screen flex flex-col items-center justify-center">
 			<h1 className="font-display text-3xl md:text-5xl mb-20">
 				Login to Portal
 			</h1>
-			<LoginForm return_to={searchParams?.return_to} />
+			<LoginForm return_to={return_to} />
 		</div>
 	);
 }

apps/site/src/app/(main)/mentor/Mentor.tsx

@@ -6,7 +6,7 @@ export const revalidate = 60;
 export default async function Mentor({
 	searchParams,
 }: {
-	searchParams?: {
+	searchParams: {
 		prefaceAccepted?: string;
 	};
 }) {

apps/site/src/app/(main)/volunteer/Volunteer.tsx

@@ -6,7 +6,7 @@ export const revalidate = 60;
 export default async function Volunteer({
 	searchParams,
 }: {
-	searchParams?: {
+	searchParams: {
 		prefaceAccepted?: string;
 	};
 }) {

apps/site/src/lib/components/forms/shared/ApplicationFlow.tsx

@@ -12,7 +12,7 @@ import getUserIdentity from "@/lib/utils/getUserIdentity";
 export const revalidate = 60;
 
 interface ApplicationFlowProps {
-	searchParams?: {
+	searchParams: {
 		prefaceAccepted?: string;
 	};
 	applicationType: "Hacker" | "Mentor" | "Volunteer";
@@ -25,7 +25,7 @@ export default async function ApplicationFlow({
 	applicationURL,
 	children,
 }: ApplicationFlowProps & PropsWithChildren) {
-	const hasAcceptedQueryParam = searchParams?.prefaceAccepted === "true";
+	const hasAcceptedQueryParam = searchParams.prefaceAccepted === "true";
 	const identity = await getUserIdentity();
 
 	if (identity.status !== null) {