fix: Fix broken condition in middleware & prevent cookie from being set twice (#164)

Magnum5234 · paulgv · commit 7c8392281208 · 2019-01-23T16:06:45.000-05:00
diff --git a/src/templates/middleware.js b/src/templates/middleware.js
@@ -118,10 +118,6 @@ middleware['i18n'] = async ({ app, req, res, route, store, redirect, isHMR }) =>
           redirectToLocale = browserLocale
         }
 
-        if(useCookie){
-          setCookie(redirectToLocale || 1)
-        }
-
         if (redirectToLocale && redirectToLocale !== app.i18n.locale && locales.indexOf(redirectToLocale) !== -1) {
 
           // We switch the locale before redirect to prevent loops
@@ -137,5 +133,5 @@ middleware['i18n'] = async ({ app, req, res, route, store, redirect, isHMR }) =>
     }
   }
 
-  await switchLocale(locale = routeLocale ? routeLocale : locale)
+  await switchLocale(routeLocale ? routeLocale : locale)
 }

Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,6 @@ middleware['i18n'] = async ({ app, req, res, route, store, redirect, isHMR }) =>`
`118`	`118`	`redirectToLocale = browserLocale`
`119`	`119`	`}`
`120`	`120`
`121`		`- if(useCookie){`
`122`		`- setCookie(redirectToLocale \|\| 1)`
`123`		`- }`
`124`		`-`
`125`	`121`	`if (redirectToLocale && redirectToLocale !== app.i18n.locale && locales.indexOf(redirectToLocale) !== -1) {`
`126`	`122`
`127`	`123`	`// We switch the locale before redirect to prevent loops`
`@@ -137,5 +133,5 @@ middleware['i18n'] = async ({ app, req, res, route, store, redirect, isHMR }) =>`
`137`	`133`	`}`
`138`	`134`	`}`
`139`	`135`
`140`		`- await switchLocale(locale = routeLocale ? routeLocale : locale)`
	`136`	`+ await switchLocale(routeLocale ? routeLocale : locale)`
`141`	`137`	`}`