yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-04 11:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

better error handling in email (#6599)

Browse Source 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
This commit is contained in:
Pierre Noël 2020-06-09 12:11:25 +02:00 committed by GitHub
parent 7120bb2558
commit 9f277f67b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/v3.x/deployment/amazon-aws.md
View File

@ -330,7 +330,7 @@ module.exports = ({ env }) => ({
This plugin will allow configurations for each active environment.
```bash
npm install strapi-provider-upload-aws-s3@beta
npm install strapi-provider-upload-aws-s3
```
#### 4. Push your local changes to your project's GitHub repository.

4
docs/v3.x/plugins/email.md
View File

@ -35,7 +35,7 @@ To install a new provider run:
::: tab yarn
```
yarn add strapi-provider-email-sendgrid@beta --save
yarn add strapi-provider-email-sendgrid --save
```
:::
@ -43,7 +43,7 @@ yarn add strapi-provider-email-sendgrid@beta --save
::: tab npm
```
npm install strapi-provider-email-sendgrid@beta --save
npm install strapi-provider-email-sendgrid --save
```
:::

8
packages/strapi-plugin-email/controllers/Email.js
View File

@ -8,7 +8,15 @@
module.exports = {
send: async ctx => {
let options = ctx.request.body;
try {
await strapi.plugins.email.services.email.send(options);
} catch (e) {
if (e.statusCode === 400) {
return ctx.badRequest(e.message);
} else {
throw new Error(`Couldn't send email: ${e.message}.`);
}
}
// Send 200 `ok`
ctx.send({});

2
packages/strapi-provider-email-amazon-ses/lib/index.js
View File

@ -26,7 +26,7 @@ module.exports = {
client.sendEmail(removeUndefined(msg), function(err) {
if (err) {
reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]);
reject(err);
} else {
resolve();
}

2
packages/strapi-provider-email-mailgun/lib/index.js
View File

@ -29,7 +29,7 @@ module.exports = {
mailgun.messages().send(removeUndefined(msg), function(err) {
if (err) {
reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]);
reject(err);
} else {
resolve();
}

2
packages/strapi-provider-email-sendgrid/lib/index.js
View File

@ -26,7 +26,7 @@ module.exports = {
sendgrid.send(removeUndefined(msg), function(err) {
if (err) {
reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]);
reject(err);
} else {
resolve();
}

2
packages/strapi-provider-email-sendmail/lib/index.js
View File

@ -28,7 +28,7 @@ module.exports = {
sendmail(removeUndefined(msg), err => {
if (err) {
reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]);
reject(err);
} else {
resolve();
}