Fixing missing username + date object on saved page (#922)

NiallJoeMaher · web-flow · commit 1c49c90d1d63 · 2024-04-26T22:03:09.000+01:00
* Fixing missing username + date object on saved page
diff --git a/app/(app)/[username]/page.tsx b/app/(app)/[username]/page.tsx
@@ -113,7 +113,7 @@ export default async function Page({
 
   const accountLocked = !!profile.BannedUsers;
   const session = await getServerAuthSession();
-  const isOwner = session?.user?.username === username;
+  const isOwner = session?.user?.id === profile.id;
 
   type MakeOptional<Type, Key extends keyof Type> = Omit<Type, Key> &
     Partial<Type>;
diff --git a/app/(app)/layout.tsx b/app/(app)/layout.tsx
@@ -8,6 +8,9 @@ import AuthProvider from "@/context/AuthProvider";
 import ProgressBar from "@/components/ProgressBar/ProgressBar";
 import React from "react";
 import { PromptProvider } from "@/components/PromptService";
+import { db } from "@/server/db";
+import { eq } from "drizzle-orm";
+import { user } from "@/server/db/schema";
 
 export const metadata = {
   title: "Codú - Join Our Web Developer Community",
@@ -67,6 +70,12 @@ export default async function RootLayout({
   children: React.ReactNode;
 }) {
   const session = await getServerAuthSession();
+  const userData = session?.user?.id
+    ? await db.query.user.findFirst({
+        where: eq(user.id, session.user.id),
+        columns: { username: true },
+      })
+    : null;
 
   return (
     <>
@@ -78,6 +87,7 @@ export default async function RootLayout({
               <Nav
                 session={session}
                 algoliaSearchConfig={algoliaSearchConfig}
+                username={userData?.username || null}
               />
               {children}
               <Footer />
diff --git a/app/(app)/saved/_client.tsx b/app/(app)/saved/_client.tsx
@@ -64,7 +64,7 @@ const SavedPosts = () => {
                   excerpt={excerpt}
                   name={name}
                   image={image}
-                  date={updatedAt.toISOString()}
+                  date={new Date(updatedAt).toISOString()}
                   readTime={readTimeMins}
                   showBookmark={false}
                   menuOptions={[
diff --git a/components/Nav/MobileNav.tsx b/components/Nav/MobileNav.tsx
@@ -2,7 +2,7 @@ import { type UserNavigationItem } from "@/types/types";
 import { Disclosure, Transition } from "@headlessui/react";
 import { type Session } from "next-auth";
 import { PromptLink as Link } from "../PromptService/PromptLink";
-import { MutableRefObject, useRef, type FunctionComponent } from "react";
+import { type MutableRefObject, useRef, type FunctionComponent } from "react";
 import { navigation, subNav, userSubNav } from "../../config/site_settings";
 
 function classNames(...classes: string[]) {
@@ -12,12 +12,7 @@ function classNames(...classes: string[]) {
 interface MobileNavProps {
   session: Session | null;
   userNavigation: UserNavigationItem[];
-  close?: (
-    focusableElement?:
-      | HTMLElement
-      | MutableRefObject<HTMLElement | null>
-      | undefined,
-  ) => void;
+  close?: () => void;
 }
 
 const MobileNav: FunctionComponent<MobileNavProps> = ({
diff --git a/components/Nav/Nav.tsx b/components/Nav/Nav.tsx
@@ -22,9 +22,11 @@ type AlgoliaConfig = {
 const Nav = ({
   session,
   algoliaSearchConfig,
+  username,
 }: {
   session: Session | null;
   algoliaSearchConfig: AlgoliaConfig;
+  username: string | null;
 }) => {
   const { data: count } = api.notification.getCount.useQuery(undefined, {
     enabled: session ? true : false,
@@ -33,7 +35,7 @@ const Nav = ({
   const userNavigation = [
     {
       name: "Your Profile",
-      href: `/${(session && session.user?.username) || "settings"}`,
+      href: `/${username || "settings"}`,
     },
     {
       name: "Saved posts",
diff --git a/server/auth.ts b/server/auth.ts
@@ -54,10 +54,6 @@ export const authOptions: NextAuthOptions = {
     async session({ session, user }) {
       if (session.user) {
         session.user.id = user.id;
-        if (user.username) {
-          session.user.username = user.username;
-          session.user.role = user.role;
-        }
       }
       return session;
     },
