mail templates

sinamics · Aug 28, 2024 · 8923b0b · 8923b0b
1 parent 50abcc8
commit 8923b0b
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 85 deletions.
diff --git a/src/components/adminPage/mail/mailDeviceIpChangeNotificationTemplate.tsx b/src/components/adminPage/mail/mailDeviceIpChangeNotificationTemplate.tsx
@@ -7,6 +7,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type IMailTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const DeviceIpChangeNotificationTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "deviceIpChangeNotificationTemplate",
+		template: MailTemplateKey.DeviceIpChangeNotification,
 	});
 
 	const changeTemplateHandler = (
@@ -103,7 +104,7 @@ const DeviceIpChangeNotificationTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(stateTemplate),
-				type: "deviceIpChangeNotificationTemplate",
+				type: MailTemplateKey.DeviceIpChangeNotification,
 			},
 			{
 				onSuccess: handleApiSuccess({
@@ -179,7 +180,7 @@ const DeviceIpChangeNotificationTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "deviceIpChangeNotificationTemplate",
+								template: MailTemplateKey.DeviceIpChangeNotification,
 							})
 						}
 					>
@@ -190,7 +191,9 @@ const DeviceIpChangeNotificationTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "deviceIpChangeNotificationTemplate" })}
+						onClick={() =>
+							sendTestMail({ type: MailTemplateKey.DeviceIpChangeNotification })
+						}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")

diff --git a/src/components/adminPage/mail/mailForgotPasswordTemplate.tsx b/src/components/adminPage/mail/mailForgotPasswordTemplate.tsx
@@ -8,6 +8,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type InviteUserTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const ForgotPasswordMailTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "forgotPasswordTemplate",
+		template: MailTemplateKey.ForgotPassword,
 	});
 
 	const changeTemplateHandler = (
@@ -104,7 +105,7 @@ const ForgotPasswordMailTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(emailTemplate),
-				type: "forgotPasswordTemplate",
+				type: MailTemplateKey.ForgotPassword,
 			},
 			{
 				onSuccess: () => {
@@ -178,7 +179,7 @@ const ForgotPasswordMailTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "forgotPasswordTemplate",
+								template: MailTemplateKey.ForgotPassword,
 							})
 						}
 					>
@@ -189,7 +190,7 @@ const ForgotPasswordMailTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "forgotPasswordTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.ForgotPassword })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")

diff --git a/src/components/adminPage/mail/mailNewDeviceNotificationTemplate.tsx b/src/components/adminPage/mail/mailNewDeviceNotificationTemplate.tsx
@@ -7,6 +7,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type IMailTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const NewDeviceNotificationTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "newDeviceNotificationTemplate",
+		template: MailTemplateKey.NewDeviceNotification,
 	});
 
 	const changeTemplateHandler = (
@@ -103,7 +104,7 @@ const NewDeviceNotificationTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(stateTemplate),
-				type: "newDeviceNotificationTemplate",
+				type: MailTemplateKey.NewDeviceNotification,
 			},
 			{
 				onSuccess: handleApiSuccess({
@@ -179,7 +180,7 @@ const NewDeviceNotificationTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "newDeviceNotificationTemplate",
+								template: MailTemplateKey.NewDeviceNotification,
 							})
 						}
 					>
@@ -190,7 +191,7 @@ const NewDeviceNotificationTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "newDeviceNotificationTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.NewDeviceNotification })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")

diff --git a/src/components/adminPage/mail/mailNotificationTemplate.tsx b/src/components/adminPage/mail/mailNotificationTemplate.tsx
@@ -7,6 +7,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type IMailTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const NotificationTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "notificationTemplate",
+		template: MailTemplateKey.Notification,
 	});
 
 	const changeTemplateHandler = (
@@ -103,7 +104,7 @@ const NotificationTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(stateTemplate),
-				type: "notificationTemplate",
+				type: MailTemplateKey.Notification,
 			},
 			{
 				onSuccess: handleApiSuccess({
@@ -176,7 +177,7 @@ const NotificationTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "notificationTemplate",
+								template: MailTemplateKey.Notification,
 							})
 						}
 					>
@@ -187,7 +188,7 @@ const NotificationTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "notificationTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.Notification })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")

diff --git a/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx b/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx
@@ -7,6 +7,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type IMailTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const OrganizationInviteTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "inviteOrganizationTemplate",
+		template: MailTemplateKey.InviteOrganization,
 	});
 
 	const changeTemplateHandler = (
@@ -103,7 +104,7 @@ const OrganizationInviteTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(stateTemplate),
-				type: "inviteOrganizationTemplate",
+				type: MailTemplateKey.InviteOrganization,
 			},
 			{
 				onSuccess: handleApiSuccess({
@@ -178,7 +179,7 @@ const OrganizationInviteTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "inviteOrganizationTemplate",
+								template: MailTemplateKey.InviteOrganization,
 							})
 						}
 					>
@@ -189,7 +190,7 @@ const OrganizationInviteTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "inviteOrganizationTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.InviteOrganization })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")

diff --git a/src/components/adminPage/mail/mailUserInviteTemplate.tsx b/src/components/adminPage/mail/mailUserInviteTemplate.tsx
@@ -8,6 +8,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type InviteUserTemplate = {
 	subject: string;
@@ -30,7 +31,7 @@ const MailUserInviteTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "inviteUserTemplate",
+		template: MailTemplateKey.InviteUser,
 	});
 
 	const [emailTemplate, setEmailTemplate] = useState({
@@ -99,7 +100,7 @@ const MailUserInviteTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(emailTemplate),
-				type: "inviteUserTemplate",
+				type: MailTemplateKey.InviteUser,
 			},
 			{
 				onSuccess: handleApiSuccess({
@@ -175,7 +176,7 @@ const MailUserInviteTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "inviteUserTemplate",
+								template: MailTemplateKey.InviteUser,
 							})
 						}
 					>
@@ -186,7 +187,7 @@ const MailUserInviteTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "inviteUserTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.InviteUser })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")

diff --git a/src/components/adminPage/mail/mailVerifyEmail.tsx b/src/components/adminPage/mail/mailVerifyEmail.tsx
@@ -8,6 +8,7 @@ import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,
 } from "~/hooks/useTrpcApiHandler";
+import { MailTemplateKey } from "~/utils/enums";
 
 type InviteUserTemplate = {
 	subject: string;
@@ -35,7 +36,7 @@ const VerifyEmailTemplate = () => {
 		refetch: refetchMailTemplates,
 		isLoading: loadingTemplates,
 	} = api.admin.getMailTemplates.useQuery({
-		template: "verifyEmailTemplate",
+		template: MailTemplateKey.VerifyEmail,
 	});
 
 	const changeTemplateHandler = (
@@ -104,7 +105,7 @@ const VerifyEmailTemplate = () => {
 		setMailTemplates(
 			{
 				template: JSON.stringify(emailTemplate),
-				type: "verifyEmailTemplate",
+				type: MailTemplateKey.VerifyEmail,
 			},
 			{
 				onSuccess: () => {
@@ -178,7 +179,7 @@ const VerifyEmailTemplate = () => {
 						className="btn btn-sm"
 						onClick={() =>
 							getDefaultMailTemplate({
-								template: "verifyEmailTemplate",
+								template: MailTemplateKey.VerifyEmail,
 							})
 						}
 					>
@@ -189,7 +190,7 @@ const VerifyEmailTemplate = () => {
 					<button
 						className="btn btn-sm"
 						disabled={changes.subject || changes.body || sendingMailLoading}
-						onClick={() => sendTestMail({ type: "verifyEmailTemplate" })}
+						onClick={() => sendTestMail({ type: MailTemplateKey.VerifyEmail })}
 					>
 						{sendingMailLoading
 							? t("mail.templates.sendTestMailButtonLoading")

diff --git a/src/server/api/routers/adminRoute.ts b/src/server/api/routers/adminRoute.ts
@@ -19,6 +19,7 @@ import { ZT_FOLDER } from "~/utils/ztApi";
 import { isRunningInDocker } from "~/utils/docker";
 import { getNetworkClassCIDR } from "~/utils/IPv4gen";
 import { InvitationLinkType } from "~/types/invitation";
+import { MailTemplateKey } from "~/utils/enums";
 
 type WithError<T> = T & { error?: boolean; message?: string };
 
@@ -434,7 +435,7 @@ export const adminRouter = createTRPCRouter({
 	sendTestMail: adminRoleProtectedRoute
 		.input(
 			z.object({
-				type: z.string(),
+				type: z.nativeEnum(MailTemplateKey),
 			}),
 		)
 		.mutation(async ({ ctx, input }) => {
@@ -473,7 +474,7 @@ export const adminRouter = createTRPCRouter({
 				verifyLink: "https://ztnet.network/verify-email",
 			};
 
-			await sendMailWithTemplate(mailTemplateMap[type], {
+			await sendMailWithTemplate(type, {
 				to: user.email,
 				userId: user.id,
 				templateData,

diff --git a/src/server/api/routers/authRouter.ts b/src/server/api/routers/authRouter.ts
@@ -9,12 +9,7 @@ import {
 import { TRPCError } from "@trpc/server";
 import { throwError } from "~/server/helpers/errorHandler";
 import jwt from "jsonwebtoken";
-import {
-	forgotPasswordTemplate,
-	notificationTemplate,
-	sendMailWithTemplate,
-	verifyEmailTemplate,
-} from "~/utils/mail";
+import { sendMailWithTemplate } from "~/utils/mail";
 import * as ztController from "~/utils/ztApi";
 import {
 	API_TOKEN_SECRET,
@@ -28,6 +23,7 @@ import { Invitation, User, UserDevice, UserOptions } from "@prisma/client";
 import { validateOrganizationToken } from "../services/organizationAuthService";
 import rateLimit from "~/utils/rateLimit";
 import { ErrorCode } from "~/utils/errorCode";
+import { MailTemplateKey } from "~/utils/enums";
 
 // This regular expression (regex) is used to validate a password based on the following criteria:
 // - The password must be at least 6 characters long.
@@ -304,7 +300,7 @@ export const authRouter = createTRPCRouter({
 				});
 
 				for (const adminUser of adminUsers) {
-					await sendMailWithTemplate(notificationTemplate, {
+					await sendMailWithTemplate(MailTemplateKey.Notification, {
 						to: adminUser.email,
 						userId: adminUser.id,
 						templateData: {
@@ -546,7 +542,7 @@ export const authRouter = createTRPCRouter({
 			const resetLink = `${process.env.NEXTAUTH_URL}/auth/forgotPassword/reset?token=${validationToken}`;
 			// Send email
 			try {
-				await sendMailWithTemplate(forgotPasswordTemplate, {
+				await sendMailWithTemplate(MailTemplateKey.ForgotPassword, {
 					to: email,
 					userId: user.id,
 					templateData: {
@@ -656,7 +652,7 @@ export const authRouter = createTRPCRouter({
 		const verifyLink = `${process.env.NEXTAUTH_URL}/auth/verifyEmail?token=${validationToken}`;
 		// Send email
 		try {
-			await sendMailWithTemplate(verifyEmailTemplate, {
+			await sendMailWithTemplate(MailTemplateKey.VerifyEmail, {
 				to: user.email,
 				userId: user.id,
 				templateData: {