[AC-2268] - migrate toast to CL service for admin-console (#10663)

* migrate toast to CL service for admin-console

* fix spec

* add missing dep for toastService

* fix toastService args

* fix toastService args

* fix toastService args

apps/browser/src/vault/popup/components/vault/collections.component.ts

@@ -12,6 +12,7 @@ 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 { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
+import { ToastService } from "@bitwarden/components";
 
 @Component({
   selector: "app-vault-collections",
@@ -30,6 +31,7 @@ export class CollectionsComponent extends BaseCollectionsComponent implements On
     logService: LogService,
     configService: ConfigService,
     accountService: AccountService,
+    toastService: ToastService,
   ) {
     super(
       collectionService,
@@ -40,6 +42,7 @@ export class CollectionsComponent extends BaseCollectionsComponent implements On
       logService,
       configService,
       accountService,
+      toastService,
     );
   }
 

apps/desktop/src/vault/app/vault/collections.component.ts

@@ -9,6 +9,7 @@ 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 { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
+import { ToastService } from "@bitwarden/components";
 
 @Component({
   selector: "app-vault-collections",
@@ -24,6 +25,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
     logService: LogService,
     configService: ConfigService,
     accountService: AccountService,
+    toastService: ToastService,
   ) {
     super(
       collectionService,
@@ -34,6 +36,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
       logService,
       configService,
       accountService,
+      toastService,
     );
   }
 }

apps/web/src/app/admin-console/common/base.events.component.ts

@@ -8,6 +8,7 @@ import { FileDownloadService } from "@bitwarden/common/platform/abstractions/fil
 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 { ToastService } from "@bitwarden/components";
 
 import { EventService } from "../../core";
 import { EventExportService } from "../../tools/event-export";
@@ -34,6 +35,7 @@ export abstract class BaseEventsComponent {
     protected platformUtilsService: PlatformUtilsService,
     protected logService: LogService,
     protected fileDownloadService: FileDownloadService,
+    private toastService: ToastService,
   ) {
     const defaultDates = this.eventService.getDefaultDateFilters();
     this.start = defaultDates[0];
@@ -164,11 +166,11 @@ export abstract class BaseEventsComponent {
     try {
       dates = this.eventService.formatDateFilters(this.start, this.end);
     } catch (e) {
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "error",
+        variant: "error",
-        this.i18nService.t("errorOccurred"),
+        title: this.i18nService.t("errorOccurred"),
-        this.i18nService.t("invalidDateRange"),
+        message: this.i18nService.t("invalidDateRange"),
-      );
+      });
       return null;
     }
     return dates;

apps/web/src/app/admin-console/common/base.people.component.ts

@@ -22,7 +22,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { OrganizationUserView } from "../organizations/core/views/organization-user.view";
 import { UserConfirmComponent } from "../organizations/manage/user-confirm.component";
@@ -127,6 +127,7 @@ export abstract class BasePeopleComponent<
     protected userNamePipe: UserNamePipe,
     protected dialogService: DialogService,
     protected organizationManagementPreferencesService: OrganizationManagementPreferencesService,
+    protected toastService: ToastService,
   ) {}
 
   abstract edit(user: UserType): void;
@@ -251,11 +252,11 @@ export abstract class BasePeopleComponent<
     this.actionPromise = this.deleteUser(user.id);
     try {
       await this.actionPromise;
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        null,
+        title: null,
-        this.i18nService.t("removedUserId", this.userNamePipe.transform(user)),
+        message: this.i18nService.t("removedUserId", this.userNamePipe.transform(user)),
-      );
+      });
       this.removeUser(user);
     } catch (e) {
       this.validationService.showError(e);
@@ -282,11 +283,11 @@ export abstract class BasePeopleComponent<
     this.actionPromise = this.revokeUser(user.id);
     try {
       await this.actionPromise;
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        null,
+        title: null,
-        this.i18nService.t("revokedUserId", this.userNamePipe.transform(user)),
+        message: this.i18nService.t("revokedUserId", this.userNamePipe.transform(user)),
-      );
+      });
       await this.load();
     } catch (e) {
       this.validationService.showError(e);
@@ -298,11 +299,11 @@ export abstract class BasePeopleComponent<
     this.actionPromise = this.restoreUser(user.id);
     try {
       await this.actionPromise;
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        null,
+        title: null,
-        this.i18nService.t("restoredUserId", this.userNamePipe.transform(user)),
+        message: this.i18nService.t("restoredUserId", this.userNamePipe.transform(user)),
-      );
+      });
       await this.load();
     } catch (e) {
       this.validationService.showError(e);
@@ -318,11 +319,11 @@ export abstract class BasePeopleComponent<
     this.actionPromise = this.reinviteUser(user.id);
     try {
       await this.actionPromise;
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        null,
+        title: null,
-        this.i18nService.t("hasBeenReinvited", this.userNamePipe.transform(user)),
+        message: this.i18nService.t("hasBeenReinvited", this.userNamePipe.transform(user)),
-      );
+      });
     } catch (e) {
       this.validationService.showError(e);
     }
@@ -344,11 +345,11 @@ export abstract class BasePeopleComponent<
         this.actionPromise = this.confirmUser(user, publicKey);
         await this.actionPromise;
         updateUser(this);
-        this.platformUtilsService.showToast(
+        this.toastService.showToast({
-          "success",
+          variant: "success",
-          null,
+          title: null,
-          this.i18nService.t("hasBeenConfirmed", this.userNamePipe.transform(user)),
+          message: this.i18nService.t("hasBeenConfirmed", this.userNamePipe.transform(user)),
-        );
+        });
       } catch (e) {
         this.validationService.showError(e);
         throw e;

apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts

@@ -12,7 +12,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { DialogService, TableDataSource } from "@bitwarden/components";
+import { DialogService, TableDataSource, ToastService } from "@bitwarden/components";
 
 import { EventService } from "../../../core";
 import { SharedModule } from "../../../shared";
@@ -63,6 +63,7 @@ export class EntityEventsComponent implements OnInit {
     private organizationUserService: OrganizationUserService,
     private formBuilder: FormBuilder,
     private validationService: ValidationService,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -109,11 +110,11 @@ export class EntityEventsComponent implements OnInit {
         this.filterFormGroup.value.end,
       );
     } catch (e) {
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "error",
+        variant: "error",
-        this.i18nService.t("errorOccurred"),
+        title: this.i18nService.t("errorOccurred"),
-        this.i18nService.t("invalidDateRange"),
+        message: this.i18nService.t("invalidDateRange"),
-      );
+      });
       return;
     }
 

apps/web/src/app/admin-console/organizations/manage/events.component.ts

@@ -14,6 +14,7 @@ import { FileDownloadService } from "@bitwarden/common/platform/abstractions/fil
 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 { ToastService } from "@bitwarden/components";
 
 import { EventService } from "../../../core";
 import { EventExportService } from "../../../tools/event-export";
@@ -51,6 +52,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
     private organizationUserService: OrganizationUserService,
     private providerService: ProviderService,
     fileDownloadService: FileDownloadService,
+    toastService: ToastService,
   ) {
     super(
       eventService,
@@ -59,6 +61,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
       platformUtilsService,
       logService,
       fileDownloadService,
+      toastService,
     );
   }
 

apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts

@@ -24,7 +24,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { CollectionAdminService } from "../../../vault/core/collection-admin.service";
 import { CollectionAdminView } from "../../../vault/core/views/collection-admin.view";
@@ -213,6 +213,7 @@ export class GroupAddEditComponent implements OnInit, OnDestroy {
     private organizationService: OrganizationService,
     private accountService: AccountService,
     private collectionAdminService: CollectionAdminService,
+    private toastService: ToastService,
   ) {
     this.tabIndex = params.initialTab ?? GroupAddEditTabType.Info;
   }
@@ -280,11 +281,14 @@ export class GroupAddEditComponent implements OnInit, OnDestroy {
 
     if (this.groupForm.invalid) {
       if (this.tabIndex !== GroupAddEditTabType.Info) {
-        this.platformUtilsService.showToast(
+        this.toastService.showToast({
-          "error",
+          variant: "error",
-          null,
+          title: null,
-          this.i18nService.t("fieldOnTabRequiresAttention", this.i18nService.t("groupInfo")),
+          message: this.i18nService.t(
-        );
+            "fieldOnTabRequiresAttention",
+            this.i18nService.t("groupInfo"),
+          ),
+        });
       }
       return;
     }
@@ -300,11 +304,14 @@ export class GroupAddEditComponent implements OnInit, OnDestroy {
 
     await this.groupService.save(groupView);
 
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      null,
+      title: null,
-      this.i18nService.t(this.editMode ? "editedGroupId" : "createdGroupId", formValue.name),
+      message: this.i18nService.t(
-    );
+        this.editMode ? "editedGroupId" : "createdGroupId",
+        formValue.name,
+      ),
+    });
 
     this.dialogRef.close(GroupAddEditDialogResultType.Saved);
   };
@@ -325,11 +332,11 @@ export class GroupAddEditComponent implements OnInit, OnDestroy {
 
     await this.groupService.delete(this.organizationId, this.groupId);
 
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      null,
+      title: null,
-      this.i18nService.t("deletedGroupId", this.group.name),
+      message: this.i18nService.t("deletedGroupId", this.group.name),
-    );
+    });
     this.dialogRef.close(GroupAddEditDialogResultType.Deleted);
   };
 }

apps/web/src/app/admin-console/organizations/manage/verify-recover-delete-org.component.ts

@@ -6,6 +6,7 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso
 import { OrganizationVerifyDeleteRecoverRequest } from "@bitwarden/common/admin-console/models/request/organization-verify-delete-recover.request";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ToastService } from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared/shared.module";
 
@@ -27,6 +28,7 @@ export class VerifyRecoverDeleteOrgComponent implements OnInit {
     private platformUtilsService: PlatformUtilsService,
     private i18nService: I18nService,
     private route: ActivatedRoute,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -44,11 +46,11 @@ export class VerifyRecoverDeleteOrgComponent implements OnInit {
   submit = async () => {
     const request = new OrganizationVerifyDeleteRecoverRequest(this.token);
     await this.apiService.deleteUsingToken(this.orgId, request);
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      this.i18nService.t("organizationDeleted"),
+      title: this.i18nService.t("organizationDeleted"),
-      this.i18nService.t("organizationDeletedDesc"),
+      message: this.i18nService.t("organizationDeletedDesc"),
-    );
+    });
     await this.router.navigate(["/"]);
   };
 }

apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-enable-sm-dialog.component.ts

@@ -4,7 +4,7 @@ import { Component, Inject, OnInit } from "@angular/core";
 import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DialogService, TableDataSource } from "@bitwarden/components";
+import { DialogService, TableDataSource, ToastService } from "@bitwarden/components";
 
 import { OrganizationUserView } from "../../../core";
 
@@ -24,6 +24,7 @@ export class BulkEnableSecretsManagerDialogComponent implements OnInit {
     private organizationUserService: OrganizationUserService,
     private platformUtilsService: PlatformUtilsService,
     private i18nService: I18nService,
+    private toastService: ToastService,
   ) {}
 
   ngOnInit(): void {
@@ -35,11 +36,11 @@ export class BulkEnableSecretsManagerDialogComponent implements OnInit {
       this.data.orgId,
       this.dataSource.data.map((u) => u.id),
     );
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      null,
+      title: null,
-      this.i18nService.t("activatedAccessToSecretsManager"),
+      message: this.i18nService.t("activatedAccessToSecretsManager"),
-    );
+    });
     this.dialogRef.close();
   };
 

apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts

@@ -26,7 +26,7 @@ import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { CollectionAdminService } from "../../../../../vault/core/collection-admin.service";
 import { CollectionAdminView } from "../../../../../vault/core/views/collection-admin.view";
@@ -143,6 +143,7 @@ export class MemberDialogComponent implements OnDestroy {
     private dialogService: DialogService,
     private accountService: AccountService,
     organizationService: OrganizationService,
+    private toastService: ToastService,
   ) {
     this.organization$ = organizationService
       .get$(this.params.organizationId)
@@ -376,11 +377,11 @@ export class MemberDialogComponent implements OnDestroy {
     ) {
       this.permissionsGroup.value.manageUsers = true;
       (document.getElementById("manageUsers") as HTMLInputElement).checked = true;
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "info",
+        variant: "info",
-        null,
+        title: null,
-        this.i18nService.t("accountRecoveryManageUsers"),
+        message: this.i18nService.t("accountRecoveryManageUsers"),
-      );
+      });
     }
   }
 
@@ -389,11 +390,11 @@ export class MemberDialogComponent implements OnDestroy {
 
     if (this.formGroup.invalid) {
       if (this.tabIndex !== MemberDialogTab.Role) {
-        this.platformUtilsService.showToast(
+        this.toastService.showToast({
-          "error",
+          variant: "error",
-          null,
+          title: null,
-          this.i18nService.t("fieldOnTabRequiresAttention", this.i18nService.t("role")),
+          message: this.i18nService.t("fieldOnTabRequiresAttention", this.i18nService.t("role")),
-        );
+        });
       }
       return;
     }
@@ -401,11 +402,11 @@ export class MemberDialogComponent implements OnDestroy {
     const organization = await firstValueFrom(this.organization$);
 
     if (!organization.useCustomPermissions && this.customUserTypeSelected) {
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "error",
+        variant: "error",
-        null,
+        title: null,
-        this.i18nService.t("customNonEnterpriseError"),
+        message: this.i18nService.t("customNonEnterpriseError"),
-      );
+      });
       return;
     }
 
@@ -452,11 +453,14 @@ export class MemberDialogComponent implements OnDestroy {
       await this.userService.invite(emails, userView);
     }
 
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      null,
+      title: null,
-      this.i18nService.t(this.editMode ? "editedUserId" : "invitedUsers", this.params.name),
+      message: this.i18nService.t(
-    );
+        this.editMode ? "editedUserId" : "invitedUsers",
+        this.params.name,
+      ),
+    });
     this.close(MemberDialogResult.Saved);
   };
 
@@ -492,11 +496,11 @@ export class MemberDialogComponent implements OnDestroy {
       this.params.organizationUserId,
     );
 
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      null,
+      title: null,
-      this.i18nService.t("removedUserId", this.params.name),
+      message: this.i18nService.t("removedUserId", this.params.name),
-    );
+    });
     this.close(MemberDialogResult.Deleted);
   };
 
@@ -529,11 +533,11 @@ export class MemberDialogComponent implements OnDestroy {
       this.params.organizationUserId,
     );
 
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      null,
+      title: null,
-      this.i18nService.t("revokedUserId", this.params.name),
+      message: this.i18nService.t("revokedUserId", this.params.name),
-    );
+    });
     this.isRevoked = true;
     this.close(MemberDialogResult.Revoked);
   };
@@ -548,11 +552,11 @@ export class MemberDialogComponent implements OnDestroy {
       this.params.organizationUserId,
     );
 
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      null,
+      title: null,
-      this.i18nService.t("restoredUserId", this.params.name),
+      message: this.i18nService.t("restoredUserId", this.params.name),
-    );
+    });
     this.isRevoked = false;
     this.close(MemberDialogResult.Restored);
   };

apps/web/src/app/admin-console/organizations/members/components/reset-password.component.ts

@@ -17,7 +17,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
 import { OrganizationUserResetPasswordService } from "../services/organization-user-reset-password/organization-user-reset-password.service";
@@ -50,6 +50,7 @@ export class ResetPasswordComponent implements OnInit, OnDestroy {
     private policyService: PolicyService,
     private logService: LogService,
     private dialogService: DialogService,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -88,30 +89,30 @@ export class ResetPasswordComponent implements OnInit, OnDestroy {
     }
 
     this.platformUtilsService.copyToClipboard(value, { window: window });
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "info",
+      variant: "info",
-      null,
+      title: null,
-      this.i18nService.t("valueCopied", this.i18nService.t("password")),
+      message: this.i18nService.t("valueCopied", this.i18nService.t("password")),
-    );
+    });
   }
 
   async submit() {
     // Validation
     if (this.newPassword == null || this.newPassword === "") {
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "error",
+        variant: "error",
-        this.i18nService.t("errorOccurred"),
+        title: this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPasswordRequired"),
+        message: this.i18nService.t("masterPasswordRequired"),
-      );
+      });
       return false;
     }
 
     if (this.newPassword.length < Utils.minimumPasswordLength) {
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "error",
+        variant: "error",
-        this.i18nService.t("errorOccurred"),
+        title: this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPasswordMinlength", Utils.minimumPasswordLength),
+        message: this.i18nService.t("masterPasswordMinlength", Utils.minimumPasswordLength),
-      );
+      });
       return false;
     }
 
@@ -123,11 +124,11 @@ export class ResetPasswordComponent implements OnInit, OnDestroy {
         this.enforcedPolicyOptions,
       )
     ) {
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "error",
+        variant: "error",
-        this.i18nService.t("errorOccurred"),
+        title: this.i18nService.t("errorOccurred"),
-        this.i18nService.t("masterPasswordPolicyRequirementsNotMet"),
+        message: this.i18nService.t("masterPasswordPolicyRequirementsNotMet"),
-      );
+      });
       return;
     }
 
@@ -151,11 +152,11 @@ export class ResetPasswordComponent implements OnInit, OnDestroy {
         this.organizationId,
       );
       await this.formPromise;
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        null,
+        title: null,
-        this.i18nService.t("resetPasswordSuccess"),
+        message: this.i18nService.t("resetPasswordSuccess"),
-      );
+      });
       this.passwordReset.emit();
     } catch (e) {
       this.logService.error(e);

apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts

@@ -15,7 +15,7 @@ import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/po
 import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { BasePolicy, BasePolicyComponent } from "../policies";
 
@@ -58,6 +58,7 @@ export class PolicyEditComponent implements AfterViewInit {
     private cdr: ChangeDetectorRef,
     private formBuilder: FormBuilder,
     private dialogRef: DialogRef<PolicyEditDialogResult>,
+    private toastService: ToastService,
   ) {}
   get policy(): BasePolicy {
     return this.data.policy;
@@ -95,7 +96,7 @@ export class PolicyEditComponent implements AfterViewInit {
     try {
       request = await this.policyComponent.buildRequest(this.data.policiesEnabledMap);
     } catch (e) {
-      this.platformUtilsService.showToast("error", null, e.message);
+      this.toastService.showToast({ variant: "error", title: null, message: e.message });
       return;
     }
     this.formPromise = this.policyApiService.putPolicy(
@@ -104,11 +105,11 @@ export class PolicyEditComponent implements AfterViewInit {
       request,
     );
     await this.formPromise;
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      null,
+      title: null,
-      this.i18nService.t("editedPolicyId", this.i18nService.t(this.data.policy.name)),
+      message: this.i18nService.t("editedPolicyId", this.i18nService.t(this.data.policy.name)),
-    );
+    });
     this.dialogRef.close(PolicyEditDialogResult.Saved);
   };
 

apps/web/src/app/admin-console/organizations/settings/account.component.ts

@@ -14,7 +14,7 @@ import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.se
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { ApiKeyComponent } from "../../../auth/settings/security/api-key.component";
 import { PurgeVaultComponent } from "../../../vault/settings/purge-vault.component";
@@ -77,6 +77,7 @@ export class AccountComponent implements OnInit, OnDestroy {
     private organizationApiService: OrganizationApiServiceAbstraction,
     private dialogService: DialogService,
     private formBuilder: FormBuilder,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -167,7 +168,11 @@ export class AccountComponent implements OnInit, OnDestroy {
 
     await this.organizationApiService.save(this.organizationId, request);
 
-    this.platformUtilsService.showToast("success", null, this.i18nService.t("organizationUpdated"));
+    this.toastService.showToast({
+      variant: "success",
+      title: null,
+      message: this.i18nService.t("organizationUpdated"),
+    });
   };
 
   submitCollectionManagement = async () => {
@@ -184,11 +189,11 @@ export class AccountComponent implements OnInit, OnDestroy {
 
     await this.organizationApiService.updateCollectionManagement(this.organizationId, request);
 
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      null,
+      title: null,
-      this.i18nService.t("updatedCollectionManagement"),
+      message: this.i18nService.t("updatedCollectionManagement"),
-    );
+    });
   };
 
   async deleteOrganization() {

apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts

@@ -14,7 +14,7 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { UserVerificationModule } from "../../../../auth/shared/components/user-verification";
 import { SharedModule } from "../../../../shared/shared.module";
@@ -94,6 +94,7 @@ export class DeleteOrganizationDialogComponent implements OnInit, OnDestroy {
     private organizationService: OrganizationService,
     private organizationApiService: OrganizationApiServiceAbstraction,
     private formBuilder: FormBuilder,
+    private toastService: ToastService,
   ) {}
 
   ngOnDestroy(): void {
@@ -121,11 +122,11 @@ export class DeleteOrganizationDialogComponent implements OnInit, OnDestroy {
       .buildRequest(this.formGroup.value.secret)
       .then((request) => this.organizationApiService.delete(this.organization.id, request));
 
-    this.platformUtilsService.showToast(
+    this.toastService.showToast({
-      "success",
+      variant: "success",
-      this.i18nService.t("organizationDeleted"),
+      title: this.i18nService.t("organizationDeleted"),
-      this.i18nService.t("organizationDeletedDesc"),
+      message: this.i18nService.t("organizationDeletedDesc"),
-    );
+    });
     this.dialogRef.close(DeleteOrganizationDialogResult.Deleted);
   };
 

apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts

@@ -14,7 +14,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { OrganizationPlansComponent } from "../../../billing";
 import { SharedModule } from "../../../shared";
@@ -68,6 +68,7 @@ export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
     private organizationService: OrganizationService,
     private dialogService: DialogService,
     private formBuilder: FormBuilder,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -76,12 +77,12 @@ export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
     this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
       const error = qParams.token == null;
       if (error) {
-        this.platformUtilsService.showToast(
+        this.toastService.showToast({
-          "error",
+          variant: "error",
-          null,
+          title: null,
-          this.i18nService.t("sponsoredFamiliesAcceptFailed"),
+          message: this.i18nService.t("sponsoredFamiliesAcceptFailed"),
-          { timeout: 10000 },
+          timeout: 10000,
-        );
+        });
         // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.router.navigate(["/"]);
@@ -139,11 +140,11 @@ export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
       request.sponsoredOrganizationId = organizationId;
 
       await this.apiService.postRedeemSponsorship(this.token, request);
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        null,
+        title: null,
-        this.i18nService.t("sponsoredFamiliesOfferRedeemed"),
+        message: this.i18nService.t("sponsoredFamiliesOfferRedeemed"),
-      );
+      });
       await this.syncService.fullSync(true);
 
       // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.

apps/web/src/app/admin-console/organizations/users/enroll-master-password-reset.component.ts

@@ -8,7 +8,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { OrganizationUserResetPasswordService } from "../members/services/organization-user-reset-password/organization-user-reset-password.service";
 
@@ -29,6 +29,7 @@ export class EnrollMasterPasswordReset {
     syncService: SyncService,
     logService: LogService,
     userVerificationService: UserVerificationService,
+    toastService: ToastService,
   ) {
     const result = await UserVerificationDialogComponent.open(dialogService, {
       title: "enrollAccountRecovery",
@@ -71,7 +72,11 @@ export class EnrollMasterPasswordReset {
 
     // Enrollment succeeded
     try {
-      platformUtilsService.showToast("success", null, i18nService.t("enrollPasswordResetSuccess"));
+      toastService.showToast({
+        variant: "success",
+        title: null,
+        message: i18nService.t("enrollPasswordResetSuccess"),
+      });
       await syncService.fullSync(true);
     } catch (e) {
       logService.error(e);

apps/web/src/app/admin-console/providers/verify-recover-delete-provider.component.ts

@@ -7,6 +7,7 @@ import { ProviderVerifyRecoverDeleteRequest } from "@bitwarden/common/admin-cons
 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 { ToastService } from "@bitwarden/components";
 
 @Component({
   selector: "app-verify-recover-delete-provider",
@@ -27,6 +28,7 @@ export class VerifyRecoverDeleteProviderComponent implements OnInit {
     private i18nService: I18nService,
     private route: ActivatedRoute,
     private logService: LogService,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -48,11 +50,11 @@ export class VerifyRecoverDeleteProviderComponent implements OnInit {
         request,
       );
       await this.formPromise;
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        this.i18nService.t("providerDeleted"),
+        title: this.i18nService.t("providerDeleted"),
-        this.i18nService.t("providerDeletedDesc"),
+        message: this.i18nService.t("providerDeletedDesc"),
-      );
+      });
       await this.router.navigate(["/"]);
     } catch (e) {
       this.logService.error(e);

apps/web/src/app/vault/individual-vault/collections.component.ts

@@ -11,7 +11,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/vault/abstractions/collection.service";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 @Component({
   selector: "app-vault-collections",
@@ -29,6 +29,7 @@ export class CollectionsComponent extends BaseCollectionsComponent implements On
     accountService: AccountService,
     protected dialogRef: DialogRef,
     @Inject(DIALOG_DATA) params: CollectionsDialogParams,
+    toastService: ToastService,
   ) {
     super(
       collectionService,
@@ -39,6 +40,7 @@ export class CollectionsComponent extends BaseCollectionsComponent implements On
       logService,
       configService,
       accountService,
+      toastService,
     );
     this.cipherId = params?.cipherId;
   }

apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts

@@ -15,7 +15,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { OrganizationUserResetPasswordService } from "../../../../admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service";
 import { EnrollMasterPasswordReset } from "../../../../admin-console/organizations/users/enroll-master-password-reset.component";
@@ -50,6 +50,7 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
     private dialogService: DialogService,
     private resetPasswordService: OrganizationUserResetPasswordService,
     private userVerificationService: UserVerificationService,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -158,6 +159,7 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
         this.syncService,
         this.logService,
         this.userVerificationService,
+        this.toastService,
       );
     } else {
       // Remove reset password

apps/web/src/app/vault/org-vault/collections.component.ts

@@ -15,7 +15,7 @@ import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherCollectionsRequest } from "@bitwarden/common/vault/models/request/cipher-collections.request";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import {
   CollectionsComponent as BaseCollectionsComponent,
@@ -41,6 +41,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
     accountService: AccountService,
     protected dialogRef: DialogRef,
     @Inject(DIALOG_DATA) params: OrgVaultCollectionsDialogParams,
+    toastService: ToastService,
   ) {
     super(
       collectionService,
@@ -53,6 +54,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
       accountService,
       dialogRef,
       params,
+      toastService,
     );
     this.allowSelectNone = true;
     this.collectionIds = params?.collectionIds;

bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts

@@ -14,7 +14,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { TableDataSource, NoItemsModule } from "@bitwarden/components";
+import { TableDataSource, NoItemsModule, ToastService } from "@bitwarden/components";
 import { Devices } from "@bitwarden/web-vault/app/admin-console/icons";
 import { LooseComponentsModule } from "@bitwarden/web-vault/app/shared";
 import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module";
@@ -54,6 +54,7 @@ export class DeviceApprovalsComponent implements OnInit, OnDestroy {
     private logService: LogService,
     private validationService: ValidationService,
     private configService: ConfigService,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -84,17 +85,17 @@ export class DeviceApprovalsComponent implements OnInit, OnDestroy {
           authRequest,
         );
 
-        this.platformUtilsService.showToast(
+        this.toastService.showToast({
-          "success",
+          variant: "success",
-          null,
+          title: null,
-          this.i18nService.t("loginRequestApproved"),
+          message: this.i18nService.t("loginRequestApproved"),
-        );
+        });
       } catch (error) {
-        this.platformUtilsService.showToast(
+        this.toastService.showToast({
-          "error",
+          variant: "error",
-          null,
+          title: null,
-          this.i18nService.t("resetPasswordDetailsError"),
+          message: this.i18nService.t("resetPasswordDetailsError"),
-        );
+        });
       }
     });
   }
@@ -109,18 +110,22 @@ export class DeviceApprovalsComponent implements OnInit, OnDestroy {
         this.organizationId,
         this.tableDataSource.data,
       );
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        null,
+        title: null,
-        this.i18nService.t("allLoginRequestsApproved"),
+        message: this.i18nService.t("allLoginRequestsApproved"),
-      );
+      });
     });
   }
 
   async denyRequest(requestId: string) {
     await this.performAsyncAction(async () => {
       await this.organizationAuthRequestService.denyPendingRequests(this.organizationId, requestId);
-      this.platformUtilsService.showToast("error", null, this.i18nService.t("loginRequestDenied"));
+      this.toastService.showToast({
+        variant: "error",
+        title: null,
+        message: this.i18nService.t("loginRequestDenied"),
+      });
     });
   }
 
@@ -134,11 +139,11 @@ export class DeviceApprovalsComponent implements OnInit, OnDestroy {
         this.organizationId,
         ...this.tableDataSource.data.map((r) => r.id),
       );
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "error",
+        variant: "error",
-        null,
+        title: null,
-        this.i18nService.t("allLoginRequestsDenied"),
+        message: this.i18nService.t("allLoginRequestsDenied"),
-      );
+      });
     });
   }
 

bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.ts

@@ -13,7 +13,7 @@ import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitw
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { domainNameValidator } from "./validators/domain-name.validator";
 import { uniqueInArrayValidator } from "./validators/unique-in-array.validator";
@@ -66,6 +66,7 @@ export class DomainAddEditDialogComponent implements OnInit, OnDestroy {
     private orgDomainService: OrgDomainServiceAbstraction,
     private validationService: ValidationService,
     private dialogService: DialogService,
+    private toastService: ToastService,
   ) {}
 
   // Angular Method Implementations
@@ -112,7 +113,11 @@ export class DomainAddEditDialogComponent implements OnInit, OnDestroy {
   // Creates a new domain record. The DNS TXT Record will be generated server-side and returned in the response.
   saveDomain = async (): Promise<void> => {
     if (this.domainForm.invalid) {
-      this.platformUtilsService.showToast("error", null, this.i18nService.t("domainFormInvalid"));
+      this.toastService.showToast({
+        variant: "error",
+        title: null,
+        message: this.i18nService.t("domainFormInvalid"),
+      });
       return;
     }
 
@@ -126,7 +131,11 @@ export class DomainAddEditDialogComponent implements OnInit, OnDestroy {
       this.data.orgDomain = await this.orgDomainApiService.post(this.data.organizationId, request);
       // Patch the DNS TXT Record that was generated server-side
       this.domainForm.controls.txt.patchValue(this.data.orgDomain.txt);
-      this.platformUtilsService.showToast("success", null, this.i18nService.t("domainSaved"));
+      this.toastService.showToast({
+        variant: "success",
+        title: null,
+        message: this.i18nService.t("domainSaved"),
+      });
     } catch (e) {
       this.handleDomainSaveError(e);
     }
@@ -177,7 +186,11 @@ export class DomainAddEditDialogComponent implements OnInit, OnDestroy {
   verifyDomain = async (): Promise<void> => {
     if (this.domainForm.invalid) {
       // Note: shouldn't be possible, but going to leave this to be safe.
-      this.platformUtilsService.showToast("error", null, this.i18nService.t("domainFormInvalid"));
+      this.toastService.showToast({
+        variant: "error",
+        title: null,
+        message: this.i18nService.t("domainFormInvalid"),
+      });
       return;
     }
 
@@ -188,7 +201,11 @@ export class DomainAddEditDialogComponent implements OnInit, OnDestroy {
       );
 
       if (this.data.orgDomain.verifiedDate) {
-        this.platformUtilsService.showToast("success", null, this.i18nService.t("domainVerified"));
+        this.toastService.showToast({
+          variant: "success",
+          title: null,
+          message: this.i18nService.t("domainVerified"),
+        });
         this.dialogRef.close();
       } else {
         this.domainNameCtrl.setErrors({
@@ -250,7 +267,11 @@ export class DomainAddEditDialogComponent implements OnInit, OnDestroy {
     }
 
     await this.orgDomainApiService.delete(this.data.organizationId, this.data.orgDomain.id);
-    this.platformUtilsService.showToast("success", null, this.i18nService.t("domainRemoved"));
+    this.toastService.showToast({
+      variant: "success",
+      title: null,
+      message: this.i18nService.t("domainRemoved"),
+    });
 
     this.dialogRef.close();
   };

bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts

@@ -10,7 +10,7 @@ import { ErrorResponse } from "@bitwarden/common/models/response/error.response"
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import {
   DomainAddEditDialogComponent,
@@ -37,6 +37,7 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
     private orgDomainService: OrgDomainServiceAbstraction,
     private dialogService: DialogService,
     private validationService: ValidationService,
+    private toastService: ToastService,
   ) {}
 
   // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -110,13 +111,17 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
       );
 
       if (orgDomain.verifiedDate) {
-        this.platformUtilsService.showToast("success", null, this.i18nService.t("domainVerified"));
+        this.toastService.showToast({
+          variant: "success",
+          title: null,
+          message: this.i18nService.t("domainVerified"),
+        });
       } else {
-        this.platformUtilsService.showToast(
+        this.toastService.showToast({
-          "error",
+          variant: "error",
-          null,
+          title: null,
-          this.i18nService.t("domainNotVerified", domainName),
+          message: this.i18nService.t("domainNotVerified", domainName),
-        );
+        });
         // Update this item so the last checked date gets updated.
         await this.updateOrgDomain(orgDomainId);
       }
@@ -138,11 +143,11 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
       switch (errorResponse.statusCode) {
         case HttpStatusCode.Conflict:
           if (errorResponse.message.includes("The domain is not available to be claimed")) {
-            this.platformUtilsService.showToast(
+            this.toastService.showToast({
-              "error",
+              variant: "error",
-              null,
+              title: null,
-              this.i18nService.t("domainNotAvailable", domainName),
+              message: this.i18nService.t("domainNotAvailable", domainName),
-            );
+            });
           }
           break;
 
@@ -166,7 +171,11 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
 
     await this.orgDomainApiService.delete(this.organizationId, orgDomainId);
 
-    this.platformUtilsService.showToast("success", null, this.i18nService.t("domainRemoved"));
+    this.toastService.showToast({
+      variant: "success",
+      title: null,
+      message: this.i18nService.t("domainRemoved"),
+    });
   }
 
   ngOnDestroy(): void {

bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.ts

@@ -17,7 +17,7 @@ import { OrganizationConnectionResponse } from "@bitwarden/common/admin-console/
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 @Component({
   selector: "app-org-manage-scim",
@@ -46,6 +46,7 @@ export class ScimComponent implements OnInit {
     private environmentService: EnvironmentService,
     private organizationApiService: OrganizationApiServiceAbstraction,
     private dialogService: DialogService,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -104,7 +105,11 @@ export class ScimComponent implements OnInit {
       endpointUrl: await this.getScimEndpointUrl(),
       clientSecret: response.apiKey,
     });
-    this.platformUtilsService.showToast("success", null, this.i18nService.t("scimApiKeyRotated"));
+    this.toastService.showToast({
+      variant: "success",
+      title: null,
+      message: this.i18nService.t("scimApiKeyRotated"),
+    });
   };
 
   copyScimKey = async () => {
@@ -131,7 +136,11 @@ export class ScimComponent implements OnInit {
     }
 
     await this.setConnectionFormValues(response);
-    this.platformUtilsService.showToast("success", null, this.i18nService.t("scimSettingsSaved"));
+    this.toastService.showToast({
+      variant: "success",
+      title: null,
+      message: this.i18nService.t("scimSettingsSaved"),
+    });
   };
 
   async getScimEndpointUrl() {

bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.ts

@@ -7,7 +7,7 @@ import { Provider } from "@bitwarden/common/admin-console/models/domain/provider
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 import { WebProviderService } from "../services/web-provider.service";
 
@@ -32,6 +32,7 @@ export class AddOrganizationComponent implements OnInit {
     private platformUtilsService: PlatformUtilsService,
     private validationService: ValidationService,
     private dialogService: DialogService,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -73,11 +74,11 @@ export class AddOrganizationComponent implements OnInit {
         return;
       }
 
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        null,
+        title: null,
-        this.i18nService.t("organizationJoinedProvider"),
+        message: this.i18nService.t("organizationJoinedProvider"),
-      );
+      });
 
       this.dialogRef.close(true);
     };

bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.spec.ts

@@ -6,7 +6,7 @@ import { ProviderService } from "@bitwarden/common/admin-console/abstractions/pr
 import { ProviderUserType } from "@bitwarden/common/admin-console/enums";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ToastService } from "@bitwarden/components";
 
 import { providerPermissionsGuard } from "./provider-permissions.guard";
 
@@ -39,7 +39,7 @@ describe("Provider Permissions Guard", () => {
     TestBed.configureTestingModule({
       providers: [
         { provide: ProviderService, useValue: providerService },
-        { provide: PlatformUtilsService, useValue: mock<PlatformUtilsService>() },
+        { provide: ToastService, useValue: mock<ToastService>() },
         { provide: I18nService, useValue: mock<I18nService>() },
         { provide: Router, useValue: mock<Router>() },
       ],

bitwarden_license/bit-web/src/app/admin-console/providers/guards/provider-permissions.guard.ts

@@ -9,7 +9,7 @@ import {
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ToastService } from "@bitwarden/components";
 
 /**
  * `CanActivateFn` that asserts the logged in user has permission to access
@@ -36,8 +36,8 @@ export function providerPermissionsGuard(
   return async (route: ActivatedRouteSnapshot, _state: RouterStateSnapshot) => {
     const providerService = inject(ProviderService);
     const router = inject(Router);
-    const platformUtilsService = inject(PlatformUtilsService);
     const i18nService = inject(I18nService);
+    const toastService = inject(ToastService);
 
     const provider = await providerService.get(route.params.providerId);
     if (provider == null) {
@@ -45,14 +45,22 @@ export function providerPermissionsGuard(
     }
 
     if (!provider.isProviderAdmin && !provider.enabled) {
-      platformUtilsService.showToast("error", null, i18nService.t("providerIsDisabled"));
+      toastService.showToast({
+        variant: "error",
+        title: null,
+        message: i18nService.t("providerIsDisabled"),
+      });
       return router.createUrlTree(["/"]);
     }
 
     const hasSpecifiedPermissions = permissionsCallback == null || permissionsCallback(provider);
 
     if (!hasSpecifiedPermissions) {
-      platformUtilsService.showToast("error", null, i18nService.t("accessDenied"));
+      toastService.showToast({
+        variant: "error",
+        title: null,
+        message: i18nService.t("accessDenied"),
+      });
       return router.createUrlTree(["/providers", provider.id]);
     }
 

bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts

@@ -9,6 +9,7 @@ import { FileDownloadService } from "@bitwarden/common/platform/abstractions/fil
 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 { ToastService } from "@bitwarden/components";
 import { BaseEventsComponent } from "@bitwarden/web-vault/app/admin-console/common/base.events.component";
 import { EventService } from "@bitwarden/web-vault/app/core";
 import { EventExportService } from "@bitwarden/web-vault/app/tools/event-export";
@@ -37,6 +38,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit {
     logService: LogService,
     private userNamePipe: UserNamePipe,
     fileDownloadService: FileDownloadService,
+    toastService: ToastService,
   ) {
     super(
       eventService,
@@ -45,6 +47,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit {
       platformUtilsService,
       logService,
       fileDownloadService,
+      toastService,
     );
   }
 

bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.ts

@@ -21,7 +21,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 import { BasePeopleComponent } from "@bitwarden/web-vault/app/admin-console/common/base.people.component";
 import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
 import { BulkStatusComponent } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-status.component";
@@ -75,6 +75,7 @@ export class PeopleComponent
     dialogService: DialogService,
     organizationManagementPreferencesService: OrganizationManagementPreferencesService,
     private configService: ConfigService,
+    protected toastService: ToastService,
   ) {
     super(
       apiService,
@@ -89,6 +90,7 @@ export class PeopleComponent
       userNamePipe,
       dialogService,
       organizationManagementPreferencesService,
+      toastService,
     );
   }
 
@@ -213,11 +215,11 @@ export class PeopleComponent
     const filteredUsers = users.filter((u) => u.status === ProviderUserStatusType.Invited);
 
     if (filteredUsers.length <= 0) {
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "error",
+        variant: "error",
-        this.i18nService.t("errorOccurred"),
+        title: this.i18nService.t("errorOccurred"),
-        this.i18nService.t("noSelectedUsersApplicable"),
+        message: this.i18nService.t("noSelectedUsersApplicable"),
-      );
+      });
       return;
     }
 

bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.ts

@@ -8,7 +8,7 @@ import { ProviderUserUpdateRequest } from "@bitwarden/common/admin-console/model
 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 { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 /**
  * @deprecated Please use the {@link MembersDialogComponent} instead.
@@ -42,6 +42,7 @@ export class UserAddEditComponent implements OnInit {
     private platformUtilsService: PlatformUtilsService,
     private logService: LogService,
     private dialogService: DialogService,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -80,11 +81,11 @@ export class UserAddEditComponent implements OnInit {
         this.formPromise = this.apiService.postProviderUserInvite(this.providerId, request);
       }
       await this.formPromise;
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        null,
+        title: null,
-        this.i18nService.t(this.editMode ? "editedUserId" : "invitedUsers", this.name),
+        message: this.i18nService.t(this.editMode ? "editedUserId" : "invitedUsers", this.name),
-      );
+      });
       this.savedUser.emit();
     } catch (e) {
       this.logService.error(e);
@@ -109,11 +110,11 @@ export class UserAddEditComponent implements OnInit {
     try {
       this.deletePromise = this.apiService.deleteProviderUser(this.providerId, this.providerUserId);
       await this.deletePromise;
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        null,
+        title: null,
-        this.i18nService.t("removedUserId", this.name),
+        message: this.i18nService.t("removedUserId", this.name),
-      );
+      });
       this.deletedUser.emit();
     } catch (e) {
       this.logService.error(e);

bitwarden_license/bit-web/src/app/admin-console/providers/settings/account.component.ts

@@ -14,7 +14,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
-import { DialogService } from "@bitwarden/components";
+import { DialogService, ToastService } from "@bitwarden/components";
 
 @Component({
   selector: "provider-account",
@@ -49,6 +49,7 @@ export class AccountComponent implements OnDestroy, OnInit {
     private providerApiService: ProviderApiServiceAbstraction,
     private formBuilder: FormBuilder,
     private router: Router,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -86,7 +87,11 @@ export class AccountComponent implements OnDestroy, OnInit {
     await this.providerApiService.putProvider(this.providerId, request);
     await this.syncService.fullSync(true);
     this.provider = await this.providerApiService.getProvider(this.providerId);
-    this.platformUtilsService.showToast("success", null, this.i18nService.t("providerUpdated"));
+    this.toastService.showToast({
+      variant: "success",
+      title: null,
+      message: this.i18nService.t("providerUpdated"),
+    });
   };
 
   async deleteProvider() {
@@ -110,11 +115,11 @@ export class AccountComponent implements OnDestroy, OnInit {
 
     try {
       await this.providerApiService.deleteProvider(this.providerId);
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "success",
+        variant: "success",
-        this.i18nService.t("providerDeleted"),
+        title: this.i18nService.t("providerDeleted"),
-        this.i18nService.t("providerDeletedDesc"),
+        message: this.i18nService.t("providerDeletedDesc"),
-      );
+      });
     } catch (e) {
       this.logService.error(e);
     }

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts

@@ -6,6 +6,7 @@ import { FileDownloadService } from "@bitwarden/common/platform/abstractions/fil
 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 { ToastService } from "@bitwarden/components";
 import { BaseEventsComponent } from "@bitwarden/web-vault/app/admin-console/common/base.events.component";
 import { EventService } from "@bitwarden/web-vault/app/core";
 import { EventExportService } from "@bitwarden/web-vault/app/tools/event-export";
@@ -33,6 +34,7 @@ export class ServiceAccountEventsComponent
     platformUtilsService: PlatformUtilsService,
     logService: LogService,
     fileDownloadService: FileDownloadService,
+    toastService: ToastService,
   ) {
     super(
       eventService,
@@ -41,6 +43,7 @@ export class ServiceAccountEventsComponent
       platformUtilsService,
       logService,
       fileDownloadService,
+      toastService,
     );
   }
 

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

@@ -14,6 +14,7 @@ import { CollectionService } from "@bitwarden/common/vault/abstractions/collecti
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/vault/models/view/collection.view";
+import { ToastService } from "@bitwarden/components";
 
 @Directive()
 export class CollectionsComponent implements OnInit {
@@ -39,6 +40,7 @@ export class CollectionsComponent implements OnInit {
     private logService: LogService,
     private configService: ConfigService,
     private accountService: AccountService,
+    private toastService: ToastService,
   ) {}
 
   async ngOnInit() {
@@ -82,11 +84,11 @@ export class CollectionsComponent implements OnInit {
       })
       .map((c) => c.id);
     if (!this.allowSelectNone && selectedCollectionIds.length === 0) {
-      this.platformUtilsService.showToast(
+      this.toastService.showToast({
-        "error",
+        variant: "error",
-        this.i18nService.t("errorOccurred"),
+        title: this.i18nService.t("errorOccurred"),
-        this.i18nService.t("selectOneCollection"),
+        message: this.i18nService.t("selectOneCollection"),
-      );
+      });
       return false;
     }
     this.cipherDomain.collectionIds = selectedCollectionIds;
@@ -94,10 +96,18 @@ export class CollectionsComponent implements OnInit {
       this.formPromise = this.saveCollections();
       await this.formPromise;
       this.onSavedCollections.emit();
-      this.platformUtilsService.showToast("success", null, this.i18nService.t("editedItem"));
+      this.toastService.showToast({
+        variant: "success",
+        title: null,
+        message: this.i18nService.t("editedItem"),
+      });
       return true;
     } catch (e) {
-      this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), e.message);
+      this.toastService.showToast({
+        variant: "error",
+        title: this.i18nService.t("errorOccurred"),
+        message: e.message,
+      });
       return false;
     }
   }