Skip to content

fix(admin-panel): fix incorrect bounce types #19516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2025
Merged

fix(admin-panel): fix incorrect bounce types #19516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions ...es/fxa-admin-panel/src/components/PageAccountSearch/EmailBounces/getBounceDescription.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,6 @@ const getEmailBounceDescription = (
) => {
let description: string[] | string = HIDE_ROW;
switch (bounceType) {
case BounceType.Undetermined: {
if (bounceSubType === BounceSubType.Undetermined) {
description = BOUNCE_DESCRIPTIONS.undetermined;
}
break;
}

case BounceType.Permanent: {
if (bounceSubType === BounceSubType.General) {
description = BOUNCE_DESCRIPTIONS.permanentGeneral;
Expand Down Expand Up @@ -148,7 +141,11 @@ const getEmailBounceDescription = (
break;
}

case BounceType.Undetermined:
default: {
if (bounceSubType === BounceSubType.Undetermined) {
description = BOUNCE_DESCRIPTIONS.undetermined;
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/fxa-admin-server/src/gql/model/email-bounces.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@ import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';

export enum BounceType {
unmapped,
Undetermined,
Permanent,
Transient,
Complaint,
Undetermined,
}

export enum BounceSubType {
unmapped,
Undetermined,
General,
NoEmail,
OnAccountSuppressionList,
Suppressed,
MailboxFull,
MessageTooLarge,
Expand All @@ -28,6 +27,7 @@ export enum BounceSubType {
NotSpam,
Other,
Virus,
OnAccountSuppressionList,
}

registerEnumType(BounceType, {
Expand Down
8 changes: 4 additions & 4 deletions packages/fxa-admin-server/src/graphql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,17 @@

export enum BounceType {
unmapped = "unmapped",
Undetermined = "Undetermined",
Permanent = "Permanent",
Transient = "Transient",
Complaint = "Complaint"
Complaint = "Complaint",
Undetermined = "Undetermined"
}

export enum BounceSubType {
unmapped = "unmapped",
Undetermined = "Undetermined",
General = "General",
NoEmail = "NoEmail",
OnAccountSuppressionList = "OnAccountSuppressionList",
Suppressed = "Suppressed",
MailboxFull = "MailboxFull",
MessageTooLarge = "MessageTooLarge",
Expand All @@ -32,7 +31,8 @@ export enum BounceSubType {
Fraud = "Fraud",
NotSpam = "NotSpam",
Other = "Other",
Virus = "Virus"
Virus = "Virus",
OnAccountSuppressionList = "OnAccountSuppressionList"
}

export enum ProviderId {
Expand Down
4 changes: 2 additions & 2 deletions packages/fxa-admin-server/src/schema.gql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,17 @@ type EmailBounce {

enum BounceType {
unmapped
Undetermined
Permanent
Transient
Complaint
Undetermined
}

enum BounceSubType {
unmapped
Undetermined
General
NoEmail
OnAccountSuppressionList
Suppressed
MailboxFull
MessageTooLarge
Expand All @@ -64,6 +63,7 @@ enum BounceSubType {
NotSpam
Other
Virus
OnAccountSuppressionList
}

type Email {
Expand Down
2 changes: 2 additions & 0 deletions packages/fxa-shared/db/models/auth/email-bounce.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const BOUNCE_TYPES = {
Permanent: 1,
Transient: 2,
Complaint: 3,
Undetermined: 4,
} as const;

export const BOUNCE_SUB_TYPES = {
Expand All @@ -28,6 +29,7 @@ export const BOUNCE_SUB_TYPES = {
'not-spam': 12,
other: 13,
virus: 14,
OnAccountSuppressionList: 15,
} as const;

export type BounceType = keyof typeof BOUNCE_TYPES;
Expand Down