1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-10 13:23:34 +00:00

[PM-11619] Replace client-side feature flag with server-side flag (#10709)

This commit is contained in:
Todd Martin
2024-09-06 09:25:15 -04:00
committed by GitHub
parent f0fe397307
commit 03b3345bf6
18 changed files with 27 additions and 53 deletions

View File

@@ -166,7 +166,7 @@ describe("Cipher Service", () => {
);
configService.checkServerMeetsVersionRequirement$.mockReturnValue(of(false));
setEncryptionKeyFlag(false);
configService.getFeatureFlag.mockResolvedValue(false);
const spy = jest.spyOn(cipherFileUploadService, "upload");
@@ -298,16 +298,16 @@ describe("Cipher Service", () => {
});
describe("cipher.key", () => {
it("is null when enableCipherKeyEncryption flag is false", async () => {
setEncryptionKeyFlag(false);
it("is null when feature flag is false", async () => {
configService.getFeatureFlag.mockResolvedValue(false);
const cipher = await cipherService.encrypt(cipherView, userId);
expect(cipher.key).toBeNull();
});
it("is defined when enableCipherKeyEncryption flag is true", async () => {
setEncryptionKeyFlag(true);
it("is defined when feature flag flag is true", async () => {
configService.getFeatureFlag.mockResolvedValue(true);
const cipher = await cipherService.encrypt(cipherView, userId);
@@ -320,16 +320,16 @@ describe("Cipher Service", () => {
jest.spyOn<any, string>(cipherService, "encryptCipherWithCipherKey");
});
it("is not called when enableCipherKeyEncryption is false", async () => {
setEncryptionKeyFlag(false);
it("is not called when feature flag is false", async () => {
configService.getFeatureFlag.mockResolvedValue(false);
await cipherService.encrypt(cipherView, userId);
expect(cipherService["encryptCipherWithCipherKey"]).not.toHaveBeenCalled();
});
it("is called when enableCipherKeyEncryption is true", async () => {
setEncryptionKeyFlag(true);
it("is called when feature flag is true", async () => {
configService.getFeatureFlag.mockResolvedValue(true);
await cipherService.encrypt(cipherView, userId);
@@ -345,7 +345,7 @@ describe("Cipher Service", () => {
let encryptedKey: EncString;
beforeEach(() => {
setEncryptionKeyFlag(true);
configService.getFeatureFlag.mockResolvedValue(true);
configService.checkServerMeetsVersionRequirement$.mockReturnValue(of(true));
searchService.indexedEntityId$ = of(null);
@@ -398,9 +398,3 @@ describe("Cipher Service", () => {
});
});
});
function setEncryptionKeyFlag(value: boolean) {
process.env.FLAGS = JSON.stringify({
enableCipherKeyEncryption: value,
});
}