@strapi/email 5.55.1 → 5.57.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/server/controllers/email.js +3 -3
- package/dist/server/controllers/email.js.map +1 -1
- package/dist/server/controllers/email.mjs +3 -3
- package/dist/server/controllers/email.mjs.map +1 -1
- package/dist/server/middlewares/rateLimit.js +3 -3
- package/dist/server/middlewares/rateLimit.js.map +1 -1
- package/dist/server/middlewares/rateLimit.mjs +2 -2
- package/dist/server/middlewares/rateLimit.mjs.map +1 -1
- package/dist/server/src/controllers/email.d.ts.map +1 -1
- package/dist/server/src/index.d.ts.map +1 -1
- package/dist/server/src/middlewares/index.d.ts.map +1 -1
- package/package.json +15 -11
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _ = require('lodash');
|
|
4
4
|
var utils = require('@strapi/utils');
|
|
5
5
|
|
|
6
6
|
const { ApplicationError } = utils.errors;
|
|
@@ -59,12 +59,12 @@ const { ApplicationError } = utils.errors;
|
|
|
59
59
|
// Get pool idle status if provider supports it
|
|
60
60
|
const isIdle = typeof provider?.isIdle === 'function' ? provider.isIdle() : undefined;
|
|
61
61
|
ctx.send({
|
|
62
|
-
config:
|
|
62
|
+
config: _.pick(config, [
|
|
63
63
|
'provider',
|
|
64
64
|
'settings.defaultFrom',
|
|
65
65
|
'settings.defaultReplyTo',
|
|
66
66
|
'settings.testAddress'
|
|
67
|
-
]
|
|
67
|
+
]),
|
|
68
68
|
supportsVerify,
|
|
69
69
|
...capabilities ? {
|
|
70
70
|
capabilities
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.js","sources":["../../../server/src/controllers/email.ts"],"sourcesContent":["import { pick } from 'lodash
|
|
1
|
+
{"version":3,"file":"email.js","sources":["../../../server/src/controllers/email.ts"],"sourcesContent":["import { pick } from 'lodash';\nimport { errors } from '@strapi/utils';\n\nimport type Koa from 'koa';\nimport type {} from 'koa-body';\nimport type { EmailConfig, SendOptions } from '../types';\n\nconst { ApplicationError } = errors;\n\n/**\n * Email.js controller\n *\n * @description: A set of functions called \"actions\" of the `email` plugin.\n */\nconst emailController = {\n async send(ctx: Koa.Context) {\n const options = ctx.request.body as SendOptions;\n\n try {\n await strapi.plugin('email').service('email').send(options);\n } catch (error) {\n if (error instanceof Error) {\n if ('statusCode' in error && error.statusCode === 400) {\n throw new ApplicationError(error.message);\n } else {\n throw new Error(`Couldn't send email: ${error.message}.`);\n }\n }\n }\n\n // Send 200 `ok`\n ctx.send({});\n },\n\n async test(ctx: Koa.Context) {\n const { to } = ctx.request.body as Pick<SendOptions, 'to'>;\n\n if (!to) {\n throw new ApplicationError('No recipient(s) are given');\n }\n\n const email: SendOptions = {\n to,\n subject: `Strapi test mail to: ${to}`,\n text: `Great! You have correctly configured the Strapi email plugin with the ${strapi.config.get(\n 'plugin::email.provider'\n )} provider. \\r\\nFor documentation on how to use the email plugin checkout: https://docs.strapi.io/developer-docs/latest/plugins/email.html`,\n };\n\n try {\n await strapi.plugin('email').service('email').send(email);\n } catch (error) {\n if (error instanceof Error) {\n if ('statusCode' in error && error.statusCode === 400) {\n throw new ApplicationError(error.message);\n } else {\n throw new Error(`Couldn't send test email: ${error.message}.`);\n }\n }\n }\n\n // Send 200 `ok`\n ctx.send({});\n },\n\n async getSettings(ctx: Koa.Context) {\n const config: EmailConfig = strapi.plugin('email').service('email').getProviderSettings();\n const provider = strapi.plugin('email').provider;\n\n // Check if provider supports verify method\n const supportsVerify = typeof provider?.verify === 'function';\n\n // Get capabilities from provider (e.g. SMTP host, auth type, features)\n const capabilities =\n typeof provider?.getCapabilities === 'function' ? provider.getCapabilities() : undefined;\n\n // Get pool idle status if provider supports it\n const isIdle = typeof provider?.isIdle === 'function' ? provider.isIdle() : undefined;\n\n ctx.send({\n config: pick(config, [\n 'provider',\n 'settings.defaultFrom',\n 'settings.defaultReplyTo',\n 'settings.testAddress',\n ]),\n supportsVerify,\n ...(capabilities ? { capabilities } : {}),\n ...(isIdle !== undefined ? { isIdle } : {}),\n });\n },\n\n async verify(ctx: Koa.Context) {\n const provider = strapi.plugin('email').provider;\n\n if (!provider?.verify || typeof provider.verify !== 'function') {\n throw new ApplicationError('This email provider does not support connection verification');\n }\n\n try {\n await provider.verify();\n ctx.send({ success: true, message: 'SMTP connection verified successfully' });\n } catch (error) {\n if (error instanceof Error) {\n throw new ApplicationError(`Connection verification failed: ${error.message}`);\n }\n throw new ApplicationError('Connection verification failed');\n }\n },\n};\n\nexport default emailController;\n"],"names":["ApplicationError","errors","emailController","send","ctx","options","request","body","strapi","plugin","service","error","Error","statusCode","message","test","to","email","subject","text","config","get","getSettings","getProviderSettings","provider","supportsVerify","verify","capabilities","getCapabilities","undefined","isIdle","pick","success"],"mappings":";;;;;AAOA,MAAM,EAAEA,gBAAgB,EAAE,GAAGC,YAAAA;AAE7B;;;;AAIC,UACKC,eAAAA,GAAkB;AACtB,IAAA,MAAMC,MAAKC,GAAgB,EAAA;AACzB,QAAA,MAAMC,OAAAA,GAAUD,GAAAA,CAAIE,OAAO,CAACC,IAAI;QAEhC,IAAI;YACF,MAAMC,MAAAA,CAAOC,MAAM,CAAC,OAAA,CAAA,CAASC,OAAO,CAAC,OAAA,CAAA,CAASP,IAAI,CAACE,OAAAA,CAAAA;AACrD,QAAA,CAAA,CAAE,OAAOM,KAAAA,EAAO;AACd,YAAA,IAAIA,iBAAiBC,KAAAA,EAAO;AAC1B,gBAAA,IAAI,YAAA,IAAgBD,KAAAA,IAASA,KAAAA,CAAME,UAAU,KAAK,GAAA,EAAK;oBACrD,MAAM,IAAIb,gBAAAA,CAAiBW,KAAAA,CAAMG,OAAO,CAAA;gBAC1C,CAAA,MAAO;oBACL,MAAM,IAAIF,MAAM,CAAC,qBAAqB,EAAED,KAAAA,CAAMG,OAAO,CAAC,CAAC,CAAC,CAAA;AAC1D,gBAAA;AACF,YAAA;AACF,QAAA;;QAGAV,GAAAA,CAAID,IAAI,CAAC,EAAC,CAAA;AACZ,IAAA,CAAA;AAEA,IAAA,MAAMY,MAAKX,GAAgB,EAAA;AACzB,QAAA,MAAM,EAAEY,EAAE,EAAE,GAAGZ,GAAAA,CAAIE,OAAO,CAACC,IAAI;AAE/B,QAAA,IAAI,CAACS,EAAAA,EAAI;AACP,YAAA,MAAM,IAAIhB,gBAAAA,CAAiB,2BAAA,CAAA;AAC7B,QAAA;AAEA,QAAA,MAAMiB,KAAAA,GAAqB;AACzBD,YAAAA,EAAAA;YACAE,OAAAA,EAAS,CAAC,qBAAqB,EAAEF,EAAAA,CAAAA,CAAI;YACrCG,IAAAA,EAAM,CAAC,sEAAsE,EAAEX,MAAAA,CAAOY,MAAM,CAACC,GAAG,CAC9F,wBAAA,CAAA,CACA,yIAAyI;AAC7I,SAAA;QAEA,IAAI;YACF,MAAMb,MAAAA,CAAOC,MAAM,CAAC,OAAA,CAAA,CAASC,OAAO,CAAC,OAAA,CAAA,CAASP,IAAI,CAACc,KAAAA,CAAAA;AACrD,QAAA,CAAA,CAAE,OAAON,KAAAA,EAAO;AACd,YAAA,IAAIA,iBAAiBC,KAAAA,EAAO;AAC1B,gBAAA,IAAI,YAAA,IAAgBD,KAAAA,IAASA,KAAAA,CAAME,UAAU,KAAK,GAAA,EAAK;oBACrD,MAAM,IAAIb,gBAAAA,CAAiBW,KAAAA,CAAMG,OAAO,CAAA;gBAC1C,CAAA,MAAO;oBACL,MAAM,IAAIF,MAAM,CAAC,0BAA0B,EAAED,KAAAA,CAAMG,OAAO,CAAC,CAAC,CAAC,CAAA;AAC/D,gBAAA;AACF,YAAA;AACF,QAAA;;QAGAV,GAAAA,CAAID,IAAI,CAAC,EAAC,CAAA;AACZ,IAAA,CAAA;AAEA,IAAA,MAAMmB,aAAYlB,GAAgB,EAAA;QAChC,MAAMgB,MAAAA,GAAsBZ,OAAOC,MAAM,CAAC,SAASC,OAAO,CAAC,SAASa,mBAAmB,EAAA;AACvF,QAAA,MAAMC,QAAAA,GAAWhB,MAAAA,CAAOC,MAAM,CAAC,SAASe,QAAQ;;QAGhD,MAAMC,cAAAA,GAAiB,OAAOD,QAAAA,EAAUE,MAAAA,KAAW,UAAA;;AAGnD,QAAA,MAAMC,eACJ,OAAOH,QAAAA,EAAUI,oBAAoB,UAAA,GAAaJ,QAAAA,CAASI,eAAe,EAAA,GAAKC,SAAAA;;AAGjF,QAAA,MAAMC,SAAS,OAAON,QAAAA,EAAUM,WAAW,UAAA,GAAaN,QAAAA,CAASM,MAAM,EAAA,GAAKD,SAAAA;AAE5EzB,QAAAA,GAAAA,CAAID,IAAI,CAAC;AACPiB,YAAAA,MAAAA,EAAQW,OAAKX,MAAAA,EAAQ;AACnB,gBAAA,UAAA;AACA,gBAAA,sBAAA;AACA,gBAAA,yBAAA;AACA,gBAAA;AACD,aAAA,CAAA;AACDK,YAAAA,cAAAA;AACA,YAAA,GAAIE,YAAAA,GAAe;AAAEA,gBAAAA;AAAa,aAAA,GAAI,EAAE;AACxC,YAAA,GAAIG,WAAWD,SAAAA,GAAY;AAAEC,gBAAAA;AAAO,aAAA,GAAI;AAC1C,SAAA,CAAA;AACF,IAAA,CAAA;AAEA,IAAA,MAAMJ,QAAOtB,GAAgB,EAAA;AAC3B,QAAA,MAAMoB,QAAAA,GAAWhB,MAAAA,CAAOC,MAAM,CAAC,SAASe,QAAQ;AAEhD,QAAA,IAAI,CAACA,QAAAA,EAAUE,MAAAA,IAAU,OAAOF,QAAAA,CAASE,MAAM,KAAK,UAAA,EAAY;AAC9D,YAAA,MAAM,IAAI1B,gBAAAA,CAAiB,8DAAA,CAAA;AAC7B,QAAA;QAEA,IAAI;AACF,YAAA,MAAMwB,SAASE,MAAM,EAAA;AACrBtB,YAAAA,GAAAA,CAAID,IAAI,CAAC;gBAAE6B,OAAAA,EAAS,IAAA;gBAAMlB,OAAAA,EAAS;AAAwC,aAAA,CAAA;AAC7E,QAAA,CAAA,CAAE,OAAOH,KAAAA,EAAO;AACd,YAAA,IAAIA,iBAAiBC,KAAAA,EAAO;AAC1B,gBAAA,MAAM,IAAIZ,gBAAAA,CAAiB,CAAC,gCAAgC,EAAEW,KAAAA,CAAMG,OAAO,CAAA,CAAE,CAAA;AAC/E,YAAA;AACA,YAAA,MAAM,IAAId,gBAAAA,CAAiB,gCAAA,CAAA;AAC7B,QAAA;AACF,IAAA;AACF;;;;"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { pick } from 'lodash
|
|
1
|
+
import { pick } from 'lodash';
|
|
2
2
|
import { errors } from '@strapi/utils';
|
|
3
3
|
|
|
4
4
|
const { ApplicationError } = errors;
|
|
@@ -57,12 +57,12 @@ const { ApplicationError } = errors;
|
|
|
57
57
|
// Get pool idle status if provider supports it
|
|
58
58
|
const isIdle = typeof provider?.isIdle === 'function' ? provider.isIdle() : undefined;
|
|
59
59
|
ctx.send({
|
|
60
|
-
config: pick([
|
|
60
|
+
config: pick(config, [
|
|
61
61
|
'provider',
|
|
62
62
|
'settings.defaultFrom',
|
|
63
63
|
'settings.defaultReplyTo',
|
|
64
64
|
'settings.testAddress'
|
|
65
|
-
]
|
|
65
|
+
]),
|
|
66
66
|
supportsVerify,
|
|
67
67
|
...capabilities ? {
|
|
68
68
|
capabilities
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.mjs","sources":["../../../server/src/controllers/email.ts"],"sourcesContent":["import { pick } from 'lodash
|
|
1
|
+
{"version":3,"file":"email.mjs","sources":["../../../server/src/controllers/email.ts"],"sourcesContent":["import { pick } from 'lodash';\nimport { errors } from '@strapi/utils';\n\nimport type Koa from 'koa';\nimport type {} from 'koa-body';\nimport type { EmailConfig, SendOptions } from '../types';\n\nconst { ApplicationError } = errors;\n\n/**\n * Email.js controller\n *\n * @description: A set of functions called \"actions\" of the `email` plugin.\n */\nconst emailController = {\n async send(ctx: Koa.Context) {\n const options = ctx.request.body as SendOptions;\n\n try {\n await strapi.plugin('email').service('email').send(options);\n } catch (error) {\n if (error instanceof Error) {\n if ('statusCode' in error && error.statusCode === 400) {\n throw new ApplicationError(error.message);\n } else {\n throw new Error(`Couldn't send email: ${error.message}.`);\n }\n }\n }\n\n // Send 200 `ok`\n ctx.send({});\n },\n\n async test(ctx: Koa.Context) {\n const { to } = ctx.request.body as Pick<SendOptions, 'to'>;\n\n if (!to) {\n throw new ApplicationError('No recipient(s) are given');\n }\n\n const email: SendOptions = {\n to,\n subject: `Strapi test mail to: ${to}`,\n text: `Great! You have correctly configured the Strapi email plugin with the ${strapi.config.get(\n 'plugin::email.provider'\n )} provider. \\r\\nFor documentation on how to use the email plugin checkout: https://docs.strapi.io/developer-docs/latest/plugins/email.html`,\n };\n\n try {\n await strapi.plugin('email').service('email').send(email);\n } catch (error) {\n if (error instanceof Error) {\n if ('statusCode' in error && error.statusCode === 400) {\n throw new ApplicationError(error.message);\n } else {\n throw new Error(`Couldn't send test email: ${error.message}.`);\n }\n }\n }\n\n // Send 200 `ok`\n ctx.send({});\n },\n\n async getSettings(ctx: Koa.Context) {\n const config: EmailConfig = strapi.plugin('email').service('email').getProviderSettings();\n const provider = strapi.plugin('email').provider;\n\n // Check if provider supports verify method\n const supportsVerify = typeof provider?.verify === 'function';\n\n // Get capabilities from provider (e.g. SMTP host, auth type, features)\n const capabilities =\n typeof provider?.getCapabilities === 'function' ? provider.getCapabilities() : undefined;\n\n // Get pool idle status if provider supports it\n const isIdle = typeof provider?.isIdle === 'function' ? provider.isIdle() : undefined;\n\n ctx.send({\n config: pick(config, [\n 'provider',\n 'settings.defaultFrom',\n 'settings.defaultReplyTo',\n 'settings.testAddress',\n ]),\n supportsVerify,\n ...(capabilities ? { capabilities } : {}),\n ...(isIdle !== undefined ? { isIdle } : {}),\n });\n },\n\n async verify(ctx: Koa.Context) {\n const provider = strapi.plugin('email').provider;\n\n if (!provider?.verify || typeof provider.verify !== 'function') {\n throw new ApplicationError('This email provider does not support connection verification');\n }\n\n try {\n await provider.verify();\n ctx.send({ success: true, message: 'SMTP connection verified successfully' });\n } catch (error) {\n if (error instanceof Error) {\n throw new ApplicationError(`Connection verification failed: ${error.message}`);\n }\n throw new ApplicationError('Connection verification failed');\n }\n },\n};\n\nexport default emailController;\n"],"names":["ApplicationError","errors","emailController","send","ctx","options","request","body","strapi","plugin","service","error","Error","statusCode","message","test","to","email","subject","text","config","get","getSettings","getProviderSettings","provider","supportsVerify","verify","capabilities","getCapabilities","undefined","isIdle","pick","success"],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var utils = require('@strapi/utils');
|
|
4
|
-
var
|
|
4
|
+
var _ = require('lodash');
|
|
5
5
|
|
|
6
6
|
const { RateLimitError } = utils.errors;
|
|
7
7
|
var rateLimit = ((config, { strapi })=>async (ctx, next)=>{
|
|
@@ -14,8 +14,8 @@ var rateLimit = ((config, { strapi })=>async (ctx, next)=>{
|
|
|
14
14
|
// TODO: TS - Do the dynamic import
|
|
15
15
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
16
16
|
const rateLimit = require('koa2-ratelimit').RateLimit;
|
|
17
|
-
const requestEmail =
|
|
18
|
-
const userEmail =
|
|
17
|
+
const requestEmail = _.get(ctx, 'request.body.email');
|
|
18
|
+
const userEmail = _.isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';
|
|
19
19
|
const loadConfig = {
|
|
20
20
|
interval: {
|
|
21
21
|
min: 5
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimit.js","sources":["../../../server/src/middlewares/rateLimit.ts"],"sourcesContent":["import type { Context, Next } from 'koa';\nimport { errors } from '@strapi/utils';\nimport {
|
|
1
|
+
{"version":3,"file":"rateLimit.js","sources":["../../../server/src/middlewares/rateLimit.ts"],"sourcesContent":["import type { Context, Next } from 'koa';\nimport { errors } from '@strapi/utils';\nimport { get, isString } from 'lodash';\nimport type { Core } from '@strapi/types';\n\nconst { RateLimitError } = errors;\n\nexport default (config: any, { strapi }: { strapi: Core.Strapi }) =>\n async (ctx: Context, next: Next) => {\n const pluginConfig = strapi.config.get('plugin::email') as any;\n const rateLimitConfig = {\n enabled: true,\n ...pluginConfig.ratelimit,\n };\n\n if (rateLimitConfig.enabled === true) {\n // TODO: TS - Do the dynamic import\n // eslint-disable-next-line @typescript-eslint/no-var-requires\n const rateLimit = require('koa2-ratelimit').RateLimit;\n\n const requestEmail = get(ctx, 'request.body.email');\n const userEmail = isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';\n\n const loadConfig = {\n interval: { min: 5 },\n max: 5,\n prefixKey: `${userEmail}`,\n handler() {\n throw new RateLimitError();\n },\n ...rateLimitConfig,\n ...config,\n };\n\n return rateLimit.middleware(loadConfig)(ctx, next);\n }\n\n return next();\n };\n"],"names":["RateLimitError","errors","config","strapi","ctx","next","pluginConfig","get","rateLimitConfig","enabled","ratelimit","rateLimit","require","RateLimit","requestEmail","userEmail","isString","toLowerCase","loadConfig","interval","min","max","prefixKey","handler","middleware"],"mappings":";;;;;AAKA,MAAM,EAAEA,cAAc,EAAE,GAAGC,YAAAA;AAE3B,gBAAe,CAAA,CAACC,MAAAA,EAAa,EAAEC,MAAM,EAA2B,GAC9D,OAAOC,GAAAA,EAAcC,IAAAA,GAAAA;AACnB,QAAA,MAAMC,YAAAA,GAAeH,MAAAA,CAAOD,MAAM,CAACK,GAAG,CAAC,eAAA,CAAA;AACvC,QAAA,MAAMC,eAAAA,GAAkB;YACtBC,OAAAA,EAAS,IAAA;AACT,YAAA,GAAGH,aAAaI;AAClB,SAAA;QAEA,IAAIF,eAAAA,CAAgBC,OAAO,KAAK,IAAA,EAAM;;;YAGpC,MAAME,SAAAA,GAAYC,OAAAA,CAAQ,gBAAA,CAAA,CAAkBC,SAAS;YAErD,MAAMC,YAAAA,GAAeP,MAAIH,GAAAA,EAAK,oBAAA,CAAA;AAC9B,YAAA,MAAMW,SAAAA,GAAYC,UAAAA,CAASF,YAAAA,CAAAA,GAAgBA,YAAAA,CAAaG,WAAW,EAAA,GAAK,cAAA;AAExE,YAAA,MAAMC,UAAAA,GAAa;gBACjBC,QAAAA,EAAU;oBAAEC,GAAAA,EAAK;AAAE,iBAAA;gBACnBC,GAAAA,EAAK,CAAA;AACLC,gBAAAA,SAAAA,EAAW,GAAGP,SAAAA,CAAAA,CAAW;AACzBQ,gBAAAA,OAAAA,CAAAA,GAAAA;AACE,oBAAA,MAAM,IAAIvB,cAAAA,EAAAA;AACZ,gBAAA,CAAA;AACA,gBAAA,GAAGQ,eAAe;AAClB,gBAAA,GAAGN;AACL,aAAA;AAEA,YAAA,OAAOS,SAAAA,CAAUa,UAAU,CAACN,UAAAA,CAAAA,CAAYd,GAAAA,EAAKC,IAAAA,CAAAA;AAC/C,QAAA;QAEA,OAAOA,IAAAA,EAAAA;AACT,IAAA,CAAA;;;;"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { errors } from '@strapi/utils';
|
|
2
|
-
import { get, isString } from 'lodash
|
|
2
|
+
import { get, isString } from 'lodash';
|
|
3
3
|
|
|
4
4
|
const { RateLimitError } = errors;
|
|
5
5
|
var rateLimit = ((config, { strapi })=>async (ctx, next)=>{
|
|
@@ -12,7 +12,7 @@ var rateLimit = ((config, { strapi })=>async (ctx, next)=>{
|
|
|
12
12
|
// TODO: TS - Do the dynamic import
|
|
13
13
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
14
14
|
const rateLimit = require('koa2-ratelimit').RateLimit;
|
|
15
|
-
const requestEmail = get('request.body.email')
|
|
15
|
+
const requestEmail = get(ctx, 'request.body.email');
|
|
16
16
|
const userEmail = isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';
|
|
17
17
|
const loadConfig = {
|
|
18
18
|
interval: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimit.mjs","sources":["../../../server/src/middlewares/rateLimit.ts"],"sourcesContent":["import type { Context, Next } from 'koa';\nimport { errors } from '@strapi/utils';\nimport {
|
|
1
|
+
{"version":3,"file":"rateLimit.mjs","sources":["../../../server/src/middlewares/rateLimit.ts"],"sourcesContent":["import type { Context, Next } from 'koa';\nimport { errors } from '@strapi/utils';\nimport { get, isString } from 'lodash';\nimport type { Core } from '@strapi/types';\n\nconst { RateLimitError } = errors;\n\nexport default (config: any, { strapi }: { strapi: Core.Strapi }) =>\n async (ctx: Context, next: Next) => {\n const pluginConfig = strapi.config.get('plugin::email') as any;\n const rateLimitConfig = {\n enabled: true,\n ...pluginConfig.ratelimit,\n };\n\n if (rateLimitConfig.enabled === true) {\n // TODO: TS - Do the dynamic import\n // eslint-disable-next-line @typescript-eslint/no-var-requires\n const rateLimit = require('koa2-ratelimit').RateLimit;\n\n const requestEmail = get(ctx, 'request.body.email');\n const userEmail = isString(requestEmail) ? requestEmail.toLowerCase() : 'unknownEmail';\n\n const loadConfig = {\n interval: { min: 5 },\n max: 5,\n prefixKey: `${userEmail}`,\n handler() {\n throw new RateLimitError();\n },\n ...rateLimitConfig,\n ...config,\n };\n\n return rateLimit.middleware(loadConfig)(ctx, next);\n }\n\n return next();\n };\n"],"names":["RateLimitError","errors","config","strapi","ctx","next","pluginConfig","get","rateLimitConfig","enabled","ratelimit","rateLimit","require","RateLimit","requestEmail","userEmail","isString","toLowerCase","loadConfig","interval","min","max","prefixKey","handler","middleware"],"mappings":";;;AAKA,MAAM,EAAEA,cAAc,EAAE,GAAGC,MAAAA;AAE3B,gBAAe,CAAA,CAACC,MAAAA,EAAa,EAAEC,MAAM,EAA2B,GAC9D,OAAOC,GAAAA,EAAcC,IAAAA,GAAAA;AACnB,QAAA,MAAMC,YAAAA,GAAeH,MAAAA,CAAOD,MAAM,CAACK,GAAG,CAAC,eAAA,CAAA;AACvC,QAAA,MAAMC,eAAAA,GAAkB;YACtBC,OAAAA,EAAS,IAAA;AACT,YAAA,GAAGH,aAAaI;AAClB,SAAA;QAEA,IAAIF,eAAAA,CAAgBC,OAAO,KAAK,IAAA,EAAM;;;YAGpC,MAAME,SAAAA,GAAYC,OAAAA,CAAQ,gBAAA,CAAA,CAAkBC,SAAS;YAErD,MAAMC,YAAAA,GAAeP,IAAIH,GAAAA,EAAK,oBAAA,CAAA;AAC9B,YAAA,MAAMW,SAAAA,GAAYC,QAAAA,CAASF,YAAAA,CAAAA,GAAgBA,YAAAA,CAAaG,WAAW,EAAA,GAAK,cAAA;AAExE,YAAA,MAAMC,UAAAA,GAAa;gBACjBC,QAAAA,EAAU;oBAAEC,GAAAA,EAAK;AAAE,iBAAA;gBACnBC,GAAAA,EAAK,CAAA;AACLC,gBAAAA,SAAAA,EAAW,GAAGP,SAAAA,CAAAA,CAAW;AACzBQ,gBAAAA,OAAAA,CAAAA,GAAAA;AACE,oBAAA,MAAM,IAAIvB,cAAAA,EAAAA;AACZ,gBAAA,CAAA;AACA,gBAAA,GAAGQ,eAAe;AAClB,gBAAA,GAAGN;AACL,aAAA;AAEA,YAAA,OAAOS,SAAAA,CAAUa,UAAU,CAACN,UAAAA,CAAAA,CAAYd,GAAAA,EAAKC,IAAAA,CAAAA;AAC/C,QAAA;QAEA,OAAOA,IAAAA,EAAAA;AACT,IAAA,CAAA;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../../../server/src/controllers/email.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAM3B;;;;GAIG;AACH,QAAA,MAAM,eAAe;cACH,GAAG,CAAC,OAAO;cAmBX,GAAG,CAAC,OAAO;qBA+BJ,GAAG,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../../../server/src/controllers/email.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAM3B;;;;GAIG;AACH,QAAA,MAAM,eAAe;cACH,GAAG,CAAC,OAAO;cAmBX,GAAG,CAAC,OAAO;qBA+BJ,GAAG,CAAC,OAAO;gBA2BhB,GAAG,CAAC,OAAO;CAiB9B,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../server/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../server/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAUE,0BACC,EAAC,wBACJ;;;AALA,wBAOE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/src/middlewares/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/src/middlewares/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;;;;WAKyG,0BAAY,EAAC,wBAAW;;AAHpL,wBAEE"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@strapi/email",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.57.0",
|
|
4
4
|
"description": "Easily configure your Strapi application to send emails.",
|
|
5
5
|
"homepage": "https://strapi.io",
|
|
6
6
|
"bugs": {
|
|
@@ -53,19 +53,21 @@
|
|
|
53
53
|
"build:types:admin": "run -T tsc -p admin/tsconfig.build.json --emitDeclarationOnly",
|
|
54
54
|
"clean": "run -T rimraf ./dist",
|
|
55
55
|
"lint": "run -T eslint . --max-warnings=0",
|
|
56
|
-
"test:unit": "run -T jest",
|
|
57
56
|
"test:front": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js",
|
|
58
57
|
"test:front:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js",
|
|
59
58
|
"test:front:watch": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
|
|
60
59
|
"test:front:watch:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll",
|
|
60
|
+
"test:ts:back": "run -T tsc -p server/tsconfig.json",
|
|
61
61
|
"test:ts:front": "run -T tsc -p admin/tsconfig.json",
|
|
62
|
-
"watch": "run -T rollup -c -w"
|
|
62
|
+
"watch": "run -T rollup -c -w",
|
|
63
|
+
"test:unit:vitest": "vitest run",
|
|
64
|
+
"test:unit:vitest:watch": "vitest --watch"
|
|
63
65
|
},
|
|
64
66
|
"dependencies": {
|
|
65
67
|
"@strapi/design-system": "2.2.4",
|
|
66
68
|
"@strapi/icons": "2.2.4",
|
|
67
|
-
"@strapi/provider-email-sendmail": "5.
|
|
68
|
-
"@strapi/utils": "5.
|
|
69
|
+
"@strapi/provider-email-sendmail": "5.57.0",
|
|
70
|
+
"@strapi/utils": "5.57.0",
|
|
69
71
|
"koa2-ratelimit": "^1.1.3",
|
|
70
72
|
"lodash": "4.18.1",
|
|
71
73
|
"react-intl": "6.6.2",
|
|
@@ -74,8 +76,8 @@
|
|
|
74
76
|
"zod": "4.4.3"
|
|
75
77
|
},
|
|
76
78
|
"devDependencies": {
|
|
77
|
-
"@strapi/admin": "5.
|
|
78
|
-
"@strapi/types": "5.
|
|
79
|
+
"@strapi/admin": "5.57.0",
|
|
80
|
+
"@strapi/types": "5.57.0",
|
|
79
81
|
"@testing-library/dom": "10.4.1",
|
|
80
82
|
"@testing-library/jest-dom": "6.9.1",
|
|
81
83
|
"@testing-library/react": "16.3.2",
|
|
@@ -88,14 +90,16 @@
|
|
|
88
90
|
"koa-body": "6.0.1",
|
|
89
91
|
"react": "18.3.1",
|
|
90
92
|
"react-dom": "18.3.1",
|
|
91
|
-
"react-router-dom": "6.30.
|
|
92
|
-
"styled-components": "6.4.1"
|
|
93
|
+
"react-router-dom": "6.30.6",
|
|
94
|
+
"styled-components": "6.4.1",
|
|
95
|
+
"vitest": "catalog:",
|
|
96
|
+
"vitest-config": "5.57.0"
|
|
93
97
|
},
|
|
94
98
|
"peerDependencies": {
|
|
95
99
|
"@strapi/admin": "^5.0.0",
|
|
96
100
|
"koa": "^2.15.2",
|
|
97
|
-
"react": "^
|
|
98
|
-
"react-dom": "^
|
|
101
|
+
"react": "^18.0.0",
|
|
102
|
+
"react-dom": "^18.0.0",
|
|
99
103
|
"react-router-dom": "^6.30.3",
|
|
100
104
|
"styled-components": "^6.0.0"
|
|
101
105
|
},
|