Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Refactor queries (#1725)
Luke Vella3f3e2a5aabbb
diff --git a/apps/web/src/app/[locale]/(space)/components/sidebar/app-sidebar.tsx b/apps/web/src/app/[locale]/(space)/components/sidebar/app-sidebar.tsxindex 89fc84139..a93bf268f 100644--- a/apps/web/src/app/[locale]/(space)/components/sidebar/app-sidebar.tsx+++ b/apps/web/src/app/[locale]/(space)/components/sidebar/app-sidebar.tsx@@ -22,9 +22,9 @@ import type * as React from "react";import { LogoLink } from "@/app/components/logo-link";import { Trans } from "@/components/trans";-import { getUser } from "@/data/get-user";import { FeedbackToggle } from "@/features/feedback/components/feedback-toggle";+import { requireUser } from "@/auth/queries";import { UpgradeButton } from "../upgrade-button";import { NavItem } from "./nav-item";import { NavUser } from "./nav-user";@@ -32,7 +32,7 @@ import { NavUser } from "./nav-user";export async function AppSidebar({...props}: React.ComponentProps<typeof Sidebar>) {- const user = await getUser();+ const user = await requireUser();return (<Sidebar variant="inset" {...props}><SidebarHeader>diff --git a/apps/web/src/app/[locale]/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsxindex f16c3f810..d3144cbd1 100644--- a/apps/web/src/app/[locale]/(space)/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/layout.tsx@@ -5,7 +5,7 @@ import Link from "next/link";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";import { CommandMenu } from "@/features/navigation/command-menu";-import { getOnboardedUser } from "@/features/setup/api";+import { getOnboardedUser } from "@/features/setup/queries";import { TimezoneProvider } from "@/features/timezone/client/context";import { AppSidebar } from "./components/sidebar/app-sidebar";diff --git a/apps/web/src/app/[locale]/(space)/page.tsx b/apps/web/src/app/[locale]/(space)/page.tsxindex 8a7805212..2a4a0a054 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 { requireUser } from "@/auth/queries";import { Trans } from "@/components/trans";import { IfCloudHosted } from "@/contexts/environment";-import { getUser } from "@/data/get-user";import { getTranslation } from "@/i18n/server";import { prisma } from "@rallly/database";import { FeedbackAlert } from "./feedback-alert";async function loadData() {- const user = await getUser();+ const user = await requireUser();if (!user) {return {diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsxindex 426484293..f116a0fe7 100644--- a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx@@ -4,9 +4,9 @@ import { TrashIcon } from "lucide-react";import type { Params } from "@/app/[locale]/types";import { Trans } from "@/components/trans";-import { getUser } from "@/data/get-user";import { getTranslation } from "@/i18n/server";+import { requireUser } from "@/auth/queries";import {SettingsContent,SettingsSection,@@ -16,7 +16,7 @@ import { ProfileEmailAddress } from "./profile-email-address";import { ProfileSettings } from "./profile-settings";export default async function Page() {- const user = await getUser();+ const user = await requireUser();return (<SettingsContent><SettingsSectiondiff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsxindex 64174cca8..a4b03b4ff 100644--- a/apps/web/src/app/[locale]/layout.tsx+++ b/apps/web/src/app/[locale]/layout.tsx@@ -12,7 +12,6 @@ import type React from "react";import { TimeZoneChangeDetector } from "@/app/[locale]/timezone-change-detector";import { UserProvider } from "@/components/user-provider";import { PreferencesProvider } from "@/contexts/preferences";-import { getUser } from "@/data/get-user";import { TimezoneProvider } from "@/features/timezone/client/context";import { I18nProvider } from "@/i18n/client";import { getLocale } from "@/i18n/server/get-locale";@@ -20,6 +19,7 @@ import { auth, getUserId } from "@/next-auth";import { TRPCProvider } from "@/trpc/client/provider";import { ConnectedDayjsProvider } from "@/utils/dayjs";+import { getUser } from "@/features/user/queries";import { PostHogPageView } from "../posthog-page-view";const inter = Inter({@@ -43,7 +43,7 @@ export default async function Root({const userId = await getUserId();- const user = userId ? await getUser() : null;+ const user = userId ? await getUser(userId) : null;if (user?.locale) {locale = user.locale;@@ -76,11 +76,13 @@ export default async function Root({: "hobby": "guest",image: user.image,+ role: user.role,}: session?.user? {id: session.user.id,tier: "guest",+ role: "guest",}: undefined}diff --git a/apps/web/src/app/[locale]/setup/page.tsx b/apps/web/src/app/[locale]/setup/page.tsxindex 02436b387..9f5687532 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)/settings/profile/profile-picture";+import { requireUser } from "@/auth/queries";import { Logo } from "@/components/logo";import { Trans } from "@/components/trans";-import { getUser } from "@/data/get-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 getUser();+ const user = await requireUser();const isUserOnboarded = onboardedUserSchema.safeParse(user).success;diff --git a/apps/web/src/auth/queries.ts b/apps/web/src/auth/queries.tsnew file mode 100644index 000000000..36fe82127--- /dev/null+++ b/apps/web/src/auth/queries.ts@@ -0,0 +1,28 @@+import { getUser } from "@/features/user/queries";+import { auth } from "@/next-auth";+import { notFound, redirect } from "next/navigation";++export async function requireUser() {+ 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 async function requireAdmin() {+ const user = await requireUser();++ if (user.role !== "admin") {+ notFound();+ }++ return user;+}diff --git a/apps/web/src/components/user-provider.tsx b/apps/web/src/components/user-provider.tsxindex b04a4dd20..77f480aae 100644--- a/apps/web/src/components/user-provider.tsx+++ b/apps/web/src/components/user-provider.tsx@@ -16,6 +16,7 @@ type UserData = {isGuest: boolean;tier: "guest" | "hobby" | "pro";image?: string;+ role: "guest" | "user" | "admin";};export const UserContext = React.createContext<{@@ -54,6 +55,7 @@ export const IfGuest = (props: { children?: React.ReactNode }) => {type BaseUser = {id: string;tier: "guest" | "hobby" | "pro";+ role: "guest" | "user" | "admin";image?: string;name?: string;email?: string;@@ -105,6 +107,7 @@ export const UserProvider = ({isGuest,tier,image: user?.image,+ role: user?.role ?? "guest",},createGuestIfNeeded: async () => {if (!user) {diff --git a/apps/web/src/features/feedback/actions.ts b/apps/web/src/features/feedback/actions.tsindex 423a9b042..21947f1fa 100644--- a/apps/web/src/features/feedback/actions.ts+++ b/apps/web/src/features/feedback/actions.ts@@ -1,6 +1,6 @@"use server";-import { getUser } from "@/data/get-user";+import { requireUser } from "@/auth/queries";import { type Feedback, feedbackSchema } from "@/features/feedback/schema";import { getEmailClient } from "@/utils/emails";@@ -15,7 +15,7 @@ export const submitFeedback = async (formData: Feedback) => {};}- const user = await getUser();+ const user = await requireUser();try {const { content } = feedbackSchema.parse(formData);getEmailClient().sendEmail({diff --git a/apps/web/src/features/setup/api.ts b/apps/web/src/features/setup/queries.tssimilarity index 89%rename from apps/web/src/features/setup/api.tsrename to apps/web/src/features/setup/queries.tsindex 28c6a904f..04e4e3ff8 100644--- a/apps/web/src/features/setup/api.ts+++ b/apps/web/src/features/setup/queries.ts@@ -2,12 +2,11 @@ import { headers } from "next/headers";import { redirect } from "next/navigation";import { cache } from "react";-import { getUser } from "@/data/get-user";-+import { requireUser } from "@/auth/queries";import { onboardedUserSchema } from "./schema";export const getOnboardedUser = cache(async () => {- const user = await getUser();+ const user = await requireUser();const onboardedUser = onboardedUserSchema.safeParse(user);diff --git a/apps/web/src/data/get-user.ts b/apps/web/src/features/user/queries.tssimilarity index 67%rename from apps/web/src/data/get-user.tsrename to apps/web/src/features/user/queries.tsindex cf003f0bc..b2f2f2950 100644--- a/apps/web/src/data/get-user.ts+++ b/apps/web/src/features/user/queries.ts@@ -1,13 +1,9 @@import { prisma } from "@rallly/database";-import { redirect } from "next/navigation";import { cache } from "react";-import { requireUser } from "@/next-auth";import { isSelfHosted } from "@/utils/constants";-export const getUser = cache(async () => {- const { userId } = await requireUser();-+export const getUser = cache(async (userId: string) => {const user = await prisma.user.findUnique({where: {id: userId,@@ -21,6 +17,7 @@ export const getUser = cache(async () => {timeZone: true,timeFormat: true,weekStart: true,+ role: true,subscription: {select: {active: true,@@ -30,7 +27,7 @@ export const getUser = cache(async () => {});if (!user) {- redirect("/api/auth/invalid-session");+ return null;}return {@@ -42,6 +39,23 @@ export const getUser = cache(async () => {timeZone: user.timeZone ?? undefined,timeFormat: user.timeFormat ?? undefined,weekStart: user.weekStart ?? undefined,+ role: user.role,isPro: Boolean(isSelfHosted || user.subscription?.active),};});++export const getAdminCount = cache(async () => {+ return prisma.user.count({+ where: {+ role: "admin",+ },+ });+});++export const hasAdmins = async () => {+ return (await getAdminCount()) > 0;+};++export const getUserCount = cache(async () => {+ return await prisma.user.count();+});