Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00
Code Issues Projects Releases Wiki Activity

Update jslib (#942)

Browse Source 
* Update jslib

* stub out new platformUtilsService method

* Throw not implemented

* Update jslib

* This interface method was reverted
This commit is contained in:
Matt Gibson 2021-04-21 14:20:20 -05:00 committed by GitHub
parent 6e4782784c
commit 3e8194a3f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 66eec2b02260ce41227e83153020f561d105b1ba Subproject commit 3c872e56f27ae78fb922b765d7601886b5c39f78

4
src/app/organizations/manage/collection-add-edit.component.ts
View File

@ -14,7 +14,7 @@ import { I18nService } from 'jslib/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { UserService } from 'jslib/abstractions/user.service'; import { UserService } from 'jslib/abstractions/user.service';
import { CipherString } from 'jslib/models/domain/cipherString'; import { EncString } from 'jslib/models/domain/encString';
import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey';
import { CollectionRequest } from 'jslib/models/request/collectionRequest'; import { CollectionRequest } from 'jslib/models/request/collectionRequest';
import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest'; import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest';
@ -63,7 +63,7 @@ export class CollectionAddEditComponent implements OnInit {
this.title = this.i18nService.t('editCollection'); this.title = this.i18nService.t('editCollection');
try { try {
const collection = await this.apiService.getCollectionDetails(this.organizationId, this.collectionId); const collection = await this.apiService.getCollectionDetails(this.organizationId, this.collectionId);
this.name = await this.cryptoService.decryptToUtf8(new CipherString(collection.name), this.orgKey); this.name = await this.cryptoService.decryptToUtf8(new EncString(collection.name), this.orgKey);
this.externalId = collection.externalId; this.externalId = collection.externalId;
if (collection.groups != null && this.groups.length > 0) { if (collection.groups != null && this.groups.length > 0) {
collection.groups.forEach(s => { collection.groups.forEach(s => {

6
src/app/settings/change-password.component.ts
View File

@ -19,7 +19,7 @@ import {
import { EmergencyAccessStatusType } from 'jslib/enums/emergencyAccessStatusType'; import { EmergencyAccessStatusType } from 'jslib/enums/emergencyAccessStatusType';
import { Utils } from 'jslib/misc/utils'; import { Utils } from 'jslib/misc/utils';
import { CipherString } from 'jslib/models/domain/cipherString'; import { EncString } from 'jslib/models/domain/encString';
import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey';
import { CipherWithIdRequest } from 'jslib/models/request/cipherWithIdRequest'; import { CipherWithIdRequest } from 'jslib/models/request/cipherWithIdRequest';
@ -108,7 +108,7 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
} }
async performSubmitActions(newMasterPasswordHash: string, newKey: SymmetricCryptoKey, async performSubmitActions(newMasterPasswordHash: string, newKey: SymmetricCryptoKey,
newEncKey: [SymmetricCryptoKey, CipherString]) { newEncKey: [SymmetricCryptoKey, EncString]) {
const request = new PasswordRequest(); const request = new PasswordRequest();
request.masterPasswordHash = await this.cryptoService.hashPassword(this.currentMasterPassword, null); request.masterPasswordHash = await this.cryptoService.hashPassword(this.currentMasterPassword, null);
request.newMasterPasswordHash = newMasterPasswordHash; request.newMasterPasswordHash = newMasterPasswordHash;
@ -136,7 +136,7 @@ export class ChangePasswordComponent extends BaseChangePasswordComponent {
private async updateKey(key: SymmetricCryptoKey, masterPasswordHash: string) { private async updateKey(key: SymmetricCryptoKey, masterPasswordHash: string) {
const encKey = await this.cryptoService.makeEncKey(key); const encKey = await this.cryptoService.makeEncKey(key);
const privateKey = await this.cryptoService.getPrivateKey(); const privateKey = await this.cryptoService.getPrivateKey();
let encPrivateKey: CipherString = null; let encPrivateKey: EncString = null;
if (privateKey != null) { if (privateKey != null) {
encPrivateKey = await this.cryptoService.encrypt(privateKey, encKey[0]); encPrivateKey = await this.cryptoService.encrypt(privateKey, encKey[0]);
} }

4
src/app/settings/update-key.component.ts
View File

@ -13,7 +13,7 @@ import { I18nService } from 'jslib/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib/abstractions/messaging.service';
import { SyncService } from 'jslib/abstractions/sync.service'; import { SyncService } from 'jslib/abstractions/sync.service';
import { CipherString } from 'jslib/models/domain/cipherString'; import { EncString } from 'jslib/models/domain/encString';
import { CipherWithIdRequest } from 'jslib/models/request/cipherWithIdRequest'; import { CipherWithIdRequest } from 'jslib/models/request/cipherWithIdRequest';
import { FolderWithIdRequest } from 'jslib/models/request/folderWithIdRequest'; import { FolderWithIdRequest } from 'jslib/models/request/folderWithIdRequest';
@ -64,7 +64,7 @@ export class UpdateKeyComponent {
const key = await this.cryptoService.getKey(); const key = await this.cryptoService.getKey();
const encKey = await this.cryptoService.makeEncKey(key); const encKey = await this.cryptoService.makeEncKey(key);
const privateKey = await this.cryptoService.getPrivateKey(); const privateKey = await this.cryptoService.getPrivateKey();
let encPrivateKey: CipherString = null; let encPrivateKey: EncString = null;
if (privateKey != null) { if (privateKey != null) {
encPrivateKey = await this.cryptoService.encrypt(privateKey, encKey[0]); encPrivateKey = await this.cryptoService.encrypt(privateKey, encKey[0]);
} }