fix: create session in viewData

merkle-open · Nov 2, 2023 · e3ac16a · e3ac16a
1 parent 159ee1c
commit e3ac16a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/packages/generator-nitro/generators/app/templates/project/routes/_themes.js b/packages/generator-nitro/generators/app/templates/project/routes/_themes.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const cookieSession = require('cookie-session');
 const utils = require('@nitro/app/app/lib/utils');
 
 const validThemes = utils.getValidThemes();
@@ -12,13 +11,6 @@ const validThemes = utils.getValidThemes();
 module.exports = (app) => {
 	if (app.get('env') === 'production') {
 		if (validThemes) {
-			app.use(
-				cookieSession({
-					name: 'theme',
-					keys: ['keeeeeeeeeeey', 'schlüssel'],
-				}),
-			);
-
 			for (const theme of validThemes) {
 				app.route(`/theme/${theme.id}`).get((req, res, next) => {
 					req.session.theme = theme.id;

diff --git a/packages/generator-nitro/generators/app/templates/project/viewData/_themes.js b/packages/generator-nitro/generators/app/templates/project/viewData/_themes.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const cookieSession = require('cookie-session');
 const extend = require('extend');
 const utils = require('@nitro/app/app/lib/utils');
 const view = require('@nitro/app/app/lib/view');
@@ -35,6 +36,14 @@ function theme(req, res, next) {
 
 module.exports = (app) => {
 	if (validThemes) {
+		if (app.get('env') === 'production') {
+			app.use(
+				cookieSession({
+					name: 'theme',
+					keys: ['keeeeeeeeeeey', 'schlüssel'],
+				}),
+			);
+		}
 		app.route('*').all(theme);
 	}
 };
diff --git a/packages/project-nitro/project/routes/_themes.js b/packages/project-nitro/project/routes/_themes.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const cookieSession = require('cookie-session');
 const utils = require('@nitro/app/app/lib/utils');
 
 const validThemes = utils.getValidThemes();
@@ -12,13 +11,6 @@ const validThemes = utils.getValidThemes();
 module.exports = (app) => {
 	if (app.get('env') === 'production') {
 		if (validThemes) {
-			app.use(
-				cookieSession({
-					name: 'theme',
-					keys: ['keeeeeeeeeeey', 'schlüssel'],
-				}),
-			);
-
 			for (const theme of validThemes) {
 				app.route(`/theme/${theme.id}`).get((req, res, next) => {
 					req.session.theme = theme.id;

diff --git a/packages/project-nitro/project/viewData/_themes.js b/packages/project-nitro/project/viewData/_themes.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const cookieSession = require('cookie-session');
 const extend = require('extend');
 const utils = require('@nitro/app/app/lib/utils');
 const view = require('@nitro/app/app/lib/view');
@@ -35,6 +36,14 @@ function theme(req, res, next) {
 
 module.exports = (app) => {
 	if (validThemes) {
+		if (app.get('env') === 'production') {
+			app.use(
+				cookieSession({
+					name: 'theme',
+					keys: ['keeeeeeeeeeey', 'schlüssel'],
+				}),
+			);
+		}
 		app.route('*').all(theme);
 	}
 };