+
+
\ No newline at end of file
diff --git a/server/src/mails/base/partials/body.hbs b/server/src/mails/base/partials/body.hbs
new file mode 100644
index 0000000000..5eaadb3e6a
--- /dev/null
+++ b/server/src/mails/base/partials/body.hbs
@@ -0,0 +1,7 @@
+
+
+
+ {{{bodyContent}}}
+
+
+
\ No newline at end of file
diff --git a/server/src/mails/base/partials/footer.hbs b/server/src/mails/base/partials/footer.hbs
new file mode 100644
index 0000000000..d867885859
--- /dev/null
+++ b/server/src/mails/base/partials/footer.hbs
@@ -0,0 +1,26 @@
+
\ No newline at end of file
diff --git a/server/src/mails/base/partials/header.hbs b/server/src/mails/base/partials/header.hbs
new file mode 100644
index 0000000000..c0cf4f92b2
--- /dev/null
+++ b/server/src/mails/base/partials/header.hbs
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/server/src/mails/invite_user.hbs b/server/src/mails/invite_user.hbs
new file mode 100644
index 0000000000..f884a8ed57
--- /dev/null
+++ b/server/src/mails/invite_user.hbs
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
Hi {{name}},
+
+
+
+
+
+ {{sender}}
+ has invited you to join the workspace -
+ {{organizationName}}. Click the
+ button below to get started!
+
+
+ Should you have any questions or need assistance, our support team
+ is
+ here
+ to help or reach out to us on
+
+ hello@tooljet.com.
+
\ No newline at end of file
diff --git a/server/src/mails/reset_password.hbs b/server/src/mails/reset_password.hbs
new file mode 100644
index 0000000000..5a08a5b83a
--- /dev/null
+++ b/server/src/mails/reset_password.hbs
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
Hi {{name}},
+
+
+
+
+
+ We all forget our password sometimes. Don’t worry, click the
+ button below to reset your password.
+
+
+ If you didn’t make the request of if you’d no longer like to
+ create a new password, you can safely ignore this email.
+
+
+ Should you have any questions or need assistance, our support team
+ is
+ here
+ to help or reach out to us on
+
+ hello@tooljet.com.
+
\ No newline at end of file
diff --git a/server/src/mails/setup_account.hbs b/server/src/mails/setup_account.hbs
new file mode 100644
index 0000000000..ab4bfd94ee
--- /dev/null
+++ b/server/src/mails/setup_account.hbs
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
Hi {{name}},
+
+
+
+
+
+ Thank you for signing up to ToolJet. We’re excited to have you
+ onboard! Please confirm your email address by clicking the button
+ below to get started.
+
+
+ Should you have any questions or need assistance, our support team
+ is
+ here
+ to help or reach out to us on
+
+ hello@tooljet.com.
+
- ${
- organizationInvitationToken && sender && organizationName
- ? `
- ${sender} has invited you to use ToolJet workspace: ${organizationName}.
- `
- : ''
- }
-
- Please use the link below to set up your account and get started.
-
-
- ${inviteUrl}
-
-
- Welcome aboard,
- ToolJet Team
-
-
-
- `;
-
- await this.sendEmail(to, subject, html);
+ const subject = isOrgInvite ? `Welcome to ${organizationName || 'ToolJet'}` : 'Set up your account!';
+ const footerText = isOrgInvite
+ ? 'You have received this email as an invitation to join ToolJet’s workspace'
+ : 'You have received this email to confirm your email address';
+
+ const templateData = {
+ name: name || '',
+ inviteUrl,
+ sender,
+ organizationName,
+ };
+ const templatePath = isOrgInvite ? 'invite_user.hbs' : 'setup_account.hbs';
+ const htmlEmailContent = this.compileTemplate(templatePath, templateData);
+
+ return await this.sendEmail(to, subject, {
+ bodyHeader: subject,
+ bodyContent: htmlEmailContent,
+ footerText: footerText,
+ inviteUrl,
+ });
}
async sendOrganizationUserWelcomeEmail(
@@ -116,42 +122,39 @@ export class EmailService {
invitationtoken: string,
organizationName: string
) {
- const subject = 'Welcome to ToolJet';
+ const subject = `Welcome to ${organizationName || 'ToolJet'}`;
const inviteUrl = generateOrgInviteURL(invitationtoken);
- const html = `
-
-
-
-
-
-
-
Hi ${name || ''},
-
-
- ${sender} has invited you to use ToolJet workspace: ${organizationName}. Use the link below to set up your account and get started.
-
-
- ${inviteUrl}
-
-
-
- Welcome aboard,
- ToolJet Team
-
-
-
- `;
-
- await this.sendEmail(to, subject, html);
+ const templateData = {
+ name: name || '',
+ inviteUrl,
+ sender,
+ organizationName,
+ };
+ const templatePath = 'invite_user.hbs';
+ const htmlEmailContent = this.compileTemplate(templatePath, templateData);
+
+ return await this.sendEmail(to, subject, {
+ bodyHeader: subject,
+ bodyContent: htmlEmailContent,
+ footerText: 'You have received this email as an invitation to join ToolJet’s workspace',
+ inviteUrl,
+ });
}
- async sendPasswordResetEmail(to: string, token: string) {
- const subject = 'password reset instructions';
+ async sendPasswordResetEmail(to: string, token: string, firstName?: string) {
+ const subject = 'Reset your password';
const url = `${this.TOOLJET_HOST}/reset-password/${token}`;
- const html = `
- Please use this link to reset your password: ${url}
- `;
- await this.sendEmail(to, subject, html);
+ const templateData = {
+ name: firstName || '',
+ resetLink: url,
+ };
+ const templatePath = 'reset_password.hbs';
+ const htmlEmailContent = this.compileTemplate(templatePath, templateData);
+
+ return await this.sendEmail(to, subject, {
+ bodyContent: htmlEmailContent,
+ footerText: 'You have received this email as because a request to reset your password was made',
+ });
}
async sendCommentMentionEmail(
diff --git a/server/src/services/organization_users.service.ts b/server/src/services/organization_users.service.ts
index e42db5aba0..2d9d0025fe 100644
--- a/server/src/services/organization_users.service.ts
+++ b/server/src/services/organization_users.service.ts
@@ -106,7 +106,7 @@ export class OrganizationUsersService {
`${invitationToken}?oid=${organizationUser.organizationId}`,
organizationUser.organization.name
)
- .catch((err) => console.error(err));
+ .catch((err) => console.error('Error while sending welcome mail', err));
return;
}