Merge aa5aee3 into c565268

stanford-oval · May 3, 2021 · 52d0363 · 52d0363
2 parents c565268 + aa5aee3
commit 52d0363
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/util/user.js b/util/user.js
@@ -170,19 +170,26 @@ module.exports = {
     requireLogIn(req, res, next) {
         if (!model.isConfigured()) {
             if (req.method === 'GET' || req.method === 'HEAD') {
-                req.session.redirect_to = req.originalUrl;
+                if (!req.originalUrl.startsWith('/api') &&
+                    !req.originalUrl.startsWith('/recording') &&
+                    !req.originalUrl.startsWith('/ws'))
+                    req.session.redirect_to = req.originalUrl;
                 res.redirect(Config.BASE_URL + '/user/configure');
             } else {
-                res.status(401).render('configuration_required',
-                                       { page_title: "Almond - Error" });
+                res.status(401).render('error', {
+                    page_title: "Almond - Error",
+                    message: "You must complete the initial configuration of your Almond before you can perform this action."
+                });
             }
         } else if (!req.user) {
             if (req.method === 'GET' || req.method === 'HEAD') {
-                req.session.redirect_to = req.originalUrl;
+                if (!req.originalUrl.startsWith('/api') &&
+                    !req.originalUrl.startsWith('/recording') &&
+                    !req.originalUrl.startsWith('/ws'))
+                    req.session.redirect_to = req.originalUrl;
                 res.redirect(Config.BASE_URL + '/user/login');
             } else {
-                res.status(401).render('login_required',
-                                   { page_title: "Almond - Error" });
+                res.status(401).render('login_required', { page_title: "Almond - Error" });
             }
         } else {
             next();