[FIX] User can resend email verification if email is invalid or is em…

…pty (#16095)
RocketChat · Jun 19, 2020 · 1b10d80 · 1b10d80
1 parent 19781ef
commit 1b10d80
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/app/ui-account/client/accountProfile.html b/app/ui-account/client/accountProfile.html
@@ -162,7 +162,7 @@
 								{{/unless}}
 								{{#unless emailVerified}}
 									<div class="rc-input__error">
-										<button class="rc-button rc-button--small" id="resend-verification-email">{{_ "Resend_verification_email"}}</button>
+										<button class="rc-button rc-button--small" id="resend-verification-email"  {{canResendEmailConf 'disabled'}}>{{_ "Resend_verification_email"}}</button>
 									</div>
 								{{/unless}}
 							</div>

diff --git a/app/ui-account/client/accountProfile.js b/app/ui-account/client/accountProfile.js
@@ -149,6 +149,13 @@ Template.accountProfile.helpers({
 			return ret;
 		}
 	},
+	canResendEmailConf(ret) {
+		const email = Template.instance().email.get();
+		const user = Meteor.user();
+		if (getUserEmailAddress(user) && getUserEmailAddress(user) !== email) {
+			return ret;
+		}
+	},
 	allowDeleteOwnAccount() {
 		return settings.get('Accounts_AllowDeleteOwnAccount');
 	},