Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-10-28 07:49:41 +01:00
Code Issues Projects Releases Wiki Activity

Fix test and storybook failures

Browse Source
This commit is contained in:
Thomas Rittson 2024-10-28 12:47:09 +10:00
parent 8b21ad25aa
commit e99d221dba
No known key found for this signature in database
GPG Key ID: CDDDA03861C35E27
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/browser/src/background/main.background.ts
View File

@ -1275,6 +1275,7 @@ export default class MainBackground {
this.cipherAuthorizationService = new DefaultCipherAuthorizationService(
this.collectionService,
this.organizationService,
this.accountService,
);
}

3
apps/browser/src/vault/popup/components/vault/collections.component.ts
View File

@ -8,7 +8,6 @@ import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/ang
import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { ToastService } from "@bitwarden/components";
@ -27,7 +26,6 @@ export class CollectionsComponent extends BaseCollectionsComponent implements On
organizationService: OrganizationService,
private route: ActivatedRoute,
private location: Location,
logService: LogService,
accountService: AccountService,
toastService: ToastService,
) {
@ -37,7 +35,6 @@ export class CollectionsComponent extends BaseCollectionsComponent implements On
i18nService,
cipherService,
organizationService,
logService,
accountService,
toastService,
);

1
apps/cli/src/service-container/service-container.ts
View File

@ -815,6 +815,7 @@ export class ServiceContainer {
this.cipherAuthorizationService = new DefaultCipherAuthorizationService(
this.collectionService,
this.organizationService,
this.accountService,
);
}

2
libs/admin-console/src/common/collections/services/default-collection.service.spec.ts
View File

@ -106,10 +106,12 @@ describe("DefaultCollectionService", () => {
expect(encryptService.decryptToUtf8).toHaveBeenCalledWith(
expect.objectContaining(new EncString(collection1.name)),
orgKey1,
expect.any(String),
);
expect(encryptService.decryptToUtf8).toHaveBeenCalledWith(
expect.objectContaining(new EncString(collection2.name)),
orgKey2,
expect.any(String),
);
});

2
libs/angular/src/admin-console/components/collections.component.ts
View File

@ -7,7 +7,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
@ -36,7 +35,6 @@ export class CollectionsComponent implements OnInit {
protected i18nService: I18nService,
protected cipherService: CipherService,
protected organizationService: OrganizationService,
private logService: LogService,
private accountService: AccountService,
private toastService: ToastService,
) {}

2
libs/common/src/platform/misc/rxjs-operators.spec.ts
View File

@ -22,7 +22,7 @@ describe("custom rxjs operators", () => {
const output = await firstValueFrom(getById(2)(of(input)));
expect(output).toEqual([{ id: 1, data: "one" }]);
expect(output).toEqual({ id: 2, data: "two" });
});
});