From 30463b28b7a16e7e52f58945e512846e6c8d9623 Mon Sep 17 00:00:00 2001 From: "testbot-codemonk[bot]" <161732285+testbot-codemonk[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 08:27:31 +0000 Subject: [PATCH] Update files in Redirection-40 --- public/js/interactivity.js | 7 +++++++ routes/authRoutes.js | 2 +- routes/middleware/authMiddleware.js | 11 ++++++++++- views/login.ejs | 12 +++++++++++- views/register.ejs | 12 ++++++------ 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/public/js/interactivity.js b/public/js/interactivity.js index dc75b3e..f8b10ef 100644 --- a/public/js/interactivity.js +++ b/public/js/interactivity.js @@ -73,6 +73,13 @@ function applyJob(body) { } function handleLogin(username, password) { + const registrationSuccess = sessionStorage.getItem('registrationSuccess'); + if (registrationSuccess) { + sessionStorage.removeItem('registrationSuccess'); + window.location.href = '/login.ejs'; + return; + } + fetch('/login', { method: 'POST', headers: { diff --git a/routes/authRoutes.js b/routes/authRoutes.js index 5a11bac..7afba5e 100644 --- a/routes/authRoutes.js +++ b/routes/authRoutes.js @@ -35,7 +35,7 @@ router.post('/register', async (req, res) => { const user = new User({ username, password, email, domainOfInterest, linkedinUrl, currentCompany, currentLevel }); await user.save(); req.session.userId = user._id; - res.status(201).json({ message: 'User registered successfully', userId: user._id }); + res.redirect('/login'); } catch (error) { res.status(500).json({ message: 'Error registering user', error: error.message }); } diff --git a/routes/middleware/authMiddleware.js b/routes/middleware/authMiddleware.js index 72a053e..c2727b9 100644 --- a/routes/middleware/authMiddleware.js +++ b/routes/middleware/authMiddleware.js @@ -37,4 +37,13 @@ const requireRole = (role) => { }; }; -module.exports = { requireAuth, alreadyLoggedIn, requireRole }; +const checkRegistrationComplete = (req, res, next) => { + if (req.session.registrationComplete) { + next(); + } else { + res.redirect('/complete-registration'); + } +}; + +module.exports = { requireAuth, alreadyLoggedIn, requireRole, checkRegistrationComplete }; +``` \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs index 2525426..b4d6b99 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -55,10 +55,13 @@ button:hover { background-color: #0056b3; } - .error-message { + .error-message, .success-message { color: #d9534f; margin-bottom: 10px; } + .success-message { + color: #28a745; + } p { text-align: center; } @@ -77,6 +80,11 @@ <%= errorMessage %> <% } %> + <% if (typeof successMessage !== 'undefined') { %> +
+ <% } %>