diff --git a/jslib b/jslib index e55528e617..700e945008 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit e55528e61737635e7f8970b913bcc3f10bede85d +Subproject commit 700e945008edb38543d619e9dd4543908c057f5c diff --git a/src/popup/accounts/set-password.component.html b/src/popup/accounts/set-password.component.html index 91fd86250b..53ebcbd33a 100644 --- a/src/popup/accounts/set-password.component.html +++ b/src/popup/accounts/set-password.component.html @@ -14,92 +14,98 @@ -
- {{'ssoCompleteRegistration' | i18n}} - - {{'masterPasswordPolicyInEffect' | i18n}} -
    -
  • - {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}} -
    • -
  • - {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}} -
    • -
  • {{'policyInEffectUppercase' | i18n}}
    • -
  • {{'policyInEffectLowercase' | i18n}}
    • -
  • {{'policyInEffectNumbers' | i18n}}
    • -
  • {{'policyInEffectSpecial' | 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}} -
- \ No newline at end of file + diff --git a/src/popup/accounts/set-password.component.ts b/src/popup/accounts/set-password.component.ts index ee0da49e57..85a71ee99a 100644 --- a/src/popup/accounts/set-password.component.ts +++ b/src/popup/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() { @@ -57,4 +59,4 @@ export class SetPasswordComponent extends BaseSetPasswordComponent { return this.masterPasswordScore != null ? this.i18nService.t('weak') : null; } } -} \ No newline at end of file +} diff --git a/src/popup/scss/base.scss b/src/popup/scss/base.scss index 69e1a48e15..fed10df6df 100644 --- a/src/popup/scss/base.scss +++ b/src/popup/scss/base.scss @@ -368,7 +368,7 @@ content { } } -.center-content, .no-items { +.center-content, .no-items, .full-loading-spinner { display: flex; justify-content: center; align-items: center; @@ -377,7 +377,7 @@ content { flex-grow: 1; } -.no-items { +.no-items, .full-loading-spinner { text-align: center; .fa { diff --git a/src/popup/services/services.module.ts b/src/popup/services/services.module.ts index dc5605e06f..526eff1fe3 100644 --- a/src/popup/services/services.module.ts +++ b/src/popup/services/services.module.ts @@ -20,6 +20,7 @@ import { AuditService } from 'jslib/abstractions/audit.service'; import { AuthService as AuthServiceAbstraction } from 'jslib/abstractions/auth.service'; import { CipherService } from 'jslib/abstractions/cipher.service'; import { CollectionService } from 'jslib/abstractions/collection.service'; +import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service'; import { CryptoService } from 'jslib/abstractions/crypto.service'; import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { EventService } from 'jslib/abstractions/event.service'; @@ -123,6 +124,11 @@ export function initFactory(i18nService: I18nService, storageService: StorageSer { provide: SearchServiceAbstraction, useValue: searchService }, { provide: AuditService, useFactory: getBgService('auditService'), deps: [] }, { provide: CipherService, useFactory: getBgService('cipherService'), deps: [] }, + { + provide: CryptoFunctionService, + useFactory: getBgService('cryptoFunctionService'), + deps: [], + }, { provide: FolderService, useFactory: getBgService('folderService'), deps: [] }, { provide: CollectionService, useFactory: getBgService('collectionService'), deps: [] }, { provide: EnvironmentService, useFactory: getBgService('environmentService'), deps: [] },