Refactor email sending + remove email verification if mail sending is not set up

author: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> 2023-08-12 15:36:29 +1000
committer: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> 2023-08-12 15:36:29 +1000
commit: d18584f8e9f9423f9d72d837a36a0c3cad6e8d10 (patch)
tree: 7dae8a74764d38289985309e54f5d359716ef685 /assets/email_templates
parent: remove default welcome screen text (diff)
download: server-d18584f8e9f9423f9d72d837a36a0c3cad6e8d10.tar.xz
2 files changed, 123 insertions, 145 deletions
diff --git a/assets/email_templates/new_login_location.html b/assets/email_templates/new_login_location.html
index e4911c5e..8c188def 100644
--- a/assets/email_templates/new_login_location.html
+++ b/assets/email_templates/new_login_location.html
@@ -1,84 +1,76 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
-		<title>Verify {instanceName} Login from New Location</title>
 
-		<style>
-			* {
-				font-size: 16px;
-				line-height: 24px;
-				font-family: Arial, Helvetica, sans-serif;
-			}
-			p {
-				color: white;
-			}
-			.ExternalClass {
-				width: 100%;
-			}
-		</style>
-	</head>
-	<body>
-		<div style="background-color: #202225;">
-			<img
-				src="https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Logo-Blue.svg"
-				alt="Branding"
-				style="
+<head>
+	<meta charset="UTF-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
+	<title>Verify {instanceName} Login from New Location</title>
+
+	<style>
+		* {
+			font-size: 16px;
+			line-height: 24px;
+			font-family: Arial, Helvetica, sans-serif;
+		}
+
+		p {
+			color: white;
+		}
+
+		.ExternalClass {
+			width: 100%;
+		}
+	</style>
+</head>
+
+<body>
+	<div style="background-color: #202225;">
+		<img src="https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Logo-Blue.svg"
+			alt="Branding" style="
 					width: 100%;
 					max-width: 200px;
 					margin: 0 auto;
 					display: block;
 					padding: 20px;
-				"
-			/>
-			<div
-				style="
+				" />
+		<div style="
 					width: 100%;
 					max-width: 500px;
 					margin: 0 auto;
 					padding: 40px 50px;
 					background-color: #32353b;
 					border-radius: 5px;
-				"
-			>
-				<p
-					style="
+				">
+			<p style="
 						font-weight: 600;
 						font-size: 20px;
 						letter-spacing: 0.27px;
 						line-height: 24px;
-					"
-				>
-					Hey {userUsername},
-				</p>
-				<p>
-					It looks like someone tried to log into your {instanceName}
-					account from a new location. If this is you, follow the link
-					below to authorize logging in from this location on your
-					account. If this isn't you, we suggest changing your
-					password as soon as possible.
-				</p>
-				<p>
-					<strong>IP Address:</strong> {ipAddress}
-					<br />
-					<strong>Location:</strong> {locationCity}, {locationRegion},
-					{locationCountryName}
-				</p>
-				<div>
-					<div
-						style="
+					">
+				Hey {userUsername},
+			</p>
+			<p>
+				It looks like someone tried to log into your {instanceName}
+				account from a new location. If this is you, follow the link
+				below to authorize logging in from this location on your
+				account. If this isn't you, we suggest changing your
+				password as soon as possible.
+			</p>
+			<p>
+				<strong>IP Address:</strong> {ipAddress}
+				<br />
+				<strong>Location:</strong> {locationCity}, {locationRegion},
+				{locationCountryName}
+			</p>
+			<div>
+				<div style="
 							text-align: center;
 							justify-content: center;
 							padding-bottom: 10px;
-						"
-					>
-						<a
-							href="{verifyUrl}"
-							target="_blank"
-							style="
+						">
+					<a href="{actionUrl}" target="_blank" style="
 								font-size: 15px;
 								border: none;
 								border-radius: 3px;
@@ -88,26 +80,23 @@
 								padding: 15px 19px;
 								background-color: #0185ff;
 								border-radius: 5px;
-							"
-							>Verify Login</a
-						>
-					</div>
-					<hr />
-					<div
-						style="
+							">Verify Login</a>
+				</div>
+				<hr />
+				<div style="
 							text-align: center;
 							justify-content: center;
 							padding-bottom: 10px;
-						"
-					>
-						<p>
-							Alternatively, you can directly paste this link into
-							your browser:
-						</p>
-						<a href="{verifyUrl}" target="_blank" style="word-wrap: break-word;">{verifyUrl}</a>
-					</div>
+						">
+					<p>
+						Alternatively, you can directly paste this link into
+						your browser:
+					</p>
+					<a href="{actionUrl}" target="_blank" style="word-wrap: break-word;">{actionUrl}</a>
 				</div>
 			</div>
 		</div>
-	</body>
-</html>
+	</div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/assets/email_templates/password_reset_request.html b/assets/email_templates/password_reset_request.html
index 7de25bf1..df341798 100644
--- a/assets/email_templates/password_reset_request.html
+++ b/assets/email_templates/password_reset_request.html
@@ -1,76 +1,68 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
-		<title>Password Reset Request for {instanceName}</title>
 
-		<style>
-			* {
-				font-size: 16px;
-				line-height: 24px;
-				font-family: Arial, Helvetica, sans-serif;
-			}
-			p {
-				color: white;
-			}
-			.ExternalClass {
-				width: 100%;
-			}
-		</style>
-	</head>
-	<body>
-		<div style="background-color: #202225;">
-			<img
-				src="https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Logo-Blue.svg"
-				alt="Branding"
-				style="
+<head>
+	<meta charset="UTF-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<meta http-equiv="Content-Type" content="text/html charset=UTF-8" />
+	<title>Password Reset Request for {instanceName}</title>
+
+	<style>
+		* {
+			font-size: 16px;
+			line-height: 24px;
+			font-family: Arial, Helvetica, sans-serif;
+		}
+
+		p {
+			color: white;
+		}
+
+		.ExternalClass {
+			width: 100%;
+		}
+	</style>
+</head>
+
+<body>
+	<div style="background-color: #202225;">
+		<img src="https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Logo-Blue.svg"
+			alt="Branding" style="
 					width: 100%;
 					max-width: 200px;
 					margin: 0 auto;
 					display: block;
 					padding: 20px;
-				"
-			/>
-			<div
-				style="
+				" />
+		<div style="
 					width: 100%;
 					max-width: 500px;
 					margin: 0 auto;
 					padding: 40px 50px;
 					background-color: #32353b;
 					border-radius: 5px;
-				"
-			>
-				<p
-					style="
+				">
+			<p style="
 						font-weight: 600;
 						font-size: 20px;
 						letter-spacing: 0.27px;
 						line-height: 24px;
-					"
-				>
-					Hey {userUsername},
-				</p>
-				<p>
-					Your {instanceName} password can be reset by clicking the
-					button below. If you did not request a new password, please
-					ignore this email.
-				</p>
-				<div>
-					<div
-						style="
+					">
+				Hey {userUsername},
+			</p>
+			<p>
+				Your {instanceName} password can be reset by clicking the
+				button below. If you did not request a new password, please
+				ignore this email.
+			</p>
+			<div>
+				<div style="
 							text-align: center;
 							justify-content: center;
 							padding-bottom: 10px;
-						"
-					>
-						<a
-							href="{passwordResetUrl}"
-							target="_blank"
-							style="
+						">
+					<a href="{actionUrl}" target="_blank" style="
 								font-size: 15px;
 								border: none;
 								border-radius: 3px;
@@ -80,22 +72,19 @@
 								padding: 15px 19px;
 								background-color: #ff5f00;
 								border-radius: 5px;
-							"
-							>Reset Password</a
-						>
-					</div>
-					<hr />
-					<div style="text-align: center">
-						<p>
-							Alternatively, you can directly paste this link into
-							your browser:
-						</p>
-						<a href="{passwordResetUrl}" target="_blank" style="word-wrap: break-word;"
-							>{passwordResetUrl}</a
-						>
-					</div>
+							">Reset Password</a>
+				</div>
+				<hr />
+				<div style="text-align: center">
+					<p>
+						Alternatively, you can directly paste this link into
+						your browser:
+					</p>
+					<a href="{actionUrl}" target="_blank" style="word-wrap: break-word;">{actionUrl}</a>
 				</div>
 			</div>
 		</div>
-	</body>
-</html>
+	</div>
+</body>
+
+</html>
\ No newline at end of file
author	Madeline <46743919+MaddyUnderStars@users.noreply.github.com>	2023-08-12 15:36:29 +1000
committer	Madeline <46743919+MaddyUnderStars@users.noreply.github.com>	2023-08-12 15:36:29 +1000
commit	d18584f8e9f9423f9d72d837a36a0c3cad6e8d10 (patch)
tree	7dae8a74764d38289985309e54f5d359716ef685 /assets/email_templates
parent	remove default welcome screen text (diff)
download	server-d18584f8e9f9423f9d72d837a36a0c3cad6e8d10.tar.xz