From 0576d2b119edd65a8cc4f85dab42a251ae53e5bb Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Fri, 28 Aug 2020 10:21:35 -0500 Subject: [PATCH] [SSO] Add set password placeholder (#529) * Update jslib (6ab444a -> 700e945) * Fixing jslib changes // adding loading placeholder --- jslib | 2 +- src/app/accounts/set-password.component.html | 177 ++++++++++--------- src/app/accounts/set-password.component.ts | 6 +- 3 files changed, 97 insertions(+), 88 deletions(-) diff --git a/jslib b/jslib index 6ab444a9..700e9450 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 6ab444a9868c32ac53761f9d233d816744da9a1d +Subproject commit 700e945008edb38543d619e9dd4543908c057f5c diff --git a/src/app/accounts/set-password.component.html b/src/app/accounts/set-password.component.html index ccae85a8..eeddc204 100644 --- a/src/app/accounts/set-password.component.html +++ b/src/app/accounts/set-password.component.html @@ -2,104 +2,111 @@
Bitwarden

{{'setMasterPassword' | i18n}}

-
- {{'ssoCompleteRegistration' | i18n}} - - {{'masterPasswordPolicyInEffect' | i18n}} -
    -
  • - {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}} -
    • -
  • - {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}} -
    • -
  • {{'policyInEffectUppercase' | i18n}}
    • -
  • {{'policyInEffectLowercase' | i18n}}
    • -
  • {{'policyInEffectNumbers' | i18n}}
    • -
  • {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}} -
    • -
- +
+ + {{'loading' | i18n}}
-
+
-
-
-
-
- - + {{'ssoCompleteRegistration' | i18n}} + + {{'masterPasswordPolicyInEffect' | i18n}} +
    +
  • + {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}} +
    • +
  • + {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}} +
    • +
  • {{'policyInEffectUppercase' | i18n}}
    • +
  • {{'policyInEffectLowercase' | i18n}}
    • +
  • {{'policyInEffectNumbers' | i18n}}
    • +
  • + {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}} +
    • +
+ +
+ +
+
+
+
+
+ + +
+
+ + + +
-
- - - +
+
+
-
-
+
+
+ {{'masterPassDesc' | i18n}} +
+
+
+
+
+
+
+ + +
+
+ + + +
-
- {{'masterPassDesc' | i18n}} -
-
-
-
-
-
-
- - -
-
- - - -
+
+
+
+ +
-
-
-
-
-
- - +
+ {{'masterPassHintDesc' | i18n}}
-
- {{'masterPassHintDesc' | i18n}} +
+ +
-
-
- - -
- + +
diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts index a36e7d04..85a71ee9 100644 --- a/src/app/accounts/set-password.component.ts +++ b/src/app/accounts/set-password.component.ts @@ -9,6 +9,7 @@ import { MessagingService } from 'jslib/abstractions/messaging.service'; import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PolicyService } from 'jslib/abstractions/policy.service'; +import { SyncService } from 'jslib/abstractions/sync.service'; import { UserService } from 'jslib/abstractions/user.service'; import { @@ -23,9 +24,10 @@ export class SetPasswordComponent extends BaseSetPasswordComponent { constructor(apiService: ApiService, i18nService: I18nService, cryptoService: CryptoService, messagingService: MessagingService, userService: UserService, passwordGenerationService: PasswordGenerationService, - platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router) { + platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router, + syncService: SyncService) { super(i18nService, cryptoService, messagingService, userService, passwordGenerationService, - platformUtilsService, policyService, router, apiService); + platformUtilsService, policyService, router, apiService, syncService); } get masterPasswordScoreWidth() {