bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-12 22:33:23 +00:00
Code Issues Releases Wiki Activity

Check encKey when importing encrypted JSON (#968)

Browse Source 
* Check encKey when importing encrypted JSON

* bump jslib
This commit is contained in:
Thomas Rittson
2021-05-13 11:22:26 +10:00
committed by GitHub
parent 4c1e36462c
commit 7f9f6d3d0e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: 1e2c56cacf...306aef73d4

4
src/app/services/services.module.ts
View File

@@ -129,9 +129,9 @@ const containerService = new ContainerService(cryptoService);
const authService = new AuthService(cryptoService, apiService,
userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService, vaultTimeoutService,
consoleLogService);
const exportService = new ExportService(folderService, cipherService, apiService);
const exportService = new ExportService(folderService, cipherService, apiService, cryptoService);
const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService,
platformUtilsService);
platformUtilsService, cryptoService);
const notificationsService = new NotificationsService(userService, syncService, appIdService,
apiService, vaultTimeoutService, async () => messagingService.send('logout', { expired: true }), consoleLogService);
const environmentService = new EnvironmentService(apiService, storageService, notificationsService);

3
src/locales/en/messages.json
View File

@@ -1036,6 +1036,9 @@
"importNothingError": {
"message": "Nothing was imported."
},
"importEncKeyError": {
"message": "Error decrypting the exported file. Your encryption key does not match the encryption key used export the data."
},
"selectFormat": {
"message": "Select the format of the import file"
},