Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export class EmailValidationService implements IEmailValidationService {
try {
// Race between provider validation and timeout
const result = await Promise.race([
this.deps.emailValidationProvider.validateEmail(request),
this.deps.emailValidationProvider.validateEmail({ request, abortSignal: controller.signal }),
new Promise<never>((_, reject) => {
controller.signal.addEventListener("abort", () => {
reject(new Error(`Email validation provider timeout after ${this.providerTimeout}ms`));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@ import type { EmailValidationRequest, EmailValidationResult } from "../dto/types
* have universal meanings, and blocking decisions are centralized in EmailValidationService.
*/
export interface IEmailValidationProviderService {
validateEmail(request: EmailValidationRequest): Promise<EmailValidationResult>;
validateEmail(params: {
request: EmailValidationRequest;
abortSignal?: AbortSignal;
}): Promise<EmailValidationResult>;
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe("ZeroBounceEmailValidationProviderService", () => {

mockFetch.mockResolvedValue(mockResponse);

const result = await service.validateEmail({ email: "test@example.com" });
const result = await service.validateEmail({ request: { email: "test@example.com" } });

expect(result).toEqual({
status: "valid",
Expand All @@ -52,17 +52,19 @@ describe("ZeroBounceEmailValidationProviderService", () => {
delete process.env.ZEROBOUNCE_API_KEY;
const serviceWithoutKey = new ZeroBounceEmailValidationProviderService();

await expect(serviceWithoutKey.validateEmail({ email: "test@example.com" })).rejects.toThrow(
"ZeroBounce API key not configured"
);
await expect(
serviceWithoutKey.validateEmail({ request: { email: "test@example.com" } })
).rejects.toThrow("ZeroBounce API key not configured");

expect(mockFetch).not.toHaveBeenCalled();
});

it("should propagate error when ZeroBounce API is unreachable or returns network error", async () => {
mockFetch.mockRejectedValue(new Error("Network error"));

await expect(service.validateEmail({ email: "test@example.com" })).rejects.toThrow("Network error");
await expect(service.validateEmail({ request: { email: "test@example.com" } })).rejects.toThrow(
"Network error"
);
});

it("should reject validation request when ZeroBounce API returns server error", async () => {
Expand All @@ -74,7 +76,7 @@ describe("ZeroBounceEmailValidationProviderService", () => {

mockFetch.mockResolvedValue(mockResponse);

await expect(service.validateEmail({ email: "test@example.com" })).rejects.toThrow(
await expect(service.validateEmail({ request: { email: "test@example.com" } })).rejects.toThrow(
"ZeroBounce API returned 500: Internal Server Error"
);
});
Expand All @@ -92,8 +94,10 @@ describe("ZeroBounceEmailValidationProviderService", () => {
mockFetch.mockResolvedValue(mockResponse);

await service.validateEmail({
email: "test@example.com",
ipAddress: "192.168.1.1",
request: {
email: "test@example.com",
ipAddress: "192.168.1.1",
},
});

expect(mockFetch).toHaveBeenCalledWith(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ export class ZeroBounceEmailValidationProviderService implements IEmailValidatio
this.apiKey = process.env.ZEROBOUNCE_API_KEY || "";
}

async validateEmail(request: EmailValidationRequest): Promise<EmailValidationResult> {
async validateEmail({
request,
abortSignal,
}: {
request: EmailValidationRequest;
abortSignal?: AbortSignal;
}): Promise<EmailValidationResult> {
const { email, ipAddress } = request;

if (!this.apiKey) {
Expand All @@ -46,6 +52,7 @@ export class ZeroBounceEmailValidationProviderService implements IEmailValidatio
Accept: "application/json",
"User-Agent": "Cal.com",
},
signal: abortSignal,
});

if (!response.ok) {
Expand Down