Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Get user data from props rather than context (#2023)

Luke Vellae1c53e291809
diff --git a/apps/web/src/app/[locale]/(optional-space)/new/page.tsx b/apps/web/src/app/[locale]/(optional-space)/new/page.tsx
index a6536f1ad..09d7113e1 100644
--- a/apps/web/src/app/[locale]/(optional-space)/new/page.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/new/page.tsx
@@ -3,22 +3,20 @@ import type { Metadata } from "next";
import Link from "next/link";
import { PollPageIcon } from "@/app/components/page-icons";
+import { getCurrentUser } from "@/auth/data";
import { CreatePoll } from "@/components/create-poll";
import { Trans } from "@/components/trans";
import { UserDropdown } from "@/components/user-dropdown";
import { getTranslation } from "@/i18n/server";
-import { getUserIdIfLoggedIn } from "@/lib/auth";
import { getRegistrationEnabled } from "@/utils/get-registration-enabled";
import { BackButton } from "./back-button";
export default async function Page() {
- const [userId, isRegistrationEnabled] = await Promise.all([
- getUserIdIfLoggedIn(),
+ const [user, isRegistrationEnabled] = await Promise.all([
+ getCurrentUser(),
getRegistrationEnabled(),
]);
- const isLoggedIn = !!userId;
-
return (
<div className="absolute inset-0 h-dvh overflow-auto bg-gray-100">
<div className="sticky top-0 z-20 border-b bg-gray-100/90 p-3 backdrop-blur-md sm:grid-cols-3">
@@ -37,8 +35,12 @@ export default async function Page() {
</div>
</div>
<div className="flex flex-1 justify-end">
- {isLoggedIn ? (
- <UserDropdown />
+ {user ? (
+ <UserDropdown
+ name={user.name}
+ image={user.image ?? undefined}
+ email={user.email ?? undefined}
+ />
) : (
<div className="flex items-center gap-x-2">
<Button variant="ghost" asChild>
diff --git a/apps/web/src/app/[locale]/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
index 4a918beae..15c3d5379 100644
--- a/apps/web/src/app/[locale]/(space)/settings/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
@@ -21,7 +21,7 @@ import { Trans } from "@/components/trans";
import { BillingProvider } from "@/features/billing/client";
import { AccountSidebarMenu, SpaceSidebarMenu } from "./components/sidebar";
-export default async function ProfileLayout({
+export default async function Layout({
children,
}: {
children?: React.ReactNode;
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
index b8e368650..71dad51db 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
@@ -62,7 +62,7 @@ export default async function Page() {
</PageSectionDescription>
</PageSectionHeader>
<PageSectionContent>
- <ProfileEmailAddress />
+ <ProfileEmailAddress email={user.email} />
</PageSectionContent>
</PageSection>
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
index 22ea40d08..b92afd7fb 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
@@ -19,7 +19,6 @@ import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import { z } from "zod";
import { Trans } from "@/components/trans";
-import { useAuthenticatedUser } from "@/components/user-provider";
import { trpc } from "@/trpc/client";
const emailChangeFormData = z.object({
@@ -27,12 +26,12 @@ const emailChangeFormData = z.object({
});
type EmailChangeFormData = z.infer<typeof emailChangeFormData>;
-export const ProfileEmailAddress = () => {
- const { user } = useAuthenticatedUser();
+
+export const ProfileEmailAddress = ({ email }: { email: string }) => {
const requestEmailChange = trpc.user.requestEmailChange.useMutation();
const form = useForm<EmailChangeFormData>({
defaultValues: {
- email: user?.email,
+ email,
},
resolver: zodResolver(emailChangeFormData),
});
@@ -47,16 +46,12 @@ export const ProfileEmailAddress = () => {
const { handleSubmit, formState, reset } = form;
- if (!user) {
- return <div>You need to be logged in to see this page.</div>;
- }
-
return (
<div className="grid gap-y-4">
<Form {...form}>
<form
onSubmit={handleSubmit(async (data) => {
- if (data.email !== user.email) {
+ if (data.email !== email) {
const res = await requestEmailChange.mutateAsync({
email: data.email,
});
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsx
index a0ef6c063..ddcfeac01 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsx
@@ -8,12 +8,16 @@ import {
ImageUploadPreview,
} from "@/components/image-upload";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
-import { useAuthenticatedUser } from "@/components/user-provider";
import { useFeatureFlag } from "@/lib/feature-flags/client";
import { trpc } from "@/trpc/client";
-function ProfilePictureUpload() {
- const { user } = useAuthenticatedUser();
+function ProfilePictureUpload({
+ image,
+ name,
+}: {
+ image?: string;
+ name: string;
+}) {
const router = useRouter();
const posthog = usePostHog();
@@ -32,22 +36,16 @@ function ProfilePictureUpload() {
posthog?.capture("remove profile picture");
};
- if (!user) return <div>You need to be logged in to see this page.</div>;
-
return (
<ImageUpload>
<ImageUploadPreview>
- <OptimizedAvatarImage
- src={user.image ?? undefined}
- name={user.name}
- size="xl"
- />
+ <OptimizedAvatarImage src={image} name={name} size="xl" />
</ImageUploadPreview>
<ImageUploadControl
keyPrefix="avatars"
onUploadSuccess={handleUploadSuccess}
onRemoveSuccess={handleRemoveSuccess}
- hasCurrentImage={!!user.image}
+ hasCurrentImage={!!image}
/>
</ImageUpload>
);
@@ -63,7 +61,7 @@ export function ProfilePicture({
const isStorageEnabled = useFeatureFlag("storage");
if (isStorageEnabled) {
- return <ProfilePictureUpload />;
+ return <ProfilePictureUpload image={image} name={name} />;
}
return <OptimizedAvatarImage src={image} name={name} size="lg" />;
diff --git a/apps/web/src/app/[locale]/(space)/settings/security/components/setup-password-form.tsx b/apps/web/src/app/[locale]/(space)/settings/security/components/setup-password-form.tsx
index a385af6ca..e05365839 100644
--- a/apps/web/src/app/[locale]/(space)/settings/security/components/setup-password-form.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/security/components/setup-password-form.tsx
@@ -3,32 +3,21 @@ import { Alert, AlertDescription } from "@rallly/ui/alert";
import { Button } from "@rallly/ui/button";
import { toast } from "@rallly/ui/sonner";
import { MailWarningIcon } from "lucide-react";
-import { useRouter } from "next/navigation";
import React from "react";
import { Trans } from "@/components/trans";
-import { useAuthenticatedUser } from "@/components/user-provider";
import { authClient } from "@/lib/auth-client";
-export function SetupPasswordForm() {
- const { user } = useAuthenticatedUser();
- const router = useRouter();
+export function SetupPasswordForm({ email }: { email: string }) {
const [isLoading, setIsLoading] = React.useState(false);
const [isSuccess, setIsSuccess] = React.useState(false);
const onSubmit = async () => {
setIsLoading(true);
- if (!user?.email) {
- router.push(
- `/login?redirectTo=${encodeURIComponent("/settings/security")}`,
- );
- return;
- }
-
// For users without passwords, we need to use the password reset flow
// First request a password reset
const resetRes = await authClient.requestPasswordReset({
- email: user.email,
+ email,
redirectTo: `/reset-password?redirectTo=${encodeURIComponent("/settings/security?setupPassword=true")}`,
});
diff --git a/apps/web/src/app/[locale]/(space)/settings/security/page.tsx b/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
index ffd5b7ae9..1487474a0 100644
--- a/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
@@ -104,7 +104,7 @@ export default async function SecurityPage({
</PageSectionDescription>
</PageSectionHeader>
<PageSectionContent>
- <SetupPasswordForm />
+ <SetupPasswordForm email={user.email} />
</PageSectionContent>
</PageSection>
)}
diff --git a/apps/web/src/auth/data.ts b/apps/web/src/auth/data.ts
index 517763f89..01c354902 100644
--- a/apps/web/src/auth/data.ts
+++ b/apps/web/src/auth/data.ts
@@ -10,10 +10,14 @@ import { getSession } from "@/lib/auth";
import { AppError } from "@/lib/errors";
import { isInitialAdmin } from "@/utils/is-initial-admin";
+/**
+ * Gets the current user if they are logged in, otherwise null.
+ * @returns The current user if they are logged in, otherwise null.
+ */
export const getCurrentUser = async () => {
const session = await getSession();
- if (!session?.user) {
+ if (!session?.user || session.user.isGuest) {
return null;
}
diff --git a/apps/web/src/components/poll/poll-header.tsx b/apps/web/src/components/poll/poll-header.tsx
deleted file mode 100644
index bd64cd80b..000000000
--- a/apps/web/src/components/poll/poll-header.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Button } from "@rallly/ui/button";
-import Image from "next/image";
-import Link from "next/link";
-import { usePathname } from "next/navigation";
-
-import { Trans } from "@/components/trans";
-import { UserDropdown } from "@/components/user-dropdown";
-
-import { useUser } from "../user-provider";
-
-export function PollHeader() {
- const { user } = useUser();
- const pathname = usePathname();
- const redirectTo = `?redirectTo=${encodeURIComponent(pathname)}`;
- return (
- <div className="sticky top-0 z-40 border-b bg-gray-100/90 p-3 backdrop-blur-md">
- <div className="mx-auto flex max-w-4xl items-center justify-between">
- <div className="flex items-center gap-x-2.5">
- <Link
- className="transition-transform active:translate-y-1"
- href="https://rallly.co"
- >
- <Image
- src="/images/logo-mark.svg"
- alt="Rallly"
- width={32}
- height={32}
- priority={true}
- className="shrink-0"
- />
- <span className="sr-only">Rallly</span>
- </Link>
- </div>
- <div className="flex items-center gap-x-2.5">
- {user ? (
- <UserDropdown />
- ) : (
- <>
- <Button variant="ghost" asChild>
- <Link href={`/login${redirectTo}`}>
- <Trans i18nKey="login" defaults="Login" />
- </Link>
- </Button>
- <Button variant="primary" asChild>
- <Link href={`/register${redirectTo}`}>
- <Trans i18nKey="signUp" defaults="Sign Up" />
- </Link>
- </Button>
- </>
- )}
- </div>
- </div>
- </div>
- );
-}
diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsx
index cb35a4b4d..65f7ff887 100644
--- a/apps/web/src/components/user-dropdown.tsx
+++ b/apps/web/src/components/user-dropdown.tsx
@@ -27,12 +27,20 @@ import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { Trans } from "@/components/trans";
import { IfCloudHosted, IfSelfHosted } from "@/contexts/environment";
import { signOut } from "@/lib/auth-client";
-import { useAuthenticatedUser } from "./user-provider";
-export const UserDropdown = ({ className }: { className?: string }) => {
- const { user } = useAuthenticatedUser();
+export const UserDropdown = ({
+ name,
+ image,
+ email,
+ className,
+}: {
+ name: string;
+ image?: string;
+ email?: string;
+ className?: string;
+}) => {
const posthog = usePostHog();
- if (!user) return null;
+
return (
<DropdownMenu modal={false}>
<DropdownMenuTrigger
@@ -41,12 +49,8 @@ export const UserDropdown = ({ className }: { className?: string }) => {
className={cn("group min-w-0", className)}
>
<Button variant="ghost">
- <OptimizedAvatarImage
- src={user.image ?? undefined}
- name={user.name}
- size="sm"
- />
- <span className="truncate">{user.name}</span>
+ <OptimizedAvatarImage src={image} name={name} size="sm" />
+ <span className="truncate">{name}</span>
<Icon>
<ChevronDownIcon />
</Icon>
@@ -55,10 +59,10 @@ export const UserDropdown = ({ className }: { className?: string }) => {
<DropdownMenuContent align="end">
<DropdownMenuLabel className="flex items-center gap-2">
<div className="grow">
- <div>{user.isGuest ? <Trans i18nKey="guest" /> : user.name}</div>
- {user.email ? (
+ <div className="font-medium text-foreground text-sm">{name}</div>
+ {email ? (
<div className="font-normal text-muted-foreground text-xs">
- {user.email}
+ {email}
</div>
) : null}
</div>
diff --git a/apps/web/src/components/user-provider.tsx b/apps/web/src/components/user-provider.tsx
index 96524a6d9..a914d8a79 100644
--- a/apps/web/src/components/user-provider.tsx
+++ b/apps/web/src/components/user-provider.tsx
@@ -29,15 +29,6 @@ export const useUser = () => {
return useRequiredContext(UserContext, "UserContext");
};
-export const useAuthenticatedUser = () => {
- const { user } = useUser();
- if (!user || user.isGuest) {
- return { user: null };
- }
-
- return { user };
-};
-
export const UserProvider = ({
children,
user,