bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

remove old EncKey methods from crypto service

Browse Source
This commit is contained in:
Jacob Fink
2023-06-09 08:52:02 -04:00
parent d79f2e24be
commit 42db4eb0ac
6 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/src/app/settings/change-email.component.ts
View File

@@ -42,8 +42,8 @@ export class ChangeEmailComponent implements OnInit {
} }
async submit() { async submit() {
const hasEncKey = await this.cryptoService.hasEncKey(); const hasUserKey = await this.cryptoService.hasUserKey();
if (!hasEncKey) { if (!hasUserKey) {
this.platformUtilsService.showToast("error", null, this.i18nService.t("updateKey")); this.platformUtilsService.showToast("error", null, this.i18nService.t("updateKey"));
return; return;
} }

4
apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts
View File

@@ -46,8 +46,8 @@ export class ChangeKdfConfirmationComponent {
async submit() { async submit() {
this.loading = true; this.loading = true;
const hasEncKey = await this.cryptoService.hasEncKey(); const hasUserKey = await this.cryptoService.hasUserKey();
if (!hasEncKey) { if (!hasUserKey) {
this.platformUtilsService.showToast("error", null, this.i18nService.t("updateKey")); this.platformUtilsService.showToast("error", null, this.i18nService.t("updateKey"));
return; return;
} }

2
apps/web/src/app/vault/individual-vault/vault.component.ts
View File

@@ -195,7 +195,7 @@ export class VaultComponent implements OnInit, OnDestroy {
const canAccessPremium = await this.stateService.getCanAccessPremium(); const canAccessPremium = await this.stateService.getCanAccessPremium();
this.showPremiumCallout = this.showPremiumCallout =
!this.showVerifyEmail && !canAccessPremium && !this.platformUtilsService.isSelfHost(); !this.showVerifyEmail && !canAccessPremium && !this.platformUtilsService.isSelfHost();
this.showUpdateKey = !(await this.cryptoService.hasEncKey()); this.showUpdateKey = !(await this.cryptoService.hasUserKey());
const cipherId = getCipherIdFromParams(params); const cipherId = getCipherIdFromParams(params);
if (!cipherId) { if (!cipherId) {

2
libs/angular/src/vault/components/attachments.component.ts
View File

@@ -192,7 +192,7 @@ export class AttachmentsComponent implements OnInit {
this.cipherDomain = await this.loadCipher(); this.cipherDomain = await this.loadCipher();
this.cipher = await this.cipherDomain.decrypt(); this.cipher = await this.cipherDomain.decrypt();
this.hasUpdatedKey = await this.cryptoService.hasEncKey(); this.hasUpdatedKey = await this.cryptoService.hasUserKey();
const canAccessPremium = await this.stateService.getCanAccessPremium(); const canAccessPremium = await this.stateService.getCanAccessPremium();
this.canAccessAttachments = canAccessPremium || this.cipher.organizationId != null; this.canAccessAttachments = canAccessPremium || this.cipher.organizationId != null;

2
libs/common/src/platform/abstractions/crypto.service.ts
View File

@@ -119,7 +119,5 @@ export abstract class CryptoService {
decryptToBytes: (encString: EncString, key?: SymmetricCryptoKey) => Promise<ArrayBuffer>; decryptToBytes: (encString: EncString, key?: SymmetricCryptoKey) => Promise<ArrayBuffer>;
decryptToUtf8: (encString: EncString, key?: SymmetricCryptoKey) => Promise<string>; decryptToUtf8: (encString: EncString, key?: SymmetricCryptoKey) => Promise<string>;
decryptFromBytes: (encBuffer: EncArrayBuffer, key: SymmetricCryptoKey) => Promise<ArrayBuffer>; decryptFromBytes: (encBuffer: EncArrayBuffer, key: SymmetricCryptoKey) => Promise<ArrayBuffer>;
setEncKey: (encKey: string) => Promise<void>;
hasEncKey: () => Promise<boolean>;
clearEncKey: (memoryOnly?: boolean, userId?: string) => Promise<any>; clearEncKey: (memoryOnly?: boolean, userId?: string) => Promise<any>;
} }

27
libs/common/src/platform/services/crypto.service.ts
View File

@@ -1161,33 +1161,6 @@ export class CryptoService implements CryptoServiceAbstraction {
return this.encryptService.decryptToBytes(encBuffer, key); return this.encryptService.decryptToBytes(encBuffer, key);
} }
/**
* @deprecated use SetUserKey instead
*/
async setEncKey(encKey: string): Promise<void> {
if (encKey == null) {
return;
}
await this.stateService.setDecryptedCryptoSymmetricKey(null);
await this.stateService.setEncryptedCryptoSymmetricKey(encKey);
}
/**
* @deprecated use getUserKey instead
*/
@sequentialize(() => "getEncKey")
getEncKey(key: SymmetricCryptoKey = null): Promise<SymmetricCryptoKey> {
return this.getEncKeyHelper(key);
}
/**
* @deprecated use hasUserKey instead
*/
async hasEncKey(): Promise<boolean> {
return (await this.stateService.getEncryptedCryptoSymmetricKey()) != null;
}
/** /**
* @deprecated use clearKey instead * @deprecated use clearKey instead
*/ */