[PM-24030] Migrate abstract services in libs/common strict TS (#15727)

Migrates the abstract classes in libs/common to be strict ts compatible. Primarily by adding abstract to every field and converting it to a function syntax instead of lambda.

libs/common/src/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction.ts

@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { ListResponse } from "../../../models/response/list.response";
 import { OrganizationDomainRequest } from "../../services/organization-domain/requests/organization-domain.request";
 
@@ -8,19 +6,19 @@ import { OrganizationDomainResponse } from "./responses/organization-domain.resp
 import { VerifiedOrganizationDomainSsoDetailsResponse } from "./responses/verified-organization-domain-sso-details.response";
 
 export abstract class OrgDomainApiServiceAbstraction {
-  getAllByOrgId: (orgId: string) => Promise<Array<OrganizationDomainResponse>>;
-  getByOrgIdAndOrgDomainId: (
+  abstract getAllByOrgId(orgId: string): Promise<Array<OrganizationDomainResponse>>;
+  abstract getByOrgIdAndOrgDomainId(
     orgId: string,
     orgDomainId: string,
-  ) => Promise<OrganizationDomainResponse>;
-  post: (
+  ): Promise<OrganizationDomainResponse>;
+  abstract post(
     orgId: string,
     orgDomain: OrganizationDomainRequest,
-  ) => Promise<OrganizationDomainResponse>;
-  verify: (orgId: string, orgDomainId: string) => Promise<OrganizationDomainResponse>;
-  delete: (orgId: string, orgDomainId: string) => Promise<any>;
-  getClaimedOrgDomainByEmail: (email: string) => Promise<OrganizationDomainSsoDetailsResponse>;
-  getVerifiedOrgDomainsByEmail: (
+  ): Promise<OrganizationDomainResponse>;
+  abstract verify(orgId: string, orgDomainId: string): Promise<OrganizationDomainResponse>;
+  abstract delete(orgId: string, orgDomainId: string): Promise<any>;
+  abstract getClaimedOrgDomainByEmail(email: string): Promise<OrganizationDomainSsoDetailsResponse>;
+  abstract getVerifiedOrgDomainsByEmail(
     email: string,
-  ) => Promise<ListResponse<VerifiedOrganizationDomainSsoDetailsResponse>>;
+  ): Promise<ListResponse<VerifiedOrganizationDomainSsoDetailsResponse>>;
 }

libs/common/src/admin-console/abstractions/organization-domain/org-domain.service.abstraction.ts

@@ -1,22 +1,20 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Observable } from "rxjs";
 
 import { OrganizationDomainResponse } from "./responses/organization-domain.response";
 
 export abstract class OrgDomainServiceAbstraction {
-  orgDomains$: Observable<OrganizationDomainResponse[]>;
+  abstract orgDomains$: Observable<OrganizationDomainResponse[]>;
 
-  get: (orgDomainId: string) => OrganizationDomainResponse;
+  abstract get(orgDomainId: string): OrganizationDomainResponse;
 
-  copyDnsTxt: (dnsTxt: string) => void;
+  abstract copyDnsTxt(dnsTxt: string): void;
 }
 
 // Note: this separate class is designed to hold methods that are not
 // meant to be used in components (e.g., data write methods)
 export abstract class OrgDomainInternalServiceAbstraction extends OrgDomainServiceAbstraction {
-  upsert: (orgDomains: OrganizationDomainResponse[]) => void;
-  replace: (orgDomains: OrganizationDomainResponse[]) => void;
-  clearCache: () => void;
-  delete: (orgDomainIds: string[]) => void;
+  abstract upsert(orgDomains: OrganizationDomainResponse[]): void;
+  abstract replace(orgDomains: OrganizationDomainResponse[]): void;
+  abstract clearCache(): void;
+  abstract delete(orgDomainIds: string[]): void;
 }

libs/common/src/admin-console/abstractions/organization/organization-api.service.abstraction.ts

@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { OrganizationApiKeyRequest } from "../../../admin-console/models/request/organization-api-key.request";
 import { OrganizationSsoRequest } from "../../../auth/models/request/organization-sso.request";
 import { SecretVerificationRequest } from "../../../auth/models/request/secret-verification.request";
@@ -34,60 +32,66 @@ import { OrganizationKeysResponse } from "../../models/response/organization-key
 import { OrganizationResponse } from "../../models/response/organization.response";
 import { ProfileOrganizationResponse } from "../../models/response/profile-organization.response";
 
-export class OrganizationApiServiceAbstraction {
-  get: (id: string) => Promise<OrganizationResponse>;
-  getBilling: (id: string) => Promise<BillingResponse>;
-  getBillingHistory: (id: string) => Promise<BillingHistoryResponse>;
-  getSubscription: (id: string) => Promise<OrganizationSubscriptionResponse>;
-  getLicense: (id: string, installationId: string) => Promise<unknown>;
-  getAutoEnrollStatus: (identifier: string) => Promise<OrganizationAutoEnrollStatusResponse>;
-  create: (request: OrganizationCreateRequest) => Promise<OrganizationResponse>;
-  createWithoutPayment: (
+export abstract class OrganizationApiServiceAbstraction {
+  abstract get(id: string): Promise<OrganizationResponse>;
+  abstract getBilling(id: string): Promise<BillingResponse>;
+  abstract getBillingHistory(id: string): Promise<BillingHistoryResponse>;
+  abstract getSubscription(id: string): Promise<OrganizationSubscriptionResponse>;
+  abstract getLicense(id: string, installationId: string): Promise<unknown>;
+  abstract getAutoEnrollStatus(identifier: string): Promise<OrganizationAutoEnrollStatusResponse>;
+  abstract create(request: OrganizationCreateRequest): Promise<OrganizationResponse>;
+  abstract createWithoutPayment(
     request: OrganizationNoPaymentMethodCreateRequest,
-  ) => Promise<OrganizationResponse>;
-  createLicense: (data: FormData) => Promise<OrganizationResponse>;
-  save: (id: string, request: OrganizationUpdateRequest) => Promise<OrganizationResponse>;
-  updatePayment: (id: string, request: PaymentRequest) => Promise<void>;
-  upgrade: (id: string, request: OrganizationUpgradeRequest) => Promise<PaymentResponse>;
-  updatePasswordManagerSeats: (
+  ): Promise<OrganizationResponse>;
+  abstract createLicense(data: FormData): Promise<OrganizationResponse>;
+  abstract save(id: string, request: OrganizationUpdateRequest): Promise<OrganizationResponse>;
+  abstract updatePayment(id: string, request: PaymentRequest): Promise<void>;
+  abstract upgrade(id: string, request: OrganizationUpgradeRequest): Promise<PaymentResponse>;
+  abstract updatePasswordManagerSeats(
     id: string,
     request: OrganizationSubscriptionUpdateRequest,
-  ) => Promise<ProfileOrganizationResponse>;
-  updateSecretsManagerSubscription: (
+  ): Promise<ProfileOrganizationResponse>;
+  abstract updateSecretsManagerSubscription(
     id: string,
     request: OrganizationSmSubscriptionUpdateRequest,
-  ) => Promise<ProfileOrganizationResponse>;
-  updateSeats: (id: string, request: SeatRequest) => Promise<PaymentResponse>;
-  updateStorage: (id: string, request: StorageRequest) => Promise<PaymentResponse>;
-  verifyBank: (id: string, request: VerifyBankRequest) => Promise<void>;
-  reinstate: (id: string) => Promise<void>;
-  leave: (id: string) => Promise<void>;
-  delete: (id: string, request: SecretVerificationRequest) => Promise<void>;
-  deleteUsingToken: (
+  ): Promise<ProfileOrganizationResponse>;
+  abstract updateSeats(id: string, request: SeatRequest): Promise<PaymentResponse>;
+  abstract updateStorage(id: string, request: StorageRequest): Promise<PaymentResponse>;
+  abstract verifyBank(id: string, request: VerifyBankRequest): Promise<void>;
+  abstract reinstate(id: string): Promise<void>;
+  abstract leave(id: string): Promise<void>;
+  abstract delete(id: string, request: SecretVerificationRequest): Promise<void>;
+  abstract deleteUsingToken(
     organizationId: string,
     request: OrganizationVerifyDeleteRecoverRequest,
-  ) => Promise<any>;
-  updateLicense: (id: string, data: FormData) => Promise<void>;
-  importDirectory: (organizationId: string, request: ImportDirectoryRequest) => Promise<void>;
-  getOrCreateApiKey: (id: string, request: OrganizationApiKeyRequest) => Promise<ApiKeyResponse>;
-  getApiKeyInformation: (
+  ): Promise<any>;
+  abstract updateLicense(id: string, data: FormData): Promise<void>;
+  abstract importDirectory(organizationId: string, request: ImportDirectoryRequest): Promise<void>;
+  abstract getOrCreateApiKey(
+    id: string,
+    request: OrganizationApiKeyRequest,
+  ): Promise<ApiKeyResponse>;
+  abstract getApiKeyInformation(
     id: string,
     organizationApiKeyType?: OrganizationApiKeyType,
-  ) => Promise<ListResponse<OrganizationApiKeyInformationResponse>>;
-  rotateApiKey: (id: string, request: OrganizationApiKeyRequest) => Promise<ApiKeyResponse>;
-  getTaxInfo: (id: string) => Promise<TaxInfoResponse>;
-  updateTaxInfo: (id: string, request: ExpandedTaxInfoUpdateRequest) => Promise<void>;
-  getKeys: (id: string) => Promise<OrganizationKeysResponse>;
-  updateKeys: (id: string, request: OrganizationKeysRequest) => Promise<OrganizationKeysResponse>;
-  getSso: (id: string) => Promise<OrganizationSsoResponse>;
-  updateSso: (id: string, request: OrganizationSsoRequest) => Promise<OrganizationSsoResponse>;
-  selfHostedSyncLicense: (id: string) => Promise<void>;
-  subscribeToSecretsManager: (
+  ): Promise<ListResponse<OrganizationApiKeyInformationResponse>>;
+  abstract rotateApiKey(id: string, request: OrganizationApiKeyRequest): Promise<ApiKeyResponse>;
+  abstract getTaxInfo(id: string): Promise<TaxInfoResponse>;
+  abstract updateTaxInfo(id: string, request: ExpandedTaxInfoUpdateRequest): Promise<void>;
+  abstract getKeys(id: string): Promise<OrganizationKeysResponse>;
+  abstract updateKeys(
+    id: string,
+    request: OrganizationKeysRequest,
+  ): Promise<OrganizationKeysResponse>;
+  abstract getSso(id: string): Promise<OrganizationSsoResponse>;
+  abstract updateSso(id: string, request: OrganizationSsoRequest): Promise<OrganizationSsoResponse>;
+  abstract selfHostedSyncLicense(id: string): Promise<void>;
+  abstract subscribeToSecretsManager(
     id: string,
     request: SecretsManagerSubscribeRequest,
-  ) => Promise<ProfileOrganizationResponse>;
-  updateCollectionManagement: (
+  ): Promise<ProfileOrganizationResponse>;
+  abstract updateCollectionManagement(
     id: string,
     request: OrganizationCollectionManagementUpdateRequest,
-  ) => Promise<OrganizationResponse>;
+  ): Promise<OrganizationResponse>;
 }

libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts

@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { map, Observable } from "rxjs";
 
 import { UserId } from "../../../types/guid";
@@ -68,20 +66,20 @@ export abstract class OrganizationService {
    * Publishes state for all organizations under the specified user.
    * @returns An observable list of organizations
    */
-  organizations$: (userId: UserId) => Observable<Organization[]>;
+  abstract organizations$(userId: UserId): Observable<Organization[]>;
 
   // @todo Clean these up. Continuing to expand them is not recommended.
   // @see https://bitwarden.atlassian.net/browse/AC-2252
-  memberOrganizations$: (userId: UserId) => Observable<Organization[]>;
+  abstract memberOrganizations$(userId: UserId): Observable<Organization[]>;
   /**
    * Emits true if the user can create or manage a Free Bitwarden Families sponsorship.
    */
-  canManageSponsorships$: (userId: UserId) => Observable<boolean>;
+  abstract canManageSponsorships$(userId: UserId): Observable<boolean>;
   /**
    * Emits true if any of the user's organizations have a Free Bitwarden Families sponsorship available.
    */
-  familySponsorshipAvailable$: (userId: UserId) => Observable<boolean>;
-  hasOrganizations: (userId: UserId) => Observable<boolean>;
+  abstract familySponsorshipAvailable$(userId: UserId): Observable<boolean>;
+  abstract hasOrganizations(userId: UserId): Observable<boolean>;
 }
 
 /**
@@ -96,7 +94,7 @@ export abstract class InternalOrganizationServiceAbstraction extends Organizatio
    * @param organization The organization state being saved.
    * @param userId The userId to replace state for.
    */
-  upsert: (OrganizationData: OrganizationData, userId: UserId) => Promise<void>;
+  abstract upsert(OrganizationData: OrganizationData, userId: UserId): Promise<void>;
 
   /**
    * Replaces state for the entire registered organization list for the specified user.
@@ -107,5 +105,8 @@ export abstract class InternalOrganizationServiceAbstraction extends Organizatio
    * user.
    * @param userId The userId to replace state for.
    */
-  replace: (organizations: { [id: string]: OrganizationData }, userId: UserId) => Promise<void>;
+  abstract replace(
+    organizations: { [id: string]: OrganizationData },
+    userId: UserId,
+  ): Promise<void>;
 }

libs/common/src/admin-console/abstractions/provider.service.ts

@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Observable } from "rxjs";
 
 import { UserId } from "../../types/guid";
@@ -7,8 +5,8 @@ import { ProviderData } from "../models/data/provider.data";
 import { Provider } from "../models/domain/provider";
 
 export abstract class ProviderService {
-  get$: (id: string) => Observable<Provider>;
-  get: (id: string) => Promise<Provider>;
-  getAll: () => Promise<Provider[]>;
-  save: (providers: { [id: string]: ProviderData }, userId?: UserId) => Promise<any>;
+  abstract get$(id: string): Observable<Provider>;
+  abstract get(id: string): Promise<Provider>;
+  abstract getAll(): Promise<Provider[]>;
+  abstract save(providers: { [id: string]: ProviderData }, userId?: UserId): Promise<any>;
 }

libs/common/src/admin-console/abstractions/provider/provider-api.service.abstraction.ts

@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { AddableOrganizationResponse } from "@bitwarden/common/admin-console/models/response/addable-organization.response";
 
 import { ProviderSetupRequest } from "../../models/request/provider/provider-setup.request";
@@ -7,21 +5,23 @@ import { ProviderUpdateRequest } from "../../models/request/provider/provider-up
 import { ProviderVerifyRecoverDeleteRequest } from "../../models/request/provider/provider-verify-recover-delete.request";
 import { ProviderResponse } from "../../models/response/provider/provider.response";
 
-export class ProviderApiServiceAbstraction {
-  postProviderSetup: (id: string, request: ProviderSetupRequest) => Promise<ProviderResponse>;
-  getProvider: (id: string) => Promise<ProviderResponse>;
-  putProvider: (id: string, request: ProviderUpdateRequest) => Promise<ProviderResponse>;
-  providerRecoverDeleteToken: (
+export abstract class ProviderApiServiceAbstraction {
+  abstract postProviderSetup(id: string, request: ProviderSetupRequest): Promise<ProviderResponse>;
+  abstract getProvider(id: string): Promise<ProviderResponse>;
+  abstract putProvider(id: string, request: ProviderUpdateRequest): Promise<ProviderResponse>;
+  abstract providerRecoverDeleteToken(
     organizationId: string,
     request: ProviderVerifyRecoverDeleteRequest,
-  ) => Promise<any>;
-  deleteProvider: (id: string) => Promise<void>;
-  getProviderAddableOrganizations: (providerId: string) => Promise<AddableOrganizationResponse[]>;
-  addOrganizationToProvider: (
+  ): Promise<any>;
+  abstract deleteProvider(id: string): Promise<void>;
+  abstract getProviderAddableOrganizations(
+    providerId: string,
+  ): Promise<AddableOrganizationResponse[]>;
+  abstract addOrganizationToProvider(
     providerId: string,
     request: {
       key: string;
       organizationId: string;
     },
-  ) => Promise<void>;
+  ): Promise<void>;
 }