Auth: Fix email verification bypass when using basic authentication (#82914)

emails/templates/invited_to_org.mjml

@@ -4,7 +4,7 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject! Use the HTML comment below ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject! Use the HTML comment below ⬇ -->
     <mj-title>
       {{ Subject .Subject .TemplateData "{{ .InvitedBy }} has added you to the {{ .OrgName }} organization" }}
     </mj-title>

emails/templates/new_user_invite.mjml

@@ -4,7 +4,7 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
     <mj-title>
       {{ Subject .Subject .TemplateData "{{ .InvitedBy }} has invited you to join Grafana" }}
     </mj-title>

emails/templates/ng_alert_notification.mjml

@@ -4,7 +4,7 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
     <mj-title>
       {{ Subject .Subject .TemplateData "{{ .Title }}" }}
     </mj-title>

emails/templates/reset_password.mjml

@@ -4,7 +4,7 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
     <mj-title>
       {{ Subject .Subject .TemplateData "Reset your Grafana password - {{.Name}}" }}
     </mj-title>

emails/templates/signup_started.mjml

@@ -4,7 +4,7 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
     <mj-title>
       {{ Subject .Subject .TemplateData "Welcome to Grafana, please complete your sign up!" }}
     </mj-title>

emails/templates/verify_email_update.mjml

@@ -0,0 +1,40 @@
+<mjml>
+  <!-- global variables -->
+  <mj-include path="./partials/_globals.mjml" />
+  <!-- css styling -->
+  <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
+  <mj-head>
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
+    <mj-title>
+      {{ Subject .Subject .TemplateData "Verify your new email - {{.Name}}" }}
+    </mj-title>
+    <mj-include path="./partials/layout/head.mjml" />
+  </mj-head>
+  <mj-body>
+    <mj-section>
+      <mj-include path="./partials/layout/header.mjml" />
+    </mj-section>
+    <mj-section css-class="background">
+      <mj-column>
+        <mj-text>
+          <h2>Hi {{ .Name }},</h2>
+        </mj-text>
+        <mj-text>
+          Please click the following link to verify your email within <strong>{{ .VerificationEmailLifetimeHours }} hour(s)</strong>.
+        </mj-text>
+        <mj-button href="{{ .AppUrl }}user/email/update?code={{ .Code }}">
+          Verify Email
+        </mj-button>
+        <mj-text>
+          You can also copy and paste this link into your browser directly:
+        </mj-text>
+        <mj-text>
+          <a rel="noopener" href="{{ .AppUrl }}user/email/update?code={{ .Code }}">{{ .AppUrl }}user/email/update?code={{ .Code }}</a>
+        </mj-text>
+      </mj-column>
+    </mj-section>
+    <mj-section>
+      <mj-include path="./partials/layout/footer.mjml" />
+    </mj-section>
+  </mj-body>
+</mjml>

emails/templates/verify_email_update.txt

@@ -0,0 +1,6 @@
+[[HiddenSubject .Subject "Verify your new email - [[.Name]]"]]
+
+Hi [[.Name]],
+
+Copy and paste the following link directly in your browser to verify your email within [[.VerificationEmailLifetimeHours]] hour(s).
+[[.AppUrl]]user/email/update?code=[[.Code]]

emails/templates/welcome_on_signup.mjml

@@ -4,7 +4,7 @@
   <!-- css styling -->
   <mj-include path="./partials/layout/theme.css" type="css" css-inline="inline" />
   <mj-head>
-    <!-- ⬇ Don't forget to specifify an email subject below! ⬇ -->
+    <!-- ⬇ Don't forget to specify an email subject below! ⬇ -->
     <mj-title>
       {{ Subject .Subject .TemplateData "Welcome to Grafana" }}
     </mj-title>