Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-30 23:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Handle redirect in middleware, fix #542 and #2665

Browse Source
This commit is contained in:
Sébastien Chopin 2018-01-26 12:16:53 +01:00
parent 5f50d402d5
commit 1ab4be456f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/app/client.js
View File

@ -226,11 +226,11 @@ async function render (to, from, next) {
if (!Components.length) { if (!Components.length) {
// Default layout // Default layout
await callMiddleware.call(this, Components, app.context) await callMiddleware.call(this, Components, app.context)
if (app.context._redirected) return if (nextCalled) return
// Load layout for error page // Load layout for error page
const layout = await this.loadLayout(typeof NuxtError.layout === 'function' ? NuxtError.layout(app.context) : NuxtError.layout) const layout = await this.loadLayout(typeof NuxtError.layout === 'function' ? NuxtError.layout(app.context) : NuxtError.layout)
await callMiddleware.call(this, Components, app.context, layout) await callMiddleware.call(this, Components, app.context, layout)
if (app.context._redirected) return if (nextCalled) return
// Show error page // Show error page
app.context.error({ statusCode: 404, message: '<%= messages.error_404 %>' }) app.context.error({ statusCode: 404, message: '<%= messages.error_404 %>' })
return next() return next()
@ -250,7 +250,7 @@ async function render (to, from, next) {
try { try {
// Call middleware // Call middleware
await callMiddleware.call(this, Components, app.context) await callMiddleware.call(this, Components, app.context)
if (app.context._redirected) return if (nextCalled) return
if (app.context._errored) return next() if (app.context._errored) return next()
// Set layout // Set layout
@ -262,7 +262,7 @@ async function render (to, from, next) {
// Call middleware for layout // Call middleware for layout
await callMiddleware.call(this, Components, app.context, layout) await callMiddleware.call(this, Components, app.context, layout)
if (app.context._redirected) return if (nextCalled) return
if (app.context._errored) return next() if (app.context._errored) return next()
// Call .validate() // Call .validate()