bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-10 21:33:17 +00:00
Code Issues Releases Wiki Activity

Merge commit '8b2dfc6cdcb8ff5b604364c2ea6d343473aee7cd' into feature/workspaces

Browse Source 
# Conflicts:
#	common/spec/importers/fsecureFskImporter.spec.ts
#	common/spec/services/cipher.service.spec.ts
#	package-lock.json
#	package.json
This commit is contained in:
Hinton
2022-01-03 12:46:02 +01:00
parent df94c8022e 8b2dfc6cdc
commit d68d4b4bdc
108 changed files with 11516 additions and 8636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/spec/services/cipher.service.spec.ts
View File

@@ -7,8 +7,8 @@ import { I18nService } from 'src/abstractions/i18n.service';
import { LogService } from 'src/abstractions/log.service';
import { SearchService } from 'src/abstractions/search.service';
import { SettingsService } from 'src/abstractions/settings.service';
import { StorageService } from 'src/abstractions/storage.service';
import { UserService } from 'src/abstractions/user.service';
import { StateService } from 'src/abstractions/state.service';
import { Utils } from 'src/misc/utils';
import { Cipher } from 'src/models/domain/cipher';
import { EncArrayBuffer } from 'src/models/domain/encArrayBuffer';
@@ -22,11 +22,10 @@ const ENCRYPTED_BYTES = new EncArrayBuffer(Utils.fromUtf8ToArray(ENCRYPTED_TEXT)
describe('Cipher Service', () => {
let cryptoService: SubstituteOf<CryptoService>;
let userService: SubstituteOf<UserService>;
let stateService: SubstituteOf<StateService>;
let settingsService: SubstituteOf<SettingsService>;
let apiService: SubstituteOf<ApiService>;
let fileUploadService: SubstituteOf<FileUploadService>;
let storageService: SubstituteOf<StorageService>;
let i18nService: SubstituteOf<I18nService>;
let searchService: SubstituteOf<SearchService>;
let logService: SubstituteOf<LogService>;
@@ -35,11 +34,10 @@ describe('Cipher Service', () => {
beforeEach(() => {
cryptoService = Substitute.for<CryptoService>();
userService = Substitute.for<UserService>();
stateService = Substitute.for<StateService>();
settingsService = Substitute.for<SettingsService>();
apiService = Substitute.for<ApiService>();
fileUploadService = Substitute.for<FileUploadService>();
storageService = Substitute.for<StorageService>();
i18nService = Substitute.for<I18nService>();
searchService = Substitute.for<SearchService>();
logService = Substitute.for<LogService>();
@@ -47,12 +45,11 @@ describe('Cipher Service', () => {
cryptoService.encryptToBytes(Arg.any(), Arg.any()).resolves(ENCRYPTED_BYTES);
cryptoService.encrypt(Arg.any(), Arg.any()).resolves(new EncString(ENCRYPTED_TEXT));
cipherService = new CipherService(cryptoService, userService, settingsService, apiService, fileUploadService,
storageService, i18nService, () => searchService, logService);
cipherService = new CipherService(cryptoService, settingsService, apiService, fileUploadService,
i18nService, () => searchService, logService, stateService);
});
it('attachments upload encrypted file contents', async () => {
const key = new SymmetricCryptoKey(new Uint8Array(32).buffer);
const fileName = 'filename';
const fileData = new Uint8Array(10).buffer;
cryptoService.getOrgKey(Arg.any()).resolves(new SymmetricCryptoKey(new Uint8Array(32).buffer));