Removed awaits for emails, added redirect if invite verify fails

This commit is contained in:
Alex Holliday committed 2024-08-26 15:21:06 -07:00
1 parent c39eab49bd
commit 20b2b089a4
2 files changed
+31 -18

No files matched your search

+1 -2
View File
@@ -451,14 +451,13 @@ const Register = ({ isSuperAdmin }) => {
useEffect(() => {
const fetchInvite = async () => {
console.log("FETCHING");
if (token !== undefined) {
try {
const res = await networkService.verifyInvitationToken(token);
const { role, email, teamId } = res.data.data;
setForm({ ...form, email, role, teamId });
} catch (error) {
logger.error(error);
navigate("/register", { replace: true });
}
}
};
+30 -16
View File
@@ -90,12 +90,20 @@ const registerController = async (req, res, next) => {
const token = issueToken(userForToken);
await req.emailService.buildAndSendEmail(
"welcomeEmailTemplate",
{ name: newUser.firstName },
newUser.email,
"Welcome to Uptime Monitor"
);
req.emailService
.buildAndSendEmail(
"welcomeEmailTemplate",
{ name: newUser.firstName },
newUser.email,
"Welcome to Uptime Monitor"
)
.catch((error) => {
logger.error("Error sending welcome email", {
service: SERVICE_NAME,
error: error.message,
});
});
return res.status(200).json({
success: true,
msg: successMessages.AUTH_CREATE_USER,
@@ -241,15 +249,22 @@ const inviteController = async (req, res, next) => {
}
const inviteToken = await req.db.requestInviteToken(req, res);
await req.emailService.buildAndSendEmail(
"employeeActivationTemplate",
{
name: firstname,
link: `${process.env.CLIENT_HOST}/register/${inviteToken.token}`,
},
req.body.email,
"Welcome to Uptime Monitor"
);
req.emailService
.buildAndSendEmail(
"employeeActivationTemplate",
{
name: firstname,
link: `${process.env.CLIENT_HOST}/register/${inviteToken.token}`,
},
req.body.email,
"Welcome to Uptime Monitor"
)
.catch((error) => {
logger.error("Error sending invite email", {
service: SERVICE_NAME,
error: error.message,
});
});
return res
.status(200)
@@ -275,7 +290,6 @@ const inviteVerifyController = async (req, res, next) => {
try {
const invite = await req.db.getInviteToken(req, res);
res
.status(200)
.json({ status: "success", msg: "Invite verified", data: invite });