Resolve more than one Sponsorship revoke bug (#14818)

apps/web/src/app/billing/members/free-bitwarden-families.component.ts

@@ -179,7 +179,10 @@ export class FreeBitwardenFamiliesComponent implements OnInit {
       return;
     }
 
-    await this.organizationSponsorshipApiService.deleteRevokeSponsorship(this.organizationId, true);
+    await this.organizationSponsorshipApiService.deleteAdminInitiatedRevokeSponsorship(
+      this.organizationId,
+      sponsorship.friendlyName,
+    );
 
     this.toastService.showToast({
       variant: "success",

libs/common/src/billing/abstractions/organizations/organization-sponsorship-api.service.abstraction.ts

@@ -11,8 +11,10 @@ export abstract class OrganizationSponsorshipApiServiceAbstraction {
     friendlyName?: string,
   ): Promise<void>;
 
-  abstract deleteRevokeSponsorship: (
+  abstract deleteRevokeSponsorship: (sponsoringOrganizationId: string) => Promise<void>;
+
+  abstract deleteAdminInitiatedRevokeSponsorship: (
     sponsoringOrganizationId: string,
-    isAdminInitiated?: boolean,
+    sponsoredFriendlyName: string,
   ) => Promise<void>;
 }

libs/common/src/billing/services/organization/organization-sponsorship-api.service.ts

@@ -44,11 +44,30 @@ export class OrganizationSponsorshipApiService
   ): Promise<void> {
     const basePath = "/organization/sponsorship/";
     const hostPath = this.platformUtilsService.isSelfHost() ? "self-hosted/" : "";
-    const queryParam = `?isAdminInitiated=${isAdminInitiated}`;
 
     return await this.apiService.send(
       "DELETE",
-      basePath + hostPath + sponsoringOrganizationId + queryParam,
+      basePath + hostPath + sponsoringOrganizationId,
+      null,
+      true,
+      false,
+    );
+  }
+
+  async deleteAdminInitiatedRevokeSponsorship(
+    sponsoringOrganizationId: string,
+    sponsoredFriendlyName: string,
+  ): Promise<void> {
+    const basePath = "/organization/sponsorship/";
+    const hostPath = this.platformUtilsService.isSelfHost() ? "self-hosted/" : "";
+    return await this.apiService.send(
+      "DELETE",
+      basePath +
+        hostPath +
+        sponsoringOrganizationId +
+        "/" +
+        encodeURIComponent(sponsoredFriendlyName) +
+        "/revoke",
       null,
       true,
       false,