Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/flash save session before redirect #52

Merged
merged 2 commits into from
May 19, 2022
Merged

Bugfix/flash save session before redirect #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee5ad1b
Bump
nlsvgtr May 3, 2022
5bb393a
Wait for a session save after flash beore redirect
nlsvgtr May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions middleware/request/validation/site.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
123 changes: 45 additions & 78 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion routes/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
}
);

Expand Down
4 changes: 3 additions & 1 deletion routes/site/idea-export.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'},
Expand Down
10 changes: 7 additions & 3 deletions routes/site/idea-import.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
}
);
Expand Down
18 changes: 12 additions & 6 deletions routes/site/idea.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
}
);
Expand Down Expand Up @@ -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);
});
});
}
);
Expand Down
4 changes: 3 additions & 1 deletion routes/site/newsletter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'},
Expand Down