Skip to content

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

♻️ Use requireUser (#1858)

Luke Vella6a6d34371c1d
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.json
index 1297d3043..de70f1dba 100644
--- a/apps/web/public/locales/en/app.json
+++ b/apps/web/public/locales/en/app.json
@@ -419,7 +419,7 @@
"acceptInvite": "Accept Invite",
"acceptInviteSuccess": "Successfully joined the space!",
"joinSpace": "Join {spaceName}",
- "acceptInviteTitle": "{inviterName} invited you to join the {spaceName}",
+ "acceptInviteTitle": "{inviterName} invited you to join {spaceName}",
"youAreSignedInAs": "You're signed in as",
"acceptInviteMetadataTitle": "Join {spaceName}",
"actionErrorPaymentRequired": "You need to upgrade to perform this action",
diff --git a/apps/web/src/app/[locale]/(space)/account/billing/page.tsx b/apps/web/src/app/[locale]/(space)/account/billing/page.tsx
index 50d3566df..fc91fb9c6 100644
--- a/apps/web/src/app/[locale]/(space)/account/billing/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/account/billing/page.tsx
@@ -14,7 +14,7 @@ import {
import type { Metadata } from "next";
import Link from "next/link";
import { notFound } from "next/navigation";
-import { loadCurrentUser } from "@/auth/data";
+import { requireUser } from "@/auth/data";
import {
DescriptionDetails,
DescriptionList,
@@ -43,7 +43,7 @@ import { SubscriptionStatus } from "./components/subscription-status";
async function loadData() {
const [user, subscription, paymentMethods] = await Promise.all([
- loadCurrentUser(),
+ requireUser(),
loadSubscription(),
loadPaymentMethods(),
]);
diff --git a/apps/web/src/app/[locale]/(space)/account/profile/page.tsx b/apps/web/src/app/[locale]/(space)/account/profile/page.tsx
index b072ad9da..50d7edb03 100644
--- a/apps/web/src/app/[locale]/(space)/account/profile/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/account/profile/page.tsx
@@ -4,7 +4,7 @@ import { TrashIcon } from "lucide-react";
import type { Metadata } from "next";
import type { Params } from "@/app/[locale]/types";
-import { loadCurrentUser } from "@/auth/data";
+import { requireUser } from "@/auth/data";
import { Trans } from "@/components/trans";
import { getTranslation } from "@/i18n/server";
import {
@@ -16,7 +16,7 @@ import { ProfileEmailAddress } from "./profile-email-address";
import { ProfileSettings } from "./profile-settings";
export default async function Page() {
- const user = await loadCurrentUser();
+ const user = await requireUser();
return (
<SettingsContent>
<SettingsSection
diff --git a/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx b/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx
index 1c2cb1cf1..cb96df952 100644
--- a/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx
+++ b/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx
@@ -13,7 +13,7 @@ import Link from "next/link";
import type React from "react";
import { SpaceSidebarMenu } from "@/app/[locale]/(space)/components/sidebar/space-sidebar-menu";
import { LogoLink } from "@/app/components/logo-link";
-import { loadCurrentUserSpace } from "@/auth/data";
+import { requireSpace, requireUser } from "@/auth/data";
import { Trans } from "@/components/trans";
import { FeedbackToggle } from "@/features/feedback/components/feedback-toggle";
import { SpaceDropdown } from "@/features/space/components/space-dropdown";
@@ -24,22 +24,23 @@ import { UpgradeButton } from "../upgrade-button";
import { NavUser } from "./nav-user";
async function loadData() {
- const [{ user, space }, spaces] = await Promise.all([
- loadCurrentUserSpace(),
+ const [user, activeSpace, spaces] = await Promise.all([
+ requireUser(),
+ requireSpace(),
loadSpaces(),
]);
return {
user,
spaces,
- space,
+ activeSpace,
};
}
export async function SpaceSidebar({
...props
}: React.ComponentProps<typeof Sidebar>) {
- const { user, spaces, space: activeSpace } = await loadData();
+ const { user, spaces, activeSpace } = await loadData();
return (
<Sidebar variant="inset" {...props}>
diff --git a/apps/web/src/app/[locale]/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsx
index ad2164d15..6d07e874f 100644
--- a/apps/web/src/app/[locale]/(space)/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/layout.tsx
@@ -2,7 +2,7 @@ import { Button } from "@rallly/ui/button";
import { SidebarInset, SidebarTrigger } from "@rallly/ui/sidebar";
import Link from "next/link";
import { redirect } from "next/navigation";
-import { loadCurrentUserSpace } from "@/auth/data";
+import { requireSpace, requireUser } from "@/auth/data";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";
import { CommandMenu } from "@/features/navigation/command-menu";
@@ -14,7 +14,7 @@ import { SpaceSidebarProvider } from "./components/sidebar/space-sidebar-provide
import { TopBar, TopBarLeft, TopBarRight } from "./components/top-bar";
async function loadData() {
- const { user, space } = await loadCurrentUserSpace();
+ const [user, space] = await Promise.all([requireUser(), requireSpace()]);
if (!isUserOnboarded(user)) {
redirect("/setup");
diff --git a/apps/web/src/app/[locale]/(space)/page.tsx b/apps/web/src/app/[locale]/(space)/page.tsx
index 7c225e5a8..f07319f40 100644
--- a/apps/web/src/app/[locale]/(space)/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/page.tsx
@@ -16,7 +16,7 @@ import {
PageHeader,
PageTitle,
} from "@/app/components/page-layout";
-import { loadCurrentUserSpace } from "@/auth/data";
+import { requireSpace } from "@/auth/data";
import { Trans } from "@/components/trans";
import { IfCloudHosted } from "@/contexts/environment";
import { loadUpcomingEventsCount } from "@/features/scheduled-event/data";
@@ -24,7 +24,7 @@ import { getTranslation } from "@/i18n/server";
import { FeedbackAlert } from "./feedback-alert";
async function loadData() {
- const { space } = await loadCurrentUserSpace();
+ const space = await requireSpace();
const [livePollCount, upcomingEventCount] = await Promise.all([
prisma.poll.count({
diff --git a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
index d26228e19..60324d40b 100644
--- a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
+++ b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
@@ -1,7 +1,7 @@
import { prisma } from "@rallly/database";
import { notFound } from "next/navigation";
import { FullLogoLink } from "@/app/components/full-logo-link";
-import { loadCurrentUser } from "@/auth/data";
+import { requireUser } from "@/auth/data";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { Trans } from "@/components/trans";
import { SpaceIcon } from "@/features/space/components/space-icon";
@@ -15,7 +15,7 @@ export default async function JoinPage({
params: Promise<{ inviteId: string }>;
}) {
const { inviteId } = await params;
- const user = await loadCurrentUser();
+ const user = await requireUser();
const invite = await prisma.spaceMemberInvite.findUnique({
where: {
id: inviteId,
@@ -62,7 +62,7 @@ export default async function JoinPage({
<p className="mt-1 text-sm">
<Trans
i18nKey="acceptInviteTitle"
- defaults="{inviterName} invited you to join the {spaceName}"
+ defaults="{inviterName} invited you to join {spaceName}"
values={{
spaceName: invite.space.name,
inviterName: invite.invitedBy.name,
diff --git a/apps/web/src/app/[locale]/admin-setup/page.tsx b/apps/web/src/app/[locale]/admin-setup/page.tsx
index d74075fd0..2ef4657de 100644
--- a/apps/web/src/app/[locale]/admin-setup/page.tsx
+++ b/apps/web/src/app/[locale]/admin-setup/page.tsx
@@ -3,7 +3,7 @@ import { CrownIcon } from "lucide-react";
import type { Metadata } from "next";
import Link from "next/link";
import { notFound, redirect } from "next/navigation";
-import { loadCurrentUser } from "@/auth/data";
+import { requireUser } from "@/auth/data";
import {
EmptyState,
EmptyStateDescription,
@@ -17,7 +17,7 @@ import { isInitialAdmin } from "@/utils/is-initial-admin";
import { MakeMeAdminButton } from "./make-me-admin-button";
export default async function AdminSetupPage() {
- const user = await loadCurrentUser();
+ const user = await requireUser();
if (user.role === "admin") {
redirect("/control-panel");
diff --git a/apps/web/src/app/[locale]/control-panel/users/page.tsx b/apps/web/src/app/[locale]/control-panel/users/page.tsx
index 40f2386cd..a67802b0b 100644
--- a/apps/web/src/app/[locale]/control-panel/users/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/users/page.tsx
@@ -5,7 +5,7 @@ import type { Metadata } from "next";
import { notFound } from "next/navigation";
import z from "zod";
import { PageIcon } from "@/app/components/page-icons";
-import { getCurrentUser } from "@/auth/data";
+import { requireUser } from "@/auth/data";
import {
EmptyState,
EmptyStateDescription,
@@ -37,7 +37,7 @@ async function loadData({
q?: string;
role?: "admin" | "user";
}) {
- const user = await getCurrentUser();
+ const user = await requireUser();
if (user.role !== "admin") {
notFound();
diff --git a/apps/web/src/app/[locale]/setup/page.tsx b/apps/web/src/app/[locale]/setup/page.tsx
index 4f05cd83d..8525f85cb 100644
--- a/apps/web/src/app/[locale]/setup/page.tsx
+++ b/apps/web/src/app/[locale]/setup/page.tsx
@@ -2,7 +2,7 @@ import type { Metadata } from "next";
import { redirect } from "next/navigation";
import { ProfilePicture } from "@/app/[locale]/(space)/account/profile/profile-picture";
-import { loadCurrentUser } from "@/auth/data";
+import { requireUser } from "@/auth/data";
import { Logo } from "@/components/logo";
import { Trans } from "@/components/trans";
import { SetupForm } from "@/features/setup/components/setup-form";
@@ -10,7 +10,7 @@ import { isUserOnboarded } from "@/features/setup/utils";
import { getTranslation } from "@/i18n/server";
export default async function SetupPage() {
- const user = await loadCurrentUser();
+ const user = await requireUser();
if (isUserOnboarded(user)) {
redirect("/");
diff --git a/apps/web/src/app/api/stripe/checkout/route.ts b/apps/web/src/app/api/stripe/checkout/route.ts
index fbae62ebb..72835b0eb 100644
--- a/apps/web/src/app/api/stripe/checkout/route.ts
+++ b/apps/web/src/app/api/stripe/checkout/route.ts
@@ -4,7 +4,7 @@ import { absoluteUrl } from "@rallly/utils/absolute-url";
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { z } from "zod";
-import { requireUserWithSpace } from "@/auth/data";
+import { requireSpace, requireUser } from "@/auth/data";
import type {
SubscriptionCheckoutMetadata,
SubscriptionMetadata,
@@ -18,7 +18,7 @@ const inputSchema = z.object({
});
export async function POST(request: NextRequest) {
- const { user, space } = await requireUserWithSpace();
+ const [user, space] = await Promise.all([requireUser(), requireSpace()]);
if (space.ownerId !== user.id) {
throw new AppError({
diff --git a/apps/web/src/auth/data.ts b/apps/web/src/auth/data.ts
index 143cd46bc..fb74fe9eb 100644
--- a/apps/web/src/auth/data.ts
+++ b/apps/web/src/auth/data.ts
@@ -13,10 +13,7 @@ export const getCurrentUser = async () => {
const session = await auth();
if (!session?.user) {
- throw new AppError({
- code: "UNAUTHORIZED",
- message: "User not authenticated",
- });
+ return null;
}
const user = await prisma.user.findUnique({
@@ -26,38 +23,19 @@ export const getCurrentUser = async () => {
});
if (!user) {
- throw new AppError({
- code: "NOT_FOUND",
- message: "User not found",
- });
+ return null;
}
return createUserDTO(user);
};
-export const loadCurrentUser = cache(async () => {
- try {
- return await getCurrentUser();
- } catch (error) {
- if (error instanceof AppError) {
- switch (error.code) {
- case "NOT_FOUND":
- redirect("/api/auth/invalid-session");
- break;
- case "UNAUTHORIZED":
- redirect("/login");
- break;
- default:
- throw error;
- }
- }
- throw error;
- }
-});
-
export const getCurrentUserSpace = async () => {
const user = await getCurrentUser();
+ if (!user) {
+ return null;
+ }
+
if (user.activeSpaceId) {
const space = await prisma.space.findUnique({
where: {
@@ -84,17 +62,44 @@ export const getCurrentUserSpace = async () => {
},
});
- if (!space) {
- throw new AppError({
- code: "NOT_FOUND",
- message: "Space not found",
- });
+ if (space) {
+ return {
+ user,
+ space: createSpaceDTO(user.id, space),
+ };
}
- return {
- user,
- space: createSpaceDTO(user.id, space),
- };
+ const defaultSpace = await prisma.space.findFirst({
+ where: {
+ ownerId: user.id,
+ },
+ select: {
+ id: true,
+ name: true,
+ ownerId: true,
+ subscription: {
+ select: {
+ active: true,
+ },
+ },
+ members: {
+ where: {
+ userId: user.id,
+ },
+ select: {
+ role: true,
+ userId: true,
+ },
+ },
+ },
+ });
+
+ if (defaultSpace) {
+ return {
+ user,
+ space: createSpaceDTO(user.id, defaultSpace),
+ };
+ }
}
const space = await prisma.space.findFirst({
@@ -135,35 +140,15 @@ export const getCurrentUserSpace = async () => {
};
};
-export const loadCurrentUserSpace = cache(async () => {
- try {
- return await getCurrentUserSpace();
- } catch (error) {
- if (error instanceof AppError) {
- switch (error.code) {
- case "NOT_FOUND":
- redirect("/api/auth/invalid-session");
- break;
- case "UNAUTHORIZED":
- redirect("/login");
- break;
- default:
- throw error;
- }
- }
- throw error;
- }
-});
-
export const requireAdmin = cache(async () => {
- const user = await loadCurrentUser();
+ const user = await requireUser();
if (user.role !== "admin") {
notFound();
}
});
-export const requireUser = async () => {
+export const requireUser = cache(async () => {
const session = await auth();
const headersList = await headers();
const pathname = headersList.get("x-pathname") ?? "/";
@@ -185,9 +170,9 @@ export const requireUser = async () => {
}
return createUserDTO(user);
-};
+});
-export const requireUserWithSpace = async () => {
+export const requireSpace = cache(async () => {
const user = await requireUser();
if (user.activeSpaceId) {
@@ -202,10 +187,7 @@ export const requireUserWithSpace = async () => {
});
if (space) {
- return {
- user,
- space: createSpaceDTO(user.id, space),
- };
+ return createSpaceDTO(user.id, space);
}
console.error("Could not find user's active space");
}
@@ -227,5 +209,5 @@ export const requireUserWithSpace = async () => {
});
}
- return { user, space: createSpaceDTO(user.id, space) };
-};
+ return createSpaceDTO(user.id, space);
+});
diff --git a/apps/web/src/features/poll/data.ts b/apps/web/src/features/poll/data.ts
index ffab1bcb9..c5d5a5da2 100644
--- a/apps/web/src/features/poll/data.ts
+++ b/apps/web/src/features/poll/data.ts
@@ -1,7 +1,7 @@
import type { PollStatus, Prisma } from "@rallly/database";
import { prisma } from "@rallly/database";
import { cache } from "react";
-import { loadCurrentUserSpace } from "@/auth/data";
+import { requireSpace } from "@/auth/data";
type PollFilters = {
status?: PollStatus;
@@ -12,7 +12,7 @@ type PollFilters = {
export const loadPolls = cache(
async ({ status, page = 1, pageSize = 10, q }: PollFilters) => {
- const { space } = await loadCurrentUserSpace();
+ const space = await requireSpace();
// Build the where clause based on filters
const where: Prisma.PollWhereInput = {
diff --git a/apps/web/src/features/scheduled-event/data.ts b/apps/web/src/features/scheduled-event/data.ts
index 2561085f9..b7bb8a163 100644
--- a/apps/web/src/features/scheduled-event/data.ts
+++ b/apps/web/src/features/scheduled-event/data.ts
@@ -3,7 +3,7 @@ import { prisma } from "@rallly/database";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
import { cache } from "react";
-import { loadCurrentUserSpace } from "@/auth/data";
+import { requireSpace } from "@/auth/data";
import type { Status } from "./schema";
dayjs.extend(utc);
@@ -62,7 +62,7 @@ export const loadScheduledEvents = cache(
page?: number;
pageSize?: number;
}) => {
- const { space } = await loadCurrentUserSpace();
+ const space = await requireSpace();
const where = getEventsWhereInput({
spaceId: space.id,
status,
@@ -120,7 +120,7 @@ export const loadScheduledEvents = cache(
);
export const loadUpcomingEventsCount = cache(async () => {
- const { space } = await loadCurrentUserSpace();
+ const space = await requireSpace();
return prisma.scheduledEvent.count({
where: getEventsWhereInput({
spaceId: space.id,
diff --git a/apps/web/src/features/space/data.ts b/apps/web/src/features/space/data.ts
index 0dbdd45a2..86d2279f0 100644
--- a/apps/web/src/features/space/data.ts
+++ b/apps/web/src/features/space/data.ts
@@ -5,7 +5,7 @@ import type {
} from "@rallly/database";
import { prisma } from "@rallly/database";
import { cache } from "react";
-import { loadCurrentUser, loadCurrentUserSpace } from "@/auth/data";
+import { requireSpace, requireUser } from "@/auth/data";
import type { MemberDTO } from "@/features/space/member/types";
import type { MemberRole } from "@/features/space/schema";
import type { SpaceDTO } from "@/features/space/types";
@@ -56,7 +56,7 @@ export function createSpaceDTO(
}
export const loadSpaces = cache(async () => {
- const user = await loadCurrentUser();
+ const user = await requireUser();
const ability = defineAbilityFor(user);
const spaces = await prisma.space.findMany({
where: accessibleBy(ability).Space,
@@ -100,7 +100,7 @@ export const loadSpace = cache(async ({ id }: { id: string }) => {
const space = spaces.find((space) => space.id === id);
if (!space) {
- const user = await loadCurrentUser();
+ const user = await requireUser();
throw new Error(`User ${user.id} does not have access to space ${id}`);
}
@@ -108,7 +108,7 @@ export const loadSpace = cache(async ({ id }: { id: string }) => {
});
export const loadSubscription = cache(async () => {
- const { space } = await loadCurrentUserSpace();
+ const space = await requireSpace();
const subscription = await prisma.subscription.findUnique({
where: {
spaceId: space.id,
@@ -129,7 +129,7 @@ export const loadSubscription = cache(async () => {
});
export const loadPaymentMethods = cache(async () => {
- const user = await loadCurrentUser();
+ const user = await requireUser();
const paymentMethods = await prisma.paymentMethod.findMany({
where: {
userId: user.id,
@@ -156,7 +156,7 @@ export const loadMembers = cache(
q?: string;
role?: "all" | MemberRole;
}) => {
- const { space } = await loadCurrentUserSpace();
+ const space = await requireSpace();
const whereClause: Prisma.SpaceMemberWhereInput = {
spaceId: space.id,
diff --git a/apps/web/src/lib/safe-action/server.ts b/apps/web/src/lib/safe-action/server.ts
index 0caa6e57b..dba0c4829 100644
--- a/apps/web/src/lib/safe-action/server.ts
+++ b/apps/web/src/lib/safe-action/server.ts
@@ -89,19 +89,20 @@ export const actionClient = createSafeActionClient({
export const authActionClient = actionClient
.use(async ({ next }) => {
- try {
- const user = await getCurrentUser();
- const ability = defineAbilityFor(user);
- return next({
- ctx: { user, ability },
- });
- } catch (error) {
+ const user = await getCurrentUser();
+
+ if (!user) {
throw new AppError({
code: "UNAUTHORIZED",
message: "You are not authenticated.",
- cause: error,
});
}
+
+ const ability = defineAbilityFor(user);
+
+ return next({
+ ctx: { user, ability },
+ });
})
.use(posthogMiddleware);
@@ -118,31 +119,32 @@ export const adminActionClient = authActionClient.use(async ({ ctx, next }) => {
export const spaceActionClient = actionClient
.use(async ({ next }) => {
- try {
- const { user, space } = await getCurrentUserSpace();
- const getUserAbility = () => defineAbilityFor(user);
- const getMemberAbility = () =>
- defineAbilityForMember({
- userId: user.id,
- spaceId: space.id,
- role: space.role,
- });
- const getSpaceAbility = () => defineAbilityForSpace(space);
- return next({
- ctx: {
- user,
- space,
- getUserAbility,
- getMemberAbility,
- getSpaceAbility,
- },
- });
- } catch (error) {
+ const data = await getCurrentUserSpace();
+
+ if (!data) {
throw new AppError({
code: "UNAUTHORIZED",
message: "You are not authenticated.",
- cause: error,
});
}
+
+ const { user, space } = data;
+ const getUserAbility = () => defineAbilityFor(user);
+ const getMemberAbility = () =>
+ defineAbilityForMember({
+ userId: user.id,
+ spaceId: space.id,
+ role: space.role,
+ });
+ const getSpaceAbility = () => defineAbilityForSpace(space);
+ return next({
+ ctx: {
+ user,
+ space,
+ getUserAbility,
+ getMemberAbility,
+ getSpaceAbility,
+ },
+ });
})
.use(posthogMiddleware);
diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.ts
index de0a55c98..b95cc997d 100644
--- a/apps/web/src/trpc/routers/polls.ts
+++ b/apps/web/src/trpc/routers/polls.ts
@@ -181,8 +181,14 @@ export const polls = router({
let spaceId: string | undefined;
if (!ctx.user.isGuest) {
- const { space } = await getCurrentUserSpace();
- spaceId = space.id;
+ const data = await getCurrentUserSpace();
+ if (!data) {
+ throw new TRPCError({
+ code: "NOT_FOUND",
+ message: "Space not found",
+ });
+ }
+ spaceId = data.space.id;
}
const poll = await prisma.poll.create({