chore(session): refactor getting user session

OgaDavid · Jan 2, 2024 · 4387486 · 4387486
1 parent 4ba4cd4
commit 4387486
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 30 deletions.
diff --git a/data/user.ts → actions/get-user.ts b/data/user.ts → actions/get-user.ts
diff --git a/app/(routes)/(dashboard)/_components/dashboard-header.tsx b/app/(routes)/(dashboard)/_components/dashboard-header.tsx
@@ -6,12 +6,14 @@ import { Button } from "@/components/ui/button";
 import Link from "next/link";
 import UserAvatar from "./dashboard-avatar";
 import { usePathname } from "next/navigation";
+import { useSession } from "next-auth/react";
+
+const DashboardHeader = () => {
+
+  const { data: userSession } = useSession();
+
+  const user = userSession?.user
 
-const DashboardHeader = ({
-  session,
-}: {
-  session: UserSession| undefined;
-}) => {
   const pathname = usePathname();
 
   const createContent = pathname.match("/dashboard/create");
@@ -30,7 +32,7 @@ const DashboardHeader = ({
                   Create a content
                 </Button>
               </Link>
-              <UserAvatar imageUrl={session?.image} />
+              <UserAvatar imageUrl={user?.image} />
             </span>
           </div>
         </div>

diff --git a/app/(routes)/(dashboard)/_components/dashboard-navigation.tsx b/app/(routes)/(dashboard)/_components/dashboard-navigation.tsx
@@ -5,6 +5,7 @@ import { Icons } from "../../../../components/icons";
 import UserAvatar from "./dashboard-avatar";
 import DashboardNavItem from "./dashboard-nav-item";
 import { usePathname } from "next/navigation";
+import { useSession } from "next-auth/react";
 
 export const DashboardNavigationItems = [
   {
@@ -49,17 +50,12 @@ export const DashboardNavigationItems = [
   },
 ];
 
-const DashboardNavigation = ({
-  session,
-}: {
-  session:
-    | {
-        name?: string | null | undefined;
-        email?: string | null | undefined;
-        image?: string | null | undefined;
-      }
-    | undefined;
-}) => {
+const DashboardNavigation = () => {
+
+  const { data: userSession } = useSession();
+
+  const user = userSession?.user
+
 
     const pathname = usePathname();
 
@@ -81,7 +77,7 @@ const DashboardNavigation = ({
           </div>
         </div>
         <span className="md:hidden">
-          <UserAvatar imageUrl={session?.image} />
+          <UserAvatar imageUrl={user?.image} />
         </span>
       </div>
       <div className="flex items-center max-w-[820px] w-full justify-between mx-auto">

diff --git a/app/(routes)/(dashboard)/layout.tsx b/app/(routes)/(dashboard)/layout.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import { Metadata } from "next";
 import DashboardHeader from "@/app/(routes)/(dashboard)/_components/dashboard-header";
-import getSession from "@/actions/get-user-session";
 import DashboardNavigation from "@/app/(routes)/(dashboard)/_components/dashboard-navigation";
 
 export const metadata: Metadata = {
@@ -16,14 +15,11 @@ export default async function DashboardLayout({
 }: {
   children: React.ReactNode;
 }) {
-  const session = await getSession();
 
   return (
     <div className="pb-10">
-      <DashboardHeader session={session} />
-      <div>
-        <DashboardNavigation session={session} />
-      </div>
+      <DashboardHeader />
+      <DashboardNavigation />
       {children}
     </div>
   );

diff --git a/app/api/auth/[...nextauth]/options.ts b/app/api/auth/[...nextauth]/options.ts
@@ -4,7 +4,7 @@ import { PrismaAdapter } from "@auth/prisma-adapter";
 import prismadb from "@/lib/prismadb";
 import bcrypt from 'bcryptjs';
 import { LoginFormSchema } from "@/schemas";
-import { getUserByEmail } from "@/data/user";
+import { getUserByEmail } from "@/actions/get-user";
 
 interface User extends NextAuthUser {
   phoneNumber: string;
@@ -44,10 +44,6 @@ export const authOptions: NextAuthOptions = {
 
         const { email, password } = verifiedCredentials.data
 
-        if (!email || !password) {
-          return null;
-        }
-
         const user = await getUserByEmail(email);
 
         if (!user) {

diff --git a/app/api/auth/register-user/route.ts b/app/api/auth/register-user/route.ts
@@ -2,7 +2,7 @@ import bcrypt from "bcryptjs";
 import prismadb from "@/lib/prismadb";
 import { NextResponse } from "next/server";
 import { RegisterFormSchema } from "@/schemas";
-import { getUserByEmail } from "@/data/user";
+import { getUserByEmail } from "@/actions/get-user";
 
 export async function POST(req: Request) {
     try {