{{'number' | i18n}}
- {{cipher.card.number}}
+ {{cipher.card.maskedNumber}}
+ {{cipher.card.number}}
diff --git a/src/app/vault/view.component.ts b/src/app/vault/view.component.ts
index 5e554234a75..ef3e1463d22 100644
--- a/src/app/vault/view.component.ts
+++ b/src/app/vault/view.component.ts
@@ -14,6 +14,7 @@ import { CryptoService } from 'jslib/abstractions/crypto.service';
import { EventService } from 'jslib/abstractions/event.service';
import { I18nService } from 'jslib/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service';
+import { PasswordRepromptService } from 'jslib/abstractions/passwordReprompt.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { StorageService } from 'jslib/abstractions/storage.service';
import { TokenService } from 'jslib/abstractions/token.service';
@@ -41,9 +42,10 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
auditService: AuditService, broadcasterService: BroadcasterService,
ngZone: NgZone, changeDetectorRef: ChangeDetectorRef,
userService: UserService, eventService: EventService, apiService: ApiService,
- private messagingService: MessagingService, private storageService: StorageService) {
+ private messagingService: MessagingService, passwordRepromptService: PasswordRepromptService) {
super(cipherService, totpService, tokenService, i18nService, cryptoService, platformUtilsService,
- auditService, window, broadcasterService, ngZone, changeDetectorRef, userService, eventService, apiService);
+ auditService, window, broadcasterService, ngZone, changeDetectorRef, userService, eventService,
+ apiService, passwordRepromptService);
}
ngOnInit() {
super.ngOnInit();
@@ -72,7 +74,7 @@ export class ViewComponent extends BaseViewComponent implements OnChanges {
this.onViewCipherPasswordHistory.emit(this.cipher);
}
- copy(value: string, typeI18nKey: string, aType: string) {
+ async copy(value: string, typeI18nKey: string, aType: string) {
super.copy(value, typeI18nKey, aType);
this.messagingService.send('minimizeOnCopy');
}
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index c80c9d04009..00f8ac62e33 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1668,5 +1668,14 @@
},
"emailVerificationRequiredDesc": {
"message": "You must verify your email to use this feature."
+ },
+ "passwordPrompt": {
+ "message": "Master password re-prompt"
+ },
+ "passwordConfirmation": {
+ "message": "Master password confirmation"
+ },
+ "passwordConfirmationDesc": {
+ "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
}
}
diff --git a/src/scss/plugins.scss b/src/scss/plugins.scss
index 71670785016..5a240788adb 100644
--- a/src/scss/plugins.scss
+++ b/src/scss/plugins.scss
@@ -203,4 +203,8 @@ $fa-font-path: "~font-awesome/fonts";
}
}
}
+
+ .swal2-validation-message {
+ margin-top: 20px;
+ }
}
diff --git a/src/services/electronPlatformUtils.service.ts b/src/services/electronPlatformUtils.service.ts
new file mode 100644
index 00000000000..ae1c31bc7d6
--- /dev/null
+++ b/src/services/electronPlatformUtils.service.ts
@@ -0,0 +1,42 @@
+import Swal from 'sweetalert2';
+
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { MessagingService } from 'jslib/abstractions/messaging.service';
+import { StorageService } from 'jslib/abstractions/storage.service';
+import {
+ ElectronPlatformUtilsService as BaseElectronPlatformUtilsService
+} from 'jslib/electron/services/electronPlatformUtils.service';
+
+export class ElectronPlatformUtilsService extends BaseElectronPlatformUtilsService {
+
+ constructor(i18nService: I18nService, messagingService: MessagingService,
+ isDesktopApp: boolean, storageService: StorageService) {
+ super(i18nService, messagingService, isDesktopApp, storageService);
+ }
+
+ async showPasswordDialog(title: string, body: string, passwordValidation: (value: string) => Promise
):
+ Promise {
+ const result = await Swal.fire({
+ heightAuto: false,
+ title: title,
+ input: 'password',
+ text: body,
+ confirmButtonText: this.i18nService.t('ok'),
+ showCancelButton: true,
+ cancelButtonText: this.i18nService.t('cancel'),
+ inputAttributes: {
+ autocapitalize: 'off',
+ autocorrect: 'off',
+ },
+ inputValidator: async (value: string): Promise => {
+ if (await passwordValidation(value)) {
+ return false;
+ }
+
+ return this.i18nService.t('invalidMasterPassword');
+ },
+ });
+
+ return result.isConfirmed;
+ }
+}