diff --git a/application/src/main/resources/templates/2fa.verification.code.ftl b/application/src/main/resources/templates/2fa.verification.code.ftl index 2b205ecb5d..0aba62f90b 100644 --- a/application/src/main/resources/templates/2fa.verification.code.ftl +++ b/application/src/main/resources/templates/2fa.verification.code.ftl @@ -20,81 +20,42 @@ - - - Thingsboard - Api Usage State + + + Email verification code @@ -103,33 +64,54 @@ style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;" bgcolor="#f6f6f6"> - - - -
- - - - - - - - - - - - -
Your 2FA verification code: ${verificationCode}
— The ThingsBoard
+ + + - -
+
+ + +
+ + + + + + + + + + + + + + + + + + +
+

Email verification code:

+
+

${verificationCode}

+
+ Please verify your access using the code above. +
+ This code will expire in ${expiredTime} minutes. To get a new one, click Resend code on the Thingsboard platform. +
+ If you didn't request for this code, then you can just ignore this email; access won't provided. +
+ — The Thingsboard +
+
+ + + + +
This email was sent to ${targetEmail} by Thingsboard.
+
+
- - - - - -
This email was sent to ${targetEmail} by ThingsBoard.
diff --git a/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.html index 656f6d7c3b..f3e850a8d7 100644 --- a/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.html +++ b/ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.html @@ -32,7 +32,7 @@
- admin.2fa.general-setting + admin.2fa.verification-limitations
admin.2fa.total-allowed-time-for-verification diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 80064c88f9..98b4df1c2b 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -315,7 +315,6 @@ "2fa": { "2fa": "Two-factor authentication", "available-providers": "Available providers", - "general-setting": "General setting", "issuer-name": "Issuer name", "issuer-name-required": "Issuer name is required.", "max-verification-failures-before-user-lockout": "Max verification failures before user lockout", @@ -338,6 +337,7 @@ "verification-code-lifetime-required": "Verification code lifetime is required.", "verification-code-send-rate-limit": "Verification code send rate limit", "verification-message-template": "Verification message template", + "verification-limitations": "Verification limitations", "verification-message-template-pattern": "Verification message need to contains pattern: ${verificationCode}", "verification-message-template-required": "Verification message template is required.", "within-time": "Within time (sec)",