Skip to content

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

♻️ Use data access layer (#1834)

Luke Vella0c443c20f05b
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 33aae8166..3f0cd5842 100644
--- a/apps/web/src/app/[locale]/(space)/account/billing/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/account/billing/page.tsx
@@ -1,4 +1,3 @@
-import { prisma } from "@rallly/database";
import { Badge } from "@rallly/ui/badge";
import { Button } from "@rallly/ui/button";
import { DialogTrigger } from "@rallly/ui/dialog";
@@ -13,8 +12,7 @@ import {
SparklesIcon,
} from "lucide-react";
import Link from "next/link";
-import { notFound, redirect } from "next/navigation";
-import { requireUser } from "@/auth/queries";
+import { notFound } from "next/navigation";
import {
DescriptionDetails,
DescriptionList,
@@ -29,6 +27,8 @@ import {
} from "@/components/empty-state";
import { PayWallDialog } from "@/components/pay-wall-dialog";
import { Trans } from "@/components/trans";
+import { loadPaymentMethods, loadSubscription } from "@/data/space";
+import { loadUserAbility } from "@/data/user";
import { FormattedDateTime } from "@/features/timezone/client/formatted-date-time";
import { getTranslation } from "@/i18n/server";
import { isSelfHosted } from "@/utils/constants";
@@ -40,52 +40,22 @@ import { PaymentMethod } from "./components/payment-method";
import { SubscriptionPrice } from "./components/subscription-price";
import { SubscriptionStatus } from "./components/subscription-status";
-async function getData() {
- const user = await requireUser();
-
- const data = await prisma.user.findUnique({
- where: { id: user.id },
- select: {
- customerId: true,
- subscription: {
- select: {
- id: true,
- active: true,
- currency: true,
- amount: true,
- priceId: true,
- periodStart: true,
- periodEnd: true,
- interval: true,
- cancelAtPeriodEnd: true,
- status: true,
- },
- },
- paymentMethods: {
- select: {
- id: true,
- type: true,
- data: true,
- },
- },
- },
- });
-
- if (!data) {
- redirect("/api/auth/invalid-session");
- }
-
- return data;
-}
-
-export default async function Page() {
+async function loadData() {
if (isSelfHosted) {
notFound();
}
- const data = await getData();
+ const [{ user }, subscription, paymentMethods] = await Promise.all([
+ loadUserAbility(),
+ loadSubscription(),
+ loadPaymentMethods(),
+ ]);
- const { subscription } = data;
+ return { user, subscription, paymentMethods };
+}
+
+export default async function Page() {
+ const { user, subscription, paymentMethods } = await loadData();
return (
<SettingsContent>
@@ -166,7 +136,7 @@ export default async function Page() {
/>
</DescriptionTerm>
<DescriptionDetails>
- {data.paymentMethods.length === 0 ? (
+ {paymentMethods.length === 0 ? (
<div>
<div className="space-y-2">
<div className="flex items-center gap-x-2 text-destructive">
@@ -204,7 +174,7 @@ export default async function Page() {
</div>
) : (
<ul className="space-y-2">
- {data.paymentMethods.map((method) => (
+ {paymentMethods.map((method) => (
<li key={method.id}>
<PaymentMethod type={method.type} data={method.data} />
</li>
@@ -213,7 +183,7 @@ export default async function Page() {
)}
</DescriptionDetails>
</DescriptionList>
- {data.customerId ? (
+ {user.customerId ? (
<div className="flex flex-col items-start justify-between gap-6 gap-x-4 rounded-lg border bg-gray-50 p-4 sm:flex-row">
<div className="space-y-1">
<h3 className="font-medium text-sm">
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 5a071dc06..dceb16aee 100644
--- a/apps/web/src/app/[locale]/(space)/account/profile/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/account/profile/page.tsx
@@ -3,8 +3,8 @@ import { DialogTrigger } from "@rallly/ui/dialog";
import { TrashIcon } from "lucide-react";
import type { Params } from "@/app/[locale]/types";
-import { requireUser } from "@/auth/queries";
import { Trans } from "@/components/trans";
+import { loadUserAbility } from "@/data/user";
import { getTranslation } from "@/i18n/server";
import {
SettingsContent,
@@ -15,7 +15,7 @@ import { ProfileEmailAddress } from "./profile-email-address";
import { ProfileSettings } from "./profile-settings";
export default async function Page() {
- const user = await requireUser();
+ const { user } = await loadUserAbility();
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 536dd657a..bd50fdaf2 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
@@ -14,21 +14,21 @@ 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 { getActiveSpace, requireUserAbility } from "@/auth/queries";
import { Trans } from "@/components/trans";
+import { loadActiveSpace, loadSpaces } from "@/data/space";
+import { loadUserAbility } from "@/data/user";
import { FeedbackToggle } from "@/features/feedback/components/feedback-toggle";
import { SpaceDropdown } from "@/features/spaces/components/space-dropdown";
import { SpaceIcon } from "@/features/spaces/components/space-icon";
import { isSpacesEnabled } from "@/features/spaces/constants";
-import { loadSpaces } from "@/features/spaces/queries";
import { UpgradeButton } from "../upgrade-button";
import { NavUser } from "./nav-user";
async function loadData() {
const [{ user }, spaces, activeSpace] = await Promise.all([
- requireUserAbility(),
+ loadUserAbility(),
loadSpaces(),
- getActiveSpace(),
+ loadActiveSpace(),
]);
return {
diff --git a/apps/web/src/app/[locale]/(space)/events/page.tsx b/apps/web/src/app/[locale]/(space)/events/page.tsx
index 31fc7bdb8..3e26e2843 100644
--- a/apps/web/src/app/[locale]/(space)/events/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/events/page.tsx
@@ -1,5 +1,5 @@
import { CalendarIcon } from "lucide-react";
-
+import type { Metadata } from "next";
import type { Params } from "@/app/[locale]/types";
import { EventPageIcon } from "@/app/components/page-icons";
import {
@@ -10,7 +10,6 @@ import {
PageTitle,
} from "@/app/components/page-layout";
import { SearchInput } from "@/app/components/search-input";
-import { getActiveSpace } from "@/auth/queries";
import {
EmptyState,
EmptyStateDescription,
@@ -20,8 +19,8 @@ import {
import { Pagination } from "@/components/pagination";
import { StackedList, StackedListItem } from "@/components/stacked-list";
import { Trans } from "@/components/trans";
+import { loadScheduledEvents } from "@/data/event";
import { ScheduledEventListItem } from "@/features/scheduled-event/components/scheduled-event-list";
-import { getScheduledEvents } from "@/features/scheduled-event/queries";
import type { Status } from "@/features/scheduled-event/schema";
import { statusSchema } from "@/features/scheduled-event/schema";
import { getTranslation } from "@/i18n/server";
@@ -38,9 +37,7 @@ async function loadData({
page?: number;
pageSize?: number;
}) {
- const space = await getActiveSpace();
- return getScheduledEvents({
- spaceId: space.id,
+ return loadScheduledEvents({
status,
search,
page,
@@ -182,7 +179,7 @@ export default async function Page(props: {
);
}
-export async function generateMetadata() {
+export async function generateMetadata(): Promise<Metadata> {
const { t } = await getTranslation();
return {
title: t("events", {
diff --git a/apps/web/src/app/[locale]/(space)/page.tsx b/apps/web/src/app/[locale]/(space)/page.tsx
index c91aba67c..7e350c7c8 100644
--- a/apps/web/src/app/[locale]/(space)/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/page.tsx
@@ -17,15 +17,15 @@ import {
PageHeader,
PageTitle,
} from "@/app/components/page-layout";
-import { getActiveSpace } from "@/auth/queries";
import { Trans } from "@/components/trans";
import { IfCloudHosted } from "@/contexts/environment";
-import { getUpcomingEventsCount } from "@/features/scheduled-event/queries";
+import { loadUpcomingEventsCount } from "@/data/event";
+import { loadActiveSpace } from "@/data/space";
import { getTranslation } from "@/i18n/server";
import { FeedbackAlert } from "./feedback-alert";
async function loadData() {
- const space = await getActiveSpace();
+ const space = await loadActiveSpace();
const [livePollCount, upcomingEventCount] = await Promise.all([
prisma.poll.count({
@@ -35,7 +35,7 @@ async function loadData() {
deleted: false,
},
}),
- getUpcomingEventsCount(),
+ loadUpcomingEventsCount(),
]);
return {
diff --git a/apps/web/src/app/[locale]/(space)/polls/page.tsx b/apps/web/src/app/[locale]/(space)/polls/page.tsx
index c55110370..215e2d3be 100644
--- a/apps/web/src/app/[locale]/(space)/polls/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/polls/page.tsx
@@ -21,7 +21,7 @@ import {
} from "@/components/empty-state";
import { Pagination } from "@/components/pagination";
import { Trans } from "@/components/trans";
-import { getPolls } from "@/features/poll/api/get-polls";
+import { loadPolls } from "@/data/poll";
import { PollList, PollListItem } from "@/features/poll/components/poll-list";
import { getTranslation } from "@/i18n/server";
@@ -42,7 +42,7 @@ async function loadData({
q?: string;
}) {
const [{ total, data: polls }] = await Promise.all([
- getPolls({ status, page, pageSize, q }),
+ loadPolls({ status, page, pageSize, q }),
]);
return {
diff --git a/apps/web/src/app/[locale]/admin-setup/page.tsx b/apps/web/src/app/[locale]/admin-setup/page.tsx
index a7da33e35..9d843a881 100644
--- a/apps/web/src/app/[locale]/admin-setup/page.tsx
+++ b/apps/web/src/app/[locale]/admin-setup/page.tsx
@@ -3,7 +3,6 @@ import { Button } from "@rallly/ui/button";
import { CrownIcon } from "lucide-react";
import Link from "next/link";
import { notFound, redirect } from "next/navigation";
-import { requireUserAbility } from "@/auth/queries";
import {
EmptyState,
EmptyStateDescription,
@@ -12,11 +11,12 @@ import {
EmptyStateTitle,
} from "@/components/empty-state";
import { Trans } from "@/components/trans";
+import { loadUserAbility } from "@/data/user";
import { getTranslation } from "@/i18n/server";
import { MakeMeAdminButton } from "./make-me-admin-button";
export default async function AdminSetupPage() {
- const { user, ability } = await requireUserAbility();
+ const { user, ability } = await loadUserAbility();
if (ability.can("access", "ControlPanel")) {
redirect("/control-panel");
diff --git a/apps/web/src/app/[locale]/control-panel/layout.tsx b/apps/web/src/app/[locale]/control-panel/layout.tsx
index 67434ce4c..3a81eb015 100644
--- a/apps/web/src/app/[locale]/control-panel/layout.tsx
+++ b/apps/web/src/app/[locale]/control-panel/layout.tsx
@@ -1,5 +1,4 @@
import { SidebarInset } from "@rallly/ui/sidebar";
-import { requireAdmin } from "@/auth/queries";
import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";
import { CommandMenu } from "@/features/navigation/command-menu";
import { getTranslation } from "@/i18n/server";
@@ -11,8 +10,6 @@ export default async function AdminLayout({
}: {
children: React.ReactNode;
}) {
- await requireAdmin();
-
return (
<ControlPanelSidebarProvider>
<CommandMenu />
diff --git a/apps/web/src/app/[locale]/control-panel/license/page.tsx b/apps/web/src/app/[locale]/control-panel/license/page.tsx
index a15f0f906..f9aa4a25f 100644
--- a/apps/web/src/app/[locale]/control-panel/license/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/license/page.tsx
@@ -10,7 +10,6 @@ import { Icon } from "@rallly/ui/icon";
import dayjs from "dayjs";
import { KeySquareIcon, PlusIcon, ShoppingBagIcon } from "lucide-react";
import { PageIcon } from "@/app/components/page-icons";
-import { requireAdmin } from "@/auth/queries";
import {
EmptyState,
EmptyStateDescription,
@@ -25,14 +24,17 @@ import {
FullWidthLayoutTitle,
} from "@/components/full-width-layout";
import { Trans } from "@/components/trans";
+import { loadInstanceLicense } from "@/data/instance-license";
+import { loadAdminUserAbility } from "@/data/user";
import { LicenseKeyForm } from "@/features/licensing/components/license-key-form";
import { RemoveLicenseButton } from "@/features/licensing/components/remove-license-button";
-import { getLicense } from "@/features/licensing/queries";
import { getTranslation } from "@/i18n/server";
async function loadData() {
- await requireAdmin();
- const license = await getLicense();
+ const [_, license] = await Promise.all([
+ loadAdminUserAbility(),
+ loadInstanceLicense(),
+ ]);
return { license };
}
diff --git a/apps/web/src/app/[locale]/control-panel/page.tsx b/apps/web/src/app/[locale]/control-panel/page.tsx
index 900cea55d..d523fbfad 100644
--- a/apps/web/src/app/[locale]/control-panel/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/page.tsx
@@ -11,7 +11,6 @@ import {
} from "lucide-react";
import Link from "next/link";
import { PageIcon } from "@/app/components/page-icons";
-import { requireAdmin } from "@/auth/queries";
import {
FullWidthLayout,
FullWidthLayoutContent,
@@ -19,14 +18,14 @@ import {
FullWidthLayoutTitle,
} from "@/components/full-width-layout";
import { Trans } from "@/components/trans";
-import { getLicense } from "@/features/licensing/queries";
+import { loadInstanceLicense } from "@/data/instance-license";
+import { loadAdminUserAbility } from "@/data/user";
async function loadData() {
- await requireAdmin();
-
- const [userCount, license] = await Promise.all([
+ const [_, userCount, license] = await Promise.all([
+ loadAdminUserAbility(),
prisma.user.count(),
- getLicense(),
+ loadInstanceLicense(),
]);
return {
diff --git a/apps/web/src/app/[locale]/control-panel/settings/page.tsx b/apps/web/src/app/[locale]/control-panel/settings/page.tsx
index 07a6772b9..e84a21a2d 100644
--- a/apps/web/src/app/[locale]/control-panel/settings/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/settings/page.tsx
@@ -1,6 +1,5 @@
import { SettingsIcon } from "lucide-react";
import { PageIcon } from "@/app/components/page-icons";
-import { requireAdmin } from "@/auth/queries";
import {
FullWidthLayout,
FullWidthLayoutContent,
@@ -8,11 +7,12 @@ import {
FullWidthLayoutTitle,
} from "@/components/full-width-layout";
import { Trans } from "@/components/trans";
+import { loadAdminUserAbility } from "@/data/user";
import { getInstanceSettings } from "@/features/instance-settings/queries";
import { InstanceSettingsForm } from "./instance-settings-form";
async function loadData() {
- await requireAdmin();
+ await loadAdminUserAbility();
const instanceSettings = await getInstanceSettings();
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 0d16ea213..c8b378110 100644
--- a/apps/web/src/app/[locale]/control-panel/users/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/users/page.tsx
@@ -3,7 +3,6 @@ import { prisma } from "@rallly/database";
import { UsersIcon } from "lucide-react";
import z from "zod";
import { PageIcon } from "@/app/components/page-icons";
-import { requireAdmin } from "@/auth/queries";
import {
EmptyState,
EmptyStateDescription,
@@ -19,6 +18,7 @@ import {
import { Pagination } from "@/components/pagination";
import { StackedList } from "@/components/stacked-list";
import { Trans } from "@/components/trans";
+import { loadAdminUserAbility } from "@/data/user";
import { getTranslation } from "@/i18n/server";
import { UserRow } from "./user-row";
import { UserSearchInput } from "./user-search-input";
@@ -35,7 +35,7 @@ async function loadData({
q?: string;
role?: "admin" | "user";
}) {
- const adminUser = await requireAdmin();
+ const { user } = await loadAdminUserAbility();
const where: Prisma.UserWhereInput = {};
@@ -81,7 +81,7 @@ async function loadData({
});
return {
- adminUser,
+ adminUser: user,
allUsers: allUsers.map((user) => ({
...user,
image: user.image ?? undefined,
diff --git a/apps/web/src/app/[locale]/setup/page.tsx b/apps/web/src/app/[locale]/setup/page.tsx
index 966f4ec2d..ef40a7bfb 100644
--- a/apps/web/src/app/[locale]/setup/page.tsx
+++ b/apps/web/src/app/[locale]/setup/page.tsx
@@ -1,15 +1,15 @@
import { redirect } from "next/navigation";
import { ProfilePicture } from "@/app/[locale]/(space)/account/profile/profile-picture";
-import { requireUser } from "@/auth/queries";
import { Logo } from "@/components/logo";
import { Trans } from "@/components/trans";
+import { loadUserAbility } from "@/data/user";
import { SetupForm } from "@/features/setup/components/setup-form";
import { onboardedUserSchema } from "@/features/setup/schema";
import { getTranslation } from "@/i18n/server";
export default async function SetupPage() {
- const user = await requireUser();
+ const { user } = await loadUserAbility();
const isUserOnboarded = onboardedUserSchema.safeParse(user).success;
diff --git a/apps/web/src/app/api/stripe/checkout/route.ts b/apps/web/src/app/api/stripe/checkout/route.ts
index f5f544a58..b637411e4 100644
--- a/apps/web/src/app/api/stripe/checkout/route.ts
+++ b/apps/web/src/app/api/stripe/checkout/route.ts
@@ -4,8 +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 { getActiveSpace, requireUser } from "@/auth/queries";
+import { requireUser } from "@/data/user";
import type {
SubscriptionCheckoutMetadata,
SubscriptionMetadata,
@@ -18,7 +17,8 @@ const inputSchema = z.object({
});
export async function POST(request: NextRequest) {
- const user = await requireUser();
+ const { user } = await requireUser();
+
const formData = await request.formData();
const data = inputSchema.safeParse(Object.fromEntries(formData.entries()));
@@ -70,9 +70,20 @@ export async function POST(request: NextRequest) {
const proPricingData = await getProPricing();
- const space = await getActiveSpace();
+ let spaceId = user.activeSpaceId;
+
+ if (!spaceId) {
+ const space = await prisma.space.findFirstOrThrow({
+ where: {
+ ownerId: user.id,
+ },
+ select: {
+ id: true,
+ },
+ });
- const spaceId = space.id;
+ spaceId = space.id;
+ }
const checkoutSession = await stripe.checkout.sessions.create({
success_url: absoluteUrl(
diff --git a/apps/web/src/auth/queries.ts b/apps/web/src/auth/queries.ts
index cb2c50115..d793cc249 100644
--- a/apps/web/src/auth/queries.ts
+++ b/apps/web/src/auth/queries.ts
@@ -1,14 +1,13 @@
-import { notFound, redirect } from "next/navigation";
-import { cache } from "react";
+import { redirect } from "next/navigation";
import { defineAbilityFor } from "@/features/ability-manager";
-import { loadDefaultSpace, loadSpace } from "@/features/spaces/queries";
import { getUser } from "@/features/user/queries";
import { auth } from "@/next-auth";
-/**
- * @deprecated - Use requireUserAbility() instead
- */
-export const requireUser = cache(async () => {
+export const isInitialAdmin = (email: string) => {
+ return email.toLowerCase() === process.env.INITIAL_ADMIN_EMAIL?.toLowerCase();
+};
+
+export const requireUserAbility = async () => {
const session = await auth();
if (!session?.user) {
redirect("/login");
@@ -20,48 +19,10 @@ export const requireUser = cache(async () => {
redirect("/api/auth/invalid-session");
}
- return user;
-});
-
-export const isInitialAdmin = cache((email: string) => {
- return email.toLowerCase() === process.env.INITIAL_ADMIN_EMAIL?.toLowerCase();
-});
-
-export const requireAdmin = cache(async () => {
- const { user } = await requireUserAbility();
-
- if (user.role !== "admin") {
- if (isInitialAdmin(user.email)) {
- redirect("/admin-setup");
- }
- notFound();
- }
-
- return user;
-});
-
-export const getActiveSpace = cache(async () => {
- const { user } = await requireUserAbility();
-
- if (user.activeSpaceId) {
- try {
- return await loadSpace({ id: user.activeSpaceId });
- } catch {
- console.warn(
- `User ${user.id} has an active space ID ${user.activeSpaceId} that does not exist or is no longer accessible`,
- );
- }
- }
-
- return await loadDefaultSpace();
-});
-
-export const requireUserAbility = cache(async () => {
- const user = await requireUser();
return {
user,
ability: defineAbilityFor(user, {
isInitialAdmin: isInitialAdmin(user.email),
}),
};
-});
+};
diff --git a/apps/web/src/data/event.ts b/apps/web/src/data/event.ts
new file mode 100644
index 000000000..fd6086e24
--- /dev/null
+++ b/apps/web/src/data/event.ts
@@ -0,0 +1,130 @@
+import type { Prisma } from "@rallly/database";
+import { prisma } from "@rallly/database";
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc";
+import { cache } from "react";
+import { loadActiveSpace } from "@/data/space";
+import type { Status } from "../features/scheduled-event/schema";
+
+dayjs.extend(utc);
+
+const mapStatus = {
+ upcoming: "confirmed",
+ unconfirmed: "unconfirmed",
+ past: "confirmed",
+ canceled: "canceled",
+} as const;
+
+function getEventsWhereInput({
+ spaceId,
+ status,
+ search,
+}: {
+ spaceId: string;
+ status: Status;
+ search?: string;
+}) {
+ const now = new Date();
+
+ const todayStart = dayjs().startOf("day").utc().toDate();
+
+ const where: Prisma.ScheduledEventWhereInput = {
+ spaceId,
+ deletedAt: null,
+ ...(status === "upcoming" && {
+ OR: [
+ { allDay: false, start: { gte: now } },
+ { allDay: true, start: { gte: todayStart } },
+ ],
+ }),
+ ...(status === "past" && {
+ OR: [
+ { allDay: false, start: { lt: now } },
+ { allDay: true, start: { lt: todayStart } },
+ ],
+ }),
+ ...(search && { title: { contains: search, mode: "insensitive" } }),
+ status: mapStatus[status],
+ };
+
+ return where;
+}
+
+export const loadScheduledEvents = cache(
+ async ({
+ status,
+ search,
+ page = 1,
+ pageSize = 10,
+ }: {
+ status: Status;
+ search?: string;
+ page?: number;
+ pageSize?: number;
+ }) => {
+ const space = await loadActiveSpace();
+ const where = getEventsWhereInput({
+ spaceId: space.id,
+ status,
+ search,
+ });
+
+ const [rawEvents, totalCount] = await Promise.all([
+ prisma.scheduledEvent.findMany({
+ where,
+ orderBy: {
+ start: status === "past" ? "desc" : "asc",
+ },
+ select: {
+ id: true,
+ title: true,
+ description: true,
+ location: true,
+ start: true,
+ end: true,
+ allDay: true,
+ timeZone: true,
+ status: true,
+ invites: {
+ select: {
+ id: true,
+ inviteeName: true,
+ user: {
+ select: {
+ image: true,
+ },
+ },
+ },
+ },
+ },
+ skip: (page - 1) * pageSize,
+ take: pageSize,
+ }),
+ prisma.scheduledEvent.count({ where }),
+ ]);
+
+ const events = rawEvents.map((event) => ({
+ ...event,
+ invites: event.invites.map((invite) => ({
+ id: invite.id,
+ inviteeName: invite.inviteeName,
+ inviteeImage: invite.user?.image ?? undefined,
+ })),
+ }));
+
+ const totalPages = Math.ceil(totalCount / pageSize);
+ const hasNextPage = page * pageSize < totalCount;
+
+ return { events, totalCount, totalPages, hasNextPage };
+ },
+);
+
+export const loadUpcomingEventsCount = cache(async () => {
+ const space = await loadActiveSpace();
+ return prisma.scheduledEvent.count({
+ where: getEventsWhereInput({
+ spaceId: space.id,
+ status: "upcoming",
+ }),
+ });
+});
diff --git a/apps/web/src/features/licensing/queries.ts b/apps/web/src/data/instance-license.ts
similarity index 84%
rename from apps/web/src/features/licensing/queries.ts
rename to apps/web/src/data/instance-license.ts
index 02f668f78..1618c436e 100644
--- a/apps/web/src/features/licensing/queries.ts
+++ b/apps/web/src/data/instance-license.ts
@@ -1,6 +1,7 @@
import { prisma } from "@rallly/database";
+import { cache } from "react";
-export async function getLicense() {
+export const loadInstanceLicense = cache(async () => {
const license = await prisma.instanceLicense.findFirst();
if (!license) {
@@ -19,4 +20,4 @@ export async function getLicense() {
: 1,
type: license.type,
};
-}
+});
diff --git a/apps/web/src/data/poll.ts b/apps/web/src/data/poll.ts
new file mode 100644
index 000000000..826ef9bbe
--- /dev/null
+++ b/apps/web/src/data/poll.ts
@@ -0,0 +1,95 @@
+import type { PollStatus, Prisma } from "@rallly/database";
+import { prisma } from "@rallly/database";
+import { cache } from "react";
+import { loadActiveSpace } from "@/data/space";
+
+type PollFilters = {
+ status?: PollStatus;
+ page?: number;
+ pageSize?: number;
+ q?: string;
+};
+
+export const loadPolls = cache(
+ async ({ status, page = 1, pageSize = 10, q }: PollFilters) => {
+ const space = await loadActiveSpace();
+
+ // Build the where clause based on filters
+ const where: Prisma.PollWhereInput = {
+ spaceId: space.id,
+ status,
+ deleted: false,
+ };
+
+ // Add search filter if provided
+ if (q) {
+ where.title = {
+ contains: q,
+ mode: "insensitive",
+ };
+ }
+
+ const [total, data] = await Promise.all([
+ prisma.poll.count({ where }),
+ prisma.poll.findMany({
+ where,
+ select: {
+ id: true,
+ title: true,
+ status: true,
+ createdAt: true,
+ updatedAt: true,
+ user: {
+ select: {
+ id: true,
+ name: true,
+ image: true,
+ },
+ },
+ participants: {
+ where: {
+ deleted: false,
+ },
+ select: {
+ id: true,
+ name: true,
+ email: true,
+ user: {
+ select: {
+ image: true,
+ },
+ },
+ },
+ orderBy: {
+ createdAt: "asc",
+ },
+ },
+ },
+ orderBy: {
+ updatedAt: "desc",
+ },
+ skip: (page - 1) * pageSize,
+ take: pageSize,
+ }),
+ ]);
+
+ const hasNextPage = page * pageSize < total;
+
+ return {
+ total,
+ data: data.map((poll) => {
+ return {
+ ...poll,
+ user: poll.user,
+ participants: poll.participants.map((participant) => ({
+ id: participant.id,
+ name: participant.name,
+ email: participant.email ?? undefined,
+ image: participant.user?.image ?? undefined,
+ })),
+ };
+ }),
+ hasNextPage,
+ };
+ },
+);
diff --git a/apps/web/src/features/spaces/queries.ts b/apps/web/src/data/space.ts
similarity index 53%
rename from apps/web/src/features/spaces/queries.ts
rename to apps/web/src/data/space.ts
index ab00150d2..5eaf26b2f 100644
--- a/apps/web/src/features/spaces/queries.ts
+++ b/apps/web/src/data/space.ts
@@ -2,7 +2,7 @@ import { accessibleBy } from "@casl/prisma";
import type { SpaceMemberRole } from "@rallly/database";
import { prisma } from "@rallly/database";
import { cache } from "react";
-import { requireUserAbility } from "@/auth/queries";
+import { loadUserAbility } from "@/data/user";
export type SpaceDTO = {
id: string;
@@ -13,7 +13,7 @@ export type SpaceDTO = {
};
export const loadSpaces = cache(async () => {
- const { user, ability } = await requireUserAbility();
+ const { user, ability } = await loadUserAbility();
const spaces = await prisma.space.findMany({
where: accessibleBy(ability).Space,
include: {
@@ -51,8 +51,20 @@ export const loadSpaces = cache(async () => {
.filter(Boolean) as SpaceDTO[];
});
-export const loadDefaultSpace = cache(async () => {
- const { user } = await requireUserAbility();
+export const loadSpace = cache(async ({ id }: { id: string }) => {
+ const spaces = await loadSpaces();
+ const space = spaces.find((space) => space.id === id);
+
+ if (!space) {
+ const { user } = await loadUserAbility();
+ throw new Error(`User ${user.id} does not have access to space ${id}`);
+ }
+
+ return space;
+});
+
+const loadDefaultSpace = cache(async () => {
+ const { user } = await loadUserAbility();
const spaces = await loadSpaces();
const defaultSpace = spaces.find((space) => space.ownerId === user.id);
@@ -63,14 +75,55 @@ export const loadDefaultSpace = cache(async () => {
return defaultSpace;
});
-export const loadSpace = cache(async ({ id }: { id: string }) => {
- const spaces = await loadSpaces();
- const space = spaces.find((space) => space.id === id);
+export const loadActiveSpace = cache(async () => {
+ const { user } = await loadUserAbility();
- if (!space) {
- const { user } = await requireUserAbility();
- throw new Error(`User ${user.id} does not have access to space ${id}`);
+ if (user.activeSpaceId) {
+ try {
+ return await loadSpace({ id: user.activeSpaceId });
+ } catch {
+ console.warn(
+ `User ${user.id} has an active space ID ${user.activeSpaceId} that does not exist or is no longer accessible`,
+ );
+ }
}
- return space;
+ return await loadDefaultSpace();
+});
+
+export const loadSubscription = cache(async () => {
+ const space = await loadActiveSpace();
+ const subscription = await prisma.subscription.findUnique({
+ where: {
+ spaceId: space.id,
+ },
+ select: {
+ id: true,
+ active: true,
+ amount: true,
+ currency: true,
+ interval: true,
+ status: true,
+ periodEnd: true,
+ cancelAtPeriodEnd: true,
+ },
+ });
+
+ return subscription;
+});
+
+export const loadPaymentMethods = cache(async () => {
+ const { user } = await loadUserAbility();
+ const paymentMethods = await prisma.paymentMethod.findMany({
+ where: {
+ userId: user.id,
+ },
+ select: {
+ id: true,
+ type: true,
+ data: true,
+ },
+ });
+
+ return paymentMethods;
});
diff --git a/apps/web/src/data/user.ts b/apps/web/src/data/user.ts
new file mode 100644
index 000000000..46c03cfed
--- /dev/null
+++ b/apps/web/src/data/user.ts
@@ -0,0 +1,48 @@
+import { notFound, redirect } from "next/navigation";
+import { cache } from "react";
+import { isInitialAdmin } from "@/auth/queries";
+import { defineAbilityFor } from "@/features/ability-manager";
+import { getUser } from "@/features/user/queries";
+import { auth } from "@/next-auth";
+
+export const requireUser = async () => {
+ const session = await auth();
+
+ if (!session?.user) {
+ redirect("/login");
+ }
+
+ const user = await getUser(session.user.id);
+
+ if (!user) {
+ redirect("/api/auth/invalid-session");
+ }
+
+ return {
+ user,
+ };
+};
+
+export const loadUserAbility = cache(async () => {
+ const { user } = await requireUser();
+
+ return {
+ user,
+ ability: defineAbilityFor(user, {
+ isInitialAdmin: isInitialAdmin(user.email),
+ }),
+ };
+});
+
+export const loadAdminUserAbility = cache(async () => {
+ const { user, ability } = await loadUserAbility();
+
+ if (user.role !== "admin") {
+ notFound();
+ }
+
+ return {
+ user,
+ ability,
+ };
+});
diff --git a/apps/web/src/features/licensing/components/license-limit-warning.tsx b/apps/web/src/features/licensing/components/license-limit-warning.tsx
index d613f4478..72748acd6 100644
--- a/apps/web/src/features/licensing/components/license-limit-warning.tsx
+++ b/apps/web/src/features/licensing/components/license-limit-warning.tsx
@@ -1,6 +1,6 @@
import Link from "next/link";
import { Trans } from "@/components/trans";
-import { getLicense } from "@/features/licensing/queries";
+import { loadInstanceLicense } from "@/data/instance-license";
import { getUserCount } from "@/features/user/queries";
import { isSelfHosted } from "@/utils/constants";
@@ -10,7 +10,7 @@ export async function LicenseLimitWarning() {
}
const [license, userCount] = await Promise.all([
- getLicense(),
+ loadInstanceLicense(),
getUserCount(),
]);
diff --git a/apps/web/src/features/licensing/mutations.ts b/apps/web/src/features/licensing/mutations.ts
deleted file mode 100644
index ee2421031..000000000
--- a/apps/web/src/features/licensing/mutations.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-"use server";
-
-import { prisma } from "@rallly/database";
-import { requireAdmin } from "@/auth/queries";
-
-export async function removeInstanceLicense() {
- try {
- await requireAdmin();
- } catch (_error) {
- return {
- success: false,
- message: "You must be an admin to delete a license",
- };
- }
-
- try {
- await prisma.instanceLicense.deleteMany();
- } catch (_error) {
- return {
- success: false,
- message: "Failed to delete license",
- };
- }
-
- return {
- success: true,
- message: "License deleted successfully",
- };
-}
diff --git a/apps/web/src/features/poll/api/get-polls.ts b/apps/web/src/features/poll/api/get-polls.ts
deleted file mode 100644
index 19a577f7c..000000000
--- a/apps/web/src/features/poll/api/get-polls.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import type { PollStatus, Prisma } from "@rallly/database";
-import { prisma } from "@rallly/database";
-import { getActiveSpace } from "@/auth/queries";
-
-type PollFilters = {
- status?: PollStatus;
- page?: number;
- pageSize?: number;
- q?: string;
-};
-
-export async function getPolls({
- status,
- page = 1,
- pageSize = 10,
- q,
-}: PollFilters) {
- const space = await getActiveSpace();
-
- // Build the where clause based on filters
- const where: Prisma.PollWhereInput = {
- spaceId: space.id,
- status,
- deleted: false,
- };
-
- // Add search filter if provided
- if (q) {
- where.title = {
- contains: q,
- mode: "insensitive",
- };
- }
-
- const [total, data] = await Promise.all([
- prisma.poll.count({ where }),
- prisma.poll.findMany({
- where,
- select: {
- id: true,
- title: true,
- status: true,
- createdAt: true,
- updatedAt: true,
- user: {
- select: {
- id: true,
- name: true,
- image: true,
- },
- },
- participants: {
- where: {
- deleted: false,
- },
- select: {
- id: true,
- name: true,
- email: true,
- user: {
- select: {
- image: true,
- },
- },
- },
- orderBy: {
- createdAt: "asc",
- },
- },
- },
- orderBy: {
- updatedAt: "desc",
- },
- skip: (page - 1) * pageSize,
- take: pageSize,
- }),
- ]);
-
- const hasNextPage = page * pageSize < total;
-
- return {
- total,
- data: data.map((poll) => {
- return {
- ...poll,
- user: poll.user,
- participants: poll.participants.map((participant) => ({
- id: participant.id,
- name: participant.name,
- email: participant.email ?? undefined,
- image: participant.user?.image ?? undefined,
- })),
- };
- }),
- hasNextPage,
- };
-}
diff --git a/apps/web/src/features/scheduled-event/queries.ts b/apps/web/src/features/scheduled-event/queries.ts
deleted file mode 100644
index cc3b717b5..000000000
--- a/apps/web/src/features/scheduled-event/queries.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import type { Prisma } from "@rallly/database";
-import { prisma } from "@rallly/database";
-import dayjs from "dayjs";
-import utc from "dayjs/plugin/utc";
-import { cache } from "react";
-import { getActiveSpace } from "@/auth/queries";
-import type { Status } from "./schema";
-
-dayjs.extend(utc);
-
-const mapStatus = {
- upcoming: "confirmed",
- unconfirmed: "unconfirmed",
- past: "confirmed",
- canceled: "canceled",
-} as const;
-
-function getEventsWhereInput({
- spaceId,
- status,
- search,
-}: {
- spaceId: string;
- status: Status;
- search?: string;
-}) {
- const now = new Date();
-
- const todayStart = dayjs().startOf("day").utc().toDate();
-
- const where: Prisma.ScheduledEventWhereInput = {
- spaceId,
- deletedAt: null,
- ...(status === "upcoming" && {
- OR: [
- { allDay: false, start: { gte: now } },
- { allDay: true, start: { gte: todayStart } },
- ],
- }),
- ...(status === "past" && {
- OR: [
- { allDay: false, start: { lt: now } },
- { allDay: true, start: { lt: todayStart } },
- ],
- }),
- ...(search && { title: { contains: search, mode: "insensitive" } }),
- status: mapStatus[status],
- };
-
- return where;
-}
-
-export async function getScheduledEvents({
- spaceId,
- status,
- search,
- page = 1,
- pageSize = 10,
-}: {
- spaceId: string;
- status: Status;
- search?: string;
- page?: number;
- pageSize?: number;
-}) {
- const where = getEventsWhereInput({
- spaceId,
- status,
- search,
- });
-
- const [rawEvents, totalCount] = await Promise.all([
- prisma.scheduledEvent.findMany({
- where,
- orderBy: {
- start: status === "past" ? "desc" : "asc",
- },
- select: {
- id: true,
- title: true,
- description: true,
- location: true,
- start: true,
- end: true,
- allDay: true,
- timeZone: true,
- status: true,
- invites: {
- select: {
- id: true,
- inviteeName: true,
- user: {
- select: {
- image: true,
- },
- },
- },
- },
- },
- skip: (page - 1) * pageSize,
- take: pageSize,
- }),
- prisma.scheduledEvent.count({ where }),
- ]);
-
- const events = rawEvents.map((event) => ({
- ...event,
- invites: event.invites.map((invite) => ({
- id: invite.id,
- inviteeName: invite.inviteeName,
- inviteeImage: invite.user?.image ?? undefined,
- })),
- }));
-
- const totalPages = Math.ceil(totalCount / pageSize);
- const hasNextPage = page * pageSize < totalCount;
-
- return { events, totalCount, totalPages, hasNextPage };
-}
-
-export const getUpcomingEventsCount = cache(async () => {
- const space = await getActiveSpace();
- return prisma.scheduledEvent.count({
- where: getEventsWhereInput({
- spaceId: space.id,
- status: "upcoming",
- }),
- });
-});
diff --git a/apps/web/src/features/setup/queries.ts b/apps/web/src/features/setup/queries.ts
index 04e4e3ff8..0eced22a8 100644
--- a/apps/web/src/features/setup/queries.ts
+++ b/apps/web/src/features/setup/queries.ts
@@ -2,11 +2,11 @@ import { headers } from "next/headers";
import { redirect } from "next/navigation";
import { cache } from "react";
-import { requireUser } from "@/auth/queries";
+import { loadUserAbility } from "@/data/user";
import { onboardedUserSchema } from "./schema";
export const getOnboardedUser = cache(async () => {
- const user = await requireUser();
+ const { user } = await loadUserAbility();
const onboardedUser = onboardedUserSchema.safeParse(user);
diff --git a/apps/web/src/features/spaces/actions.ts b/apps/web/src/features/spaces/actions.ts
index 96eb07175..90829bfb9 100644
--- a/apps/web/src/features/spaces/actions.ts
+++ b/apps/web/src/features/spaces/actions.ts
@@ -4,7 +4,6 @@ import { subject } from "@casl/ability";
import { accessibleBy } from "@casl/prisma";
import { prisma } from "@rallly/database";
import { z } from "zod";
-import { requireUserAbility } from "@/auth/queries";
import { ActionError, authActionClient } from "@/features/safe-action/server";
export const setActiveSpaceAction = authActionClient
@@ -16,17 +15,15 @@ export const setActiveSpaceAction = authActionClient
.metadata({
actionName: "space_set_active",
})
- .action(async ({ parsedInput }) => {
- const { user, ability } = await requireUserAbility();
-
+ .action(async ({ ctx, parsedInput }) => {
const space = await prisma.space.findFirst({
where: {
- AND: [accessibleBy(ability).Space, { id: parsedInput.spaceId }],
+ AND: [accessibleBy(ctx.ability).Space, { id: parsedInput.spaceId }],
},
include: {
members: {
where: {
- userId: user.id,
+ userId: ctx.user.id,
},
},
},
@@ -39,7 +36,7 @@ export const setActiveSpaceAction = authActionClient
});
}
- if (!ability.can("read", subject("Space", space))) {
+ if (!ctx.ability.can("read", subject("Space", space))) {
throw new ActionError({
code: "FORBIDDEN",
message: "You do not have access to this space",
@@ -48,7 +45,7 @@ export const setActiveSpaceAction = authActionClient
await prisma.user.update({
where: {
- id: user.id,
+ id: ctx.user.id,
},
data: {
activeSpaceId: parsedInput.spaceId,
@@ -65,16 +62,14 @@ export const createSpaceAction = authActionClient
name: z.string().min(1).max(100),
}),
)
- .action(async ({ parsedInput }) => {
- const { user } = await requireUserAbility();
-
+ .action(async ({ ctx, parsedInput }) => {
const space = await prisma.space.create({
data: {
name: parsedInput.name,
- ownerId: user.id,
+ ownerId: ctx.user.id,
members: {
create: {
- userId: user.id,
+ userId: ctx.user.id,
role: "OWNER",
},
},
@@ -84,7 +79,7 @@ export const createSpaceAction = authActionClient
try {
await prisma.user.update({
where: {
- id: user.id,
+ id: ctx.user.id,
},
data: {
activeSpaceId: space.id,
@@ -104,12 +99,10 @@ export const deleteSpaceAction = authActionClient
spaceId: z.string(),
}),
)
- .action(async ({ parsedInput }) => {
- const { ability } = await requireUserAbility();
-
+ .action(async ({ ctx, parsedInput }) => {
const space = await prisma.space.findFirst({
where: {
- AND: [accessibleBy(ability).Space, { id: parsedInput.spaceId }],
+ AND: [accessibleBy(ctx.ability).Space, { id: parsedInput.spaceId }],
},
include: {
subscription: true,
@@ -123,7 +116,7 @@ export const deleteSpaceAction = authActionClient
});
}
- if (ability.cannot("delete", subject("Space", space))) {
+ if (ctx.ability.cannot("delete", subject("Space", space))) {
throw new ActionError({
code: "FORBIDDEN",
message: "You do not have access to this space",
diff --git a/apps/web/src/features/spaces/api.ts b/apps/web/src/features/spaces/api.ts
new file mode 100644
index 000000000..d2a4d505a
--- /dev/null
+++ b/apps/web/src/features/spaces/api.ts
@@ -0,0 +1,33 @@
+import { prisma } from "@rallly/database";
+import { requireUserAbility } from "@/auth/queries";
+
+export async function getActiveSpace() {
+ const { user } = await requireUserAbility();
+ if (user.activeSpaceId) {
+ const space = await prisma.space.findFirst({
+ where: {
+ id: user.activeSpaceId,
+ },
+ });
+
+ if (space) {
+ return space;
+ }
+
+ console.warn(
+ `User ${user.id} has an active space ID ${user.activeSpaceId} that does not exist or is no longer accessible`,
+ );
+ }
+
+ const space = await prisma.space.findFirst({
+ where: {
+ ownerId: user.id,
+ },
+ });
+
+ if (!space) {
+ throw new Error("User does not have an active space");
+ }
+
+ return space;
+}
diff --git a/apps/web/src/features/spaces/client.tsx b/apps/web/src/features/spaces/client.tsx
deleted file mode 100644
index ca3a9933d..000000000
--- a/apps/web/src/features/spaces/client.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-"use client";
-import React from "react";
-import type { SpaceDTO } from "@/features/spaces/queries";
-
-export const SpaceContext = React.createContext<SpaceDTO | null>(null);
-
-export const useSpace = () => {
- const space = React.useContext(SpaceContext);
-
- if (!space) {
- throw new Error("useSpace must be used within a SpaceProvider");
- }
-
- return space;
-};
-
-export const SpaceProvider = ({
- space,
- children,
-}: {
- space: SpaceDTO;
- children?: React.ReactNode;
-}) => {
- return (
- <SpaceContext.Provider value={space}>{children}</SpaceContext.Provider>
- );
-};
diff --git a/apps/web/src/features/user/queries.ts b/apps/web/src/features/user/queries.ts
index 99e4084bb..0440999f4 100644
--- a/apps/web/src/features/user/queries.ts
+++ b/apps/web/src/features/user/queries.ts
@@ -1,9 +1,8 @@
import { prisma } from "@rallly/database";
-import { cache } from "react";
import { isSelfHosted } from "@/utils/constants";
-export const getUser = cache(async (userId: string) => {
+export const getUser = async (userId: string) => {
const user = await prisma.user.findUnique({
where: {
id: userId,
@@ -19,6 +18,7 @@ export const getUser = cache(async (userId: string) => {
weekStart: true,
role: true,
activeSpaceId: true,
+ customerId: true,
subscription: {
select: {
active: true,
@@ -38,10 +38,11 @@ export const getUser = cache(async (userId: string) => {
timeZone: user.timeZone ?? undefined,
timeFormat: user.timeFormat ?? undefined,
weekStart: user.weekStart ?? undefined,
+ customerId: user.customerId ?? undefined,
isPro: Boolean(isSelfHosted || user.subscription?.active),
};
-});
+};
-export const getUserCount = cache(async () => {
+export const getUserCount = async () => {
return await prisma.user.count();
-});
+};
diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.ts
index 96bc70147..a605c10b3 100644
--- a/apps/web/src/trpc/routers/polls.ts
+++ b/apps/web/src/trpc/routers/polls.ts
@@ -8,9 +8,9 @@ import dayjs from "dayjs";
import * as ics from "ics";
import { revalidatePath } from "next/cache";
import { z } from "zod";
-import { getActiveSpace } from "@/auth/queries";
import { moderateContent } from "@/features/moderation";
import { formatEventDateTime } from "@/features/scheduled-event/utils";
+import { getActiveSpace } from "@/features/spaces/api";
import { getEmailClient } from "@/utils/emails";
import {
createRateLimitMiddleware,