Merge pull request #52 from Amsterdam/bugfix/flash-save-session-befor…

…e-redirect Bugfix/flash save session before redirect
openstad · May 19, 2022 · ff369ca · ff369ca
2 parents 033e508 + 5bb393a
commit ff369ca
Show file tree

Hide file tree

Showing 12 changed files with 184 additions and 129 deletions.
diff --git a/middleware/request/validation/site.js b/middleware/request/validation/site.js
@@ -91,8 +91,10 @@ module.exports = (req, res, next) => {
 
   if (errors.length > 0) {
     req.flash('error', { msg: errors.join(',')});
-    const redirectUrl = getRefererUrl(req.header('Referer'));
-    return res.redirect(redirectUrl);
+    req.session.save( () => {
+      const redirectUrl = getRefererUrl(req.header('Referer'));
+      return res.redirect(redirectUrl);
+    });
   }
 
   next();

diff --git a/package-lock.json b/package-lock.json
diff --git a/routes/server.js b/routes/server.js
@@ -29,7 +29,9 @@ module.exports = function(app){
       const ingresses = await ingress.ensureIngressForAllDomains(req.sites);
 
       req.flash('success', { msg: 'Checked ingress' });
-      res.redirect('/admin/server');
+      req.session.save( () => {
+        res.redirect('/admin/server');
+      });
     }
   );
 

diff --git a/routes/site/idea-export.js b/routes/site/idea-export.js
@@ -18,7 +18,9 @@ module.exports = function(app){
     (req, res, next) => {
       if (req.ideas.length === 0) {
         req.flash('error', { msg: 'No ideas to export'});
-        res.redirect(req.header('Referer'));
+        req.session.save( () => {
+          res.redirect(req.header('Referer'));
+        });
       } else {
         const exportHeaders = [
           {key: 'id', label: 'ID'},

diff --git a/routes/site/idea-import.js b/routes/site/idea-import.js
@@ -65,14 +65,18 @@ module.exports = function(app){
       Promise.all(promises)
         .then(function (response) {
           req.flash('success', { msg: 'Geimporteerd!'});
-          res.redirect(`/admin/site/${req.params.siteId}/ideas`);
-    //      res.redirect(redirectTo);
+          req.session.save( () => {
+            res.redirect(`/admin/site/${req.params.siteId}/ideas`);
+            //      res.redirect(redirectTo);
+          });
         })
         .catch(function (err) {
           console.log('errerrerrerr', err);
           let message = err && err.error && err.error.message ?  'Er gaat iets mis: '+ err.error.message : 'Er gaat iets mis!';
           req.flash('error', { msg: message});
-          res.redirect(req.header('Referer')  || appUrl);
+          req.session.save( () => {
+            res.redirect(req.header('Referer')  || appUrl);
+          });
         });
     }
   );

diff --git a/routes/site/idea.js b/routes/site/idea.js
@@ -80,8 +80,10 @@ module.exports = function(app){
         })
         .catch(function (err) {
            let message = err && err.error && err.error.message ?  'Er gaat iets mis: '+ err.error.message : 'Er gaat iets mis!';
-           req.flash('error', { msg: message});
-           res.redirect(req.header('Referer')  || appUrl);
+          req.flash('error', { msg: message});
+          req.session.save( () => {
+            res.redirect(req.header('Referer')  || appUrl);
+          });
         });
     }
   );
@@ -133,14 +135,18 @@ module.exports = function(app){
       ideaApi
         .create(req.session.jwt, req.params.siteId, idea)
         .then(function (response) {
-           req.flash('success', { msg: 'Aangemaakt!'});
-           res.redirect(`/admin/site/${req.params.siteId}/ideas`);
-           res.redirect(redirectTo);
+          req.flash('success', { msg: 'Aangemaakt!'});
+          req.session.save( () => {
+            res.redirect(`/admin/site/${req.params.siteId}/ideas`);
+            res.redirect(redirectTo);
+          });
         })
         .catch(function (err) {
           let message = err && err.error && err.error.message ?  'Er gaat iets mis: '+ err.error.message : 'Er gaat iets mis!';
           req.flash('error', { msg: message});
-          res.redirect(req.header('Referer')  || appUrl);
+          req.session.save( () => {
+            res.redirect(req.header('Referer')  || appUrl);
+          });
         });
     }
   );

diff --git a/routes/site/newsletter.js b/routes/site/newsletter.js
@@ -69,7 +69,9 @@ module.exports = function(app){
     (req, res, next) => {
       if (req.newsletterSubsribers.length === 0) {
         req.flash('error', { msg: 'No subscribers to export'});
-        res.redirect(req.header('Referer'));
+        req.session.save( () => {
+          res.redirect(req.header('Referer'));
+        });
       } else {
         const exportHeaders = [
           {key: 'id', label: 'ID'},