From a00cb4a95525b8f51e5af0829ce9c8be617110c9 Mon Sep 17 00:00:00 2001 From: RobVermeer Date: Fri, 29 Dec 2023 23:40:10 +0100 Subject: [PATCH] Fix paths --- src/app/[locale]/admin/groups/[id]/page.tsx | 2 +- src/app/[locale]/admin/groups/page.tsx | 2 +- src/app/[locale]/admin/layout.tsx | 2 +- src/app/[locale]/admin/users/page.tsx | 2 +- .../[locale]/api/auth/[...nextauth]/route.ts | 54 +------------------ .../group/[groupId]/[wishlistId]/page.tsx | 2 +- src/app/[locale]/group/[groupId]/page.tsx | 2 +- src/app/[locale]/layout.tsx | 2 +- src/app/[locale]/profile/bought/page.tsx | 2 +- src/app/[locale]/profile/groups/page.tsx | 2 +- src/app/[locale]/profile/page.tsx | 2 +- src/app/[locale]/profile/wishlists/page.tsx | 2 +- src/app/[locale]/wishlist/[id]/page.tsx | 2 +- src/lib/groups/createGroupForUser.ts | 2 +- src/lib/groups/deleteGroupById.ts | 2 +- src/lib/groups/followGroupById.ts | 2 +- src/lib/groups/getGroupById.ts | 2 +- src/lib/groups/getGroups.ts | 2 +- src/lib/groups/getGroupsForUser.ts | 2 +- src/lib/groups/leaveGroupById.ts | 2 +- src/lib/groups/updateGroupById.ts | 2 +- src/lib/nextAuth.ts | 52 ++++++++++++++++++ src/lib/reminders/index.ts | 2 +- src/lib/users/deleteUserById.ts | 2 +- src/lib/users/getUsers.ts | 2 +- src/lib/users/updateFirstNameById.ts | 2 +- src/lib/users/updateProfile.ts | 2 +- .../createWishlistItemForUser.ts | 2 +- .../wishlistItems/deleteWishlistItemById.ts | 2 +- .../getBoughtWishlistItemsForUser.ts | 2 +- .../wishlistItems/toggleWishlistItemById.ts | 2 +- .../wishlistItems/updateWishlistItemById.ts | 2 +- src/lib/wishlists/createWishlistForUser.ts | 2 +- src/lib/wishlists/deleteWishlistById.ts | 2 +- src/lib/wishlists/getWishlistById.ts | 2 +- src/lib/wishlists/getWishlistsForUser.ts | 2 +- src/lib/wishlists/updateWishlistById.ts | 2 +- 37 files changed, 89 insertions(+), 87 deletions(-) create mode 100644 src/lib/nextAuth.ts diff --git a/src/app/[locale]/admin/groups/[id]/page.tsx b/src/app/[locale]/admin/groups/[id]/page.tsx index 8b2ba89..0b4960d 100644 --- a/src/app/[locale]/admin/groups/[id]/page.tsx +++ b/src/app/[locale]/admin/groups/[id]/page.tsx @@ -4,7 +4,7 @@ import { getGroupById } from "@/lib/groups/getGroupById" import { SendEmails } from "./components/SendEmails" import { notFound, redirect } from "next/navigation" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" interface Props { params: { id: string } diff --git a/src/app/[locale]/admin/groups/page.tsx b/src/app/[locale]/admin/groups/page.tsx index 318c36e..3e0d368 100644 --- a/src/app/[locale]/admin/groups/page.tsx +++ b/src/app/[locale]/admin/groups/page.tsx @@ -6,7 +6,7 @@ import { RemoveGroup } from "./components/RemoveGroup" import { Button } from "@/components/ui/button" import Link from "next/link" import { getServerSession } from "next-auth" -import { authOptions } from "../../api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { redirect } from "next/navigation" export default async function AdminUsersPage() { diff --git a/src/app/[locale]/admin/layout.tsx b/src/app/[locale]/admin/layout.tsx index 3474fae..335d770 100644 --- a/src/app/[locale]/admin/layout.tsx +++ b/src/app/[locale]/admin/layout.tsx @@ -2,7 +2,7 @@ import { AdminTabs } from "@/components/AdminTabs" import { ListTitle } from "@/components/ListTitle" import { getServerSession } from "next-auth" import { ReactNode } from "react" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { redirect } from "next/navigation" interface Props { diff --git a/src/app/[locale]/admin/users/page.tsx b/src/app/[locale]/admin/users/page.tsx index a2a6c0a..50a03af 100644 --- a/src/app/[locale]/admin/users/page.tsx +++ b/src/app/[locale]/admin/users/page.tsx @@ -6,7 +6,7 @@ import { getUsers } from "@/lib/users/getUsers" import { RemoveUser } from "./components/RemoveUser" import { getInitials } from "@/utils/string" import { getServerSession } from "next-auth" -import { authOptions } from "../../api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { redirect } from "next/navigation" export default async function AdminUsersPage() { diff --git a/src/app/[locale]/api/auth/[...nextauth]/route.ts b/src/app/[locale]/api/auth/[...nextauth]/route.ts index 4e171af..b70cb13 100644 --- a/src/app/[locale]/api/auth/[...nextauth]/route.ts +++ b/src/app/[locale]/api/auth/[...nextauth]/route.ts @@ -1,55 +1,5 @@ -import { prisma } from "@/lib/prisma" -import { updateFirstNameById } from "@/lib/users/updateFirstNameById" -import { PrismaAdapter } from "@next-auth/prisma-adapter" -import NextAuth, { AuthOptions, Session, User } from "next-auth" -import GoogleProvider from "next-auth/providers/google" -import EmailProvider from "next-auth/providers/email" -import { sendVerificationRequest } from "@/utils/send-verification-request" -import { trackIssue } from "@/lib/trackIssue" - -export const authOptions: AuthOptions = { - adapter: PrismaAdapter(prisma), - providers: [ - GoogleProvider({ - clientId: process.env.GOOGLE_CLIENT_ID!, - clientSecret: process.env.GOOGLE_CLIENT_SECRET!, - profile: (profile) => ({ - id: profile.sub, - name: profile.name, - firstName: profile.given_name, - email: profile.email, - emailVerified: profile.email_verified, - image: profile.picture, - }), - }), - EmailProvider({ - server: "", - from: "Wishlist ", - sendVerificationRequest, - }), - ], - callbacks: { - session: ({ session, user }: { session: Session; user: User }) => { - session.user.id = user.id - session.user.firstName = user.firstName - session.user.isAdmin = user.id === process.env.ADMIN_USER_ID - - return session - }, - }, - events: { - signIn: async ({ profile, user, isNewUser }) => { - trackIssue("User sign in", "info", { ...user, isNewUser }) - - if (!isNewUser && !user.firstName && profile?.firstName) { - await updateFirstNameById(user.id, profile.firstName) - } - }, - signOut: ({ session }) => { - trackIssue("User sign out", "info", session.user) - }, - }, -} +import { authOptions } from "@/lib/nextAuth" +import NextAuth from "next-auth" const handler = NextAuth(authOptions) diff --git a/src/app/[locale]/group/[groupId]/[wishlistId]/page.tsx b/src/app/[locale]/group/[groupId]/[wishlistId]/page.tsx index ce45808..583a220 100644 --- a/src/app/[locale]/group/[groupId]/[wishlistId]/page.tsx +++ b/src/app/[locale]/group/[groupId]/[wishlistId]/page.tsx @@ -1,4 +1,4 @@ -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { Wishlist } from "@/components/Wishlist" import { getGroupById } from "@/lib/groups/getGroupById" import { getWishlistById } from "@/lib/wishlists/getWishlistById" diff --git a/src/app/[locale]/group/[groupId]/page.tsx b/src/app/[locale]/group/[groupId]/page.tsx index 2e097e6..dae0639 100644 --- a/src/app/[locale]/group/[groupId]/page.tsx +++ b/src/app/[locale]/group/[groupId]/page.tsx @@ -13,7 +13,7 @@ import { NextIntlClientProvider } from "next-intl" import { getMessages, getTranslations } from "next-intl/server" import Link from "next/link" import { notFound, redirect } from "next/navigation" -import { authOptions } from "../../api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" export async function generateMetadata({ params }: Props): Promise { const group = await getGroupById(params.groupId) diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx index 0de9991..7f9da45 100644 --- a/src/app/[locale]/layout.tsx +++ b/src/app/[locale]/layout.tsx @@ -2,7 +2,7 @@ import "./globals.css" import type { Metadata } from "next" import { getServerSession } from "next-auth" import { Ubuntu } from "next/font/google" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { Header } from "@/components/Header" import { Toaster } from "@/components/ui/toaster" import { headers } from "next/headers" diff --git a/src/app/[locale]/profile/bought/page.tsx b/src/app/[locale]/profile/bought/page.tsx index fe4c354..8115d7c 100644 --- a/src/app/[locale]/profile/bought/page.tsx +++ b/src/app/[locale]/profile/bought/page.tsx @@ -4,7 +4,7 @@ import { List } from "@/components/List" import { getBoughtWishlistItemsForUser } from "@/lib/wishlistItems/getBoughtWishlistItemsForUser" import { getServerSession } from "next-auth" import { getTranslations } from "next-intl/server" -import { authOptions } from "../../api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { redirect } from "next/navigation" interface Props { diff --git a/src/app/[locale]/profile/groups/page.tsx b/src/app/[locale]/profile/groups/page.tsx index edac501..b5064da 100644 --- a/src/app/[locale]/profile/groups/page.tsx +++ b/src/app/[locale]/profile/groups/page.tsx @@ -8,7 +8,7 @@ import { pickMessages } from "@/utils/pick" import { getServerSession } from "next-auth" import { NextIntlClientProvider } from "next-intl" import { getMessages, getTranslations } from "next-intl/server" -import { authOptions } from "../../api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { redirect } from "next/navigation" interface Props { diff --git a/src/app/[locale]/profile/page.tsx b/src/app/[locale]/profile/page.tsx index 4bbd205..e36f4b7 100644 --- a/src/app/[locale]/profile/page.tsx +++ b/src/app/[locale]/profile/page.tsx @@ -4,7 +4,7 @@ import { pickMessages } from "@/utils/pick" import { getServerSession } from "next-auth" import { NextIntlClientProvider } from "next-intl" import { getMessages, getTranslations } from "next-intl/server" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { redirect } from "next/navigation" interface Props { diff --git a/src/app/[locale]/profile/wishlists/page.tsx b/src/app/[locale]/profile/wishlists/page.tsx index 30f7c31..1d84140 100644 --- a/src/app/[locale]/profile/wishlists/page.tsx +++ b/src/app/[locale]/profile/wishlists/page.tsx @@ -9,7 +9,7 @@ import { pickMessages } from "@/utils/pick" import { getServerSession } from "next-auth" import { NextIntlClientProvider } from "next-intl" import { getMessages, getTranslations } from "next-intl/server" -import { authOptions } from "../../api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { redirect } from "next/navigation" interface Props { diff --git a/src/app/[locale]/wishlist/[id]/page.tsx b/src/app/[locale]/wishlist/[id]/page.tsx index c24fb67..3e371e5 100644 --- a/src/app/[locale]/wishlist/[id]/page.tsx +++ b/src/app/[locale]/wishlist/[id]/page.tsx @@ -3,7 +3,7 @@ import { Metadata } from "next" import { getTranslations } from "next-intl/server" import { Wishlist } from "@/components/Wishlist" import { getServerSession } from "next-auth" -import { authOptions } from "../../api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { redirect } from "next/navigation" interface Props { diff --git a/src/lib/groups/createGroupForUser.ts b/src/lib/groups/createGroupForUser.ts index dfaf35f..03aacc6 100644 --- a/src/lib/groups/createGroupForUser.ts +++ b/src/lib/groups/createGroupForUser.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { groupProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { revalidatePath } from "next/cache" import { groupSchema } from "@/lib/schema" import { getErrorMessage } from "@/lib/utils" diff --git a/src/lib/groups/deleteGroupById.ts b/src/lib/groups/deleteGroupById.ts index 46fd67c..43f46b0 100644 --- a/src/lib/groups/deleteGroupById.ts +++ b/src/lib/groups/deleteGroupById.ts @@ -1,6 +1,6 @@ "use server" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { prisma } from "@/lib/prisma" import { getServerSession } from "next-auth" import { revalidatePath } from "next/cache" diff --git a/src/lib/groups/followGroupById.ts b/src/lib/groups/followGroupById.ts index bb2839c..170184a 100644 --- a/src/lib/groups/followGroupById.ts +++ b/src/lib/groups/followGroupById.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { groupProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { revalidatePath } from "next/cache" import { getErrorMessage } from "@/lib/utils" import { getTranslations } from "next-intl/server" diff --git a/src/lib/groups/getGroupById.ts b/src/lib/groups/getGroupById.ts index ddd94d4..49355d8 100644 --- a/src/lib/groups/getGroupById.ts +++ b/src/lib/groups/getGroupById.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { groupProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { cache } from "react" import { getTranslations } from "next-intl/server" diff --git a/src/lib/groups/getGroups.ts b/src/lib/groups/getGroups.ts index 04dda0b..f6209db 100644 --- a/src/lib/groups/getGroups.ts +++ b/src/lib/groups/getGroups.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { groupProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { cache } from "react" import { getTranslations } from "next-intl/server" diff --git a/src/lib/groups/getGroupsForUser.ts b/src/lib/groups/getGroupsForUser.ts index ef7845a..6a642b2 100644 --- a/src/lib/groups/getGroupsForUser.ts +++ b/src/lib/groups/getGroupsForUser.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { groupProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { cache } from "react" import { getTranslations } from "next-intl/server" diff --git a/src/lib/groups/leaveGroupById.ts b/src/lib/groups/leaveGroupById.ts index 2927d2a..df786cf 100644 --- a/src/lib/groups/leaveGroupById.ts +++ b/src/lib/groups/leaveGroupById.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { groupProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { revalidatePath } from "next/cache" import { getErrorMessage } from "@/lib/utils" import { getTranslations } from "next-intl/server" diff --git a/src/lib/groups/updateGroupById.ts b/src/lib/groups/updateGroupById.ts index 8e42a3c..ff7977f 100644 --- a/src/lib/groups/updateGroupById.ts +++ b/src/lib/groups/updateGroupById.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { groupProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { revalidatePath } from "next/cache" import { groupSchema } from "@/lib/schema" import { getErrorMessage } from "@/lib/utils" diff --git a/src/lib/nextAuth.ts b/src/lib/nextAuth.ts new file mode 100644 index 0000000..7a544c3 --- /dev/null +++ b/src/lib/nextAuth.ts @@ -0,0 +1,52 @@ +import { prisma } from "@/lib/prisma" +import { updateFirstNameById } from "@/lib/users/updateFirstNameById" +import { PrismaAdapter } from "@next-auth/prisma-adapter" +import { AuthOptions, Session, User } from "next-auth" +import GoogleProvider from "next-auth/providers/google" +import EmailProvider from "next-auth/providers/email" +import { sendVerificationRequest } from "@/utils/send-verification-request" +import { trackIssue } from "@/lib/trackIssue" + +export const authOptions: AuthOptions = { + adapter: PrismaAdapter(prisma), + providers: [ + GoogleProvider({ + clientId: process.env.GOOGLE_CLIENT_ID!, + clientSecret: process.env.GOOGLE_CLIENT_SECRET!, + profile: (profile) => ({ + id: profile.sub, + name: profile.name, + firstName: profile.given_name, + email: profile.email, + emailVerified: profile.email_verified, + image: profile.picture, + }), + }), + EmailProvider({ + server: "", + from: "Wishlist ", + sendVerificationRequest, + }), + ], + callbacks: { + session: ({ session, user }: { session: Session; user: User }) => { + session.user.id = user.id + session.user.firstName = user.firstName + session.user.isAdmin = user.id === process.env.ADMIN_USER_ID + + return session + }, + }, + events: { + signIn: async ({ profile, user, isNewUser }) => { + trackIssue("User sign in", "info", { ...user, isNewUser }) + + if (!isNewUser && !user.firstName && profile?.firstName) { + await updateFirstNameById(user.id, profile.firstName) + } + }, + signOut: ({ session }) => { + trackIssue("User sign out", "info", session.user) + }, + }, +} diff --git a/src/lib/reminders/index.ts b/src/lib/reminders/index.ts index 1296451..156d3a4 100644 --- a/src/lib/reminders/index.ts +++ b/src/lib/reminders/index.ts @@ -2,7 +2,7 @@ import { getServerSession } from "next-auth" import { prisma } from "@/lib/prisma" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { revalidatePath } from "next/cache" import { getErrorMessage } from "@/lib/utils" import { getTranslations } from "next-intl/server" diff --git a/src/lib/users/deleteUserById.ts b/src/lib/users/deleteUserById.ts index 338b2b1..75ed90e 100644 --- a/src/lib/users/deleteUserById.ts +++ b/src/lib/users/deleteUserById.ts @@ -1,6 +1,6 @@ "use server" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { prisma } from "@/lib/prisma" import { getServerSession } from "next-auth" import { revalidatePath } from "next/cache" diff --git a/src/lib/users/getUsers.ts b/src/lib/users/getUsers.ts index 1cf8942..ab1b991 100644 --- a/src/lib/users/getUsers.ts +++ b/src/lib/users/getUsers.ts @@ -1,6 +1,6 @@ "use server" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { prisma } from "@/lib/prisma" import { getServerSession } from "next-auth" import { getTranslations } from "next-intl/server" diff --git a/src/lib/users/updateFirstNameById.ts b/src/lib/users/updateFirstNameById.ts index fb668b9..2ff0c5e 100644 --- a/src/lib/users/updateFirstNameById.ts +++ b/src/lib/users/updateFirstNameById.ts @@ -1,6 +1,6 @@ "use server" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { prisma } from "@/lib/prisma" import { getErrorMessage } from "@/lib/utils" import { getServerSession } from "next-auth" diff --git a/src/lib/users/updateProfile.ts b/src/lib/users/updateProfile.ts index 4f24bd1..10a3251 100644 --- a/src/lib/users/updateProfile.ts +++ b/src/lib/users/updateProfile.ts @@ -6,7 +6,7 @@ import { revalidatePath } from "next/cache" import { getErrorMessage } from "@/lib/utils" import { getTranslations } from "next-intl/server" import { prisma } from "@/lib/prisma" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { getServerSession } from "next-auth" // import sharp from "sharp" diff --git a/src/lib/wishlistItems/createWishlistItemForUser.ts b/src/lib/wishlistItems/createWishlistItemForUser.ts index d3a8dea..3b938d7 100644 --- a/src/lib/wishlistItems/createWishlistItemForUser.ts +++ b/src/lib/wishlistItems/createWishlistItemForUser.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { wishlistItemProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { revalidatePath } from "next/cache" import { z } from "zod" import { getErrorMessage } from "@/lib/utils" diff --git a/src/lib/wishlistItems/deleteWishlistItemById.ts b/src/lib/wishlistItems/deleteWishlistItemById.ts index 9c334cb..42c6e8f 100644 --- a/src/lib/wishlistItems/deleteWishlistItemById.ts +++ b/src/lib/wishlistItems/deleteWishlistItemById.ts @@ -1,6 +1,6 @@ "use server" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { prisma } from "@/lib/prisma" import { getServerSession } from "next-auth" import { revalidatePath } from "next/cache" diff --git a/src/lib/wishlistItems/getBoughtWishlistItemsForUser.ts b/src/lib/wishlistItems/getBoughtWishlistItemsForUser.ts index 273a563..9bf469e 100644 --- a/src/lib/wishlistItems/getBoughtWishlistItemsForUser.ts +++ b/src/lib/wishlistItems/getBoughtWishlistItemsForUser.ts @@ -5,7 +5,7 @@ import { prisma } from "@/lib/prisma" import { wishlistProperties } from "@/lib/wishlists/publicProperties" import { wishlistItemProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { cache } from "react" import { getTranslations } from "next-intl/server" diff --git a/src/lib/wishlistItems/toggleWishlistItemById.ts b/src/lib/wishlistItems/toggleWishlistItemById.ts index 365c8c9..ff95b5e 100644 --- a/src/lib/wishlistItems/toggleWishlistItemById.ts +++ b/src/lib/wishlistItems/toggleWishlistItemById.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { wishlistItemProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { revalidatePath } from "next/cache" import { getErrorMessage } from "@/lib/utils" import { getTranslations } from "next-intl/server" diff --git a/src/lib/wishlistItems/updateWishlistItemById.ts b/src/lib/wishlistItems/updateWishlistItemById.ts index 0f42ed7..626e163 100644 --- a/src/lib/wishlistItems/updateWishlistItemById.ts +++ b/src/lib/wishlistItems/updateWishlistItemById.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { wishlistItemProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { revalidatePath } from "next/cache" import { wishlistItemSchema } from "@/lib/schema" import { getErrorMessage } from "@/lib/utils" diff --git a/src/lib/wishlists/createWishlistForUser.ts b/src/lib/wishlists/createWishlistForUser.ts index 506d7e9..afa8727 100644 --- a/src/lib/wishlists/createWishlistForUser.ts +++ b/src/lib/wishlists/createWishlistForUser.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { wishlistProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { revalidatePath } from "next/cache" import { wishlistSchema } from "@/lib/schema" import { z } from "zod" diff --git a/src/lib/wishlists/deleteWishlistById.ts b/src/lib/wishlists/deleteWishlistById.ts index c33cd2c..6330d07 100644 --- a/src/lib/wishlists/deleteWishlistById.ts +++ b/src/lib/wishlists/deleteWishlistById.ts @@ -1,6 +1,6 @@ "use server" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { prisma } from "@/lib/prisma" import { getServerSession } from "next-auth" import { revalidatePath } from "next/cache" diff --git a/src/lib/wishlists/getWishlistById.ts b/src/lib/wishlists/getWishlistById.ts index 226f4ee..259da66 100644 --- a/src/lib/wishlists/getWishlistById.ts +++ b/src/lib/wishlists/getWishlistById.ts @@ -4,7 +4,7 @@ import { cache } from "react" import { prisma } from "@/lib/prisma" import { wishlistProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { getTranslations } from "next-intl/server" export const getWishlistById = cache( diff --git a/src/lib/wishlists/getWishlistsForUser.ts b/src/lib/wishlists/getWishlistsForUser.ts index 2d151b1..dd1fa3b 100644 --- a/src/lib/wishlists/getWishlistsForUser.ts +++ b/src/lib/wishlists/getWishlistsForUser.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { wishlistProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { cache } from "react" import { getTranslations } from "next-intl/server" diff --git a/src/lib/wishlists/updateWishlistById.ts b/src/lib/wishlists/updateWishlistById.ts index 0da3d7a..95bef8e 100644 --- a/src/lib/wishlists/updateWishlistById.ts +++ b/src/lib/wishlists/updateWishlistById.ts @@ -3,7 +3,7 @@ import { prisma } from "@/lib/prisma" import { wishlistProperties } from "./publicProperties" import { getServerSession } from "next-auth" -import { authOptions } from "@/app/[locale]/api/auth/[...nextauth]/route" +import { authOptions } from "@/lib/nextAuth" import { revalidatePath } from "next/cache" import { wishlistSchema } from "@/lib/schema" import { z } from "zod"