Skip to content

Commit cb0ba9e

Browse files
committed
refactor: be more explicit about initConfig result
1 parent eb36ed5 commit cb0ba9e

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/next/middleware.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ function initConfig(
116116
export function withAuth(...args: WithAuthArgs) {
117117
if (args[0] instanceof NextRequest) {
118118
const config = initConfig(args[0], args[1])
119-
if (!config || config.redirect) return config?.redirect
119+
if (!config) return
120+
if (config.redirect) return config.redirect
121+
120122
const { req, secret, signInPage, authorized } = config
121123

122124
return getToken({ req: req as any, secret }).then(async (token) => {
@@ -133,7 +135,9 @@ export function withAuth(...args: WithAuthArgs) {
133135
const options = args[1] as NextAuthMiddlewareOptions | undefined
134136
return async (...args: Parameters<NextMiddleware>) => {
135137
const config = initConfig(args[0], options)
136-
if (!config || config.redirect) return config?.redirect
138+
if (!config) return
139+
if (config.redirect) return config.redirect
140+
137141
const { req, secret, signInPage, authorized } = config
138142

139143
const token = await getToken({ req: req as any, secret })
@@ -152,7 +156,8 @@ export function withAuth(...args: WithAuthArgs) {
152156
const options = args[0]
153157
return async (...args: Parameters<NextMiddleware>) => {
154158
const config = initConfig(args[0], options)
155-
if (!config || config.redirect) return config?.redirect
159+
if (!config) return
160+
if (config.redirect) return config.redirect
156161

157162
const { req, secret, signInPage, authorized } = config
158163

0 commit comments

Comments
 (0)