Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-27 12:36:14 +01:00
Code Issues Projects 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 1e2c56cacf975eab4527cb3c1a63cf8136b58bd4 Subproject commit 306aef73d459dfad8a7a06c32442c9ed2d56922e

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

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

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

@ -1036,6 +1036,9 @@
"importNothingError": { "importNothingError": {
"message": "Nothing was imported." "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": { "selectFormat": {
"message": "Select the format of the import file" "message": "Select the format of the import file"
}, },