From 2a16de3ff0076cd70a8aa26a240ad124e3a22845 Mon Sep 17 00:00:00 2001 From: bniwredyc Date: Thu, 11 May 2023 21:34:43 +0200 Subject: [PATCH] connect form fix --- api/feedback.js | 20 ++++++++------- package-lock.json | 65 +++++++++++++++++++++++------------------------ package.json | 1 + 3 files changed, 44 insertions(+), 42 deletions(-) diff --git a/api/feedback.js b/api/feedback.js index 6ea0c311..56a08f91 100644 --- a/api/feedback.js +++ b/api/feedback.js @@ -1,9 +1,10 @@ const { formidablePromise } = require('./_shared/formidablePromise') -const mailgun = require('mailgun.js') -const FormData = require('form-data') +const formData = require('form-data') +const Mailgun = require('mailgun.js') + +const mailgun = new Mailgun(formData) const { MAILGUN_API_KEY, MAILGUN_DOMAIN } = process.env - const mg = mailgun.client({ username: 'discoursio', key: MAILGUN_API_KEY }) export default async function handler(req, res) { @@ -11,14 +12,15 @@ export default async function handler(req, res) { const text = `${contact}\n\n${message}` - const form = new FormData() - form.append('from', 'Discours Feedback Robot ') - form.append('to', 'welcome@discours.io') - form.append('subject', subject) - form.append('text', text) + const data = { + from: 'Discours Feedback Robot ', + to: 'welcome@discours.io', + subject, + text + } try { - const response = await mg.messages.create(MAILGUN_DOMAIN, { form }) + const response = await mg.messages.create(MAILGUN_DOMAIN, data) console.log('Email sent successfully!', response) res.status(200).json({ result: 'great success' }) } catch (error) { diff --git a/package-lock.json b/package-lock.json index 06b8997b..5b13cedc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@aws-sdk/client-s3": "3.303.0", "@aws-sdk/lib-storage": "3.303.0", "@hocuspocus/provider": "2.0.6", + "form-data": "4.0.0", "formidable": "2.1.1", "i18next": "22.4.15", "mailgun.js": "8.2.1", @@ -7242,19 +7243,6 @@ "proxy-from-env": "^1.1.0" } }, - "node_modules/axios/node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/axobject-query": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", @@ -10279,10 +10267,9 @@ } }, "node_modules/form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", - "dev": true, + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -10774,6 +10761,20 @@ "url": "https://github.com/sponsors/jaydenseric" } }, + "node_modules/graphql-request/node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/graphql-tag": { "version": "2.12.6", "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz", @@ -25907,18 +25908,6 @@ "follow-redirects": "^1.15.0", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" - }, - "dependencies": { - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - } } }, "axobject-query": { @@ -28163,10 +28152,9 @@ } }, "form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", - "dev": true, + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -28532,6 +28520,17 @@ "resolved": "https://registry.npmjs.org/extract-files/-/extract-files-9.0.0.tgz", "integrity": "sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ==", "dev": true + }, + "form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } } } }, diff --git a/package.json b/package.json index a5cb701f..9899c4a0 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "@aws-sdk/client-s3": "3.303.0", "@aws-sdk/lib-storage": "3.303.0", "@hocuspocus/provider": "2.0.6", + "form-data": "4.0.0", "formidable": "2.1.1", "i18next": "22.4.15", "mailgun.js": "8.2.1",