fix(templates): grammar and enhancements to emails (#7903)

* fix: grammar and minor changes to email templates

* fix(handlers): fix failing session-elevation test

4 files changed, 26 insertions, 6 deletions

diff --git a/internal/templates/src/emails/Event.tsx b/internal/templates/src/emails/Event.tsx
index cdc6a2993..5def6d713 100644
--- a/internal/templates/src/emails/Event.tsx
+++ b/internal/templates/src/emails/Event.tsx
@@ -13,6 +13,9 @@ import * as React from "react";
 
 interface EventProps {
 	title?: string;
+    bodyEvent?: string;
+    bodyPrefix?: string;
+    bodySuffix?: string;
 	displayName?: string;
 	remoteIP?: string;
 	detailsKey?: string;
@@ -23,6 +26,9 @@ interface EventProps {
 
 export const Event = ({
 						  title,
+                          bodyEvent,
+                          bodyPrefix,
+                          bodySuffix,
 						  displayName,
 						  remoteIP,
 						  detailsKey,
@@ -42,7 +48,7 @@ export const Event = ({
 							Hi {displayName},
 						</Text>
 						<Text className="text-black text-[14px] leading-[24px]">
-							This notification has been sent to you in order to notify you that a new <strong><i>{title}</i></strong>
+							This notification has been sent to you in order to notify you that {bodyPrefix} <strong><i>{bodyEvent}</i></strong> {bodySuffix}
 						</Text>
 						<Hr className="border border-solid border-[#eaeaea] my-[26px] mx-0 w-full" />
 						<Text>Event Details:</Text>
@@ -74,6 +80,9 @@ Event.PreviewProps = {
 	detailsKey: "Example Detail",
 	detailsValue: "Example Value",
 	title: "Second Factor Method Added",
+    bodyEvent: "Second Factor Method",
+    bodyPrefix: "a",
+    bodySuffix: "was added to your account.",
 	remoteIP: "127.0.0.1",
 } as EventProps;
 
diff --git a/internal/templates/src/emails/IdentityVerificationJWT.tsx b/internal/templates/src/emails/IdentityVerificationJWT.tsx
index 24c1e4277..3fedcb392 100644
--- a/internal/templates/src/emails/IdentityVerificationJWT.tsx
+++ b/internal/templates/src/emails/IdentityVerificationJWT.tsx
@@ -17,6 +17,7 @@ import * as React from 'react';
 interface IdentityVerificationJWTProps {
     title?: string;
     displayName?: string;
+    domain?: string;
     remoteIP?: string;
     link?: string;
     linkText?: string;
@@ -27,6 +28,7 @@ interface IdentityVerificationJWTProps {
 export const IdentityVerificationJWT = ({
     title,
     displayName,
+    domain,
     remoteIP,
     link,
     linkText,
@@ -51,7 +53,7 @@ export const IdentityVerificationJWT = ({
                             We would like to confirm a{' '}
                             <strong>requested action </strong>related to the{' '}
                             <strong>security of your account</strong> at{' '}
-                            <i>EXAMPLE.COM.</i>
+                            <i>{domain}</i>
                             <Text className="text-black text-[14px] leading-[24px] text-center">
                                 <strong>
                                     Do not share this notification or the
@@ -83,7 +85,7 @@ export const IdentityVerificationJWT = ({
                         <Section className="text-center">
                             <Link
                                 href={link}
-                                className="text-blue-600 no-underline"
+                                className="text-blue-600 text-[12px] no-underline"
                             >
                                 {link}
                             </Link>
@@ -123,7 +125,7 @@ export const IdentityVerificationJWT = ({
                             alternatively copy and paste this URL into your
                             browser:
                         </Text>
-                        <Text className="text-black text-[14px] leading-[24px] text-center">
+                        <Text className="text-black text-[12px] leading-[24px] text-center">
                             <Link
                                 href={revocationLinkURL}
                                 className="text-blue-600 no-underline"
@@ -162,6 +164,7 @@ export const IdentityVerificationJWT = ({
 IdentityVerificationJWT.PreviewProps = {
     title: 'Reset your password',
     displayName: 'John Doe',
+    domain: 'example.com',
     link: 'https://auth.example.com',
     linkText: 'Validate',
     revocationLinkURL: 'https://auth.example.com',
diff --git a/internal/templates/src/emails/IdentityVerificationOTC.tsx b/internal/templates/src/emails/IdentityVerificationOTC.tsx
index b8d9a3afc..d2150066f 100644
--- a/internal/templates/src/emails/IdentityVerificationOTC.tsx
+++ b/internal/templates/src/emails/IdentityVerificationOTC.tsx
@@ -17,6 +17,7 @@ import * as React from 'react';
 interface IdentityVerificationOTCProps {
     title?: string;
     displayName?: string;
+    domain?: string;
     remoteIP?: string;
     oneTimeCode?: string;
     revocationLinkURL?: string;
@@ -26,6 +27,7 @@ interface IdentityVerificationOTCProps {
 export const IdentityVerificationOTC = ({
     title,
     displayName,
+    domain,
     remoteIP,
     oneTimeCode,
     revocationLinkURL,
@@ -51,7 +53,7 @@ export const IdentityVerificationOTC = ({
                             This notification has been sent to you in order to
                             verify your identity to{' '}
                             <strong>change security details</strong> for your
-                            account.{' '}
+                            account at <i>{domain}</i>.{' '}
                         </Text>
                         <Text className="text-black text-[14px] leading-[24px] text-center">
                             <strong>
@@ -107,7 +109,7 @@ export const IdentityVerificationOTC = ({
                             alternatively copy and paste this URL into your
                             browser:{' '}
                         </Text>
-                        <Text className="text-black text-[14px] leading-[24px] text-center">
+                        <Text className="text-black text-[12px] leading-[24px] text-center">
                             <Link
                                 href={revocationLinkURL}
                                 className="text-blue-600 no-underline"
@@ -146,6 +148,7 @@ export const IdentityVerificationOTC = ({
 IdentityVerificationOTC.PreviewProps = {
     title: 'Confirm your identity',
     displayName: 'John Doe',
+    domain: 'example.com',
     oneTimeCode: 'ABC123',
     revocationLinkURL: 'https://auth.example.com',
     revocationLinkText: 'Revoke',
diff --git a/internal/templates/src/index.tsx b/internal/templates/src/index.tsx
index 1fc80658e..bb0db9e72 100644
--- a/internal/templates/src/index.tsx
+++ b/internal/templates/src/index.tsx
@@ -20,6 +20,9 @@ async function doRender() {
 	const propsEvent = {
 		title: "{{ .Title }}",
 		displayName: "{{ .DisplayName }}",
+        bodyPrefix: "{{ .BodyPrefix }}",
+        bodyEvent: "{{ .BodyEvent }}",
+        bodySuffix: "{{ .BodySuffix }}",
 		remoteIP: "{{ .RemoteIP }}",
 		detailsKey: "{{ $key }}",
 		detailsValue: "{{ index $.Details $key }}",
@@ -33,6 +36,7 @@ async function doRender() {
 	const propsJWT = {
 		title: "{{ .Title }}",
 		displayName: "{{ .DisplayName }}",
+        domain: "{{ .Domain }}",
 		remoteIP: "{{ .RemoteIP }}",
 		link: "{{ .LinkURL }}",
 		linkText: "{{ .LinkText }}",
@@ -46,6 +50,7 @@ async function doRender() {
 	const propsOTC = {
 		title: "{{ .Title }}",
 		displayName: "{{ .DisplayName }}",
+        domain: "{{ .Domain }}",
 		remoteIP: "{{ .RemoteIP }}",
 		oneTimeCode: "{{ .OneTimeCode }}",
 		revocationLinkURL: "{{ .RevocationLinkURL }}",