bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-08 12:40:26 +00:00
Code Issues Releases Wiki Activity

error toast not showing on ErrorResponse

Browse Source
This commit is contained in:
Maciej Zieniuk
2025-03-13 13:21:12 +00:00
parent 3e6c3b07c7
commit ea231e355b
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libs/angular/src/auth/components/remove-password.component.spec.ts
View File

@@ -4,6 +4,7 @@ import { mock } from "jest-mock-extended";
import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { SyncService } from "@bitwarden/common/platform/sync";
@@ -128,9 +129,16 @@ describe("RemovePasswordComponent", () => {
expect(mockRouter.navigate).toHaveBeenCalledWith([""]);
});
it("should handle errors and show error toast", async () => {
it("should handle response errors and show error toast", async () => {
const errorMessage = "Can't migrate user error";
mockKeyConnectorService.migrateUser.mockRejectedValue(new Error(errorMessage));
mockKeyConnectorService.migrateUser.mockRejectedValue(
new ErrorResponse(
{
message: errorMessage,
},
404,
),
);
mockI18nService.t.mockReturnValue("error occurred");
await component.convert();
@@ -170,10 +178,17 @@ describe("RemovePasswordComponent", () => {
expect(mockRouter.navigate).toHaveBeenCalledWith([""]);
});
it("should handle errors and show error toast", async () => {
it("should handle response errors and show error toast", async () => {
const errorMessage = "Can't leave organization error";
mockDialogService.openSimpleDialog.mockResolvedValue(true);
mockOrganizationApiService.leave.mockRejectedValue(new Error(errorMessage));
mockOrganizationApiService.leave.mockRejectedValue(
new ErrorResponse(
{
message: errorMessage,
},
404,
),
);
mockI18nService.t.mockReturnValue("error occurred");
await component.leave();

5
libs/angular/src/auth/components/remove-password.component.ts
View File

@@ -6,6 +6,7 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { UserId } from "@bitwarden/common/types/guid";
@@ -76,7 +77,7 @@ export class RemovePasswordComponent implements OnInit {
} catch (e) {
this.continuing = false;
if (e instanceof Error) {
if (e instanceof ErrorResponse) {
this.toastService.showToast({
variant: "error",
title: this.i18nService.t("errorOccurred"),
@@ -111,7 +112,7 @@ export class RemovePasswordComponent implements OnInit {
} catch (e) {
this.leaving = false;
if (e instanceof Error) {
if (e instanceof ErrorResponse) {
this.toastService.showToast({
variant: "error",
title: this.i18nService.t("errorOccurred"),