Merge branch 'develop' into release

2020-04-02 15:09:54 -05:00
parent 87b26c4cfb 28bc843779
commit 3ac69d5e75
34 changed files with 618 additions and 250 deletions
@@ -28,7 +28,9 @@ api.logout = {
  async handler (req, res) {
    if (req.logout) req.logout(); // passportjs method
    req.session = null;
-    res.redirect('/');
+
+    const redirectUrl = req.query.redirectToLogin === 'true' ? '/login' : '/';
+    res.redirect(redirectUrl);
  },
 };