bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-20 18:23:31 +00:00
Code Issues Releases Wiki Activity

Revert "Use logService for console messages (#214)" (#219)

Browse Source 
This reverts commit 0fed528b6f.
This commit is contained in:
Matt Gibson
2020-12-04 13:58:32 -06:00
committed by GitHub
parent 0fed528b6f
commit 2b8c2c2b3e
10 changed files with 61 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/services/crypto.service.ts
View File

@@ -10,10 +10,8 @@ import { ProfileOrganizationResponse } from '../models/response/profileOrganizat
import { CryptoService as CryptoServiceAbstraction } from '../abstractions/crypto.service';
import { CryptoFunctionService } from '../abstractions/cryptoFunction.service';
import { LogService } from '../abstractions/log.service';
import { PlatformUtilsService } from '../abstractions/platformUtils.service';
import { StorageService } from '../abstractions/storage.service';
import { ConsoleLogService } from '../services/consoleLog.service';
import { ConstantsService } from './constants.service';
@@ -39,12 +37,7 @@ export class CryptoService implements CryptoServiceAbstraction {
private orgKeys: Map<string, SymmetricCryptoKey>;
constructor(private storageService: StorageService, private secureStorageService: StorageService,
private cryptoFunctionService: CryptoFunctionService, private platformUtilService: PlatformUtilsService,
private logService?: LogService) {
if (!logService) {
this.logService = new ConsoleLogService(false);
}
}
private cryptoFunctionService: CryptoFunctionService, private platformUtilService: PlatformUtilsService) { }
async setKey(key: SymmetricCryptoKey): Promise<any> {
this.key = key;
@@ -553,12 +546,14 @@ export class CryptoService implements CryptoServiceAbstraction {
const theKey = this.resolveLegacyKey(encType, keyForEnc);
if (theKey.macKey != null && mac == null) {
this.logService.error('mac required.');
// tslint:disable-next-line
console.error('mac required.');
return null;
}
if (theKey.encType !== encType) {
this.logService.error('encType unavailable.');
// tslint:disable-next-line
console.error('encType unavailable.');
return null;
}
@@ -568,7 +563,8 @@ export class CryptoService implements CryptoServiceAbstraction {
fastParams.macKey, 'sha256');
const macsEqual = await this.cryptoFunctionService.compareFast(fastParams.mac, computedMac);
if (!macsEqual) {
this.logService.error('mac failed.');
// tslint:disable-next-line
console.error('mac failed.');
return null;
}
}
@@ -600,7 +596,8 @@ export class CryptoService implements CryptoServiceAbstraction {
const macsMatch = await this.cryptoFunctionService.compare(mac, computedMac);
if (!macsMatch) {
this.logService.error('mac failed.');
// tslint:disable-next-line
console.error('mac failed.');
return null;
}
}