Redirects

core/app/(user)/login/LoginForm.tsx

@@ -3,8 +3,10 @@ import React, { useState, FormEvent } from "react";
 import { Button } from "ui";
 import { supabase } from "lib/supabase";
 import Link from "next/link";
+import { useRouter } from "next/navigation";
 
 export default function LoginForm() {
+	const router = useRouter();
 	const [password, setPassword] = useState("");
 	const [email, setEmail] = useState("");
 	const [isLoading, setIsLoading] = useState(false);
@@ -22,13 +24,24 @@ export default function LoginForm() {
 			setIsLoading(false);
 			setFailure(true);
 		} else if (data) {
-			window.location.href = "/";
+			// check if user is in a community
+			const response = await fetch(`/api/member?email=${data.user.email}`, {
+				method: "GET",
+				headers: { "content-type": "application/json" },
+			});
+			const { member } = await response.json();
+			setIsLoading(false);
+			router.refresh();
+			if (member) {
+				router.push(`/c/${member.community.slug}`);
+			} else {
+				router.push("/settings");
+			}
 		}
-	};
+	}
 
 	return (
 		<div className="border p-4">
-			<h1 className="text-2xl text-center">Login</h1>
 			<div className="my-10">
 				<form onSubmit={handleSubmit}>
 					<div>
@@ -38,6 +51,7 @@ export default function LoginForm() {
 						<input
 							id="email"
 							className="w-full"
+							placeholder="Enter your email address"
 							name="email"
 							value={email}
 							onChange={(evt) => setEmail(evt.target.value)}
@@ -50,6 +64,7 @@ export default function LoginForm() {
 						<input
 							id="password"
 							className="w-full"
+							placeholder="Enter your password"
 							name="password"
 							value={password}
 							type="password"
@@ -58,12 +73,7 @@ export default function LoginForm() {
 					</div>
 
 					<div className="my-6 text-center">
-						<Button
-							className="mr-4"
-							variant="outline"
-							type="submit"
-							disabled={!email || !password}
-						>
+						<Button className="mr-4" type="submit" disabled={!email || !password}>
 							Login
 						</Button>
 						<Link href="/forgot" className="text-sm text-gray-600 hover:underline">

core/app/(user)/login/page.tsx

@@ -1,9 +1,46 @@
+import Link from "next/link";
 import LoginForm from "./LoginForm";
+import { getLoginData } from "~/lib/auth/loginData";
+import { redirect } from "next/navigation";
+import prisma from "~/prisma/db";
 
-export default async function Page() {
+export default async function Login() {
+	const loginData = await getLoginData();
+	// if user and no commuhnmitiy, redirect to settings
+	if (loginData) {
+		let user;
+		try {
+			user = await prisma.user.findUnique({
+				where: { email: loginData.email },
+			});
+
+			const member = await prisma.member.findFirst({
+				where: { userId: user.id },
+				include: { community: true },
+			});
+
+			if (member) {
+				redirect(`/c/${member.community.slug}`);
+			} else {
+				redirect("/settings");
+			}
+		} catch {
+			throw new Error("Not able to redirect user");
+		}
+	}
 	return (
-		<div className="max-w-lg m-auto">
+		<div className="max-w-sm mx-auto">
 			<LoginForm />
+
+			<div className="text-gray-600 text-center mt-6">
+				Don't have an account?{" "}
+				<Link
+					href="/signup"
+					className="text-black hover:underline transition duration-150 ease-in-out"
+				>
+					Sign up
+				</Link>
+			</div>
 		</div>
 	);
 }

core/app/(user)/reset/ResetForm.tsx

@@ -25,8 +25,19 @@ export default function ResetForm() {
 			setIsLoading(false);
 			setSuccess(true);
 			router.refresh();
+			// check if user is in a community
+			const response = await fetch(`/api/member?email=${data.user.email}`, {
+				method: "GET",
+				headers: { "content-type": "application/json" },
+			});
+			const { member } = await response.json();
+			setIsLoading(false);
 			setTimeout(() => {
-				router.push("/");
+				if (member) {
+					router.push(`/c/${member.community.slug}`);
+				} else {
+					router.push("/settings");
+				}
 			}, 5000);
 		}
 	};
@@ -47,7 +58,9 @@ export default function ResetForm() {
 							Set new password
 						</Button>
 						{error && (
-							<div className={"text-red-700 my-4"}>Error resetting password: {error}</div>
+							<div className={"text-red-700 my-4"}>
+								Error resetting password: {error}
+							</div>
 						)}
 					</form>
 				</div>

core/app/(user)/reset/page.tsx

@@ -1,6 +1,7 @@
 import ResetForm from "./ResetForm";
 
 export default async function Page() {
+	// TODO: add reset token validation
 	return (
 		<div className="max-w-lg m-auto">
 			<ResetForm />

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

@@ -1,9 +1,10 @@
 "use client";
-import React, { useState, FormEvent } from "react";
-import { Button } from "ui";
+import { getSlugSuffix, slugifyString } from "lib/string";
 import { supabase } from "lib/supabase";
 import { useRouter } from "next/navigation";
-import { getSlugSuffix, slugifyString } from "lib/string";
+import { FormEvent, useState } from "react";
+import { Button } from "ui";
+import LogoutButton from "~/app/components/LogoutButton";
 import { UserPutBody, UserSettings } from "~/lib/types";
 
 type Props = UserSettings;
@@ -162,6 +163,9 @@ export default function SettingsForm({
 						Password reset email sent! Please check your inbox.
 					</div>
 				)}
+				<div className="mt-8">
+					<LogoutButton />
+				</div>
 			</div>
 		</>
 	);

core/app/api/member/route.ts

@@ -0,0 +1,28 @@
+import { NextRequest, NextResponse } from "next/server";
+
+import prisma from "prisma/db";
+import { handleErrors } from "~/lib/server";
+
+export async function GET(req: NextRequest) {
+	return await handleErrors(async () => {
+		const email = req.nextUrl.searchParams.get("email");
+		let user;
+		if (email) {
+			try {
+				user = await prisma.user.findUnique({
+					where: { email },
+				});
+			} catch {
+				throw new Error("No user found");
+			}
+
+			const member = await prisma.member.findFirst({
+				where: { userId: user.id },
+				include: { community: true },
+			});
+			return NextResponse.json({ member, status: 200 });
+		} else {
+			throw new Error("No email provided");
+		}
+	});
+}

core/app/api/user/route.ts

@@ -80,7 +80,7 @@ export async function POST(req: NextRequest) {
 			// });
 			return NextResponse.json({ message: "Existing account claimed" }, { status: 200 });
 		} else {
-			const newUser = await prisma.user.create({
+			await prisma.user.create({
 				data: {
 					supabaseId: data.user.id,
 					slug: `${slugifyString(firstName)}${

core/app/c/[communitySlug]/LoginSwitcher.tsx

@@ -1,6 +1,6 @@
 import { getLoginData } from "~/lib/auth/loginData";
 import { Avatar, AvatarFallback, AvatarImage } from "ui";
-import LogoutButton from "./LogoutButton";
+import LogoutButton from "../../components/LogoutButton";
 import Link from "next/link";
 
 export default async function LoginSwitcher() {

core/app/c/[communitySlug]/layout.tsx

@@ -31,6 +31,13 @@ export default async function MainLayout({ children, params }: Props) {
 	if (!community) {
 		return null;
 	}
+	const member = await prisma.member.findFirst({
+		where: { userId: loginData.id, communityId: community.id },
+	});
+	if (!member) {
+		redirect("/settings");
+	}
+
 	const availableCommunities = await getAvailableCommunities(loginData);
 	return (
 		<div className="flex min-h-screen">

core/app/c/[communitySlug]/page.tsx

@@ -1,6 +1,3 @@
-import { redirect } from "next/navigation";
-import { getLoginData } from "~/lib/auth/loginData";
-
 export default async function Page() {
 	return (
 		<>

core/app/c/[communitySlug]/pubs/page.tsx

@@ -4,7 +4,6 @@ import PubList from "./PubList";
 import PubHeader from "./PubHeader";
 import { createToken } from "~/lib/server/token";
 import { pubInclude, stageInclude } from "~/lib/types";
-import { redirect } from "next/navigation";
 import { expect } from "utils";
 
 const getCommunityPubs = async (communitySlug: string) => {

core/app/c/[communitySlug]/LogoutButton.tsx → core/app/components/LogoutButton.tsx

@@ -1,11 +1,15 @@
 "use client";
 import { supabase } from "~/lib/supabase";
 import { Button } from "ui";
+import { useRouter } from "next/navigation";
 
 export default function LogoutButton() {
+	const router = useRouter();
+
 	const handleSignout = async () => {
 		await supabase.auth.signOut();
-		window.location.href = "/";
+		router.refresh();
+		router.push("/");
 	};
 	return (
 		<Button onClick={handleSignout} variant="outline" size="sm">

core/app/globals.css

@@ -3,4 +3,4 @@
 @tailwind utilities;
 
 /* Not clear why we need this here if we
-also import ui/styles which includes it */
+also import ui/styles which includes it */

core/app/layout.tsx

@@ -1,7 +1,7 @@
+import { Toaster } from "ui";
 import "ui/styles.css";
-import "./globals.css";
 import InitClient from "./InitClient";
-import { Toaster } from "ui";
+import "./globals.css";
 
 export const metadata = {
 	title: "PubPub v7 Mockup Demo",

core/app/page.tsx

@@ -1,28 +1,30 @@
-import prisma from "~/prisma/db";
 import { redirect } from "next/navigation";
 import { getLoginData } from "~/lib/auth/loginData";
+import prisma from "~/prisma/db";
 
 export default async function Page() {
 	const loginData = await getLoginData();
+	// if user and no commuhnmitiy, redirect to settings
 	if (loginData) {
-		/* If we have a logged in user navigating to `/`, check */
-		/* if they are a member of any community, and if so,    */
-		/* redirect them to that community by default. We could */
-		/* eventually have a query param override, but this     */
-		/* assumes that logged in users landing on pubpub.org   */
-		/* want to go to their dashboard a la github or twitter */
-		/* TODO: Does not select for member-group access yet */
-		const community = await prisma.community.findFirst({
-			where: { members: { some: { userId: loginData.id } } },
-			select: { slug: true },
-		});
-		if (community) {
-			redirect(`/c/${community.slug}`);
+		let user;
+		try {
+			user = await prisma.user.findUnique({
+				where: { email: loginData.email },
+			});
+
+			const member = await prisma.member.findFirst({
+				where: { userId: user.id },
+				include: { community: true },
+			});
+
+			if (member) {
+				redirect(`/c/${member.community.slug}`);
+			} else {
+				redirect("/settings");
+			}
+		} catch {
+			throw new Error("Not able to redirect user");
 		}
 	}
-	return (
-		<>
-			<h1>Home</h1>
-		</>
-	);
+	return <>Home...</>;
 }

core/lib/auth/loginData.ts

@@ -53,8 +53,8 @@ export const getLoginData = cache(async () => {
 					create: {
 						communityId,
 						canAdmin,
-					}
-				}
+					},
+				},
 			},
 		});
 	}