feat: upgrade auth.js

luannguyenQV · luannguyenQV · commit 77c6fbbd4ec4 · 2024-09-06T21:10:07.000+07:00
diff --git a/apps/web/@/actions/protect/postAction.ts b/apps/web/@/actions/protect/postAction.ts
@@ -16,7 +16,7 @@ import { toast } from "react-toastify"
 
 import APP_ROUTES from "@/constants/routes"
 import { TUserItem, userSelect } from "@/types/users"
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 
 // TODO: move to database package
 // Get total actions (like, bookmark) for a post
@@ -27,7 +27,7 @@ export const getTotalActions = async ({
   postId: string
   actionType: PostOnUserType
 }) => {
-  const session = await getServerSession()
+  const session = await auth()
 
   try {
     const promises = []
@@ -70,7 +70,7 @@ export const addRelation = async ({
   postSlug: string
   action: PostOnUserType
 }) => {
-  const session = await getServerSession()
+  const session = await auth()
   const postField = action === PostOnUserType.LIKE ? "totalLike" : "totalFollow"
   try {
     await prisma.$transaction([
@@ -118,7 +118,7 @@ export const removeRelation = async ({
   postSlug: string
   action: PostOnUserType
 }) => {
-  const session = await getServerSession()
+  const session = await auth()
   const postField = action === PostOnUserType.LIKE ? "totalLike" : "totalFollow"
 
   try {
diff --git a/apps/web/@/molecules/nav/index.tsx b/apps/web/@/molecules/nav/index.tsx
@@ -4,15 +4,15 @@ import { Edit } from "lucide-react"
 import { getTranslations } from "next-intl/server"
 import { buttonVariants, cn } from "ui"
 
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 
 import { UserNav } from "../user-nav"
 import Logo from "./logo"
 import SearchBar from "./search-bar"
 import ThemeToggle from "./theme-toggle"
 
 export default async function Nav() {
-  const session = await getServerSession()
+  const session = await auth()
   const t = await getTranslations()
 
   return (
diff --git a/apps/web/@/molecules/posts/post-detail/edit-post-button/index.tsx b/apps/web/@/molecules/posts/post-detail/edit-post-button/index.tsx
@@ -10,7 +10,7 @@ import { Button, buttonVariants, cn, toast } from "ui"
 import { onTogglePost } from "@/actions/protect/postAction"
 import APP_ROUTES from "@/constants/routes"
 import { TPostItem } from "@/types/posts"
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 
 import TogglePost from "./toggle-post"
 
@@ -19,7 +19,7 @@ interface EditPostButtonProps {
 }
 
 const EditPostButton: React.FC<EditPostButtonProps> = async ({ post }) => {
-  const session = await getServerSession()
+  const session = await auth()
   const t = await getTranslations()
 
   if (post?.author?.id !== session?.user?.id) {
diff --git a/apps/web/@/molecules/sign-in-form/index.tsx b/apps/web/@/molecules/sign-in-form/index.tsx
@@ -3,15 +3,15 @@
 import Link from "next/link"
 import { useSearchParams } from "next/navigation"
 
-import { Label } from "@radix-ui/react-dropdown-menu"
-import { GithubIcon } from "lucide-react"
+import { Github } from "lucide-react"
 import { signIn } from "next-auth/react"
 import {
   Button,
   Card,
   CardContent,
   CardFooter,
   Input,
+  Label,
   Tabs,
   TabsContent,
   TabsList,
@@ -116,7 +116,7 @@ export default function SignInForm() {
                   type="button"
                   onClick={onSignIn}
                 >
-                  <GithubIcon size={16} />
+                  <Github size={16} />
                   <span className="ml-2">GitHub</span>
                 </Button>
               </div>
diff --git a/apps/web/@/molecules/user-nav/index.tsx b/apps/web/@/molecules/user-nav/index.tsx
@@ -1,6 +1,6 @@
 import Link from "next/link"
 
-import { authConfigs } from "configs/auth"
+import { auth, authConfigs } from "configs/auth"
 import { getServerSession } from "next-auth"
 import { getTranslations } from "next-intl/server"
 import {
@@ -22,7 +22,7 @@ import {
 import { LogoutMenu } from "./LogoutMenu"
 
 export async function UserNav() {
-  const session = await getServerSession(authConfigs)
+  const session = await auth()
   const t = await getTranslations()
 
   return (
diff --git a/apps/web/@/utils/auth.ts b/apps/web/@/utils/auth.ts
diff --git a/apps/web/app/[lang]/(auth)/sign-in/page.tsx b/apps/web/app/[lang]/(auth)/sign-in/page.tsx
@@ -1,14 +1,12 @@
 import React from "react"
 import { redirect } from "next/navigation"
 
-import { authConfigs } from "configs/auth"
-import { getServerSession } from "next-auth"
+import { auth } from "configs/auth"
 
 import SignInForm from "@/molecules/sign-in-form"
 
 export default async function Page() {
-  const session = await getServerSession(authConfigs)
-
+  const session = await auth()
   if (session) {
     redirect("/")
   }
diff --git a/apps/web/app/[lang]/(protected)/user/posts/page.tsx b/apps/web/app/[lang]/(protected)/user/posts/page.tsx
@@ -7,7 +7,7 @@ import NoItemFounded from "@/molecules/no-item-founded"
 import PageTitle from "@/molecules/page-title"
 import Filter from "@/molecules/user/posts/filter"
 import PostItem from "@/molecules/user/posts/post-item"
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
@@ -17,7 +17,7 @@ export async function generateMetadata(): Promise<Metadata> {
 }
 
 export default async function Page({ searchParams }) {
-  const session = await getServerSession()
+  const session = await auth()
   const { total, data } = await getPosts({
     searchParams: {
       authorId: session?.user?.id,
diff --git a/apps/web/app/[lang]/(protected)/user/profile/page.tsx b/apps/web/app/[lang]/(protected)/user/profile/page.tsx
@@ -1,13 +1,13 @@
 import APP_APIS from "@/constants/apis"
 import PageTitle from "@/molecules/page-title"
 import Profile from "@/molecules/profile"
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 import { generatePath } from "@/utils/generatePath"
 
 export default async function Page() {
   let currentUser = null
   try {
-    const session = await getServerSession()
+    const session = await auth()
 
     const userRaw = await fetch(
       `${process.env.NEXT_PUBLIC_FRONTEND_URL}${generatePath(APP_APIS.protected.user.GET, {
diff --git a/apps/web/app/[lang]/(protected-post)/user/posts/create/page.tsx b/apps/web/app/[lang]/(protected-post)/user/posts/create/page.tsx
@@ -2,15 +2,15 @@ import { redirect } from "next/navigation"
 
 import APP_ROUTES from "@/constants/routes"
 import PostForm from "@/molecules/post-form"
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 
 export const metadata = {
   title: "Create Post",
   description: "Create a new post",
 }
 
 export default async function Page() {
-  const session = await getServerSession()
+  const session = await auth()
 
   if (!session) {
     redirect(APP_ROUTES.LOGIN)
diff --git a/apps/web/app/[lang]/(public-fullwidth)/posts/[postId]/page.tsx b/apps/web/app/[lang]/(public-fullwidth)/posts/[postId]/page.tsx
@@ -12,7 +12,7 @@ import "./tocbot.css"
 
 import { getPost, PostStatus } from "database"
 
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 
 export async function generateMetadata({ params }): Promise<Metadata> {
   const post = await getPost({ postIdOrSlug: params?.postId })
@@ -31,7 +31,7 @@ export default async function Page({
   searchParams: TSearchParams
 }) {
   const post = await getPost({ postIdOrSlug: params?.postId })
-  const session = await getServerSession()
+  const session = await auth()
 
   if (
     !post ||
diff --git a/apps/web/app/api/auth/[...nextauth]/route.ts b/apps/web/app/api/auth/[...nextauth]/route.ts
@@ -1,6 +1,3 @@
-import { authConfigs } from "configs/auth"
-import NextAuth from "next-auth"
+import { handlers } from "configs/auth"
 
-const handler = NextAuth(authConfigs)
-
-export { handler as GET, handler as POST }
+export { handlers as GET, handlers as POST }
diff --git a/apps/web/app/api/protected/comment/route.ts b/apps/web/app/api/protected/comment/route.ts
@@ -4,10 +4,10 @@ import prisma from "database"
 import { z } from "zod"
 
 import { commentSelect } from "@/types/comment"
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 
 export async function POST(request: NextRequest) {
-  const session = await getServerSession()
+  const session = await auth()
 
   if (!session?.user?.id) return Response.error()
 
diff --git a/apps/web/app/api/protected/images/route.ts b/apps/web/app/api/protected/images/route.ts
@@ -7,7 +7,7 @@ import sharp from "sharp"
 import { v4 as uuidv4 } from "uuid"
 
 import { OrderByField } from "@/constants/upload"
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 
 const OrderMap = {
   [OrderByField.nameAsc]: {
@@ -44,7 +44,7 @@ export async function GET(request: NextRequest) {
   }
 
   try {
-    const session = await getServerSession()
+    const session = await auth()
 
     if (!session) {
       return Response.json({
@@ -78,7 +78,7 @@ export async function GET(request: NextRequest) {
 }
 
 export async function POST(request: NextRequest) {
-  const session = await getServerSession()
+  const session = await auth()
 
   if (!session?.user?.id) return Response.error()
 
diff --git a/apps/web/app/api/protected/user/[userId]/follower/route.ts b/apps/web/app/api/protected/user/[userId]/follower/route.ts
@@ -2,7 +2,7 @@ import { NextRequest } from "next/server"
 
 import prisma from "database"
 
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 
 export async function GET(request: NextRequest, { params }: { params: { userId: string } }) {
   const { userId } = params
diff --git a/apps/web/app/api/protected/user/[userId]/followers/route.ts b/apps/web/app/api/protected/user/[userId]/followers/route.ts
@@ -3,7 +3,7 @@ import { NextRequest } from "next/server"
 
 import prisma from "database"
 
-import { getServerSession } from "@/utils/auth"
+import { auth } from "configs/auth"
 
 export async function GET(request: NextRequest, { params }: { params: { userId: string } }) {
   const { userId } = params
@@ -33,7 +33,7 @@ export async function POST(request: NextRequest, { params }: { params: { userId:
   const { userId } = params
   const data = await request.json()
 
-  const session = await getServerSession()
+  const session = await auth()
   if (!session) {
     return new Response(null, { status: 403 })
   }
diff --git a/apps/web/configs/auth.ts b/apps/web/configs/auth.ts
@@ -1,9 +1,9 @@
 import { PrismaAdapter } from "@auth/prisma-adapter"
 import prisma from "database"
-import { NextAuthOptions } from "next-auth"
+import NextAuth from "next-auth"
 import GithubProvider from "next-auth/providers/github"
 
-export const authConfigs = {
+export const { handlers, auth, signIn, signOut } = NextAuth({
   adapter: PrismaAdapter(prisma),
   providers: [
     GithubProvider({
@@ -20,7 +20,7 @@ export const authConfigs = {
     updateAge: 24 * 60 * 60,
   },
   jwt: {
-    secret: process.env.NEXTAUTH_SECRET,
+    // secret: process.env.NEXTAUTH_SECRET,
   },
   callbacks: {
     redirect: async ({ url, baseUrl }) => {
@@ -43,4 +43,4 @@ export const authConfigs = {
       return token
     },
   },
-} as NextAuthOptions
+})
diff --git a/apps/web/middleware.ts b/apps/web/middleware.ts
@@ -1,8 +1,8 @@
 import { NextRequest, NextResponse } from "next/server"
 
 import { locales } from "i18n"
-import { getToken } from "next-auth/jwt"
 import createIntlMiddleware from "next-intl/middleware"
+import { auth } from "configs/auth"
 
 const handleI18nRouting = createIntlMiddleware({
   locales,
@@ -12,9 +12,9 @@ const handleI18nRouting = createIntlMiddleware({
 
 export async function middleware(req: NextRequest) {
   const currentPathname = req.nextUrl.pathname
-  const session = await getToken({ req, secret: process.env.NEXTAUTH_SECRET })
+  const session = await auth()
 
-  if (!session?.email && currentPathname.startsWith("/user")) {
+  if (!session?.user?.email && currentPathname.startsWith("/user")) {
     const newUrl = req.nextUrl.clone()
     const currentSearchParam = newUrl.searchParams.toString()
     newUrl.pathname = "/sign-in"
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -43,7 +43,7 @@
     "lucide-react": "^0.427.0",
     "negotiator": "^0.6.3",
     "next": "14.2.0-canary.50",
-    "next-auth": "^4.24.5",
+    "next-auth": "5.0.0-beta.20",
     "next-intl": "^3.10.0",
     "next-themes": "^0.2.1",
     "novel": "^0.5.0",
diff --git a/packages/database/prisma/migrations/20240906041742_add_created_at_update_at_for_user/migration.sql b/packages/database/prisma/migrations/20240906041742_add_created_at_update_at_for_user/migration.sql
@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - Added the required column `updatedAt` to the `User` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
