final commit ig

apps/merchant-app/app/api/auth/[...nextauth]/route.ts

@@ -1,7 +1,6 @@
-import NextAuth from "next-auth"
-import { authOptions } from "../../../../lib/auth"
+import NextAuth from "next-auth";
+import { authOptions } from "../../../../lib/auth";
 
-//@ts-ignore
-const handler = NextAuth(authOptions)
+const handler = NextAuth(authOptions);
 
-export { handler as GET, handler as POST }
+export { handler as GET, handler as POST };

apps/merchant-app/lib/auth.ts

@@ -3,37 +3,37 @@ import db from "@repo/db/client";
 import { NextAuthOptions } from "next-auth";
 
 export const authOptions: NextAuthOptions = {
-    providers: [
-        GoogleProvider({
-            clientId: process.env.GOOGLE_CLIENT_ID || "",
-            clientSecret: process.env.GOOGLE_CLIENT_SECRET || ""
-        })
-    ],
-    callbacks: {
-        async signIn({ user, account, profile, email, credentials }) {
-            console.log("hi signin");
-            if (!user || !user.email) {
-                return false;
-            }
-            await db.merchant.upsert({
-                select: {
-                    id: true
-                },
-                where: {
-                    email: user.email
-                },
-                create: {
-                    email: user.email,
-                    name: user.name,
-                    auth_type: account?.provider === "google" ? "Google" : "Github" // Use a prisma type here
-                },
-                update: {
-                    name: user.name,
-                    auth_type: account?.provider === "google" ? "Google" : "Github" // Use a prisma type here
-                }
-            });
-            return true;
-        }
+  providers: [
+    GoogleProvider({
+      clientId: process.env.GOOGLE_CLIENT_ID || "",
+      clientSecret: process.env.GOOGLE_CLIENT_SECRET || "",
+    }),
+  ],
+  callbacks: {
+    async signIn({ user, account, profile, email, credentials }) {
+      console.log("hi signin");
+      if (!user || !user.email) {
+        return false;
+      }
+      await db.merchant.upsert({
+        select: {
+          id: true,
+        },
+        where: {
+          email: user.email,
+        },
+        create: {
+          email: user.email,
+          name: user.name,
+          auth_type: account?.provider === "google" ? "Google" : "Github",
+        },
+        update: {
+          name: user.name,
+          auth_type: account?.provider === "google" ? "Google" : "Github",
+        },
+      });
+      return true;
     },
-    secret: process.env.NEXTAUTH_SECRET || "secret"
-};
+  },
+  secret: process.env.NEXTAUTH_SECRET || "secret",
+};

apps/user-app/middleware.ts

@@ -1,24 +1,25 @@
-// user-app/middleware.ts
-import { NextRequest, NextResponse } from 'next/server';
-import { getToken } from 'next-auth/jwt';
+import { NextRequest, NextResponse } from "next/server";
+import { getToken } from "next-auth/jwt";
 
 export async function middleware(req: NextRequest) {
-  const token = await getToken({ req, secret: process.env.NEXTAUTH_SECRET || "secret" });
-
+  const token = await getToken({
+    req,
+    secret: process.env.NEXTAUTH_SECRET || "secret",
+  });
 
   if (!token) {
     console.log("No token found, redirecting to sign-in");
-    return NextResponse.redirect(new URL('/api/auth/signin', req.url));
+    return NextResponse.redirect(new URL("/api/auth/signin", req.url));
   }
 
-  if (req.nextUrl.pathname === '/') {
+  if (req.nextUrl.pathname === "/") {
     console.log("Authenticated, redirecting to /transfer");
-    return NextResponse.redirect(new URL('/transfer', req.url));
+    return NextResponse.redirect(new URL("/transfer", req.url));
   }
 
   return NextResponse.next();
 }
 
 export const config = {
-  matcher: ['/', '/dashboard', '/transfer', '/transactions', '/p2p'], // Add other routes as needed
-};
+  matcher: ["/", "/dashboard", "/transfer", "/transactions", "/p2p"],
+};

packages/ui/src/Appbar.tsx

@@ -4,7 +4,6 @@ interface AppbarProps {
     user?: {
         name?: string | null;
     },
-    // TODO: can u figure out what the type should be here?
     onSignin: any,
     onSignout: any
 }