{{'removeMasterPassword' | i18n}}
+{{'convertOrganizationEncryptionDesc' | i18n : organization.name}}
+ +diff --git a/jslib b/jslib index 2db9e1ce..8f177e2d 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 2db9e1ce0d7a702f07f20ecb916dd8191ff617e1 +Subproject commit 8f177e2d3a879b854db5c6e6d7d386b24d637a66 diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts index f74012f4..2f0db827 100644 --- a/src/app/accounts/lock.component.ts +++ b/src/app/accounts/lock.component.ts @@ -13,6 +13,7 @@ import { ApiService } from 'jslib-common/abstractions/api.service'; import { CryptoService } from 'jslib-common/abstractions/crypto.service'; import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service'; +import { KeyConnectorService } from 'jslib-common/abstractions/keyConnector.service'; import { LogService } from 'jslib-common/abstractions/log.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; @@ -43,9 +44,10 @@ export class LockComponent extends BaseLockComponent implements OnDestroy { environmentService: EnvironmentService, stateService: StateService, apiService: ApiService, private route: ActivatedRoute, private broadcasterService: BroadcasterService, private ngZone: NgZone, - logService: LogService) { + logService: LogService, keyConnectorService: KeyConnectorService) { super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService, - storageService, vaultTimeoutService, environmentService, stateService, apiService, logService); + storageService, vaultTimeoutService, environmentService, stateService, apiService, logService, + keyConnectorService); } async ngOnInit() { diff --git a/src/app/accounts/remove-password.component.html b/src/app/accounts/remove-password.component.html new file mode 100644 index 00000000..bf2ef627 --- /dev/null +++ b/src/app/accounts/remove-password.component.html @@ -0,0 +1,18 @@ +
{{'convertOrganizationEncryptionDesc' | i18n : organization.name}}
+ +