Upgraded to Next Auth v5

app/api/account/authorize/route.ts

@@ -9,9 +9,6 @@ export async function GET(req: Request) {
         const scope = searchParams.get('scope') as string
         const state = searchParams.get('state') as string
 
-        console.log("CODE:", code)
-        console.log("SCOPE:", scope)
-        console.log("STATE:", state)
         if (!code || !scope || !state) {
             return new NextResponse("Bad Request", { status: 400 });
         }
@@ -38,21 +35,17 @@ export async function GET(req: Request) {
 
         // Fetch values from token.
         const { access_token, expires_in, refresh_token, token_type } = token
-        // console.log("AT", access_token)
-        // console.log("RT", refresh_token)
-        // console.log("TT", token_type)
 
         if (!access_token || !refresh_token || token_type !== "bearer") {
             return new NextResponse("Unauthorized", { status: 401 });
         }
 
-        let info = await axios.get("https://api.twitch.tv/helix/users?login=" + user.username, {
+        let info = await axios.get("https://api.twitch.tv/helix/users?login=" + user.name, {
             headers: {
                 "Authorization": "Bearer " + access_token,
                 "Client-Id": process.env.TWITCH_BOT_CLIENT_ID
             }
         })
-        console.log(info.data.data)
         const broadcasterId = info.data.data[0]['id']
 
         await db.twitchConnection.create({

app/api/account/reauthorize/route.ts

@@ -1,7 +1,6 @@
 import axios from 'axios'
 import { db } from "@/lib/db"
 import { NextResponse } from "next/server";
-import { GET as authorize } from '../authorize/route'
 
 export async function GET(req: Request) {
     try {
@@ -11,7 +10,6 @@ export async function GET(req: Request) {
             id: req.headers.get('x-api-key') as string
           }
         })
-
         if (!key) {
             return new NextResponse("Forbidden", { status: 403 });
         }
@@ -46,9 +44,6 @@ export async function GET(req: Request) {
 
         // Fetch values from token.
         const { access_token, expires_in, refresh_token, token_type } = token
-        // console.log("AT", access_token)
-        // console.log("RT", refresh_token)
-        // console.log("TT", token_type)
 
         if (!access_token || !refresh_token || token_type !== "bearer") {
             return new NextResponse("Unauthorized", { status: 401 });

app/api/account/route.ts

@@ -1,7 +1,6 @@
 import { db } from "@/lib/db"
 import { NextResponse } from "next/server";
-import { getServerSession } from "next-auth";
+import { auth } from "@/auth";
-import { generateToken } from "../token/route";
 import fetchUserUsingAPI from "@/lib/validate-api";
 
 
@@ -16,7 +15,7 @@ export async function GET(req: Request) {
 
 export async function POST(req: Request) {
     try {
-        const session = await getServerSession()
+        const session = await auth()
         const user = session?.user?.name
         if (!user) {
             return new NextResponse("Internal Error", { status: 401 })
@@ -24,26 +23,26 @@ export async function POST(req: Request) {
         
         const exist = await db.user.findFirst({
           where: {
-            username: user.toLowerCase() as string
+            name: user
           }
         });
   
         if (exist) {
             return NextResponse.json({
               id: exist.id,
-              username: exist.username
+              username: exist.name
             });
         }
     
         const newUser = await db.user.create({
           data: {
-            username: user.toLowerCase() as string,
+            name: user,
           }
         });
 
         return NextResponse.json({
           id: newUser.id,
-          username: newUser.username
+          username: newUser.name
         });
     } catch (error) {
         console.log("[ACCOUNT]", error);

app/api/auth/[...nextauth]/options.ts

@@ -1,40 +0,0 @@
-import type { NextAuthOptions } from "next-auth";
-import TwitchProvider from "next-auth/providers/twitch";
-
-export interface TwitchProfile extends Record<string, any> {
-  sub: string
-  preferred_username: string
-  email: string
-  picture: string
-}
-
-export const options: NextAuthOptions = {
-  providers: [
-    TwitchProvider({
-      clientId: process.env.TWITCH_CLIENT_ID as string,
-      clientSecret: process.env.TWITCH_CLIENT_SECRET as string,
-      authorization: {
-        params: {
-          scope: "openid user:read:email",
-          claims: {
-            id_token: {
-              email: null,
-              picture: null,
-              preferred_username: null,
-            },
-          },
-        },
-      },
-      idToken: true,
-      profile(profile) {
-        return {
-          id: profile.sub,
-          name: profile.preferred_username,
-          email: profile.email,
-          image: profile.picture,
-        }
-      },
-    })
-  ],
-  secret: process.env.NEXTAUTH_SECRET
-}

app/api/auth/[...nextauth]/route.ts

@@ -1,6 +1 @@
-import NextAuth from 'next-auth'
+export { GET, POST } from "@/auth"
-import { options } from './options'
-
-const handler = NextAuth(options)
-
-export { handler as GET, handler as POST }

app/api/settings/connections/twitch/route.ts

@@ -1,4 +1,3 @@
-import axios from "axios"
 import { db } from "@/lib/db"
 import { NextResponse } from "next/server";
 import fetchUserUsingAPI from "@/lib/validate-api";
@@ -7,7 +6,6 @@ export async function GET(req: Request) {
     try {
         const user = await fetchUserUsingAPI(req)
         if (!user) {
-            console.log("TWITCH CONNECT", user)
             return new NextResponse("Unauthorized", { status: 401 });
         }
         
@@ -32,53 +30,3 @@ export async function GET(req: Request) {
         return new NextResponse("Internal Error", { status: 500 });
     }
 }
-
-export async function POST(req: Request) {
-    try {
-        const { id, secret } = await req.json();
-        const user = await fetchUserUsingAPI(req)
-
-        if (!user) {
-            return new NextResponse("Unauthorized", { status: 401 });
-        }
-
-        let response = null;
-        try {
-          response = await axios.post("https://id.twitch.tv/oauth2/token", {
-            client_id: id,
-            client_secret: secret,
-            grant_type: "client_credentials"
-          });
-          console.log(response.data)
-        } catch (error) {
-          console.log("[CONNECTIONS/TWITCH/TOKEN]", error);
-          return;
-        }
-
-        console.log(user.username)
-        let info = await axios.get("https://api.twitch.tv/helix/users?login=" + user.username, {
-            headers: {
-                "Authorization": "Bearer " + response.data['access_token'],
-                "Client-Id": id
-            }
-        })
-        console.log(info.data.data)
-        const broadcasterId = info.data.data[0]['id']
-        const username = info.data.data[0]['login']
-
-        const connection = await db.twitchConnection.create({
-            data: {
-                id: id,
-                secret,
-                userId: user.id as string,
-                broadcasterId,
-                username
-            }
-        });
-
-        return NextResponse.json(connection);
-    } catch (error) {
-        console.log("[CONNECTION/TWITCH]", error);
-        return new NextResponse("Internal Error", { status: 500 });
-    }
-}

app/api/token/bot/route.ts

@@ -14,7 +14,6 @@ export async function GET(req: Request) {
             userId: user.id
           }
         })
-
         if (!api) {
           return new NextResponse("Forbidden", { status: 403 });
         }

app/api/validate/route.ts

@@ -1,22 +0,0 @@
-import { db } from "@/lib/db"
-import { NextResponse } from "next/server";
-
-export async function GET(req: Request, { params } : { params: { id: string } }) {
-  try {
-      let id = req.headers.get('x-api-key')
-      if (id == null) {
-        return NextResponse.json(null);
-      }
-
-      const tokens = await db.apiKey.findFirst({
-          where: {
-              id: id as string
-          }
-      });
-
-      return NextResponse.json(tokens);
-  } catch (error) {
-      console.log("[VALIDATE/GET]", error);
-      return new NextResponse("Internal Error", { status: 500});
-  }
-}

app/auth/layout.tsx

@@ -0,0 +1,9 @@
+const AuthLayout = ({ children } : { children: React.ReactNode }) => {
+  return (
+    <div className="h-full flex items-center justify-center bg-black">
+      {children}
+    </div>
+  );
+}
+ 
+export default AuthLayout;

app/auth/login/page.tsx

@@ -0,0 +1,9 @@
+import { LoginForm } from "@/components/auth/login-form";
+
+const LoginPage = () => {
+  return ( 
+    <LoginForm />
+   );
+}
+ 
+export default LoginPage;

app/settings/layout.tsx

@@ -7,14 +7,13 @@ const SettingsLayout = async (
   { children } : { children:React.ReactNode } ) => {
   const headersList = headers();
   const header_url = headersList.get('x-url') || "";
-  console.log("HEADER URL: " + header_url)
 
   return (
     <div className="h-full">
       <div className={cn("hidden md:flex h-full w-[250px] z-30 flex-col fixed inset-y-0", header_url.endsWith("/settings") && "md:flex h-full w-full z-30 flex-col fixed inset-y-0")}>
         <SettingsNavigation />
       </div>
-
+      {header_url}
       <main className={cn("md:pl-[250px] h-full", header_url.endsWith("/settings") && "hidden")}>
         {children}
       </main>

app/settings/page.tsx

@@ -1,8 +1,9 @@
-"use client";
+import { auth } from "@/auth";
 
-const SettingsPage = () => {
+const SettingsPage = async () => {
     return (
         <div>
+          {JSON.stringify(await auth())}
         </div>
     );
 }

auth.config.ts

@@ -0,0 +1,17 @@
+import Twitch from "next-auth/providers/twitch"
+
+import type { NextAuthConfig } from "next-auth"
+
+export default {
+  providers: [
+    Twitch({
+      clientId: process.env.TWITCH_CLIENT_ID,
+      clientSecret: process.env.TWITCH_CLIENT_SECRET,
+      authorization: {
+        params: {
+          scope: "openid user:read:email",
+        },
+      }
+    })
+  ],
+} satisfies NextAuthConfig

auth.ts

@@ -0,0 +1,35 @@
+import NextAuth from "next-auth"
+import { PrismaAdapter } from "@auth/prisma-adapter"
+
+import { db } from "@/lib/db"
+import authConfig from "@/auth.config"
+
+export const {
+  handlers: { GET, POST },
+  auth,
+  signIn,
+  signOut,
+} = NextAuth({
+  events: {
+    async linkAccount({ user }) {
+      await db.user.update({
+        where: {id: user.id },
+        data: { emailVerified: new Date() }
+      })
+    }
+  },
+  callbacks: {
+    async session({ session, user, token }) {
+      if (token.sub && session.user) {
+        session.user.id = token.sub
+      }
+      return session
+    },
+    async jwt({ token, user, account, profile, isNewUser }) {
+      return token
+    }
+  },
+  adapter: PrismaAdapter(db),
+  session: { strategy: "jwt" },
+  ...authConfig,
+})

components/auth/card-wrapper.tsx

@@ -0,0 +1,40 @@
+"use client"
+
+import { LoginForm } from "@/components/auth/login-form";
+import React from "react";
+import { 
+  Card,
+  CardContent,
+  CardHeader,
+  CardFooter,
+  CardTitle
+} from "@/components/ui/card";
+import { Header } from "@/components/auth/header";
+import { Social } from "@/components/auth/social";
+
+
+interface CardWrapperProps {
+  children: React.ReactNode
+  headerLabel: string
+}
+
+export const CardWrapper = ({
+  children,
+  headerLabel
+}: CardWrapperProps) => {
+  return ( 
+    <Card className="w-[400px] shadow-md bg-white text-black">
+      <CardHeader>
+        <Header label={headerLabel} />
+      </CardHeader>
+      <CardContent>
+        {children}
+      </CardContent>
+      <CardFooter>
+        <Social />
+      </CardFooter>
+    </Card>
+   );
+}
+ 
+export default CardWrapper

components/auth/header.tsx

@@ -0,0 +1,25 @@
+import { Poppins } from "next/font/google";
+import { cn } from "@/lib/utils";
+
+
+const font = Poppins({
+  subsets: ["latin"],
+  weight: ["600"]
+})
+
+interface HeaderProps {
+  label: string
+}
+
+export const Header = ({ label }: HeaderProps) => {
+  return (
+    <div className="w-full flex flex-col gap-y-4 items-center justify-center">
+      <h1 className={cn(
+        "text-3xl font-semibold", font.className
+      )}>Login</h1>
+      <p className="text-muted-foreground text-sm">
+        {label}
+      </p>
+    </div>
+  )
+}

components/auth/login-form.tsx

@@ -0,0 +1,11 @@
+import { CardWrapper } from "./card-wrapper"
+
+export const LoginForm = () => {
+  return (
+    <CardWrapper
+      headerLabel="Welcome back"
+    >
+      Login Form
+    </CardWrapper>
+  )
+}

components/auth/social.tsx

@@ -0,0 +1,27 @@
+"use client"
+
+import { signIn } from "next-auth/react"
+import { FaTwitch } from "react-icons/fa"
+import { Button } from "@/components/ui/button"
+import { DEFAULT_REDIRECT } from "@/routes"
+
+export const Social = () => {
+  const onClick = (provider: "twitch") => {
+    signIn(provider, {
+      callbackUrl: DEFAULT_REDIRECT,
+    })
+  }
+
+  return (
+    <div className="flex items-center w-full gap-x-2">
+      <Button
+        size="lg"
+        variant="outline"
+        className="w-full bg-white hover:bg-purple-500"
+        onClick={() => onClick("twitch")}  
+      >
+        <FaTwitch className="h-5 w-5" />
+      </Button>
+    </div>
+  )
+}

components/navigation/userprofile.tsx

@@ -2,40 +2,37 @@
 
 import axios from "axios";
 import * as React from 'react';
-import { User } from "@prisma/client";
 import { useEffect, useState } from "react";
 import { useSession } from "next-auth/react";
-import { usePathname } from 'next/navigation'
 import { cn } from "@/lib/utils";
 
 const UserProfile = () => {
     const { data: session, status } = useSession();
-    const [previousUsername, setPreviousUsername] = useState<string>()
+    const [user, setUser] = useState<{ id: string, username: string }>()
-    const [user, setUser] = useState<User>()
+
-    const [loading, setLoading] = useState<boolean>(true)
+    let previousUsername = ""
-    const pathname = usePathname()
 
     useEffect(() => {
       if (status !== "authenticated" || previousUsername == session.user?.name) {
           return
       }
 
-      setPreviousUsername(session.user?.name as string)
+      previousUsername = session.user?.name || ""
       if (session.user) {
         const fetchData = async () => {
-          var userData: User = (await axios.get("/api/account")).data
+          var userData = (await axios.get("/api/account")).data
           setUser(userData)
-          setLoading(false)
+          console.log(userData)
         }
 
         fetchData().catch(console.error)
 
-        // TODO: check cookies if impersonation is in use.
+        // TODO: check session if impersonation is in use.
       }
   }, [session])
 
   return ( 
-    <div className={cn("px-10 py-6 rounded-md bg-blue-300 overflow-hidden wrap", loading && "hidden")}>
+    <div className={cn("px-10 py-6 rounded-md bg-blue-300 overflow-hidden wrap", user == null && "hidden")}>
       <p className="text-xs text-gray-400">Logged in as:</p>
       <p>{user?.username}</p>
     </div>

data/user.ts

@@ -0,0 +1,10 @@
+import { db } from "@/lib/db";
+
+export const getUserById = async (id: string) => {
+  try {
+    const user = await db.user.findUnique({ where: { id }})
+    return user;
+  } catch {
+    return null;
+  }
+}

lib/validate-api.ts

@@ -1,25 +1,23 @@
-import { getServerSession } from "next-auth";
+import { auth } from "@/auth";
 import { db } from "./db";
 
 export default async function fetchUserUsingAPI(req: Request) {
-    const session = await getServerSession()
+    const session = await auth()
-    console.log("server session:", session)
     
     if (session) {
         const user = await db.user.findFirst({
           where: {
-            username: session.user?.name?.toLowerCase() as string
+            name: session.user?.name
           }
         })
 
         return {
           id: user?.id,
-          username: user?.username
+          username: user?.name
         }
     }
 
     const token = req.headers?.get('x-api-key')
-    console.log("x-api-key:", token)
     if (token === null || token === undefined)
         return null
 
@@ -35,10 +33,8 @@ export default async function fetchUserUsingAPI(req: Request) {
       }
     })
 
-    console.log("user:", user)
-
     return {
       id: user?.id,
-      username: user?.username
+      username: user?.name
     }
 }

middleware.ts

@@ -1,64 +1,43 @@
-// import { authMiddleware } from "@clerk/nextjs";
+import authConfig from "@/auth.config"
-// import { NextResponse } from "next/server";
+import NextAuth from "next-auth"
 
-// // This example protects all routes including api/trpc routes
+import {
-// // Please edit this to allow other routes to be public as needed.
+  DEFAULT_REDIRECT,
-// // See https://clerk.com/docs/references/nextjs/auth-middleware for more information about configuring your middleware
+  PUBLIC_ROUTES,
-// export default authMiddleware({
+  AUTH_ROUTES,
-//   publicRoutes: ["/api/:path*"],
+  API_PREFIX
-//   ignoredRoutes: ["/api/validate/:path*"],
+} from "@/routes"
 
-//   beforeAuth: async (req) => {
+const { auth } = NextAuth(authConfig)
-//     // if (req.url.startsWith("https://localhost:3000/api") /*&& !req.url.startsWith("https://localhost:3000/api/validate/")*/) {
-//     //   const apiKey = req.headers.get("x-api-key") as string
-//     //   let api = null
-//     //   if (apiKey != null) {
-//     //     console.log("API KEY:", apiKey)
-//     //     api = await fetch("http://localhost:3000/api/validate")
-//     //   }
-//     //   if (api == null) {
-//     //     console.log("Invalid API key attempted")
-//     //     return NextResponse.rewrite(
-//     //       `${req.nextUrl.protocol}//${req.nextUrl.host}`,
-//     //       {
-//     //         status: 401,
-//     //         headers: {
-//     //           "WWW-Authenticate": 'Basic realm="Secure Area"',
-//     //         },
-//     //       }
-//     //     );
-//     //   }
-//     // }
 
-//     return NextResponse.next();
+export default auth((req) => {
-//   }
+  const isLoggedIn = !!req.auth
-// });
 
-// export const config = {
+  const { nextUrl } = req
-//   matcher: ["/((?!.*\\..*|_next).*)", "/", "/(trpc)(.*)"],
-// };
 
-import { NextResponse } from "next/server";
+  const isApiRoute = nextUrl.pathname.startsWith(API_PREFIX)
-import { redirect } from 'next/navigation';
+  const isPublicRoute = PUBLIC_ROUTES.includes(nextUrl.pathname)
-import { withAuth } from 'next-auth/middleware';
+  const isAuthRoute = AUTH_ROUTES.includes(nextUrl.pathname)
-import { getServerSession } from "next-auth";
 
-export default withAuth(
+  if (isApiRoute) {
-  async function middleware(req) {
+    return null
-    const requestHeaders = new Headers(req.headers);
-    requestHeaders.set('x-url', req.url);
-
-    return NextResponse.next({
-      request: {
-        // Apply new request headers
-        headers: requestHeaders,
   }
-    });
+
-  },
+  if (isAuthRoute) {
-  {
+    if (isLoggedIn) {
-  callbacks: {
+      return Response.redirect(new URL(DEFAULT_REDIRECT, nextUrl))
-    authorized: async ({ req, token }) =>
+    }
-      req.nextUrl.pathname?.slice(0, 4) === '/api' ||
+    return null;
-      !!token
+  }
+
+  if (!isLoggedIn && !isPublicRoute) {
+    return Response.redirect(new URL("/auth/login", nextUrl))
+  }
+
+  return null
+})
+
+// Optionally, don't invoke Middleware on some paths
+export const config = {
+  matcher: ['/((?!.+\\.[\\w]+$|_next).*)', '/', '/(api|trpc)(.*)'],
 }
-});

prisma/schema.prisma

@@ -9,10 +9,14 @@ datasource db {
 }
 
 model User {
-  id String @id @default(uuid())
+  id String @id @default(cuid())
-  username String @unique
+  name String?
+  email String? @unique
+  emailVerified DateTime?
+  image String?
 
   apiKeys ApiKey[]
+  accounts Account[]
   twitchConnections TwitchConnection[]
   createdProfiles TtsProfile[]
   profileStatus TtsProfileStatus[]
@@ -21,6 +25,25 @@ model User {
   updatedAt DateTime @updatedAt
 }
 
+model Account {
+  id                 String  @id @default(cuid())
+  userId             String
+  type               String
+  provider           String
+  providerAccountId  String
+  refresh_token      String?  @db.Text
+  access_token       String?  @db.Text
+  expires_at         Int?
+  token_type         String?
+  scope              String?
+  id_token           String?  @db.Text
+  session_state      String?
+
+  user User @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@unique([provider, providerAccountId])
+}
+
 model ApiKey {
   id String @id @default(uuid())
   label String
@@ -88,7 +111,7 @@ model TtsBadgeFilter {
 
 model TtsUsernameFilter {
   username String
-  white Boolean
+  tag String
 
   profileId String
   profile TtsProfile @relation(fields: [profileId], references: [id], onDelete: Cascade)

routes.ts

@@ -0,0 +1,11 @@
+export const PUBLIC_ROUTES = [
+  "/"
+]
+
+export const AUTH_ROUTES = [
+  "/auth/login",
+  "/auth/register",
+]
+
+export const API_PREFIX = "/api/auth"
+export const DEFAULT_REDIRECT = "/settings"