From fd36e39a387a19a5bff0c0754a7ead0876257c71 Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Wed, 30 Aug 2023 11:31:43 +0000 Subject: [PATCH 1/3] 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 12c957494..1fa10b764 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16319,6 +16319,7 @@ } }, "packages/ee": { + "name": "@documenso/ee", "version": "1.0.0", "license": "COMMERCIAL", "dependencies": { @@ -16362,7 +16363,7 @@ "packages/lib": { "name": "@documenso/lib", "version": "1.0.0", - "license": "SEE LICENSE IN LICENSE", + "license": "MIT", "dependencies": { "@documenso/email": "*", "@documenso/prisma": "*", From 3832ce2c80a58dd652ca995c01e527e2077bd4cf Mon Sep 17 00:00:00 2001 From: Ephraim Atta-Duncan Date: Wed, 30 Aug 2023 11:32:55 +0000 Subject: [PATCH 2/3] fix: redirect root direcotory to dashboard --- apps/web/src/middleware.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts index e480b2c43..5e18ee590 100644 --- a/apps/web/src/middleware.ts +++ b/apps/web/src/middleware.ts @@ -4,7 +4,7 @@ import { getToken } from 'next-auth/jwt'; export default async function middleware(req: NextRequest) { if (req.nextUrl.pathname === '/') { - const redirectUrl = new URL('/documents', req.url); + const redirectUrl = new URL('/dashboard', req.url); return NextResponse.redirect(redirectUrl); } From e756a21fda12e515e7c66001b76596c7712deed2 Mon Sep 17 00:00:00 2001 From: Mythie Date: Thu, 31 Aug 2023 13:12:50 +1000 Subject: [PATCH 3/3] fix: retain redirect to documents rather than dashboard --- apps/web/src/middleware.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts index 5e18ee590..25bfbbb40 100644 --- a/apps/web/src/middleware.ts +++ b/apps/web/src/middleware.ts @@ -4,7 +4,7 @@ import { getToken } from 'next-auth/jwt'; export default async function middleware(req: NextRequest) { if (req.nextUrl.pathname === '/') { - const redirectUrl = new URL('/dashboard', req.url); + const redirectUrl = new URL('/documents', req.url); return NextResponse.redirect(redirectUrl); } @@ -13,8 +13,7 @@ export default async function middleware(req: NextRequest) { const token = await getToken({ req }); if (token) { - console.log('has has token', req.url); - const redirectUrl = new URL('/dashboard', req.url); + const redirectUrl = new URL('/documents', req.url); return NextResponse.redirect(redirectUrl); }