From ef79eb3ca42f261dff11003170b9a0d26560ebba Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 30 Aug 2023 11:31:43 +0000
Subject: [PATCH] fix: redirect signin page to dashboard when logged in

---
 apps/web/src/middleware.ts | 23 +++++++++++------------
 package-lock.json          |  3 ++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 2f393ce71..e480b2c43 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -1,25 +1,24 @@
 import { NextRequest, NextResponse } from 'next/server';
 
-export default function middleware(req: NextRequest) {
+import { getToken } from 'next-auth/jwt';
+
+export default async function middleware(req: NextRequest) {
   if (req.nextUrl.pathname === '/') {
     const redirectUrl = new URL('/documents', req.url);
 
     return NextResponse.redirect(redirectUrl);
   }
 
-  // if (req.nextUrl.pathname.startsWith('/dashboard')) {
-  //   const token = await getToken({ req });
+  if (req.nextUrl.pathname.startsWith('/signin')) {
+    const token = await getToken({ req });
 
-  //   console.log('token', token);
+    if (token) {
+      console.log('has has token', req.url);
+      const redirectUrl = new URL('/dashboard', req.url);
 
-  //   if (!token) {
-  //     console.log('has no token', req.url);
-  //     const redirectUrl = new URL('/signin', req.url);
-  //     redirectUrl.searchParams.set('callbackUrl', req.url);
-
-  //     return NextResponse.redirect(redirectUrl);
-  //   }
-  // }
+      return NextResponse.redirect(redirectUrl);
+    }
+  }
 
   return NextResponse.next();
 }
diff --git a/package-lock.json b/package-lock.json
index 2a57a7da6..44acaadfd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16538,6 +16538,7 @@
       }
     },
     "packages/ee": {
+      "name": "@documenso/ee",
       "version": "1.0.0",
       "license": "COMMERCIAL",
       "dependencies": {
@@ -16581,7 +16582,7 @@
     "packages/lib": {
       "name": "@documenso/lib",
       "version": "1.0.0",
-      "license": "SEE LICENSE IN LICENSE",
+      "license": "MIT",
       "dependencies": {
         "@documenso/email": "*",
         "@documenso/prisma": "*",