diff --git a/src/app/domain/user.ts b/src/app/domain/user.ts
index cb64a9233ce..29b973cd666 100644
--- a/src/app/domain/user.ts
+++ b/src/app/domain/user.ts
@@ -5,6 +5,7 @@ export class User {
isGoogleUser: boolean = false;
isRecaptchaInvalid: boolean = false;
isRecaptchaRequired: boolean;
+ isVerified: boolean;
language: string;
lastName: string;
microsoftUserId: string;
diff --git a/src/app/login/login-home/login-home.component.html b/src/app/login/login-home/login-home.component.html
index afc553f51f7..e73cfa514eb 100644
--- a/src/app/login/login-home/login-home.component.html
+++ b/src/app/login/login-home/login-home.component.html
@@ -13,32 +13,28 @@
Sign in to WISE
work. We apologize for the inconvenience.
}
-
-
- Username
-
-
-
-
-
- Password
-
-
-
+
+ Username
+
+
+
+ Password
+
+
@if (isRecaptchaEnabled) {
This site is protected by reCAPTCHA and the Google
@@ -56,6 +52,35 @@
Sign in to WISE
>
}
}
+ @if (verificationState() === 'confirmVerified') {
+ Your email has been verified.
+ } @else if (verificationState() === 'emailError') {
+
+ There was an error sending the verification email. Please try again later.
+
+ } @else if (verificationState() === 'emailSent') {
+ A verification email has been sent.
+ } @else if (verificationState() === 'unverified') {
+
+ Your email has not been verified. Check your email for a verification link.
+
+ @if (allowResendEmail()) {
+
+ Click here to resend the verification
+ email.
+
+ } @else {
+
+ Please wait to send another verification email ({{ resendEmailWaitSeconds() }}).
+
+ }
+ } @else if (verificationState() === 'verificationError') {
+
+ Your account could not be verified. Make sure you click the link sent to your email.
+
+ }
}
- You should receive an email with your account details shortly.
+ @if (!socialAccount) {
+ To sign in, you must verify your account.
+
+ You should receive an email shortly with instructions to complete your registration.
+
+ } @else {
+ You should receive an email with your account details shortly.
+ }
- @if (!socialAccount) {
- Sign In to Get Started
- }
@if (isUsingGoogleId) {
{
+ return this.http.get(this.checkVerifiedUrl, {
+ params: new HttpParams().set('username', username)
+ });
+ }
+
retrieveUserPromise(): Promise {
return this.retrieveUser().toPromise();
}
diff --git a/src/messages.xlf b/src/messages.xlf
index 84a11c314db..7f586ec6ab4 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -2455,7 +2455,7 @@
src/app/login/login-home/login-home.component.html
- 44,48
+ 40,44
src/app/register/register-student-form/register-student-form.component.html
@@ -3271,7 +3271,7 @@
src/app/login/login-home/login-home.component.html
- 70,74
+ 95,99
src/app/modules/mobile-menu/mobile-menu.component.html
@@ -3402,7 +3402,7 @@
src/app/login/login-home/login-home.component.html
- 18,21
+ 17,21
src/app/student/account/edit-profile/edit-profile.component.html
@@ -3801,7 +3801,7 @@
src/app/login/login-home/login-home.component.html
- 31,34
+ 28,32
src/app/register/register-user-form/register-user-form.component.ts
@@ -5663,14 +5663,14 @@
There was an error saving data. Please log in again. You may need to re-do your recent work. We apologize for the inconvenience.
src/app/login/login-home/login-home.component.html
- 12,17
+ 12,16
Recaptcha failed. Please reload the page and try again!
src/app/login/login-home/login-home.component.html
- 55,61
+ 51,55
src/app/register/register-student-form/register-student-form.component.html
@@ -5681,11 +5681,60 @@
160,164
+
+ Your email has been verified.
+
+ src/app/login/login-home/login-home.component.html
+ 56,58
+
+
+
+ There was an error sending the verification email. Please try again later.
+
+ src/app/login/login-home/login-home.component.html
+ 59,61
+
+
+
+ A verification email has been sent.
+
+ src/app/login/login-home/login-home.component.html
+ 62,64
+
+
+
+ Your email has not been verified. Check your email for a verification link.
+
+ src/app/login/login-home/login-home.component.html
+ 66,70
+
+
+
+ Click here to resend the verification email.
+
+ src/app/login/login-home/login-home.component.html
+ 71,73
+
+
+
+ Please wait to send another verification email ().
+
+ src/app/login/login-home/login-home.component.html
+ 76,78
+
+
+
+ Your account could not be verified. Make sure you click the link sent to your email.
+
+ src/app/login/login-home/login-home.component.html
+ 81,86
+
+
Sign in with Google
src/app/login/login-home/login-home.component.html
- 86,90
+ 111,115
src/app/register/register-google-user-already-exists/register-google-user-already-exists.component.html
@@ -5697,14 +5746,14 @@
src/app/register/register-teacher-complete/register-teacher-complete.component.html
- 24,28
+ 28,32
Sign in with Microsoft
src/app/login/login-home/login-home.component.html
- 99,103
+ 124,128
src/app/register/register-microsoft-user-already-exists/register-microsoft-user-already-exists.component.html
@@ -5716,21 +5765,21 @@
src/app/register/register-teacher-complete/register-teacher-complete.component.html
- 36,41
+ 40,45
Forgot username or password?
src/app/login/login-home/login-home.component.html
- 108,109
+ 133,134
New to WISE? Join for free!
src/app/login/login-home/login-home.component.html
- 109,110
+ 134,135
@@ -6935,7 +6984,7 @@
src/app/register/register-teacher-complete/register-teacher-complete.component.html
- 22,24
+ 26,28
src/app/student/account/edit-profile/edit-profile.component.html
@@ -7844,7 +7893,7 @@
src/app/register/register-teacher-complete/register-teacher-complete.component.html
- 35,37
+ 39,41
@@ -7871,10 +7920,6 @@
src/app/register/register-student-complete/register-student-complete.component.html
15,19
-
- src/app/register/register-teacher-complete/register-teacher-complete.component.html
- 13,17
-
Create Student Account
@@ -8012,11 +8057,25 @@
31,36
+
+ To sign in, you must verify your account.
+
+ src/app/register/register-teacher-complete/register-teacher-complete.component.html
+ 11,13
+
+
+
+ You should receive an email shortly with instructions to complete your registration.
+
+ src/app/register/register-teacher-complete/register-teacher-complete.component.html
+ 13,16
+
+
You should receive an email with your account details shortly.
src/app/register/register-teacher-complete/register-teacher-complete.component.html
- 10,13
+ 16,21