mailgun.js 3.7.3 → 4.1.1

package/test/domains.test.ts

@@ -3,17 +3,27 @@ import formData from 'form-data';
 import nock from 'nock';
 import { expect } from 'chai';
 import Request from '../lib/request';
-import DomainClient from '../lib/domains';
+import DomainClient, { Domain } from '../lib/domains';
 import RequestOptions from '../lib/interfaces/RequestOptions';
 import { InputFormData } from '../lib/interfaces/IFormData';
+import DomainCredentialsClient from '../lib/domainsCredentials';
+import {
+  ConnectionSettings,
+  MessageResponse,
+  UpdatedConnectionSettings,
+  UpdatedDKIMAuthority,
+  UpdatedDKIMSelectorResponse, UpdatedWebPrefixResponse
+} from '../lib/interfaces/Domains';
 
 // TODO: fix types
 describe('DomainClient', function () {
-  let client: any;
-  let api: any;
+  let client: DomainClient;
+  let api: nock.Scope;
 
   beforeEach(function () {
-    client = new DomainClient(new Request({ url: 'https://api.mailgun.net' } as RequestOptions, formData as InputFormData));
+    const reqObject = new Request({ url: 'https://api.mailgun.net' } as RequestOptions, formData as InputFormData);
+    const domainCredentialsClient = new DomainCredentialsClient(reqObject);
+    client = new DomainClient(reqObject, domainCredentialsClient);
     api = nock('https://api.mailgun.net');
   });
 
@@ -36,11 +46,11 @@ describe('DomainClient', function () {
         require_tls: true
       }];
 
-      api.get('/v2/domains').reply(200, {
+      api.get('/v3/domains').reply(200, {
         items: domains
       });
 
-      return client.list().then(function (dm: any[]) {
+      return client.list().then(function (dm: Domain[]) {
         dm[0].should.eql({
           created_at: 'Sun, 19 Oct 2014 18:49:36 GMT',
           name: 'testing.example.com',
@@ -74,13 +84,13 @@ describe('DomainClient', function () {
         require_tls: true
       };
 
-      api.get('/v2/domains/testing.example.com').reply(200, {
+      api.get('/v3/domains/testing.example.com').reply(200, {
         domain: domainData,
         receiving_dns_records: [],
         sending_dns_records: []
       });
 
-      return client.get('testing.example.com').then(function (domain: any) {
+      return client.get('testing.example.com').then(function (domain: Domain) {
         domain.should.eql({
           created_at: 'Sun, 19 Oct 2014 18:49:36 GMT',
           name: 'testing.example.com',
@@ -114,13 +124,17 @@ describe('DomainClient', function () {
         require_tls: true
       };
 
-      api.post('/v2/domains').reply(200, {
+      api.post('/v3/domains').reply(200, {
         domain: domainData,
         receiving_dns_records: [],
         sending_dns_records: []
       });
 
-      return client.create({ name: 'another.example.com' }).then(function (domain: any) {
+      return client.create({
+        name: 'another.example.com',
+        smtp_password: 'smtp_password',
+        web_scheme: 'https'
+      }).then(function (domain: Domain) {
         domain.should.eql({
           created_at: 'Sun, 19 Oct 2014 18:49:36 GMT',
           name: 'another.example.com',
@@ -141,11 +155,11 @@ describe('DomainClient', function () {
 
   describe('destroy', function () {
     it('deletes a domain', function () {
-      api.delete('/v2/domains/test.example.com').reply(200, {
+      api.delete('/v3/domains/test.example.com').reply(200, {
         message: 'domain deleted'
       });
 
-      return client.destroy('test.example.com').then(function (data: any) {
+      return client.destroy('test.example.com').then(function (data: MessageResponse) {
         data.should.eql({
           message: 'domain deleted'
         });
@@ -153,9 +167,46 @@ describe('DomainClient', function () {
     });
   });
 
+  describe('getConnection', function () {
+    it('returns connection settings for the defined domain', function () {
+      api.get('/v3/domains/test.example.com/connection').reply(200, {
+        connection: { require_tls: false, skip_verification: false }
+      });
+
+      return client.getConnection('test.example.com').then(function (data: ConnectionSettings) {
+        data.should.eql({ require_tls: false, skip_verification: false });
+      });
+    });
+  });
+
+  describe('updateConnection', function () {
+    it('Updates the connection settings for the defined domain.', function () {
+      api.put('/v3/domains/test.example.com/connection').reply(200, {
+        connection: {
+          message: 'Domain connection settings have been updated, may take 10 minutes to fully propagate',
+          require_tls: false,
+          skip_verification: false
+        }
+      });
+
+      return client.updateConnection('test.example.com', {
+        require_tls: true,
+        skip_verification: true
+      }).then(function (data: UpdatedConnectionSettings) {
+        data.should.eql({
+          connection: {
+            message: 'Domain connection settings have been updated, may take 10 minutes to fully propagate',
+            require_tls: false,
+            skip_verification: false
+          }
+        });
+      });
+    });
+  });
+
   describe('getTracking', function () {
     it('fetches all tracking settings', function () {
-      api.get('/v2/domains/domain.com/tracking').reply(200, {
+      api.get('/v3/domains/domain.com/tracking').reply(200, {
         tracking: {
           open: { active: true },
           click: { active: true },
@@ -172,7 +223,7 @@ describe('DomainClient', function () {
   describe('updateTracking', function () {
     it('updates tracking settings', async function () {
       const open = { active: true };
-      api.put('/v2/domains/domain.com/tracking/open').reply(200, {
+      api.put('/v3/domains/domain.com/tracking/open').reply(200, {
         message: 'Tracking settings have been updated',
         open
       });
@@ -191,11 +242,63 @@ describe('DomainClient', function () {
   describe('getIps', () => {
     it('should return list of dedicated ips', () => {
       const items = ['192.161.0.1', '192.168.0.2'];
-      api.get('/v2/domains/domain.com/ips').reply(200, { items });
+      api.get('/v3/domains/domain.com/ips').reply(200, { items });
 
       return client.getIps('domain.com').then((response: string[]) => {
         response.should.eql(items);
       });
     });
   });
+
+  describe('updateDKIMAuthority', () => {
+    it('changes the DKIM authority for a domain.', () => {
+      const expectedRes = {
+        changed: true,
+        message: 'Domain DKIM authority has been changed',
+        sending_dns_records: [
+          {
+            cached: ['a'],
+            name: 'test.example.com',
+            record_type: 'record_type',
+            valid: 'valid',
+            value: 'value'
+          }
+        ]
+      };
+
+      api.put('/v3/domains/test.example.com/dkim_authority?self=true').reply(200, expectedRes);
+
+      return client.updateDKIMAuthority('test.example.com', { self: 'true' }).then((response: UpdatedDKIMAuthority) => {
+        response.should.eql(expectedRes);
+      });
+    });
+  });
+
+  describe('updateDKIMSelector', () => {
+    it('updates the DKIM selector for a domains', () => {
+      api.put('/v3/domains/test.example.com/dkim_selector?dkim_selector=dkim_selector_value').reply(200, { message: 'Domain DKIM selector updated' });
+
+      return client.updateDKIMSelector('test.example.com', { dkimSelector: 'dkim_selector_value' }).then((response: UpdatedDKIMSelectorResponse) => {
+        response.should.eql(
+          {
+            body: { message: 'Domain DKIM selector updated' }, status: 200
+          }
+        );
+      });
+    });
+  });
+
+  describe('updateWebPrefix', () => {
+    it('Update the CNAME used for tracking opens and clicks', () => {
+      api.put('/v3/domains/test.example.com/web_prefix?web_prefix=webprefixvalue').reply(200, { message: 'Domain web prefix updated' });
+
+      return client.updateWebPrefix('test.example.com', { webPrefix: 'webprefixvalue' }).then((response: UpdatedWebPrefixResponse) => {
+        response.should.eql(
+          {
+            body: { message: 'Domain web prefix updated' }, status: 200
+          }
+        );
+      });
+    });
+  });
 });

package/test/domainsCredentials.test.ts

@@ -0,0 +1,97 @@
+import formData from 'form-data';
+
+import nock from 'nock';
+import Request from '../lib/request';
+import RequestOptions from '../lib/interfaces/RequestOptions';
+import { InputFormData } from '../lib/interfaces/IFormData';
+import DomainCredentialsClient from '../lib/domainsCredentials';
+import { DomainCredentialsList, DomainCredentialsResult } from '../lib/interfaces/DomainCredentials';
+
+// TODO: fix types
+describe('DomainsCredentialsClient', function () {
+  let client: DomainCredentialsClient;
+  let api: nock.Scope;
+
+  beforeEach(function () {
+    const reqObject = new Request({ url: 'https://api.mailgun.net' } as RequestOptions, formData as InputFormData);
+    client = new DomainCredentialsClient(reqObject);
+    api = nock('https://api.mailgun.net');
+  });
+
+  afterEach(function () {
+    api.done();
+  });
+
+  describe('list', function () {
+    it('fetches all domain credentials', function () {
+      api.get('/v3/domains/testDomain/credentials').reply(200, {
+        items: [{
+          created_at: 'Mon, 11 Oct 2021 17:30:06 -0000',
+          login: 'testLogin@testing.example.com',
+          mailbox: 'test@testing.example.com',
+          size_bytes: null
+        }],
+        total_count: 1
+      });
+
+      return client.list('testDomain').then(function (credentialsList: DomainCredentialsList) {
+        credentialsList.should.be.an('object').to.have.property('items');
+        credentialsList.items.should.be.an('array').to.have.property('length').to.be.equal(1);
+        credentialsList.items[0].should.eql({
+          created_at: 'Mon, 11 Oct 2021 17:30:06 -0000',
+          login: 'testLogin@testing.example.com',
+          mailbox: 'test@testing.example.com',
+          size_bytes: null
+        });
+      });
+    });
+  });
+
+  describe('create', function () {
+    it('creates domain credentials', function () {
+      const domainCredentialsData = {
+        login: 'testLogin',
+        password: 'testPassword'
+      };
+
+      api.post('/v3/domains/testDomain/credentials').reply(200, {
+        message: 'Created 1 credentials pair(s)'
+      });
+
+      return client.create('testDomain', domainCredentialsData).then(function (res: DomainCredentialsResult) {
+        res.should.eql({ message: 'Created 1 credentials pair(s)', status: 200 });
+      });
+    });
+  });
+
+  describe('update', function () {
+    it('updates domain credentials', function () {
+      api.put('/v3/domains/testDomain/credentials/testLogin').reply(200, {
+        message: 'Password changed'
+      });
+
+      return client.update('testDomain', 'testLogin', {
+        password: 'testPassword1'
+      }).then(function (res: DomainCredentialsResult) {
+        res.should.eql({ message: 'Password changed', status: 200 });
+      });
+    });
+  });
+
+  describe('destroy', function () {
+    it('deletes a domain credentials', function () {
+      api.delete('/v3/domains/testDomain/credentials/testLogin').reply(200, {
+        message: 'domain deleted',
+        spec: 'testDomain'
+      });
+
+      return client.destroy('testDomain', 'testLogin').then(function (data: DomainCredentialsResult) {
+        data.should.eql({
+          message: 'domain deleted',
+          spec: 'testDomain',
+          status: 200
+        });
+      });
+    });
+  });
+});

package/test/events.test.ts

@@ -5,10 +5,11 @@ import EventClient from '../lib/events';
 import MgRequest from '../lib/request';
 import RequestOptions from '../lib/interfaces/RequestOptions';
 import { InputFormData } from '../lib/interfaces/IFormData';
+import { EventsList, EventsResponse } from '../lib/interfaces/Events';
 
 describe('EventsClient', function () {
-  let client: any;
-  let api: any;
+  let client: EventClient;
+  let api: nock.Scope;
 
   beforeEach(function () {
     client = new EventClient(new MgRequest({ url: 'https://api.mailgun.net' } as RequestOptions, formData as InputFormData));
@@ -26,14 +27,12 @@ describe('EventsClient', function () {
       response = {
         items: [
           {
-            type: 'accepted',
+            event: 'accepted',
             timestamp: 'Wed, 19 Nov 2014 18:32:57 GMT',
-            gist: 'got it',
             content: { more: 'data' }
           }, {
-            type: 'opened',
+            event: 'opened',
             timestamp: 'Tue, 18 Nov 2014 12:32:57 GMT',
-            gist: 'sent',
             content: { more: 'data' }
           }
         ],
@@ -47,49 +46,41 @@ describe('EventsClient', function () {
     });
 
     it('fetches all events', function () {
-      api.get('/v2/domain.com/events').reply(200, response);
+      api.get('/v3/domain.com/events').reply(200, response);
 
-      return client.get('domain.com').then(function (data: any) {
+      return client.get('domain.com').then(function (data: EventsList) {
         let e;
 
         e = data.items[0];
-        e.type.should.eql('accepted');
-        e.gist.should.eql('got it');
+        e.event.should.eql('accepted');
         e.timestamp.should.eql('Wed, 19 Nov 2014 18:32:57 GMT');
-        e.content.should.eql({ more: 'data' });
 
         e = data.items[1];
-        e.type.should.eql('opened');
-        e.gist.should.eql('sent');
+        e.event.should.eql('opened');
         e.timestamp.should.eql('Tue, 18 Nov 2014 12:32:57 GMT');
-        e.content.should.eql({ more: 'data' });
       });
     });
 
     it('fetches single page', function () {
-      api.get('/v2/domain.com/events/pageId').reply(200, response);
+      api.get('/v3/domain.com/events/pageId').reply(200, response);
 
-      return client.get('domain.com', { page: 'pageId' }).then(function (data: any) {
+      return client.get('domain.com', { page: 'pageId' }).then(function (data: EventsList) {
         let e;
 
         e = data.items[0];
-        e.type.should.eql('accepted');
-        e.gist.should.eql('got it');
+        e.event.should.eql('accepted');
         e.timestamp.should.eql('Wed, 19 Nov 2014 18:32:57 GMT');
-        e.content.should.eql({ more: 'data' });
 
         e = data.items[1];
-        e.type.should.eql('opened');
-        e.gist.should.eql('sent');
+        e.event.should.eql('opened');
         e.timestamp.should.eql('Tue, 18 Nov 2014 12:32:57 GMT');
-        e.content.should.eql({ more: 'data' });
       });
     });
 
     it('parses page links', function () {
-      api.get('/v2/domain.com/events').reply(200, response);
+      api.get('/v3/domain.com/events').reply(200, response);
 
-      return client.get('domain.com').then(function (data: any) {
+      return client.get('domain.com').then(function (data: EventsList) {
         let page;
 
         page = data.pages.first;

package/test/multipleValidation.test.ts

@@ -0,0 +1,159 @@
+import formData from 'form-data';
+import fs from 'fs';
+import path from 'path';
+
+import nock from 'nock';
+import Request from '../lib/request';
+import RequestOptions from '../lib/interfaces/RequestOptions';
+import { InputFormData } from '../lib/interfaces/IFormData';
+import MultipleValidationClient from '../lib/multipleValidation';
+import {
+  CanceledMultipleValidationJob,
+  CreatedMultipleValidationJob,
+  MultipleValidationJob,
+  MultipleValidationJobsListResult
+} from '../lib/interfaces/MultipleValidation';
+
+const filepath = path.resolve(__dirname, './data/emailsValidation1.csv');
+
+describe('ValidateClient', function () {
+  const fsPromises = fs.promises;
+  let client: MultipleValidationClient;
+  let api: nock.Scope;
+
+  beforeEach(function () {
+    const reqObject = new Request({ url: 'https://api.mailgun.net' } as RequestOptions, formData as InputFormData);
+    client = new MultipleValidationClient(reqObject);
+    api = nock('https://api.mailgun.net');
+  });
+
+  afterEach(function () {
+    api.done();
+  });
+
+  describe('List', function () {
+    it('should provide list of all bulk validation jobs', function () {
+      const data = {
+        jobs: [
+          {
+            created_at: 1636716764,
+            download_url: {
+              csv: 'csv-url',
+              json: 'json-url'
+            },
+            id: 'testValidationList',
+            quantity: 40,
+            records_processed: 40,
+            status: 'uploaded',
+            summary: {
+              result: {
+                catch_all: 0,
+                deliverable: 2,
+                do_not_send: 0,
+                undeliverable: 16,
+                unknown: 22
+              },
+              risk: {
+                high: 16,
+                low: 2,
+                medium: 0,
+                unknown: 22
+              }
+            }
+          }
+        ],
+        paging: {
+          first: 'https://api.mailgun.net/v4/address/validate/bulk?limit=100&page=first&pivot=',
+          last: 'https://api.mailgun.net/v4/address/validate/bulk?limit=100&page=last&pivot=',
+          next: 'https://api.mailgun.net/v4/address/validate/bulk?limit=100&page=next&pivot=',
+          prev: 'https://api.mailgun.net/v4/address/validate/bulk?limit=100&page=prev&pivot='
+        },
+        total: 1
+      };
+
+      api.get('/v4/address/validate/bulk')
+        .reply(200, data);
+
+      return client.list().then(function (response: MultipleValidationJobsListResult) {
+        response.should.eql(data);
+      });
+    });
+  });
+
+  describe('get', function () {
+    it('should returns status of a bulk validation job.', function () {
+      const listId = 'testValidationList';
+      const data = {
+        created_at: 1636716764,
+        download_url: {
+          csv: 'csv-url',
+          json: 'json-url'
+        },
+        id: listId,
+        quantity: 40,
+        records_processed: 40,
+        status: 'uploaded',
+        summary: {
+          result: {
+            catch_all: 0,
+            deliverable: 2,
+            do_not_send: 0,
+            undeliverable: 16,
+            unknown: 22
+          },
+          risk: {
+            high: 16,
+            low: 2,
+            medium: 0,
+            unknown: 22
+          }
+        }
+      };
+
+      api.get(`/v4/address/validate/bulk/${listId}`)
+        .reply(200, data);
+
+      return client.get(listId).then(function (response: MultipleValidationJob) {
+        response.should.eql(data);
+      });
+    });
+  });
+
+  describe('create', function () {
+    it('Creates a bulk validation job.', async function () {
+      const listId = 'testValidationList';
+      const data = {
+        id: 'testValidationList',
+        message: 'The validation job was submitted.'
+      };
+      const file = {
+        filename: 'test.jpg',
+        data: await fsPromises.readFile(filepath)
+      };
+      api.post(`/v4/address/validate/bulk/${listId}`)
+        .reply(200, data);
+
+      return client.create(listId, { file })
+        .then(function (response: CreatedMultipleValidationJob) {
+          response.should.eql(data);
+        });
+    });
+  });
+
+  describe('destroy', function () {
+    it('should cancel current running bulk validation job.', async function () {
+      const listId = 'testValidationList';
+      const data = {
+        body: { message: 'Validation job canceled.' },
+        status: 200
+      };
+      api.delete(`/v4/address/validate/bulk/${listId}`)
+        .reply(200, { message: 'Validation job canceled.' });
+
+      return client.destroy(listId)
+        .then(function (response: CanceledMultipleValidationJob) {
+          response.should.eql(data);
+        });
+    });
+  });
+});

package/test/validate.test.ts

@@ -5,13 +5,16 @@ import Request from '../lib/request';
 import ValidateClient from '../lib/validate';
 import RequestOptions from '../lib/interfaces/RequestOptions';
 import { InputFormData } from '../lib/interfaces/IFormData';
+import MultipleValidationClient from '../lib/multipleValidation';
 
 describe('ValidateClient', function () {
-  let client: any;
-  let api: any;
+  let client: ValidateClient;
+  let api: nock.Scope;
 
   beforeEach(function () {
-    client = new ValidateClient(new Request({ url: 'https://api.mailgun.net' } as RequestOptions, formData as InputFormData));
+    const reqObject = new Request({ url: 'https://api.mailgun.net' } as RequestOptions, formData as InputFormData);
+    const multipleValidationClient = new MultipleValidationClient(reqObject);
+    client = new ValidateClient(reqObject, multipleValidationClient);
     api = nock('https://api.mailgun.net');
   });
 
@@ -28,7 +31,7 @@ describe('ValidateClient', function () {
         parts: { display_name: null, domain: null, local_part: null }
       };
 
-      api.get('/v3/address/validate')
+      api.get('/v4/address/validate')
         .query({ address: 'foo@example.com' })
         .reply(200, data);
 

package/test/webhooks.test.ts

@@ -25,7 +25,7 @@ describe('WebhookClient', function () {
     };
 
     it('fetches all webhooks', function () {
-      api.get('/v2/domains/domain.com/webhooks').reply(200, {
+      api.get('/v3/domains/domain.com/webhooks').reply(200, {
         webhooks: hooks
       });
 
@@ -37,7 +37,7 @@ describe('WebhookClient', function () {
 
   describe('get', function () {
     it('fetches single webhook', function () {
-      api.get('/v2/domains/domain.com/webhooks/click').reply(200, {
+      api.get('/v3/domains/domain.com/webhooks/click').reply(200, {
         webhook: {
           url: 'trackclick.com'
         }
@@ -51,7 +51,7 @@ describe('WebhookClient', function () {
 
   describe('create', function () {
     it('creates webhook', function () {
-      api.post('/v2/domains/domain.com/webhooks')
+      api.post('/v3/domains/domain.com/webhooks')
         .reply(200, {
           message: 'Webhook has been created',
           webhook: {
@@ -66,7 +66,7 @@ describe('WebhookClient', function () {
     });
 
     it('tests webhook', function () {
-      api.put('/v2/domains/domain.com/webhooks/click/test')
+      api.put('/v3/domains/domain.com/webhooks/click/test')
         .reply(200, {
           code: '500',
           message: 'Hi!'
@@ -81,7 +81,7 @@ describe('WebhookClient', function () {
 
   describe('update', function () {
     it('updates webhook', function () {
-      api.put('/v2/domains/domain.com/webhooks/click')
+      api.put('/v3/domains/domain.com/webhooks/click')
         .reply(200, {
           message: 'Webhook has been updated',
           webhook: {
@@ -97,7 +97,7 @@ describe('WebhookClient', function () {
 
   describe('destroy', function () {
     it('deletes webhook', function () {
-      api.delete('/v2/domains/domain.com/webhooks/click').reply(200, {
+      api.delete('/v3/domains/domain.com/webhooks/click').reply(200, {
         message: 'Webhook has been deleted',
         webhook: {
           url: 'trackclick.com'

package/webpack/webpack.dev.config.js

@@ -5,6 +5,11 @@ const nodeConf = merge(commonConfig, {
   target: 'node',
   output: {
     filename: 'mailgun.node.js'
+  },
+  watchOptions: {
+    aggregateTimeout: 300,
+    poll: 5000,
+    ignored: ['../**/dist/*', '**/node_modules']
   }
 });
 
@@ -12,6 +17,11 @@ const webConf = merge(commonConfig, {
   target: 'web',
   output: {
     filename: 'mailgun.web.js'
+  },
+  watchOptions: {
+    aggregateTimeout: 300,
+    poll: 5000,
+    ignored: ['../**/dist/*', '**/node_modules']
   }
 });