Compare commits

..

1 Commits

Author SHA1 Message Date
946e862b1c 1.0.18 2020-01-13 14:06:34 +00:00
14 changed files with 692 additions and 10304 deletions

4
.gitignore vendored
View File

@ -15,6 +15,8 @@ node_modules/
# builds
dist/
dist_*/
dist_web/
dist_serve/
dist_ts_web/
# custom

View File

@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
cache:
paths:
- .npmci_cache/
key: '$CI_BUILD_STAGE'
- .npmci_cache/
key: "$CI_BUILD_STAGE"
stages:
- security
- test
- release
- metadata
- security
- test
- release
- metadata
# ====================
# security stage
@ -18,36 +18,21 @@ stages:
mirror:
stage: security
script:
- npmci git mirror
only:
- tags
- npmci git mirror
tags:
- lossless
- docker
- notpriv
- docker
- notpriv
auditProductionDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security
script:
- npmci npm prepare
- npmci command npm install --production --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high --only=prod --production
tags:
- docker
auditDevDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
snyk:
stage: security
script:
- npmci npm prepare
- npmci command npm install -g snyk
- npmci command npm install --ignore-scripts
- npmci command npm config set registry https://registry.npmjs.org
- npmci command npm audit --audit-level=high --only=dev
- npmci command snyk test
tags:
- docker
allow_failure: true
- docker
- notpriv
# ====================
# test stage
@ -56,36 +41,37 @@ auditDevDependencies:
testStable:
stage: test
script:
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci npm test
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
- docker
- priv
testBuild:
stage: test
script:
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci command npm run build
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
- docker
- notpriv
release:
stage: release
script:
- npmci node install stable
- npmci npm publish
- npmci node install stable
- npmci npm publish
only:
- tags
- tags
tags:
- lossless
- docker
- notpriv
- docker
- notpriv
# ====================
# metadata stage
@ -93,28 +79,24 @@ release:
codequality:
stage: metadata
allow_failure: true
only:
- tags
script:
- npmci command npm install -g tslint typescript
- npmci npm prepare
- npmci npm install
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
tags:
- lossless
- docker
- priv
- docker
- priv
trigger:
stage: metadata
script:
- npmci trigger
- npmci trigger
only:
- tags
- tags
tags:
- lossless
- docker
- notpriv
- docker
- notpriv
pages:
stage: metadata
@ -125,7 +107,6 @@ pages:
- npmci npm install
- npmci command tsdoc
tags:
- lossless
- docker
- notpriv
only:
@ -133,5 +114,5 @@ pages:
artifacts:
expire_in: 1 week
paths:
- public
- public
allow_failure: true

4
.snyk
View File

@ -1,4 +0,0 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.13.5
ignore: {}
patch: {}

View File

@ -11,13 +11,7 @@
},
"gitzone": {
"type": "object",
"description": "settings for gitzone",
"properties": {
"projectType": {
"type": "string",
"enum": ["website", "element", "service", "npm", "wcc"]
}
}
"description": "settings for gitzone"
}
}
}

View File

@ -1,6 +1,5 @@
{
"gitzone": {
"projectType": "npm",
"module": {
"githost": "gitlab.com",
"gitscope": "mojoio",

10630
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,46 +1,41 @@
{
"name": "@mojoio/mailgun",
"version": "1.0.29",
"version": "1.0.18",
"private": false,
"description": "an api abstraction package for mailgun",
"main": "dist_ts/index.js",
"typings": "dist_ts/index.d.ts",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"author": "Lossless GmbH",
"license": "MIT",
"scripts": {
"test": "(tstest test/)",
"build": "(tsbuild --web)",
"build": "(tsbuild)",
"format": "(gitzone format)"
},
"devDependencies": {
"@gitzone/tsbuild": "^2.1.25",
"@gitzone/tstest": "^1.0.44",
"@pushrocks/qenv": "^4.0.10",
"@pushrocks/tapbundle": "^3.2.9",
"@types/node": "^14.0.27",
"tslint": "^6.1.3",
"@gitzone/tsbuild": "^2.0.22",
"@gitzone/tstest": "^1.0.15",
"@pushrocks/qenv": "^4.0.6",
"@pushrocks/tapbundle": "^3.2.0",
"@types/node": "^13.1.6",
"tslint": "^5.20.1",
"tslint-config-prettier": "^1.15.0"
},
"dependencies": {
"@pushrocks/smartfile": "^8.0.0",
"@pushrocks/smartmail": "^1.0.18",
"@pushrocks/smartfile": "^7.0.6",
"@pushrocks/smartmail": "^1.0.8",
"@pushrocks/smartrequest": "^1.1.47",
"@pushrocks/smartsmtp": "^1.0.6",
"@pushrocks/smartstring": "^3.0.18"
"@pushrocks/smartstring": "^3.0.17"
},
"files": [
"ts/**/*",
"ts_web/**/*",
"dist/**/*",
"dist_*/**/*",
"dist_ts/**/*",
"dist_web/**/*",
"dist_ts_web/**/*",
"assets/**/*",
"cli.js",
"npmextra.json",
"readme.md"
],
"browserslist": [
"last 1 chrome versions"
]
}

View File

@ -1,3 +1,2 @@
required:
- MAILGUN_API_TOKEN
- MAILGUN_SMTP_CREDENTIALS
- MAILGUN_API_TOKEN

View File

@ -8,29 +8,16 @@ an api abstraction package for mailgun
* [docs (typedoc)](https://mojoio.gitlab.io/mailgun/)
## Status for master
Status Category | Status Badge
-- | --
GitLab Pipelines | [![pipeline status](https://gitlab.com/mojoio/mailgun/badges/master/pipeline.svg)](https://lossless.cloud)
GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/mojoio/mailgun/badges/master/coverage.svg)](https://lossless.cloud)
npm | [![npm downloads per month](https://badgen.net/npm/dy/@mojoio/mailgun)](https://lossless.cloud)
Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/mojoio/mailgun)](https://lossless.cloud)
TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@mojoio/mailgun)](https://lossless.cloud)
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@mojoio/mailgun)](https://lossless.cloud)
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@mojoio/mailgun)](https://lossless.cloud)
Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
[![build status](https://gitlab.com/mojoio/mailgun/badges/master/build.svg)](https://gitlab.com/mojoio/mailgun/commits/master)
[![coverage report](https://gitlab.com/mojoio/mailgun/badges/master/coverage.svg)](https://gitlab.com/mojoio/mailgun/commits/master)
[![npm downloads per month](https://img.shields.io/npm/dm/@mojoio/mailgun.svg)](https://www.npmjs.com/package/@mojoio/mailgun)
[![Known Vulnerabilities](https://snyk.io/test/npm/@mojoio/mailgun/badge.svg)](https://snyk.io/test/npm/@mojoio/mailgun)
[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
## Usage
Use TypeScript for best in class intellisense.
## Contribution
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
For further information read the linked docs at the top of this readme.
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

View File

@ -5,51 +5,34 @@ import * as smartmail from '@pushrocks/smartmail';
const testQenv = new Qenv('./', './.nogit');
import * as mailgun from '../ts/index';
import { IMailgunMessage } from '../ts/index';
let testMailgunAccount: mailgun.MailgunAccount;
let testSmartmail: smartmail.Smartmail<IMailgunMessage>;
let testSmartmail: smartmail.Smartmail;
tap.test('should create a mailgun account', async () => {
tap.test('first test', async () => {
testMailgunAccount = new mailgun.MailgunAccount(testQenv.getEnvVarOnDemand('MAILGUN_API_TOKEN'));
testMailgunAccount.addSmtpCredentials(testQenv.getEnvVarOnDemand('MAILGUN_SMTP_CREDENTIALS'));
expect(testMailgunAccount).to.be.instanceOf(mailgun.MailgunAccount);
});
tap.test('should create a smartmail', async () => {
testSmartmail = new smartmail.Smartmail({
body: 'hi there. This is the body.',
from: 'Lossless GmbH <noreply@mail.lossless.com>',
subject: 'TestMessage from @mojoio/mailgun test',
from: 'noreply@mail.lossless.com',
subject: 'hi there. This is the subject'
});
expect(testSmartmail).to.be.instanceOf(smartmail.Smartmail);
return testSmartmail;
});
tap.test('should send a smartmail', async () => {
await testMailgunAccount.sendSmartMail(testSmartmail, 'Sandbox Team <sandbox@mail.git.zone>');
});
tap.test('should send a smartmail with empty body', async () => {
const emptyBodySmartmail = new smartmail.Smartmail<IMailgunMessage>({
body: '',
from: 'Lossless GmbH <noreply@mail.lossless.one>',
subject: 'A message with no body from @mojoio/mailgun test',
});
await testMailgunAccount.sendSmartMail(
emptyBodySmartmail,
'Sandbox Team <sandbox@mail.git.zone>'
);
testMailgunAccount.sendSmartMail(testSmartmail, 'sandbox@mail.git.zone');
});
tap.test('should retrieve a mail using a retrieval url', async () => {
const result = await testMailgunAccount.retrieveSmartMailFromMessageUrl(
'https://sw.api.mailgun.net/v3/domains/mail.lossless.one/messages/AgMFnnnAKC8xp_dDa79LyoxhloxtaVmnRA=='
);
if (result) {
result.options.subject = 'hi there. This is a testmail with attachment';
result.options.from = 'noreply@mail.lossless.com';
await testMailgunAccount.sendSmartMail(result, 'Sandbox Team <sandbox@mail.git.zone>');
}
const result = await testMailgunAccount.retrieveSmartMailFromMessageUrl('https://sw.api.mailgun.net/v3/domains/mail.lossless.one/messages/AgMFnnnAKC8xp_dDa79LyoxhloxtaVmnRA==');
result.options.subject = 'hi there. This is a testmail with attachment';
result.options.from = 'noreply@mail.lossless.com';
testMailgunAccount.sendSmartMail(result, 'sandbox@mail.git.zone');
});
tap.start();

View File

@ -15,14 +15,14 @@ export interface IMailgunMessage {
'X-Gm-Message-State': string;
'body-plain': string;
attachments: Array<{
url: string;
'content-type': string;
name: string;
size: number;
}>;
url: string,
'content-type': string,
name: string,
size: number
}>;
'body-html': string;
'Mime-Version': string;
Date: string;
Date: string,
'Message-Id': string;
'Content-Type': string;
'X-Google-Smtp-Source': string;

View File

@ -6,13 +6,13 @@ export interface IMailgunNotification {
'Received-Spf': string;
From: string;
'Return-Path': string;
'Arc-Seal': string[];
'Arc-Seal': string[],
'Delivered-To': string;
'X-Google-Dkim-Signature': string;
To: string;
'Dkim-Signature': string;
subject: string;
from: string;
subject: 'Booking confirmation (Order 12PN8P)';
from: 'buchungsbestaetigung@bahn.de';
'X-Received': string[];
'Ironport-Sdr': string;
'Arc-Authentication-Results': string[];
@ -32,16 +32,13 @@ export interface IMailgunNotification {
'X-Forwarded-For': string;
'X-Gm-Message-State': string;
'X-Google-Smtp-Source': string;
'X-Envelope-From': string;
'Content-Type': string;
'X-Forwarded-To': string;
'X-Envelope-From': '<phil+caf_=invoiceinbox=mail.lossless.one@lossless.com>';
'Content-Type': 'multipart/mixed; boundary="----=_Part_220882_156025801.1578848484963"';
'X-Forwarded-To': 'invoiceinbox@mail.lossless.one';
Subject: string;
attachments: string;
'body-plain': string;
'stripped-text': string;
'stripped-html': string;
'stripped-signature': string;
// Lossless specific
'X-Lossless-Auth': string;
}
}

View File

@ -5,40 +5,23 @@ export class MailgunAccount {
public baseUrl = 'https://api.mailgun.net/v3';
public apiToken: string;
public smartSmtps: { [domain: string]: plugins.smartsmtp.Smartsmtp } = {};
constructor(apiTokenArg: string) {
this.apiToken = apiTokenArg;
}
/**
* allows adding smtp credentials
* Format: [domain]|[username]|[password]
*/
public addSmtpCredentials(credentials: string) {
const credentialArray = credentials.split('|');
if (credentialArray.length !== 3) {
throw new Error('credentials are in the wrong format');
}
this.smartSmtps[credentialArray[0]] = new plugins.smartsmtp.Smartsmtp({
smtpServer: 'smtp.mailgun.org',
smtpUser: credentialArray[1],
smtpPassword: credentialArray[2],
});
}
public async getRequest(routeArg: string, binaryArg: boolean = false) {
let requestUrl = routeArg;
const needsBaseUrlPrefix = !routeArg.startsWith('https://');
needsBaseUrlPrefix ? (requestUrl = `${this.baseUrl}${routeArg}`) : null;
needsBaseUrlPrefix ? requestUrl = `${this.baseUrl}${routeArg}` : null;
console.log(requestUrl);
const requestOptions: plugins.smartrequest.ISmartRequestOptions = {
method: 'GET',
headers: {
Authorization: `Basic ${plugins.smartstring.base64.encode(`api:${this.apiToken}`)}`,
'Content-Type': 'application/json',
},
keepAlive: false,
Authorization: `Basic ${plugins.smartstring.base64.encode(
`api:${this.apiToken}`
)}`,
'Content-Type': 'application/json'
}
};
let response: plugins.smartrequest.IExtendedIncomingMessage;
if (!binaryArg) {
@ -55,9 +38,10 @@ export class MailgunAccount {
requestUrl,
{
headers: {
Authorization: `Basic ${plugins.smartstring.base64.encode(`api:${this.apiToken}`)}`,
},
keepAlive: false,
Authorization: `Basic ${plugins.smartstring.base64.encode(
`api:${this.apiToken}`
)}`
}
},
formFields
);
@ -67,33 +51,29 @@ export class MailgunAccount {
/**
* sends a SmartMail
*/
public async sendSmartMail(
smartmailArg: plugins.smartmail.Smartmail<interfaces.IMailgunMessage>,
toArg: string,
dataArg = {}
) {
const domain = smartmailArg.options.from.split('@')[1].replace('>', '');
public async sendSmartMail(smartmailArg: plugins.smartmail.Smartmail, toArg: string, dataArg = {}) {
const domain = smartmailArg.options.from.split('@')[1];
const formFields: plugins.smartrequest.IFormField[] = [
{
name: 'from',
type: 'string',
payload: smartmailArg.options.from,
payload: smartmailArg.options.from
},
{
name: 'to',
type: 'string',
payload: toArg,
payload: toArg
},
{
name: 'subject',
type: 'string',
payload: smartmailArg.getSubject(dataArg),
payload: smartmailArg.getSubject(dataArg)
},
{
name: 'html',
type: 'string',
payload: smartmailArg.getBody(dataArg),
},
payload: smartmailArg.getBody(dataArg)
}
];
console.log(smartmailArg.attachments);
@ -103,74 +83,42 @@ export class MailgunAccount {
name: 'attachment',
type: 'Buffer',
payload: attachment.contentBuffer,
fileName: attachment.parsedPath.base,
fileName: attachment.parsedPath.base
});
}
if (smartmailArg.getBody(dataArg)) {
console.log('All requirements for API met');
const response = await this.postFormData(`/${domain}/messages`, formFields);
if (response.statusCode === 200) {
console.log(
`Sent mail with subject ${smartmailArg.getSubject(
dataArg
)} to ${toArg} using the mailgun API`
);
return response.body;
} else {
console.log(response.body);
throw new Error('could not send email');
}
const response = await this.postFormData(`/${domain}/messages`, formFields);
if (response.statusCode === 200) {
return response.body;
} else {
console.log(
'An empty body was provided. This does not work via the API, but using SMTP instead.'
);
const wantedSmartsmtp = this.smartSmtps[domain];
if (!wantedSmartsmtp) {
console.log('did not find appropriate smtp credentials');
return;
}
wantedSmartsmtp.sendSmartMail(smartmailArg, toArg);
console.log(
`Sent mail with subject ${smartmailArg.getSubject(
dataArg
)} to ${toArg} using an smtp transport over Mailgun`
);
console.log(response.body);
throw new Error('could not send email');
}
}
public async retrieveSmartMailFromMessageUrl(messageUrlArg: string) {
const response = await this.getRequest(messageUrlArg);
if (response.statusCode === 404) {
console.log(response.body.message);
return null;
}
const responseBody: interfaces.IMailgunMessage = response.body;
const smartmail = new plugins.smartmail.Smartmail<interfaces.IMailgunMessage>({
const smartmail = new plugins.smartmail.Smartmail({
from: responseBody.From,
body: responseBody['body-html'],
body: responseBody["body-html"],
subject: responseBody.Subject,
creationObjectRef: responseBody,
});
// lets care about attachments
if (responseBody.attachments && responseBody.attachments instanceof Array) {
for (const attachmentInfo of responseBody.attachments) {
const attachmentName = attachmentInfo.name;
const attachmentContents = await this.getRequest(attachmentInfo.url, true);
smartmail.addAttachment(
new plugins.smartfile.Smartfile({
path: `./${attachmentName}`,
base: `./${attachmentName}`,
contentBuffer: attachmentContents.body,
})
);
}
for (const attachmentInfo of responseBody.attachments) {
const attachmentName = attachmentInfo.name;
const attachmentContents = await this.getRequest(attachmentInfo.url, true);
smartmail.addAttachment(new plugins.smartfile.Smartfile({
path: `./${attachmentName}`,
base: `./${attachmentName}`,
contentBuffer: attachmentContents.body
}));
}
return smartmail;
}
public async retrieveSmartMailFromNotifyPayload(notifyPayloadArg: any) {
return await this.retrieveSmartMailFromMessageUrl(notifyPayloadArg['message-url']);
}

View File

@ -2,7 +2,6 @@
import * as smartfile from '@pushrocks/smartfile';
import * as smartmail from '@pushrocks/smartmail';
import * as smartrequest from '@pushrocks/smartrequest';
import * as smartsmtp from '@pushrocks/smartsmtp';
import * as smartstring from '@pushrocks/smartstring';
export { smartfile, smartmail, smartrequest, smartsmtp, smartstring };
export { smartfile, smartmail, smartrequest, smartstring };