Skip to content
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.

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

feature: Adding Secure Tracking API support #424

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
4 changes: 4 additions & 0 deletions lib/Classes/MailgunClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import MultipleValidationClient from './Validations/multipleValidation';
import DomainTemplatesClient from './Domains/domainsTemplates';
import DomainTagsClient from './Domains/domainsTags';
import SubaccountsClient from './Subaccounts';
import SecureTrackingClient from './SecureTracking';

import {
IDomainsClient,
Expand All @@ -34,6 +35,7 @@ import {
IIPsClient,
IIPPoolsClient,
ISubaccountsClient,
ISecureTrackingClient,
} from '../Interfaces';

export default class MailgunClient implements IMailgunClient {
Expand All @@ -51,6 +53,7 @@ export default class MailgunClient implements IMailgunClient {
public ip_pools: IIPPoolsClient;
public lists: IMailingListsClient;
public subaccounts: ISubaccountsClient;
public secure_tracking: ISecureTrackingClient;

constructor(options: MailgunClientOptions, formData: InputFormData) {
const config: RequestOptions = { ...options } as RequestOptions;
Expand Down Expand Up @@ -92,6 +95,7 @@ export default class MailgunClient implements IMailgunClient {
this.lists = new MailingListsClient(this.request, mailListsMembers);
this.validate = new ValidateClient(this.request, multipleValidationClient);
this.subaccounts = new SubaccountsClient(this.request);
this.secure_tracking = new SecureTrackingClient(this.request);
}

setSubaccount(subaccountId: string): void {
Expand Down
30 changes: 30 additions & 0 deletions lib/Classes/SecureTracking.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { ISecureTrackingClient } from '../Interfaces';
import {
GenerateSecureTrackingCertificateResponse,
GetSecureTrackingCertificateResponse,
RegenerateSecureTrackingCertificateResponse,
} from '../Types';
import Request from './common/Request';

export default class SecureTrackingClient implements ISecureTrackingClient {
request: Request;

constructor(request: Request) {
this.request = request;
}

get(domain: string): Promise<GetSecureTrackingCertificateResponse> {
return this.request.get(`/v2/x509/${domain}/status`)
.then((response) => response.body);
}

generate(domain: string): Promise<GenerateSecureTrackingCertificateResponse> {
return this.request.post(`/v2/x509/${domain}`)
.then((response) => response.body);
}

regenerate(domain: string): Promise<RegenerateSecureTrackingCertificateResponse> {
return this.request.put(`/v2/x509/${domain}`)
.then((response) => response.body);
}
}
2 changes: 2 additions & 0 deletions lib/Interfaces/MailgunClient/IMailgunClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { IIPsClient } from '../IPs';
import { IIPPoolsClient } from '../IPPools';
import { IMailingListsClient } from '../MailingLists';
import { ISubaccountsClient } from '../Subaccounts';
import { ISecureTrackingClient } from '../SecureTracking';

export interface IMailgunClient {
domains: IDomainsClient;
Expand All @@ -25,6 +26,7 @@ export interface IMailgunClient {
ip_pools: IIPPoolsClient;
lists: IMailingListsClient;
subaccounts: ISubaccountsClient;
secure_tracking: ISecureTrackingClient;
setSubaccount(subaccountId: string): void;
resetSubaccount(): void;
}
11 changes: 11 additions & 0 deletions lib/Interfaces/SecureTracking/ISecureTracking.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import {
GenerateSecureTrackingCertificateResponse,
GetSecureTrackingCertificateResponse,
RegenerateSecureTrackingCertificateResponse,
} from '../../Types';

export interface ISecureTrackingClient {
get(domain: string): Promise<GetSecureTrackingCertificateResponse>
generate(domain: string): Promise<GenerateSecureTrackingCertificateResponse>
regenerate(domain: string): Promise<RegenerateSecureTrackingCertificateResponse>
}
1 change: 1 addition & 0 deletions lib/Interfaces/SecureTracking/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './ISecureTracking';
1 change: 1 addition & 0 deletions lib/Interfaces/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ export * from './Routes';
export * from './IPs';
export * from './IPPools';
export * from './Subaccounts';
export * from './SecureTracking';
15 changes: 15 additions & 0 deletions lib/Types/SecureTracking/SecureTracking.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export type GetSecureTrackingCertificateResponse = {
status: string;
error: string;
certificate: string;
}

export type GenerateSecureTrackingCertificateResponse = {
message: string;
location: string;
}

export type RegenerateSecureTrackingCertificateResponse = {
message: string;
location: string;
}
1 change: 1 addition & 0 deletions lib/Types/SecureTracking/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './SecureTracking';
1 change: 1 addition & 0 deletions lib/Types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export * from './MailgunClient';
export * from './MailingLists';
export * from './Messages';
export * from './Routes';
export * from './SecureTracking';
export * from './Stats';
export * from './Subaccounts';
export * from './Suppressions';
Expand Down
74 changes: 74 additions & 0 deletions test/secure-tracking.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/* eslint-disable camelcase */
import formData from 'form-data';
import nock from 'nock';
import { expect } from 'chai';
import { ISecureTrackingClient } from '../lib/Interfaces';
import Request from '../lib/Classes/common/Request';
import SecureTrackingClient from '../lib/Classes/SecureTracking';
import { InputFormData, RequestOptions } from '../lib/Types/Common';
import {
GetSecureTrackingCertificateResponse,
GenerateSecureTrackingCertificateResponse,
RegenerateSecureTrackingCertificateResponse,
} from '../lib/Types/SecureTracking';

describe('SecureTrackingClient', function () {
let client: ISecureTrackingClient;
let api: nock.Scope;
let trackingDomain: string;

beforeEach(function () {
client = new SecureTrackingClient(new Request({ url: 'https://api.mailgun.net' } as RequestOptions, formData as InputFormData));
api = nock('https://api.mailgun.net');
trackingDomain = 'email.testing.example.com';
});

afterEach(function () {
api.done();
});

describe('get', async () => {
it('fetches single secure tracking certificate by domain', async () => {
const data = {
status: 'expired',
error: 'x509 certificate has expired',
certificate: 'sample',
};

api.get(`/v2/x509/${trackingDomain}/status`).reply(200, data);

const response: GetSecureTrackingCertificateResponse = await client.get(trackingDomain);
expect(response).eql(data);
});
});

describe('generate', async () => {
it('generates a secure tracking certificate by domain', async () => {
const data = {
message: 'Initiated x509 key pair generation',
location: `/v2/x509/${trackingDomain}/status`,
};

api.post(`/v2/x509/${trackingDomain}`).reply(202, data);

const response: GenerateSecureTrackingCertificateResponse = await client
.generate(trackingDomain);
expect(response).eql(data);
});
});

describe('regenerate', async () => {
it('regenerates a secure tracking certificate by domain', async () => {
const data = {
message: 'Initiated x509 key pair generation',
location: `/v2/x509/${trackingDomain}/status`,
};

api.put(`/v2/x509/${trackingDomain}`).reply(202, data);

const response: RegenerateSecureTrackingCertificateResponse = await client
.regenerate(trackingDomain);
expect(response).eql(data);
});
});
});