Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-22 05:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt): ensure middleware is processed when returning true (#22905)

Browse Source
This commit is contained in:
Alex Liu 2023-08-31 17:19:26 +08:00 committed by GitHub
parent 1f98f34c8e
commit 2d46971162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/nuxt/src/app/plugins/router.ts
View File

@ -58,7 +58,7 @@ function getRouteFromPath (fullPath: string | Partial<Route>) {
} }
} }
type RouteGuardReturn = void | Error | string | false type RouteGuardReturn = void | Error | string | boolean
interface RouteGuard { interface RouteGuard {
(to: Route, from: Route): RouteGuardReturn | Promise<RouteGuardReturn> (to: Route, from: Route): RouteGuardReturn | Promise<RouteGuardReturn>
@ -130,7 +130,7 @@ export default defineNuxtPlugin<{ route: Route, router: Router }>({
// Cancel navigation // Cancel navigation
if (result === false || result instanceof Error) { return } if (result === false || result instanceof Error) { return }
// Redirect // Redirect
if (result) { return handleNavigation(result, true) } if (typeof result === 'string' && result.length) { return handleNavigation(result, true) }
} }
for (const handler of hooks['resolve:before']) { for (const handler of hooks['resolve:before']) {
@ -250,6 +250,7 @@ export default defineNuxtPlugin<{ route: Route, router: Router }>({
return nuxtApp.runWithContext(() => showError(error)) return nuxtApp.runWithContext(() => showError(error))
} }
} }
if (result === true) { continue }
if (result || result === false) { return result } if (result || result === false) { return result }
} }
} }

1
packages/nuxt/src/pages/runtime/plugins/router.ts
View File

@ -179,6 +179,7 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
} }
} }
if (result === true) { continue }
if (result || result === false) { if (result || result === false) {
return result return result
} }

1
test/fixtures/basic/middleware/abort.global.ts vendored
View File

@ -4,4 +4,5 @@ export default defineNuxtRouteMiddleware((to) => {
statusCode: 401 statusCode: 401
}) })
} }
return true
}) })