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

Avoid loop redirect on server-side

Browse Source
This commit is contained in:
Sebastien Chopin 2017-07-07 15:44:04 +02:00
parent b65f4533c6
commit e5906e5ac4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/app/server.js
View File

@ -32,6 +32,11 @@ export default async (context) => {
if (opts.path.indexOf('http') !== 0 && ('<%= router.base %>' !== '/' && opts.path.indexOf('<%= router.base %>') !== 0)) { if (opts.path.indexOf('http') !== 0 && ('<%= router.base %>' !== '/' && opts.path.indexOf('<%= router.base %>') !== 0)) {
opts.path = urlJoin('<%= router.base %>', opts.path) opts.path = urlJoin('<%= router.base %>', opts.path)
} }
// Avoid loop redirect
if (opts.path === context.url) {
context.redirected = false
return
}
context.res.writeHead(opts.status, { context.res.writeHead(opts.status, {
'Location': opts.path 'Location': opts.path
}) })
@ -74,12 +79,14 @@ export default async (context) => {
} }
// nuxtServerInit // nuxtServerInit
<% if (store) { %> <% if (store) { %>
let promise = (store._actions && store._actions.nuxtServerInit ? store.dispatch('nuxtServerInit', omit(getContext(context, app), 'redirect', 'error')) : null) let promise = (store._actions && store._actions.nuxtServerInit ? store.dispatch('nuxtServerInit', getContext(context, app)) : null)
if (!promise || (!(promise instanceof Promise) && (typeof promise.then !== 'function'))) promise = Promise.resolve() if (!promise || (!(promise instanceof Promise) && (typeof promise.then !== 'function'))) promise = Promise.resolve()
<% } else { %> <% } else { %>
let promise = Promise.resolve() let promise = Promise.resolve()
<% } %> <% } %>
await promise await promise
// If nuxtServerInit made a redirect
if (context.redirected) return _noopApp
// Call global middleware (nuxt.config.js) // Call global middleware (nuxt.config.js)
let midd = <%= serialize(router.middleware, { isJSON: true }) %> let midd = <%= serialize(router.middleware, { isJSON: true }) %>
midd = midd.map((name) => { midd = midd.map((name) => {
@ -222,4 +229,4 @@ function sanitizeDynamicComponents(components) {
components[name] = component components[name] = component
}) })
return clone(components) return clone(components)
} }