Merge remote-tracking branch 'origin/issue-7808' into issue-7808

# Conflicts:
#	packages/server/src/views/index/user.mustache

packages/server/src/middleware/notificationHandler.ts

@@ -63,7 +63,7 @@ async function handleConfirmEmailNotification(ctx: AppContext): Promise<Notifica
 	if (!ctx.joplin.owner.email_confirmed) {
 		return {
 			id: 'confirmEmail',
-			messageHtml: renderMarkdown('An email has been sent to you containing an activation link to complete your registration.\n\nMake sure you click it to secure your account and keep access to it.'),
+			messageHtml: renderMarkdown(`An email has been sent to you containing an activation link to complete your registration. If you did not receive it, you may send it again from [your profile page](${profileUrl()}).\n\nMake sure you click it to secure your account and keep access to it.`),
 			levelClassName: levelClassName(NotificationLevel.Important),
 			closeUrl: '',
 		};

packages/server/src/routes/index/users.ts

@@ -90,6 +90,7 @@ router.get('users/:id', async (path: SubPath, ctx: AppContext, formUser: User =
 	view.content.error = error;
 	view.content.postUrl = postUrl;
 	view.content.csrfTag = await createCsrfTag(ctx);
+	view.content.showSendAccountConfirmationEmailButton = !user.email_confirmed;
 
 	if (subscription) {
 		const lastPaymentAttempt = models.subscription().lastPaymentAttempt(subscription);
@@ -213,6 +214,7 @@ interface FormFields {
 	update_subscription_basic_button: string;
 	update_subscription_pro_button: string;
 	stop_impersonate_button: string;
+	send_account_confirmation_email: string;
 }
 
 router.post('users', async (path: SubPath, ctx: AppContext) => {
@@ -246,6 +248,8 @@ router.post('users', async (path: SubPath, ctx: AppContext) => {
 			// that user, except the current one (otherwise they would be
 			// logged out).
 			if (userToSave.password) await models.session().deleteByUserId(userToSave.id, contextSessionId(ctx));
+		} else if (fields.send_account_confirmation_email) {
+			await models.user().sendAccountConfirmationEmail(user);
 		} else if (fields.stop_impersonate_button) {
 			await stopImpersonating(ctx);
 			return redirect(ctx, config().baseUrl);

packages/server/src/views/index/user.mustache

@@ -27,7 +27,7 @@
 			</div>
 			<p id="password_strength" class="help"></p>
 		</div>
-		
+
 		<div class="field">
 			<label class="label">Repeat password</label>
 			<div class="control">
@@ -37,6 +37,9 @@
 
 		<div class="control block">
 			<input type="submit" name="post_button" class="button is-primary" value="{{buttonTitle}}" />
+            {{#showSendAccountConfirmationEmailButton}}
+                <input type="submit" name="send_account_confirmation_email" class="button is-link" value="Send account confirmation email" />
+            {{/showSendAccountConfirmationEmailButton}}
 		</div>
 	</div>
 
@@ -50,7 +53,7 @@
 					<p class="help">Click for more info about the Pro plan and to upgrade your account.</p>
 				</div>
 			{{/showUpdateSubscriptionPro}}
-			
+
 			<div class="control block">
 				<p><a class="button is-link" target="_blank" href="{{stripePortalUrl}}">Manage subscription</a></p>
 				<p class="help">Click to update your payment details, switch to a different billing cycle or plan, or to cancel your subscription.</p>