Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 946e862b1c |
4
.gitignore
vendored
4
.gitignore
vendored
@ -15,6 +15,8 @@ node_modules/
|
||||
|
||||
# builds
|
||||
dist/
|
||||
dist_*/
|
||||
dist_web/
|
||||
dist_serve/
|
||||
dist_ts_web/
|
||||
|
||||
# custom
|
||||
@ -3,44 +3,36 @@ 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
|
||||
|
||||
before_script:
|
||||
- npm install -g @shipzone/npmci
|
||||
- security
|
||||
- test
|
||||
- release
|
||||
- metadata
|
||||
|
||||
# ====================
|
||||
# security stage
|
||||
# ====================
|
||||
auditProductionDependencies:
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||
mirror:
|
||||
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
|
||||
- npmci git mirror
|
||||
tags:
|
||||
- docker
|
||||
allow_failure: true
|
||||
- docker
|
||||
- notpriv
|
||||
|
||||
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
|
||||
@ -49,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
|
||||
@ -86,37 +79,34 @@ release:
|
||||
codequality:
|
||||
stage: metadata
|
||||
allow_failure: true
|
||||
only:
|
||||
- tags
|
||||
script:
|
||||
- npmci command npm install -g typescript
|
||||
- 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
|
||||
script:
|
||||
- npmci node install stable
|
||||
- npmci node install lts
|
||||
- npmci command npm install -g @gitzone/tsdoc
|
||||
- npmci npm prepare
|
||||
- npmci npm install
|
||||
- npmci command npm run buildDocs
|
||||
- npmci command tsdoc
|
||||
tags:
|
||||
- lossless
|
||||
- docker
|
||||
- notpriv
|
||||
only:
|
||||
@ -124,5 +114,5 @@ pages:
|
||||
artifacts:
|
||||
expire_in: 1 week
|
||||
paths:
|
||||
- public
|
||||
- public
|
||||
allow_failure: true
|
||||
|
||||
8
.gitlab/.gitlab-webide.yml
Normal file
8
.gitlab/.gitlab-webide.yml
Normal file
@ -0,0 +1,8 @@
|
||||
terminal:
|
||||
image: registry.gitlab.com/hosttoday/ht-docker-node:stable
|
||||
before_script:
|
||||
- npm install -g npm-check
|
||||
variables:
|
||||
RAILS_ENV: "test"
|
||||
NODE_ENV: "test"
|
||||
|
||||
24
.vscode/launch.json
vendored
24
.vscode/launch.json
vendored
@ -2,10 +2,28 @@
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"command": "npm test",
|
||||
"name": "Run npm test",
|
||||
"name": "current file",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"type": "node-terminal"
|
||||
"args": [
|
||||
"${relativeFile}"
|
||||
],
|
||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
},
|
||||
{
|
||||
"name": "test.ts",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"args": [
|
||||
"test/test.ts"
|
||||
],
|
||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
8
.vscode/settings.json
vendored
8
.vscode/settings.json
vendored
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
{
|
||||
"gitzone": {
|
||||
"projectType": "npm",
|
||||
"module": {
|
||||
"githost": "gitlab.com",
|
||||
"gitscope": "mojoio",
|
||||
"gitrepo": "mailgun",
|
||||
"description": "an api abstraction package for mailgun",
|
||||
"shortDescription": "an api abstraction package for mailgun",
|
||||
"npmPackagename": "@mojoio/mailgun",
|
||||
"license": "MIT",
|
||||
"projectDomain": "mojo.io"
|
||||
|
||||
14095
package-lock.json
generated
14095
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
39
package.json
39
package.json
@ -1,46 +1,41 @@
|
||||
{
|
||||
"name": "@mojoio/mailgun",
|
||||
"version": "2.0.0",
|
||||
"version": "1.0.18",
|
||||
"private": false,
|
||||
"description": "an api abstraction package for mailgun",
|
||||
"main": "dist_ts/index.js",
|
||||
"typings": "dist_ts/index.d.ts",
|
||||
"type": "module",
|
||||
"main": "dist/index.js",
|
||||
"typings": "dist/index.d.ts",
|
||||
"author": "Lossless GmbH",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"test": "(tstest test/)",
|
||||
"build": "(tsbuild --web)",
|
||||
"format": "(gitzone format)",
|
||||
"buildDocs": "tsdoc"
|
||||
"build": "(tsbuild)",
|
||||
"format": "(gitzone format)"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@gitzone/tsbuild": "^2.1.65",
|
||||
"@gitzone/tstest": "^1.0.73",
|
||||
"@pushrocks/qenv": "^5.0.2",
|
||||
"@pushrocks/tapbundle": "^5.0.4",
|
||||
"@types/node": "^18.6.4"
|
||||
"@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": "^10.0.4",
|
||||
"@pushrocks/smartmail": "^1.0.22",
|
||||
"@pushrocks/smartrequest": "^2.0.10",
|
||||
"@pushrocks/smartsmtp": "^3.0.3",
|
||||
"@pushrocks/smartstring": "^4.0.2"
|
||||
"@pushrocks/smartfile": "^7.0.6",
|
||||
"@pushrocks/smartmail": "^1.0.8",
|
||||
"@pushrocks/smartrequest": "^1.1.47",
|
||||
"@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"
|
||||
]
|
||||
}
|
||||
|
||||
3
qenv.yml
3
qenv.yml
@ -1,3 +1,2 @@
|
||||
required:
|
||||
- MAILGUN_API_TOKEN
|
||||
- MAILGUN_SMTP_CREDENTIALS
|
||||
- MAILGUN_API_TOKEN
|
||||
27
readme.md
27
readme.md
@ -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 | [](https://lossless.cloud)
|
||||
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||
npm | [](https://lossless.cloud)
|
||||
Snyk | [](https://lossless.cloud)
|
||||
TypeScript Support | [](https://lossless.cloud)
|
||||
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||
Code Style | [](https://lossless.cloud)
|
||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
||||
[](https://gitlab.com/mojoio/mailgun/commits/master)
|
||||
[](https://gitlab.com/mojoio/mailgun/commits/master)
|
||||
[](https://www.npmjs.com/package/@mojoio/mailgun)
|
||||
[](https://snyk.io/test/npm/@mojoio/mailgun)
|
||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||
[](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)
|
||||
|
||||
53
test/test.ts
53
test/test.ts
@ -4,60 +4,35 @@ import * as smartmail from '@pushrocks/smartmail';
|
||||
|
||||
const testQenv = new Qenv('./', './.nogit');
|
||||
|
||||
import * as mailgun from '../ts/index.js';
|
||||
import { IMailgunMessage } from '../ts/index.js';
|
||||
import * as mailgun from '../ts/index';
|
||||
|
||||
|
||||
let testMailgunAccount: mailgun.MailgunAccount;
|
||||
let testSmartmail: smartmail.Smartmail<IMailgunMessage>;
|
||||
let testSmartmail: smartmail.Smartmail;
|
||||
|
||||
tap.test('should create a mailgun account', async () => {
|
||||
testMailgunAccount = new mailgun.MailgunAccount({
|
||||
apiToken: testQenv.getEnvVarOnDemand('MAILGUN_API_TOKEN'),
|
||||
region: 'eu',
|
||||
});
|
||||
await testMailgunAccount.addSmtpCredentials(
|
||||
testQenv.getEnvVarOnDemand('MAILGUN_SMTP_CREDENTIALS')
|
||||
);
|
||||
expect(testMailgunAccount).toBeInstanceOf(mailgun.MailgunAccount);
|
||||
tap.test('first test', async () => {
|
||||
testMailgunAccount = new mailgun.MailgunAccount(testQenv.getEnvVarOnDemand('MAILGUN_API_TOKEN'));
|
||||
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).toBeInstanceOf(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=='
|
||||
);
|
||||
console.log(result);
|
||||
|
||||
// TODO handle empty body
|
||||
if (false) {
|
||||
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();
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
/**
|
||||
* autocreated commitinfo by @pushrocks/commitinfo
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@mojoio/mailgun',
|
||||
version: '2.0.0',
|
||||
description: 'an api abstraction package for mailgun'
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
export * from './mailgun.classes.account.js';
|
||||
export * from './interfaces/index.js';
|
||||
export * from './mailgun.classes.account';
|
||||
export * from './interfaces';
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
export * from './message.js';
|
||||
export * from './notification.js';
|
||||
export * from './message';
|
||||
export * from './notification';
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -1,57 +1,27 @@
|
||||
import * as plugins from './mailgun.plugins.js';
|
||||
import * as interfaces from './interfaces/index.js';
|
||||
|
||||
export interface IMailgunAccountContructorOptions {
|
||||
apiToken: string;
|
||||
region: 'eu' | 'us';
|
||||
}
|
||||
import * as plugins from './mailgun.plugins';
|
||||
import * as interfaces from './interfaces';
|
||||
|
||||
export class MailgunAccount {
|
||||
public apiBaseUrl: string;
|
||||
public baseUrl = 'https://api.mailgun.net/v3';
|
||||
public apiToken: string;
|
||||
|
||||
public options: IMailgunAccountContructorOptions;
|
||||
|
||||
public smartSmtps: { [domain: string]: plugins.smartsmtp.Smartsmtp } = {};
|
||||
|
||||
constructor(optionsArg: IMailgunAccountContructorOptions) {
|
||||
this.options = optionsArg;
|
||||
this.apiBaseUrl =
|
||||
this.options.region === 'eu'
|
||||
? 'https://api.eu.mailgun.net/v3'
|
||||
: 'https://api..mailgun.net/v3';
|
||||
}
|
||||
|
||||
/**
|
||||
* allows adding smtp credentials
|
||||
* Format: [domain]|[username]|[password]
|
||||
*/
|
||||
public async addSmtpCredentials(credentials: string) {
|
||||
const credentialArray = credentials.split('|');
|
||||
if (credentialArray.length !== 3) {
|
||||
throw new Error('credentials are in the wrong format');
|
||||
}
|
||||
this.smartSmtps[credentialArray[0]] =
|
||||
await plugins.smartsmtp.Smartsmtp.createSmartsmtpWithRelay({
|
||||
smtpServer: 'smtp.eu.mailgun.org',
|
||||
smtpUser: credentialArray[1],
|
||||
smtpPassword: credentialArray[2],
|
||||
});
|
||||
constructor(apiTokenArg: string) {
|
||||
this.apiToken = apiTokenArg;
|
||||
}
|
||||
|
||||
public async getRequest(routeArg: string, binaryArg: boolean = false) {
|
||||
let requestUrl = routeArg;
|
||||
const needsBaseUrlPrefix = !routeArg.startsWith('https://');
|
||||
if (needsBaseUrlPrefix) {
|
||||
requestUrl = `${this.apiBaseUrl}${routeArg}`;
|
||||
}
|
||||
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.options.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) {
|
||||
@ -63,17 +33,15 @@ export class MailgunAccount {
|
||||
}
|
||||
|
||||
public async postFormData(routeArg: string, formFields: plugins.smartrequest.IFormField[]) {
|
||||
const requestUrl = `${this.apiBaseUrl}${routeArg}`;
|
||||
console.log(requestUrl);
|
||||
const requestUrl = `${this.baseUrl}${routeArg}`; // TODO;
|
||||
const response = await plugins.smartrequest.postFormData(
|
||||
requestUrl,
|
||||
{
|
||||
headers: {
|
||||
Authorization: `Basic ${plugins.smartstring.base64.encode(
|
||||
`api:${this.options.apiToken}`
|
||||
)}`,
|
||||
},
|
||||
keepAlive: false,
|
||||
`api:${this.apiToken}`
|
||||
)}`
|
||||
}
|
||||
},
|
||||
formFields
|
||||
);
|
||||
@ -83,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);
|
||||
@ -119,75 +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;
|
||||
}
|
||||
await 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) {
|
||||
console.log(`retrieving message for ${messageUrlArg}`);
|
||||
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']);
|
||||
}
|
||||
|
||||
@ -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 };
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"experimentalDecorators": true,
|
||||
"useDefineForClassFields": false,
|
||||
"target": "ES2022",
|
||||
"module": "ES2022",
|
||||
"moduleResolution": "nodenext",
|
||||
"esModuleInterop": true
|
||||
}
|
||||
}
|
||||
17
tslint.json
Normal file
17
tslint.json
Normal file
@ -0,0 +1,17 @@
|
||||
{
|
||||
"extends": ["tslint:latest", "tslint-config-prettier"],
|
||||
"rules": {
|
||||
"semicolon": [true, "always"],
|
||||
"no-console": false,
|
||||
"ordered-imports": false,
|
||||
"object-literal-sort-keys": false,
|
||||
"member-ordering": {
|
||||
"options":{
|
||||
"order": [
|
||||
"static-method"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"defaultSeverity": "warning"
|
||||
}
|
||||
Reference in New Issue
Block a user