From a151f40e3b405a74d7c774097671de0fb0c8fa5d Mon Sep 17 00:00:00 2001 From: jaasen-livefront Date: Tue, 17 Sep 2024 13:47:46 -0700 Subject: [PATCH] revert type changes --- libs/angular/src/utils/extension-refresh-swap.ts | 1 - libs/common/src/tools/send/models/view/send.view.ts | 1 - .../src/tools/send/services/send-api.service.abstraction.ts | 3 +-- .../src/tools/send/services/send.service.abstraction.ts | 6 +++--- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libs/angular/src/utils/extension-refresh-swap.ts b/libs/angular/src/utils/extension-refresh-swap.ts index 1f5433feab..6512be032d 100644 --- a/libs/angular/src/utils/extension-refresh-swap.ts +++ b/libs/angular/src/utils/extension-refresh-swap.ts @@ -23,7 +23,6 @@ export function extensionRefreshSwap( defaultComponent, refreshedComponent, async () => { - return true; const configService = inject(ConfigService); return configService.getFeatureFlag(FeatureFlag.ExtensionRefresh); }, diff --git a/libs/common/src/tools/send/models/view/send.view.ts b/libs/common/src/tools/send/models/view/send.view.ts index 07e579d4e8..451a15d414 100644 --- a/libs/common/src/tools/send/models/view/send.view.ts +++ b/libs/common/src/tools/send/models/view/send.view.ts @@ -26,7 +26,6 @@ export class SendView implements View { password: string = null; disabled = false; hideEmail = false; - hideText = false; constructor(s?: Send) { if (!s) { diff --git a/libs/common/src/tools/send/services/send-api.service.abstraction.ts b/libs/common/src/tools/send/services/send-api.service.abstraction.ts index 270123c4c1..100985c487 100644 --- a/libs/common/src/tools/send/services/send-api.service.abstraction.ts +++ b/libs/common/src/tools/send/services/send-api.service.abstraction.ts @@ -8,7 +8,6 @@ import { SendFileDownloadDataResponse } from "../models/response/send-file-downl import { SendFileUploadDataResponse } from "../models/response/send-file-upload-data.response"; import { SendResponse } from "../models/response/send.response"; import { SendAccessView } from "../models/view/send-access.view"; -import { SendView } from "../models/view/send.view"; export abstract class SendApiService { getSend: (id: string) => Promise; @@ -37,5 +36,5 @@ export abstract class SendApiService { renewSendFileUploadUrl: (sendId: string, fileId: string) => Promise; removePassword: (id: string) => Promise; delete: (id: string) => Promise; - save: (sendData: [Send, EncArrayBuffer]) => Promise; + save: (sendData: [Send, EncArrayBuffer]) => Promise; } diff --git a/libs/common/src/tools/send/services/send.service.abstraction.ts b/libs/common/src/tools/send/services/send.service.abstraction.ts index bee773be93..4fa927942c 100644 --- a/libs/common/src/tools/send/services/send.service.abstraction.ts +++ b/libs/common/src/tools/send/services/send.service.abstraction.ts @@ -4,7 +4,7 @@ import { UserKeyRotationDataProvider } from "@bitwarden/auth/common"; import { EncArrayBuffer } from "../../../platform/models/domain/enc-array-buffer"; import { SymmetricCryptoKey } from "../../../platform/models/domain/symmetric-crypto-key"; -import { SendId, UserId } from "../../../types/guid"; +import { UserId } from "../../../types/guid"; import { UserKey } from "../../../types/key"; import { SendData } from "../models/data/send.data"; import { Send } from "../models/domain/send"; @@ -54,7 +54,7 @@ export abstract class SendService implements UserKeyRotationDataProvider Promise>; + upsert: (send: SendData | SendData[]) => Promise; replace: (sends: { [id: string]: SendData }, userId: UserId) => Promise; - delete: (id: string | string[]) => Promise; + delete: (id: string | string[]) => Promise; }