+
diff --git a/src/popup/accounts/lock.component.ts b/src/popup/accounts/lock.component.ts
index 09c9bd22fd..e074f8abdd 100644
--- a/src/popup/accounts/lock.component.ts
+++ b/src/popup/accounts/lock.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+ Component,
+ NgZone,
+} from '@angular/core';
import { Router } from '@angular/router';
import Swal from 'sweetalert2';
@@ -8,6 +11,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';
@@ -30,9 +34,11 @@ export class LockComponent extends BaseLockComponent {
userService: UserService, cryptoService: CryptoService,
storageService: StorageService, vaultTimeoutService: VaultTimeoutService,
environmentService: EnvironmentService, stateService: StateService,
- apiService: ApiService, logService: LogService) {
+ apiService: ApiService, logService: LogService, keyConnectorService: KeyConnectorService,
+ ngZone: NgZone) {
super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
- storageService, vaultTimeoutService, environmentService, stateService, apiService, logService);
+ storageService, vaultTimeoutService, environmentService, stateService, apiService, logService,
+ keyConnectorService, ngZone);
this.successRoute = '/tabs/current';
this.isInitialLockScreen = (window as any).previousPopupUrl == null;
}
diff --git a/src/popup/accounts/login.component.ts b/src/popup/accounts/login.component.ts
index 460666e573..e6d1dcef24 100644
--- a/src/popup/accounts/login.component.ts
+++ b/src/popup/accounts/login.component.ts
@@ -1,4 +1,7 @@
-import { Component } from '@angular/core';
+import {
+ Component,
+ NgZone,
+} from '@angular/core';
import { Router } from '@angular/router';
import { AuthService } from 'jslib-common/abstractions/auth.service';
@@ -24,9 +27,9 @@ export class LoginComponent extends BaseLoginComponent {
protected stateService: StateService, protected environmentService: EnvironmentService,
protected passwordGenerationService: PasswordGenerationService,
protected cryptoFunctionService: CryptoFunctionService, storageService: StorageService,
- syncService: SyncService, logService: LogService) {
+ syncService: SyncService, logService: LogService, ngZone: NgZone) {
super(authService, router, platformUtilsService, i18nService, stateService, environmentService,
- passwordGenerationService, cryptoFunctionService, storageService, logService);
+ passwordGenerationService, cryptoFunctionService, storageService, logService, ngZone);
super.onSuccessfulLogin = async () => {
await syncService.fullSync(true);
};
diff --git a/src/popup/accounts/remove-password.component.html b/src/popup/accounts/remove-password.component.html
new file mode 100644
index 0000000000..dcbaac8ade
--- /dev/null
+++ b/src/popup/accounts/remove-password.component.html
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
{{'convertOrganizationEncryptionDesc' | i18n : organization.name}}
+
+
+
+
+
+
+
+
+
' + this.sanitizer.sanitize(SecurityContext.HTML, t) + '
'));
- toast.body = message;
- toast.bodyOutputType = BodyOutputType.TrustedHtml;
+ options.enableHtml = true;
}
if (msg.options != null) {
if (msg.options.trustedHtml === true) {
- toast.bodyOutputType = BodyOutputType.TrustedHtml;
+ options.enableHtml = true;
}
if (msg.options.timeout != null && msg.options.timeout > 0) {
- toast.timeout = msg.options.timeout;
+ options.timeOut = msg.options.timeout;
}
}
- this.toasterService.popAsync(toast);
+
+ this.toastrService.show(message, msg.title, options, 'toast-' + msg.type);
}
private async showDialog(msg: any) {
diff --git a/src/popup/app.module.ts b/src/popup/app.module.ts
index 57aa6a5507..8b7f1258d7 100644
--- a/src/popup/app.module.ts
+++ b/src/popup/app.module.ts
@@ -1,7 +1,6 @@
import { A11yModule } from '@angular/cdk/a11y';
import { DragDropModule } from '@angular/cdk/drag-drop';
import { ScrollingModule } from '@angular/cdk/scrolling';
-import { ToasterModule } from 'angular2-toaster';
import { AppRoutingModule } from './app-routing.module';
import { ServicesModule } from './services/services.module';
@@ -17,6 +16,7 @@ import { HomeComponent } from './accounts/home.component';
import { LockComponent } from './accounts/lock.component';
import { LoginComponent } from './accounts/login.component';
import { RegisterComponent } from './accounts/register.component';
+import { RemovePasswordComponent } from './accounts/remove-password.component';
import { SetPasswordComponent } from './accounts/set-password.component';
import { SsoComponent } from './accounts/sso.component';
import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
@@ -80,9 +80,11 @@ import { PasswordRepromptComponent } from './components/password-reprompt.compon
import { PopOutComponent } from './components/pop-out.component';
import { SendListComponent } from './components/send-list.component';
import { SetPinComponent } from './components/set-pin.component';
+import { VerifyMasterPasswordComponent } from './components/verify-master-password.component';
import { CalloutComponent } from 'jslib-angular/components/callout.component';
import { IconComponent } from 'jslib-angular/components/icon.component';
+import { BitwardenToastModule } from 'jslib-angular/components/toastr.component';
import {
CurrencyPipe,
@@ -186,12 +188,18 @@ registerLocaleData(localeZhTw, 'zh-TW');
ReactiveFormsModule,
ScrollingModule,
ServicesModule,
- ToasterModule.forRoot(),
+ BitwardenToastModule.forRoot({
+ maxOpened: 2,
+ autoDismiss: true,
+ closeButton: true,
+ positionClass: 'toast-bottom-full-width',
+ }),
],
declarations: [
A11yTitleDirective,
ActionButtonsComponent,
AddEditComponent,
+ AddEditCustomFieldsComponent,
ApiActionDirective,
AppComponent,
AttachmentsComponent,
@@ -212,8 +220,8 @@ registerLocaleData(localeZhTw, 'zh-TW');
FolderAddEditComponent,
FoldersComponent,
GroupingsComponent,
- HomeComponent,
HintComponent,
+ HomeComponent,
I18nPipe,
IconComponent,
InputVerbatimDirective,
@@ -223,6 +231,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
PasswordGeneratorComponent,
PasswordGeneratorHistoryComponent,
PasswordHistoryComponent,
+ PasswordRepromptComponent,
PopOutComponent,
PremiumComponent,
PrivateModeComponent,
@@ -235,6 +244,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
SendListComponent,
SendTypeComponent,
SetPasswordComponent,
+ SetPinComponent,
SettingsComponent,
ShareComponent,
SsoComponent,
@@ -243,15 +253,14 @@ registerLocaleData(localeZhTw, 'zh-TW');
SyncComponent,
TabsComponent,
TrueFalseValueDirective,
- TwoFactorOptionsComponent,
TwoFactorComponent,
+ TwoFactorOptionsComponent,
UpdateTempPasswordComponent,
- ViewComponent,
- PasswordRepromptComponent,
- SetPinComponent,
VaultTimeoutInputComponent,
- AddEditCustomFieldsComponent,
+ VerifyMasterPasswordComponent,
+ ViewComponent,
ViewCustomFieldsComponent,
+ RemovePasswordComponent,
],
entryComponents: [],
providers: [
diff --git a/src/popup/components/action-buttons.component.ts b/src/popup/components/action-buttons.component.ts
index 9c0f273fb0..b7cc088ddf 100644
--- a/src/popup/components/action-buttons.component.ts
+++ b/src/popup/components/action-buttons.component.ts
@@ -5,8 +5,6 @@ import {
Output,
} from '@angular/core';
-import { ToasterService } from 'angular2-toaster';
-
import { CipherRepromptType } from 'jslib-common/enums/cipherRepromptType';
import { CipherType } from 'jslib-common/enums/cipherType';
import { EventType } from 'jslib-common/enums/eventType';
@@ -33,7 +31,7 @@ export class ActionButtonsComponent {
cipherType = CipherType;
userHasPremiumAccess = false;
- constructor(private toasterService: ToasterService, private i18nService: I18nService,
+ constructor(private i18nService: I18nService,
private platformUtilsService: PlatformUtilsService, private eventService: EventService,
private totpService: TotpService, private userService: UserService,
private passwordRepromptService: PasswordRepromptService) { }
@@ -63,7 +61,7 @@ export class ActionButtonsComponent {
}
this.platformUtilsService.copyToClipboard(value, { window: window });
- this.toasterService.popAsync('info', null,
+ this.platformUtilsService.showToast('info', null,
this.i18nService.t('valueCopied', this.i18nService.t(typeI18nKey)));
if (typeI18nKey === 'password' || typeI18nKey === 'verificationCodeTotp') {
diff --git a/src/popup/components/set-pin.component.html b/src/popup/components/set-pin.component.html
index bd113f8cc7..06f3a5808b 100644
--- a/src/popup/components/set-pin.component.html
+++ b/src/popup/components/set-pin.component.html
@@ -23,7 +23,7 @@