fix signin signout and apply the new style

apps/dashboard/src/middleware.ts

@@ -4,6 +4,10 @@ import type { NextRequest } from 'next/server'
 const PUBLIC_DASHBOARD_PREFIXES = ['/dashboard/sign-in', '/dashboard/forgot-password']
 const MARKETPLACE_URL = process.env.NEXT_PUBLIC_MARKETPLACE_URL ?? 'http://localhost:3000'
 
+function dedupeDashboardPath(pathname: string): string {
+  return pathname.replace(/^\/dashboard\/dashboard(?=\/|$)/, '/dashboard')
+}
+
 function isInternalHost(host: string | null): boolean {
   if (!host) return false
   const hostname = host.split(':')[0]?.toLowerCase()
@@ -17,9 +21,16 @@ function isProtectedRoute(req: NextRequest) {
 }
 
 function localJwtMiddleware(req: NextRequest): NextResponse {
+  const token = req.cookies.get('employee_token')?.value
+  if (token && req.nextUrl.pathname === '/dashboard/sign-in') {
+    const dashboardUrl = req.nextUrl.clone()
+    dashboardUrl.pathname = '/dashboard'
+    dashboardUrl.search = ''
+    return NextResponse.redirect(dashboardUrl)
+  }
+
   if (!isProtectedRoute(req)) return NextResponse.next()
 
-  const token = req.cookies.get('employee_token')?.value
   if (!token) {
     const forwardedHost = req.headers.get('x-forwarded-host')
     const forwardedProto = req.headers.get('x-forwarded-proto')
@@ -35,7 +46,7 @@ function localJwtMiddleware(req: NextRequest): NextResponse {
     }
 
     const isMarketplaceHost = signInUrl.host === marketplaceOrigin.host
-    signInUrl.pathname = isMarketplaceHost ? '/sign-in' : '/dashboard/sign-in'
+    signInUrl.pathname = isMarketplaceHost ? '/' : '/dashboard/sign-in'
     signInUrl.searchParams.set('redirect', req.nextUrl.pathname)
     return NextResponse.redirect(signInUrl)
   }
@@ -43,6 +54,13 @@ function localJwtMiddleware(req: NextRequest): NextResponse {
 }
 
 export default function middleware(req: NextRequest) {
+  const dedupedPath = dedupeDashboardPath(req.nextUrl.pathname)
+  if (dedupedPath !== req.nextUrl.pathname) {
+    const redirectUrl = req.nextUrl.clone()
+    redirectUrl.pathname = dedupedPath
+    return NextResponse.redirect(redirectUrl)
+  }
+
   return localJwtMiddleware(req)
 }