@webiny/api-mailer 0.0.0-unstable.1e66d121db → 0.0.0-unstable.2af142b57e

package/crud/transporter.crud.js.map

@@ -1 +1 @@
-{"version":3,"names":["buildTransporter","params","settings","context","plugins","plugin","buildMailerTransport","ex","console","log","name","message","WebinyError","getDefaultSettings","input","host","process","env","WEBINY_MAILER_HOST","user","WEBINY_MAILER_USER","password","WEBINY_MAILER_PASSWORD","replyTo","WEBINY_MAILER_REPLY_TO","from","WEBINY_MAILER_FROM","hasAtLeastOneValue","Object","values","some","value","String","trim","result","createValidation","validate","error","createTransporterCrud","transporters","defaultSettings","byType","CreateTransportPlugin","type","reverse","onTransportBeforeSend","createTopic","onTransportAfterSend","onTransportError","attachOnTransportBeforeSend","getTransport","tenant","tenancy","getCurrentTenant","id","mailer","getSettings","code","transporter","sendMail","data","transport","publish","response","send"],"sources":["transporter.crud.ts"],"sourcesContent":["import {\n    MailerContext,\n    Transport,\n    OnTransportAfterSendParams,\n    OnTransportBeforeSendParams,\n    OnTransportErrorParams,\n    TransportSettings,\n    MailerTransporterContext\n} from \"~/types\";\nimport { createTopic } from \"@webiny/pubsub\";\nimport { attachOnTransportBeforeSend } from \"~/crud/transport/onTransportBeforeSend\";\nimport { CreateTransportPlugin } from \"~/plugins\";\nimport WebinyError from \"@webiny/error\";\n\nimport { createValidation } from \"./settings/validation\";\n\ninterface BuildMailerParams {\n    plugins: CreateTransportPlugin[];\n    settings: TransportSettings | null;\n    context: MailerContext;\n}\n\nconst buildTransporter = async (params: BuildMailerParams): Promise<Transport> => {\n    const { settings, context, plugins } = params;\n\n    for (const plugin of plugins) {\n        try {\n            return await plugin.buildMailerTransport({\n                settings,\n                context\n            });\n        } catch (ex) {\n            console.log(`Could not build mailer with plugin \"${plugin.name}\".`);\n            console.log(ex.message);\n        }\n    }\n    throw new WebinyError(\n        \"Could not build mailer via any of the available plugins.\",\n        \"MAILER_PLUGINS_ERROR\"\n    );\n};\n\nconst getDefaultSettings = (): TransportSettings | null => {\n    const input: Partial<TransportSettings> = {\n        host: process.env.WEBINY_MAILER_HOST,\n        user: process.env.WEBINY_MAILER_USER,\n        password: process.env.WEBINY_MAILER_PASSWORD,\n        replyTo: process.env.WEBINY_MAILER_REPLY_TO,\n        from: process.env.WEBINY_MAILER_FROM\n    };\n    /**\n     * No need to do the validation if there is not at least one variable defined.\n     */\n    const hasAtLeastOneValue = Object.values(input).some(value => !!String(value).trim());\n    if (!hasAtLeastOneValue) {\n        return null;\n    }\n\n    try {\n        const result = createValidation.validate(input);\n\n        if (!result.error) {\n            return result.value;\n        }\n    } catch (ex) {}\n\n    return null;\n};\n\nexport const createTransporterCrud = async (\n    context: MailerContext\n): Promise<MailerTransporterContext> => {\n    const transporters: Record<string, Transport> = {};\n\n    const defaultSettings: TransportSettings | null = getDefaultSettings();\n    /**\n     * We need the last possible plugin which is defined.\n     * The last plugins are our default ones with the default configurations.\n     * If users wants to override them, they just need to add new plugin with their own configuration and it will be constructed first.\n     */\n    const plugins = context.plugins\n        .byType<CreateTransportPlugin>(CreateTransportPlugin.type)\n        .reverse();\n\n    /**\n     * We define possible events to be hooked into.\n     */\n    const onTransportBeforeSend = createTopic<OnTransportBeforeSendParams>(\n        \"mailer.onTransportBeforeSend\"\n    );\n    const onTransportAfterSend = createTopic<OnTransportAfterSendParams>(\n        \"mailer.onTransportAfterSend\"\n    );\n    const onTransportError = createTopic<OnTransportErrorParams>(\"mailer.onTransportError\");\n    /**\n     * We attach our default ones.\n     */\n    attachOnTransportBeforeSend({\n        onTransportBeforeSend\n    });\n\n    const getTransport = async (): Promise<Transport | null> => {\n        const tenant = context.tenancy.getCurrentTenant().id;\n\n        if (transporters[tenant]) {\n            return transporters[tenant];\n        }\n\n        let settings: TransportSettings | null = null;\n        try {\n            settings = await context.mailer.getSettings();\n        } catch (ex) {\n            if (ex.code !== \"PASSWORD_SECRET_ERROR\") {\n                console.log(ex.message);\n                console.log(ex.code);\n            }\n        }\n        if (!settings && !defaultSettings) {\n            console.log(`There are no Mailer transport settings for tenant \"${tenant}\".`);\n        }\n        const transporter = await buildTransporter({\n            settings: settings || defaultSettings,\n            plugins,\n            context\n        });\n\n        transporters[tenant] = transporter;\n\n        return transporter;\n    };\n\n    return {\n        onTransportBeforeSend,\n        onTransportAfterSend,\n        onTransportError,\n        getTransport,\n        sendMail: async data => {\n            const transport = await getTransport();\n            if (!transport) {\n                return {\n                    result: null,\n                    error: {\n                        message: \"There is no transport available.\",\n                        code: \"NO_TRANSPORT_DEFINED\"\n                    }\n                };\n            }\n            try {\n                await onTransportBeforeSend.publish({\n                    data,\n                    transport\n                });\n                const response = await transport.send(data);\n                await onTransportAfterSend.publish({\n                    data,\n                    transport\n                });\n\n                return {\n                    result: response.result,\n                    error: response.error\n                };\n            } catch (ex) {\n                await onTransportError.publish({\n                    error: ex,\n                    data,\n                    transport\n                });\n                return {\n                    result: null,\n                    error: {\n                        message: ex.message,\n                        code: ex.code,\n                        data: {\n                            data,\n                            ...ex.data\n                        }\n                    }\n                };\n            }\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["buildTransporter","params","settings","context","plugins","plugin","buildMailerTransport","ex","console","log","name","message","WebinyError","getPort","value","port","Number","isNaN","getDefaultSettings","input","host","process","env","WEBINY_MAILER_HOST","WEBINY_MAILER_PORT","user","WEBINY_MAILER_USER","password","WEBINY_MAILER_PASSWORD","replyTo","WEBINY_MAILER_REPLY_TO","from","WEBINY_MAILER_FROM","hasAtLeastOneValue","Object","values","some","String","trim","result","createValidation","safeParse","success","data","createTransporterCrud","transporters","defaultSettings","byType","CreateTransportPlugin","type","reverse","onTransportBeforeSend","createTopic","onTransportAfterSend","onTransportError","attachOnTransportBeforeSend","getTransport","tenant","tenancy","getCurrentTenant","id","mailer","getSettings","code","transporter","sendMail","transport","error","publish","response","send"],"sources":["transporter.crud.ts"],"sourcesContent":["import {\n    MailerContext,\n    Transport,\n    OnTransportAfterSendParams,\n    OnTransportBeforeSendParams,\n    OnTransportErrorParams,\n    TransportSettings,\n    MailerTransporterContext\n} from \"~/types\";\nimport { createTopic } from \"@webiny/pubsub\";\nimport { attachOnTransportBeforeSend } from \"~/crud/transport/onTransportBeforeSend\";\nimport { CreateTransportPlugin } from \"~/plugins\";\nimport WebinyError from \"@webiny/error\";\nimport { createValidation } from \"./settings/validation\";\n\ninterface BuildMailerParams {\n    plugins: CreateTransportPlugin[];\n    settings: TransportSettings | null;\n    context: MailerContext;\n}\n\nconst buildTransporter = async (params: BuildMailerParams): Promise<Transport> => {\n    const { settings, context, plugins } = params;\n\n    for (const plugin of plugins) {\n        try {\n            return await plugin.buildMailerTransport({\n                settings,\n                context\n            });\n        } catch (ex) {\n            console.log(`Could not build mailer with plugin \"${plugin.name}\".`);\n            console.log(ex.message);\n        }\n    }\n    throw new WebinyError(\n        \"Could not build mailer via any of the available plugins.\",\n        \"MAILER_PLUGINS_ERROR\"\n    );\n};\n\nconst getPort = (value: any) => {\n    const port = Number(value);\n    if (!!value && isNaN(port) === false) {\n        return port;\n    }\n    return 25;\n};\n\nconst getDefaultSettings = (): TransportSettings | null => {\n    const input: Partial<TransportSettings> = {\n        host: process.env.WEBINY_MAILER_HOST,\n        port: getPort(process.env.WEBINY_MAILER_PORT),\n        user: process.env.WEBINY_MAILER_USER,\n        password: process.env.WEBINY_MAILER_PASSWORD,\n        replyTo: process.env.WEBINY_MAILER_REPLY_TO,\n        from: process.env.WEBINY_MAILER_FROM\n    };\n    /**\n     * No need to do the validation if there is not at least one variable defined.\n     */\n    const hasAtLeastOneValue = Object.values(input).some(value => !!String(value).trim());\n    if (!hasAtLeastOneValue) {\n        return null;\n    }\n\n    const result = createValidation.safeParse(input);\n\n    return result.success ? result.data : null;\n};\n\nexport const createTransporterCrud = async (\n    context: MailerContext\n): Promise<MailerTransporterContext> => {\n    const transporters: Record<string, Transport> = {};\n\n    const defaultSettings: TransportSettings | null = getDefaultSettings();\n    /**\n     * We need the last possible plugin which is defined.\n     * The last plugins are our default ones with the default configurations.\n     * If users wants to override them, they just need to add new plugin with their own configuration and it will be constructed first.\n     */\n    const plugins = context.plugins\n        .byType<CreateTransportPlugin>(CreateTransportPlugin.type)\n        .reverse();\n\n    /**\n     * We define possible events to be hooked into.\n     */\n    const onTransportBeforeSend = createTopic<OnTransportBeforeSendParams>(\n        \"mailer.onTransportBeforeSend\"\n    );\n    const onTransportAfterSend = createTopic<OnTransportAfterSendParams>(\n        \"mailer.onTransportAfterSend\"\n    );\n    const onTransportError = createTopic<OnTransportErrorParams>(\"mailer.onTransportError\");\n    /**\n     * We attach our default ones.\n     */\n    attachOnTransportBeforeSend({\n        onTransportBeforeSend\n    });\n\n    const getTransport = async (): Promise<Transport | null> => {\n        const tenant = context.tenancy.getCurrentTenant().id;\n\n        if (transporters[tenant]) {\n            return transporters[tenant];\n        }\n\n        let settings: TransportSettings | null = null;\n        try {\n            settings = await context.mailer.getSettings();\n        } catch (ex) {\n            if (ex.code !== \"PASSWORD_SECRET_ERROR\") {\n                console.log(ex.message);\n                console.log(ex.code);\n            }\n        }\n        if (!settings && !defaultSettings) {\n            console.log(`There are no Mailer transport settings for tenant \"${tenant}\".`);\n        }\n        const transporter = await buildTransporter({\n            settings: settings || defaultSettings,\n            plugins,\n            context\n        });\n\n        transporters[tenant] = transporter;\n\n        return transporter;\n    };\n\n    return {\n        onTransportBeforeSend,\n        onTransportAfterSend,\n        onTransportError,\n        getTransport,\n        sendMail: async data => {\n            const transport = await getTransport();\n            if (!transport) {\n                return {\n                    result: null,\n                    error: {\n                        message: \"There is no transport available.\",\n                        code: \"NO_TRANSPORT_DEFINED\"\n                    }\n                };\n            }\n            try {\n                await onTransportBeforeSend.publish({\n                    data,\n                    transport\n                });\n                const response = await transport.send(data);\n                await onTransportAfterSend.publish({\n                    data,\n                    transport\n                });\n\n                return {\n                    result: response.result,\n                    error: response.error\n                };\n            } catch (ex) {\n                await onTransportError.publish({\n                    error: ex,\n                    data,\n                    transport\n                });\n                return {\n                    result: null,\n                    error: {\n                        message: ex.message,\n                        code: ex.code,\n                        data: {\n                            data,\n                            ...ex.data\n                        }\n                    }\n                };\n            }\n        }\n    };\n};\n"],"mappings":"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"}

package/graphql/index.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createGraphQL = void 0;
-
 var _settings = require("./settings");
-
 const createGraphQL = () => {
   return [(0, _settings.createSettingsGraphQL)()];
 };
-
 exports.createGraphQL = createGraphQL;

package/graphql/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createGraphQL","createSettingsGraphQL"],"sources":["index.ts"],"sourcesContent":["import { createSettingsGraphQL } from \"~/graphql/settings\";\n\nexport const createGraphQL = () => {\n    return [createSettingsGraphQL()];\n};\n"],"mappings":";;;;;;;AAAA;;AAEO,MAAMA,aAAa,GAAG,MAAM;EAC/B,OAAO,CAAC,IAAAC,+BAAA,GAAD,CAAP;AACH,CAFM"}
+{"version":3,"names":["createGraphQL","createSettingsGraphQL"],"sources":["index.ts"],"sourcesContent":["import { createSettingsGraphQL } from \"~/graphql/settings\";\n\nexport const createGraphQL = () => {\n    return [createSettingsGraphQL()];\n};\n"],"mappings":";;;;;;AAAA;AAEO,MAAMA,aAAa,GAAG,MAAM;EAC/B,OAAO,CAAC,IAAAC,+BAAqB,GAAE,CAAC;AACpC,CAAC;AAAC"}

package/graphql/settings.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createSettingsGraphQL = void 0;
-
 var _handlerGraphql = require("@webiny/handler-graphql");
-
 const emptyResolver = () => ({});
-
 const createSettingsGraphQL = () => {
   return new _handlerGraphql.GraphQLSchemaPlugin({
     typeDefs: `
@@ -20,22 +17,24 @@ const createSettingsGraphQL = () => {
         
             type MailerTransportSettings {
                 host: String
+                port: Number
                 user: String
                 from: String
                 replyTo: String
             }
             
-            type MailerSettingsResponse {
+            type MailerTransportSettingsResponse {
                 data: MailerTransportSettings
                 error: MailerTransportSettingsError
             }
         
             type MailerQuery {
-                getSettings: MailerSettingsResponse!
+                getSettings: MailerTransportSettingsResponse!
             }
             
-            input TransportSettingsInput {
+            input MailerTransportSettingsInput {
                 host: String!
+                port: Number
                 user: String!
                 password: String
                 from: String!
@@ -43,7 +42,7 @@ const createSettingsGraphQL = () => {
             }
             
             type MailerMutation {
-                saveSettings(data: TransportSettingsInput!): MailerSettingsResponse!
+                saveSettings(data: MailerTransportSettingsInput!): MailerTransportSettingsResponse!
             }
             
             extend type Query {
@@ -62,14 +61,12 @@ const createSettingsGraphQL = () => {
           try {
             const settings = await context.mailer.getSettings();
             /**
-             * We want to remove the password from the response
+             * We want to remove the password from the response, if it exists.
              */
-
-            if (settings) {
+            if (settings !== null && settings !== void 0 && settings.password) {
               // @ts-ignore
               delete settings.password;
             }
-
             return new _handlerGraphql.Response(settings);
           } catch (ex) {
             return new _handlerGraphql.ErrorResponse(ex);
@@ -86,14 +83,12 @@ const createSettingsGraphQL = () => {
               input: args.data
             });
             /**
-             * We want to remove the password from the response
+             * We want to remove the password from the response, if it exists.
              */
-
-            if (settings) {
+            if (settings !== null && settings !== void 0 && settings.password) {
               // @ts-ignore
               delete settings.password;
             }
-
             return new _handlerGraphql.Response(settings);
           } catch (ex) {
             return new _handlerGraphql.ErrorResponse(ex);
@@ -103,5 +98,4 @@ const createSettingsGraphQL = () => {
     }
   });
 };
-
 exports.createSettingsGraphQL = createSettingsGraphQL;

package/graphql/settings.js.map

@@ -1 +1 @@
-{"version":3,"names":["emptyResolver","createSettingsGraphQL","GraphQLSchemaPlugin","typeDefs","resolvers","Query","mailer","MailerQuery","getSettings","_","__","context","settings","password","Response","ex","ErrorResponse","Mutation","MailerMutation","saveSettings","args","input","data"],"sources":["settings.ts"],"sourcesContent":["import { ErrorResponse, GraphQLSchemaPlugin, Response } from \"@webiny/handler-graphql\";\nimport { MailerContext } from \"~/types\";\n\nconst emptyResolver = () => ({});\n\nexport const createSettingsGraphQL = () => {\n    return new GraphQLSchemaPlugin<MailerContext>({\n        typeDefs: `\n            type MailerTransportSettingsError {\n                message: String!\n                code: String\n                data: JSON\n            }\n        \n            type MailerTransportSettings {\n                host: String\n                user: String\n                from: String\n                replyTo: String\n            }\n            \n            type MailerSettingsResponse {\n                data: MailerTransportSettings\n                error: MailerTransportSettingsError\n            }\n        \n            type MailerQuery {\n                getSettings: MailerSettingsResponse!\n            }\n            \n            input TransportSettingsInput {\n                host: String!\n                user: String!\n                password: String\n                from: String!\n                replyTo: String\n            }\n            \n            type MailerMutation {\n                saveSettings(data: TransportSettingsInput!): MailerSettingsResponse!\n            }\n            \n            extend type Query {\n                mailer: MailerQuery\n            }\n            extend type Mutation {\n                mailer: MailerMutation\n            }\n        `,\n        resolvers: {\n            Query: {\n                mailer: emptyResolver\n            },\n            MailerQuery: {\n                getSettings: async (_, __, context) => {\n                    try {\n                        const settings = await context.mailer.getSettings();\n                        /**\n                         * We want to remove the password from the response\n                         */\n                        if (settings) {\n                            // @ts-ignore\n                            delete settings.password;\n                        }\n                        return new Response(settings);\n                    } catch (ex) {\n                        return new ErrorResponse(ex);\n                    }\n                }\n            },\n            Mutation: {\n                mailer: emptyResolver\n            },\n            MailerMutation: {\n                saveSettings: async (_, args: any, context) => {\n                    try {\n                        const settings = await context.mailer.saveSettings({\n                            input: args.data\n                        });\n                        /**\n                         * We want to remove the password from the response\n                         */\n                        if (settings) {\n                            // @ts-ignore\n                            delete settings.password;\n                        }\n                        return new Response(settings);\n                    } catch (ex) {\n                        return new ErrorResponse(ex);\n                    }\n                }\n            }\n        }\n    });\n};\n"],"mappings":";;;;;;;AAAA;;AAGA,MAAMA,aAAa,GAAG,OAAO,EAAP,CAAtB;;AAEO,MAAMC,qBAAqB,GAAG,MAAM;EACvC,OAAO,IAAIC,mCAAJ,CAAuC;IAC1CC,QAAQ,EAAG;AACnB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SA1CkD;IA2C1CC,SAAS,EAAE;MACPC,KAAK,EAAE;QACHC,MAAM,EAAEN;MADL,CADA;MAIPO,WAAW,EAAE;QACTC,WAAW,EAAE,OAAOC,CAAP,EAAUC,EAAV,EAAcC,OAAd,KAA0B;UACnC,IAAI;YACA,MAAMC,QAAQ,GAAG,MAAMD,OAAO,CAACL,MAAR,CAAeE,WAAf,EAAvB;YACA;AACxB;AACA;;YACwB,IAAII,QAAJ,EAAc;cACV;cACA,OAAOA,QAAQ,CAACC,QAAhB;YACH;;YACD,OAAO,IAAIC,wBAAJ,CAAaF,QAAb,CAAP;UACH,CAVD,CAUE,OAAOG,EAAP,EAAW;YACT,OAAO,IAAIC,6BAAJ,CAAkBD,EAAlB,CAAP;UACH;QACJ;MAfQ,CAJN;MAqBPE,QAAQ,EAAE;QACNX,MAAM,EAAEN;MADF,CArBH;MAwBPkB,cAAc,EAAE;QACZC,YAAY,EAAE,OAAOV,CAAP,EAAUW,IAAV,EAAqBT,OAArB,KAAiC;UAC3C,IAAI;YACA,MAAMC,QAAQ,GAAG,MAAMD,OAAO,CAACL,MAAR,CAAea,YAAf,CAA4B;cAC/CE,KAAK,EAAED,IAAI,CAACE;YADmC,CAA5B,CAAvB;YAGA;AACxB;AACA;;YACwB,IAAIV,QAAJ,EAAc;cACV;cACA,OAAOA,QAAQ,CAACC,QAAhB;YACH;;YACD,OAAO,IAAIC,wBAAJ,CAAaF,QAAb,CAAP;UACH,CAZD,CAYE,OAAOG,EAAP,EAAW;YACT,OAAO,IAAIC,6BAAJ,CAAkBD,EAAlB,CAAP;UACH;QACJ;MAjBW;IAxBT;EA3C+B,CAAvC,CAAP;AAwFH,CAzFM"}
+{"version":3,"names":["emptyResolver","createSettingsGraphQL","GraphQLSchemaPlugin","typeDefs","resolvers","Query","mailer","MailerQuery","getSettings","_","__","context","settings","password","Response","ex","ErrorResponse","Mutation","MailerMutation","saveSettings","args","input","data"],"sources":["settings.ts"],"sourcesContent":["import { ErrorResponse, GraphQLSchemaPlugin, Response } from \"@webiny/handler-graphql\";\nimport { MailerContext } from \"~/types\";\n\nconst emptyResolver = () => ({});\n\nexport const createSettingsGraphQL = () => {\n    return new GraphQLSchemaPlugin<MailerContext>({\n        typeDefs: `\n            type MailerTransportSettingsError {\n                message: String!\n                code: String\n                data: JSON\n            }\n        \n            type MailerTransportSettings {\n                host: String\n                port: Number\n                user: String\n                from: String\n                replyTo: String\n            }\n            \n            type MailerTransportSettingsResponse {\n                data: MailerTransportSettings\n                error: MailerTransportSettingsError\n            }\n        \n            type MailerQuery {\n                getSettings: MailerTransportSettingsResponse!\n            }\n            \n            input MailerTransportSettingsInput {\n                host: String!\n                port: Number\n                user: String!\n                password: String\n                from: String!\n                replyTo: String\n            }\n            \n            type MailerMutation {\n                saveSettings(data: MailerTransportSettingsInput!): MailerTransportSettingsResponse!\n            }\n            \n            extend type Query {\n                mailer: MailerQuery\n            }\n            extend type Mutation {\n                mailer: MailerMutation\n            }\n        `,\n        resolvers: {\n            Query: {\n                mailer: emptyResolver\n            },\n            MailerQuery: {\n                getSettings: async (_, __, context) => {\n                    try {\n                        const settings = await context.mailer.getSettings();\n                        /**\n                         * We want to remove the password from the response, if it exists.\n                         */\n                        if (settings?.password) {\n                            // @ts-ignore\n                            delete settings.password;\n                        }\n                        return new Response(settings);\n                    } catch (ex) {\n                        return new ErrorResponse(ex);\n                    }\n                }\n            },\n            Mutation: {\n                mailer: emptyResolver\n            },\n            MailerMutation: {\n                saveSettings: async (_, args: any, context) => {\n                    try {\n                        const settings = await context.mailer.saveSettings({\n                            input: args.data\n                        });\n                        /**\n                         * We want to remove the password from the response, if it exists.\n                         */\n                        if (settings?.password) {\n                            // @ts-ignore\n                            delete settings.password;\n                        }\n                        return new Response(settings);\n                    } catch (ex) {\n                        return new ErrorResponse(ex);\n                    }\n                }\n            }\n        }\n    });\n};\n"],"mappings":";;;;;;AAAA;AAGA,MAAMA,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;AAEzB,MAAMC,qBAAqB,GAAG,MAAM;EACvC,OAAO,IAAIC,mCAAmB,CAAgB;IAC1CC,QAAQ,EAAG;AACnB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,EAAE;MACPC,KAAK,EAAE;QACHC,MAAM,EAAEN;MACZ,CAAC;MACDO,WAAW,EAAE;QACTC,WAAW,EAAE,OAAOC,CAAC,EAAEC,EAAE,EAAEC,OAAO,KAAK;UACnC,IAAI;YACA,MAAMC,QAAQ,GAAG,MAAMD,OAAO,CAACL,MAAM,CAACE,WAAW,EAAE;YACnD;AACxB;AACA;YACwB,IAAII,QAAQ,aAARA,QAAQ,eAARA,QAAQ,CAAEC,QAAQ,EAAE;cACpB;cACA,OAAOD,QAAQ,CAACC,QAAQ;YAC5B;YACA,OAAO,IAAIC,wBAAQ,CAACF,QAAQ,CAAC;UACjC,CAAC,CAAC,OAAOG,EAAE,EAAE;YACT,OAAO,IAAIC,6BAAa,CAACD,EAAE,CAAC;UAChC;QACJ;MACJ,CAAC;MACDE,QAAQ,EAAE;QACNX,MAAM,EAAEN;MACZ,CAAC;MACDkB,cAAc,EAAE;QACZC,YAAY,EAAE,OAAOV,CAAC,EAAEW,IAAS,EAAET,OAAO,KAAK;UAC3C,IAAI;YACA,MAAMC,QAAQ,GAAG,MAAMD,OAAO,CAACL,MAAM,CAACa,YAAY,CAAC;cAC/CE,KAAK,EAAED,IAAI,CAACE;YAChB,CAAC,CAAC;YACF;AACxB;AACA;YACwB,IAAIV,QAAQ,aAARA,QAAQ,eAARA,QAAQ,CAAEC,QAAQ,EAAE;cACpB;cACA,OAAOD,QAAQ,CAACC,QAAQ;YAC5B;YACA,OAAO,IAAIC,wBAAQ,CAACF,QAAQ,CAAC;UACjC,CAAC,CAAC,OAAOG,EAAE,EAAE;YACT,OAAO,IAAIC,6BAAa,CAACD,EAAE,CAAC;UAChC;QACJ;MACJ;IACJ;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}

package/index.d.ts

@@ -4,4 +4,5 @@ import { createSmtpTransport, SmtpTransport, SmtpTransportConfig } from "./trans
 import { createTransport } from "./plugins";
 export { createDummyTransport, createSmtpTransport, createTransport };
 export type { SmtpTransport, SmtpTransportConfig, DummyTransport };
-export declare const createMailer: () => PluginCollection;
+export declare const createMailerContext: () => PluginCollection;
+export declare const createMailerGraphQL: () => import("@webiny/handler-graphql").GraphQLSchemaPlugin<import("./types").MailerContext>[];

package/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,7 +10,7 @@ Object.defineProperty(exports, "createDummyTransport", {
     return _createDummyTransport.createDummyTransport;
   }
 });
-exports.createMailer = void 0;
+exports.createMailerGraphQL = exports.createMailerContext = void 0;
 Object.defineProperty(exports, "createSmtpTransport", {
   enumerable: true,
   get: function () {
@@ -22,22 +23,15 @@ Object.defineProperty(exports, "createTransport", {
     return _plugins.createTransport;
   }
 });
-
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _context = require("./context");
-
 var _createDummyTransport = require("./transports/createDummyTransport");
-
 var _createSmtpTransport = require("./transports/createSmtpTransport");
-
 var _plugins = require("./plugins");
-
 var _model = require("./crud/settings/model");
-
 var _group = require("./crud/group");
-
 var _graphql = require("./graphql");
-
-const createMailer = () => {
+const createMailerContext = () => {
   const group = (0, _group.createGroup)();
   return [group,
   /**
@@ -55,11 +49,26 @@ const createMailer = () => {
   /**
    * Smtp mailer goes into the plugins after the dummy one because plugins are loaded in reverse.
    */
-  (0, _plugins.createTransport)(async params => {
-    const plugin = await (0, _createSmtpTransport.createSmtpTransport)(params.settings);
+  (0, _plugins.createTransport)(async ({
+    settings
+  }) => {
+    /**
+     * We need to map our settings to the required settings for the SMTP NodeMailer transport.
+     */
+    const config = (0, _objectSpread2.default)({}, settings || {});
+    if (settings) {
+      config.auth = {
+        user: settings.user,
+        pass: settings.password
+      };
+    }
+    const plugin = await (0, _createSmtpTransport.createSmtpTransport)(config);
     plugin.name = "smtp-default";
     return plugin;
-  }), (0, _context.createMailerContext)(), (0, _graphql.createGraphQL)()];
+  }), (0, _context.createMailerContext)()];
 };
-
-exports.createMailer = createMailer;
+exports.createMailerContext = createMailerContext;
+const createMailerGraphQL = () => {
+  return [...(0, _graphql.createGraphQL)()];
+};
+exports.createMailerGraphQL = createMailerGraphQL;

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createMailer","group","createGroup","createSettingsModel","createTransport","plugin","createDummyTransport","name","params","createSmtpTransport","settings","createMailerContext","createGraphQL"],"sources":["index.ts"],"sourcesContent":["import { PluginCollection } from \"@webiny/plugins/types\";\nimport { createMailerContext } from \"~/context\";\nimport { createDummyTransport, DummyTransport } from \"~/transports/createDummyTransport\";\nimport {\n    createSmtpTransport,\n    SmtpTransport,\n    SmtpTransportConfig\n} from \"~/transports/createSmtpTransport\";\nimport { createTransport } from \"~/plugins\";\nimport { createSettingsModel } from \"~/crud/settings/model\";\nimport { createGroup } from \"~/crud/group\";\nimport { createGraphQL } from \"~/graphql\";\n\nexport { createDummyTransport, createSmtpTransport, createTransport };\nexport type { SmtpTransport, SmtpTransportConfig, DummyTransport };\n\nexport const createMailer = (): PluginCollection => {\n    const group = createGroup();\n    return [\n        group,\n        /**\n         * Groups and models to use via the CMS\n         */\n        createSettingsModel(group),\n        /**\n         * If something is wrong with the smtp mailer, we will initialize the dummy one.\n         */\n        createTransport(async () => {\n            const plugin = await createDummyTransport();\n            plugin.name = \"dummy-default\";\n            return plugin;\n        }),\n        /**\n         * Smtp mailer goes into the plugins after the dummy one because plugins are loaded in reverse.\n         */\n        createTransport(async params => {\n            const plugin = await createSmtpTransport(params.settings);\n            plugin.name = \"smtp-default\";\n            return plugin;\n        }),\n        createMailerContext(),\n        createGraphQL()\n    ];\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA;;AACA;;AACA;;AAKA;;AACA;;AACA;;AACA;;AAKO,MAAMA,YAAY,GAAG,MAAwB;EAChD,MAAMC,KAAK,GAAG,IAAAC,kBAAA,GAAd;EACA,OAAO,CACHD,KADG;EAEH;AACR;AACA;EACQ,IAAAE,0BAAA,EAAoBF,KAApB,CALG;EAMH;AACR;AACA;EACQ,IAAAG,wBAAA,EAAgB,YAAY;IACxB,MAAMC,MAAM,GAAG,MAAM,IAAAC,0CAAA,GAArB;IACAD,MAAM,CAACE,IAAP,GAAc,eAAd;IACA,OAAOF,MAAP;EACH,CAJD,CATG;EAcH;AACR;AACA;EACQ,IAAAD,wBAAA,EAAgB,MAAMI,MAAN,IAAgB;IAC5B,MAAMH,MAAM,GAAG,MAAM,IAAAI,wCAAA,EAAoBD,MAAM,CAACE,QAA3B,CAArB;IACAL,MAAM,CAACE,IAAP,GAAc,cAAd;IACA,OAAOF,MAAP;EACH,CAJD,CAjBG,EAsBH,IAAAM,4BAAA,GAtBG,EAuBH,IAAAC,sBAAA,GAvBG,CAAP;AAyBH,CA3BM"}
+{"version":3,"names":["createMailerContext","group","createGroup","createSettingsModel","createTransport","plugin","createDummyTransport","name","settings","config","auth","user","pass","password","createSmtpTransport","createMailerContextPlugin","createMailerGraphQL","createGraphQL"],"sources":["index.ts"],"sourcesContent":["import { PluginCollection } from \"@webiny/plugins/types\";\nimport { createMailerContext as createMailerContextPlugin } from \"~/context\";\nimport { createDummyTransport, DummyTransport } from \"~/transports/createDummyTransport\";\nimport {\n    createSmtpTransport,\n    SmtpTransport,\n    SmtpTransportConfig\n} from \"~/transports/createSmtpTransport\";\nimport { createTransport } from \"~/plugins\";\nimport { createSettingsModel } from \"~/crud/settings/model\";\nimport { createGroup } from \"~/crud/group\";\nimport { createGraphQL } from \"~/graphql\";\n\nexport { createDummyTransport, createSmtpTransport, createTransport };\nexport type { SmtpTransport, SmtpTransportConfig, DummyTransport };\n\nexport const createMailerContext = (): PluginCollection => {\n    const group = createGroup();\n    return [\n        group,\n        /**\n         * Groups and models to use via the CMS\n         */\n        createSettingsModel(group),\n        /**\n         * If something is wrong with the smtp mailer, we will initialize the dummy one.\n         */\n        createTransport(async () => {\n            const plugin = await createDummyTransport();\n            plugin.name = \"dummy-default\";\n            return plugin;\n        }),\n        /**\n         * Smtp mailer goes into the plugins after the dummy one because plugins are loaded in reverse.\n         */\n        createTransport(async ({ settings }) => {\n            /**\n             * We need to map our settings to the required settings for the SMTP NodeMailer transport.\n             */\n            const config: SmtpTransportConfig = {\n                ...(settings || {})\n            };\n            if (settings) {\n                config.auth = {\n                    user: settings.user,\n                    pass: settings.password\n                };\n            }\n            const plugin = await createSmtpTransport(config);\n            plugin.name = \"smtp-default\";\n            return plugin;\n        }),\n        createMailerContextPlugin()\n    ];\n};\n\nexport const createMailerGraphQL = () => {\n    return [...createGraphQL()];\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AAKO,MAAMA,mBAAmB,GAAG,MAAwB;EACvD,MAAMC,KAAK,GAAG,IAAAC,kBAAW,GAAE;EAC3B,OAAO,CACHD,KAAK;EACL;AACR;AACA;EACQ,IAAAE,0BAAmB,EAACF,KAAK,CAAC;EAC1B;AACR;AACA;EACQ,IAAAG,wBAAe,EAAC,YAAY;IACxB,MAAMC,MAAM,GAAG,MAAM,IAAAC,0CAAoB,GAAE;IAC3CD,MAAM,CAACE,IAAI,GAAG,eAAe;IAC7B,OAAOF,MAAM;EACjB,CAAC,CAAC;EACF;AACR;AACA;EACQ,IAAAD,wBAAe,EAAC,OAAO;IAAEI;EAAS,CAAC,KAAK;IACpC;AACZ;AACA;IACY,MAAMC,MAA2B,mCACzBD,QAAQ,IAAI,CAAC,CAAC,CACrB;IACD,IAAIA,QAAQ,EAAE;MACVC,MAAM,CAACC,IAAI,GAAG;QACVC,IAAI,EAAEH,QAAQ,CAACG,IAAI;QACnBC,IAAI,EAAEJ,QAAQ,CAACK;MACnB,CAAC;IACL;IACA,MAAMR,MAAM,GAAG,MAAM,IAAAS,wCAAmB,EAACL,MAAM,CAAC;IAChDJ,MAAM,CAACE,IAAI,GAAG,cAAc;IAC5B,OAAOF,MAAM;EACjB,CAAC,CAAC,EACF,IAAAU,4BAAyB,GAAE,CAC9B;AACL,CAAC;AAAC;AAEK,MAAMC,mBAAmB,GAAG,MAAM;EACrC,OAAO,CAAC,GAAG,IAAAC,sBAAa,GAAE,CAAC;AAC/B,CAAC;AAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-mailer",
-	"version": "0.0.0-unstable.1e66d121db",
+	"version": "0.0.0-unstable.2af142b57e",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -14,17 +14,17 @@
 	"description": "The API to send e-mails.",
 	"license": "MIT",
 	"dependencies": {
-		"@babel/runtime": "7.19.0",
-		"@webiny/api": "0.0.0-unstable.1e66d121db",
-		"@webiny/api-headless-cms": "0.0.0-unstable.1e66d121db",
-		"@webiny/error": "0.0.0-unstable.1e66d121db",
-		"@webiny/handler-graphql": "0.0.0-unstable.1e66d121db",
-		"@webiny/plugins": "0.0.0-unstable.1e66d121db",
-		"@webiny/pubsub": "0.0.0-unstable.1e66d121db",
+		"@babel/runtime": "7.20.13",
+		"@webiny/api": "0.0.0-unstable.2af142b57e",
+		"@webiny/api-headless-cms": "0.0.0-unstable.2af142b57e",
+		"@webiny/error": "0.0.0-unstable.2af142b57e",
+		"@webiny/handler-graphql": "0.0.0-unstable.2af142b57e",
+		"@webiny/plugins": "0.0.0-unstable.2af142b57e",
+		"@webiny/pubsub": "0.0.0-unstable.2af142b57e",
 		"crypto-js": "4.1.1",
-		"joi": "17.6.2",
 		"lodash": "4.17.21",
-		"nodemailer": "6.8.0"
+		"nodemailer": "6.9.1",
+		"zod": "3.20.2"
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.19.3",
@@ -33,19 +33,19 @@
 		"@babel/preset-typescript": "^7.18.6",
 		"@types/crypto-js": "^4.1.1",
 		"@types/nodemailer": "^6.4.4",
-		"@webiny/api-headless-cms-ddb": "^0.0.0-unstable.1e66d121db",
-		"@webiny/api-i18n": "^0.0.0-unstable.1e66d121db",
-		"@webiny/api-i18n-ddb": "^0.0.0-unstable.1e66d121db",
-		"@webiny/api-security": "^0.0.0-unstable.1e66d121db",
-		"@webiny/api-security-so-ddb": "^0.0.0-unstable.1e66d121db",
-		"@webiny/api-tenancy": "^0.0.0-unstable.1e66d121db",
-		"@webiny/api-tenancy-so-ddb": "^0.0.0-unstable.1e66d121db",
-		"@webiny/cli": "^0.0.0-unstable.1e66d121db",
-		"@webiny/db-dynamodb": "^0.0.0-unstable.1e66d121db",
-		"@webiny/handler": "^0.0.0-unstable.1e66d121db",
-		"@webiny/handler-aws": "^0.0.0-unstable.1e66d121db",
-		"@webiny/handler-db": "^0.0.0-unstable.1e66d121db",
-		"@webiny/project-utils": "^0.0.0-unstable.1e66d121db",
+		"@webiny/api-headless-cms-ddb": "^0.0.0-unstable.2af142b57e",
+		"@webiny/api-i18n": "^0.0.0-unstable.2af142b57e",
+		"@webiny/api-i18n-ddb": "^0.0.0-unstable.2af142b57e",
+		"@webiny/api-security": "^0.0.0-unstable.2af142b57e",
+		"@webiny/api-security-so-ddb": "^0.0.0-unstable.2af142b57e",
+		"@webiny/api-tenancy": "^0.0.0-unstable.2af142b57e",
+		"@webiny/api-tenancy-so-ddb": "^0.0.0-unstable.2af142b57e",
+		"@webiny/cli": "^0.0.0-unstable.2af142b57e",
+		"@webiny/db-dynamodb": "^0.0.0-unstable.2af142b57e",
+		"@webiny/handler": "^0.0.0-unstable.2af142b57e",
+		"@webiny/handler-aws": "^0.0.0-unstable.2af142b57e",
+		"@webiny/handler-db": "^0.0.0-unstable.2af142b57e",
+		"@webiny/project-utils": "^0.0.0-unstable.2af142b57e",
 		"graphql": "^15.7.2",
 		"jest": "^28.1.0",
 		"jest-dynalite": "^3.6.1",
@@ -61,5 +61,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "b670bf27c5039de1a2b0be764a09ba4cb94ad5e2"
+	"gitHead": "2af142b57e7cdc433f5098b3b6d43ae6caa5d54e"
 }

package/plugins/CreateTransportPlugin.js

@@ -1,34 +1,25 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createTransport = exports.CreateTransportPlugin = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _plugins = require("@webiny/plugins");
-
 class CreateTransportPlugin extends _plugins.Plugin {
   constructor(cb) {
     super();
     (0, _defineProperty2.default)(this, "cb", void 0);
     this.cb = cb;
   }
-
   async buildMailerTransport(params) {
     return this.cb(params);
   }
-
 }
-
 exports.CreateTransportPlugin = CreateTransportPlugin;
 (0, _defineProperty2.default)(CreateTransportPlugin, "type", "mailer.builder.plugin");
-
 const createTransport = cb => {
   return new CreateTransportPlugin(cb);
 };
-
 exports.createTransport = createTransport;

package/plugins/CreateTransportPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["CreateTransportPlugin","BasePlugin","constructor","cb","buildMailerTransport","params","createTransport"],"sources":["CreateTransportPlugin.ts"],"sourcesContent":["import { Plugin as BasePlugin } from \"@webiny/plugins\";\nimport { Transport, MailerContext, TransportSettings } from \"~/types\";\n\ninterface TransportParams {\n    settings: TransportSettings | null;\n    context: MailerContext;\n}\n\nexport interface CreateTransportCallable<T> {\n    (params: TransportParams): Promise<T>;\n}\n\nexport class CreateTransportPlugin<T extends Transport = Transport> extends BasePlugin {\n    public static override type = \"mailer.builder.plugin\";\n\n    private readonly cb: CreateTransportCallable<T>;\n\n    public constructor(cb: CreateTransportCallable<T>) {\n        super();\n        this.cb = cb;\n    }\n\n    public async buildMailerTransport(params: TransportParams): Promise<T> {\n        return this.cb(params);\n    }\n}\n\nexport const createTransport = <T extends Transport = Transport>(\n    cb: CreateTransportCallable<T>\n) => {\n    return new CreateTransportPlugin<T>(cb);\n};\n"],"mappings":";;;;;;;;;;;AAAA;;AAYO,MAAMA,qBAAN,SAAqEC,eAArE,CAAgF;EAK5EC,WAAW,CAACC,EAAD,EAAiC;IAC/C;IAD+C;IAE/C,KAAKA,EAAL,GAAUA,EAAV;EACH;;EAEgC,MAApBC,oBAAoB,CAACC,MAAD,EAAsC;IACnE,OAAO,KAAKF,EAAL,CAAQE,MAAR,CAAP;EACH;;AAZkF;;;8BAA1EL,qB,UACqB,uB;;AAc3B,MAAMM,eAAe,GACxBH,EAD2B,IAE1B;EACD,OAAO,IAAIH,qBAAJ,CAA6BG,EAA7B,CAAP;AACH,CAJM"}
+{"version":3,"names":["CreateTransportPlugin","BasePlugin","constructor","cb","buildMailerTransport","params","createTransport"],"sources":["CreateTransportPlugin.ts"],"sourcesContent":["import { Plugin as BasePlugin } from \"@webiny/plugins\";\nimport { Transport, MailerContext, TransportSettings } from \"~/types\";\n\ninterface TransportParams {\n    settings: TransportSettings | null;\n    context: MailerContext;\n}\n\nexport interface CreateTransportCallable<T> {\n    (params: TransportParams): Promise<T>;\n}\n\nexport class CreateTransportPlugin<T extends Transport = Transport> extends BasePlugin {\n    public static override type = \"mailer.builder.plugin\";\n\n    private readonly cb: CreateTransportCallable<T>;\n\n    public constructor(cb: CreateTransportCallable<T>) {\n        super();\n        this.cb = cb;\n    }\n\n    public async buildMailerTransport(params: TransportParams): Promise<T> {\n        return this.cb(params);\n    }\n}\n\nexport const createTransport = <T extends Transport = Transport>(\n    cb: CreateTransportCallable<T>\n) => {\n    return new CreateTransportPlugin<T>(cb);\n};\n"],"mappings":";;;;;;;;AAAA;AAYO,MAAMA,qBAAqB,SAA0CC,eAAU,CAAC;EAK5EC,WAAW,CAACC,EAA8B,EAAE;IAC/C,KAAK,EAAE;IAAC;IACR,IAAI,CAACA,EAAE,GAAGA,EAAE;EAChB;EAEA,MAAaC,oBAAoB,CAACC,MAAuB,EAAc;IACnE,OAAO,IAAI,CAACF,EAAE,CAACE,MAAM,CAAC;EAC1B;AACJ;AAAC;AAAA,8BAbYL,qBAAqB,UACA,uBAAuB;AAclD,MAAMM,eAAe,GACxBH,EAA8B,IAC7B;EACD,OAAO,IAAIH,qBAAqB,CAAIG,EAAE,CAAC;AAC3C,CAAC;AAAC"}

package/plugins/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _CreateTransportPlugin = require("./CreateTransportPlugin");
-
 Object.keys(_CreateTransportPlugin).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _CreateTransportPlugin[key]) return;

package/plugins/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./CreateTransportPlugin\";\n"],"mappings":";;;;;;AAAA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./CreateTransportPlugin\";\n"],"mappings":";;;;;AAAA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}

package/transports/createDummyTransport.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createDummyTransport = void 0;
-
 const createDummyTransport = () => {
   const sent = [];
   return {
@@ -21,5 +20,4 @@ const createDummyTransport = () => {
     }
   };
 };
-
 exports.createDummyTransport = createDummyTransport;

package/transports/createDummyTransport.js.map

@@ -1 +1 @@
-{"version":3,"names":["createDummyTransport","sent","name","send","params","push","result","error","getAllSent"],"sources":["createDummyTransport.ts"],"sourcesContent":["import { Transport, TransportSendData } from \"~/types\";\n\nexport interface DummyTransport extends Transport {\n    getAllSent: () => TransportSendData[];\n}\nexport const createDummyTransport = (): DummyTransport => {\n    const sent: TransportSendData[] = [];\n\n    return {\n        name: \"dummy-default\",\n        send: async params => {\n            sent.push(params);\n            return {\n                result: true,\n                error: null\n            };\n        },\n        getAllSent: () => {\n            return sent;\n        }\n    };\n};\n"],"mappings":";;;;;;;AAKO,MAAMA,oBAAoB,GAAG,MAAsB;EACtD,MAAMC,IAAyB,GAAG,EAAlC;EAEA,OAAO;IACHC,IAAI,EAAE,eADH;IAEHC,IAAI,EAAE,MAAMC,MAAN,IAAgB;MAClBH,IAAI,CAACI,IAAL,CAAUD,MAAV;MACA,OAAO;QACHE,MAAM,EAAE,IADL;QAEHC,KAAK,EAAE;MAFJ,CAAP;IAIH,CARE;IASHC,UAAU,EAAE,MAAM;MACd,OAAOP,IAAP;IACH;EAXE,CAAP;AAaH,CAhBM"}
+{"version":3,"names":["createDummyTransport","sent","name","send","params","push","result","error","getAllSent"],"sources":["createDummyTransport.ts"],"sourcesContent":["import { Transport, TransportSendData } from \"~/types\";\n\nexport interface DummyTransport extends Transport {\n    getAllSent: () => TransportSendData[];\n}\nexport const createDummyTransport = (): DummyTransport => {\n    const sent: TransportSendData[] = [];\n\n    return {\n        name: \"dummy-default\",\n        send: async params => {\n            sent.push(params);\n            return {\n                result: true,\n                error: null\n            };\n        },\n        getAllSent: () => {\n            return sent;\n        }\n    };\n};\n"],"mappings":";;;;;;AAKO,MAAMA,oBAAoB,GAAG,MAAsB;EACtD,MAAMC,IAAyB,GAAG,EAAE;EAEpC,OAAO;IACHC,IAAI,EAAE,eAAe;IACrBC,IAAI,EAAE,MAAMC,MAAM,IAAI;MAClBH,IAAI,CAACI,IAAI,CAACD,MAAM,CAAC;MACjB,OAAO;QACHE,MAAM,EAAE,IAAI;QACZC,KAAK,EAAE;MACX,CAAC;IACL,CAAC;IACDC,UAAU,EAAE,MAAM;MACd,OAAOP,IAAI;IACf;EACJ,CAAC;AACL,CAAC;AAAC"}

package/transports/createSmtpTransport.d.ts

@@ -9,4 +9,4 @@ export declare type SmtpTransportConfig = Options;
 export interface SmtpTransport extends Transport {
     transporter: Transporter<SMTPTransport.SentMessageInfo>;
 }
-export declare const createSmtpTransport: (config?: Partial<SmtpTransportConfig> | null) => SmtpTransport;
+export declare const createSmtpTransport: (initialConfig?: Partial<SmtpTransportConfig> | null) => SmtpTransport;

package/transports/createSmtpTransport.js

@@ -1,29 +1,39 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createSmtpTransport = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _nodemailer = _interopRequireDefault(require("nodemailer"));
-
 /**
  * Nodemailer docs
  * https://nodemailer.com/about/
  */
-const createSmtpTransport = config => {
-  if (!config || typeof config !== "object" || Object.keys(config).length === 0) {
+
+const configDefaults = {
+  socketTimeout: 15000,
+  connectionTimeout: 15000,
+  greetingTimeout: 15000
+};
+const applyDefaults = initialConfig => {
+  return Object.keys(configDefaults).reduce((config, key) => {
+    const configKey = key;
+    if (config[configKey] === undefined || config[configKey] === null) {
+      // @ts-ignore
+      config[configKey] = configDefaults[configKey];
+    }
+    return config;
+  }, (0, _objectSpread2.default)({}, initialConfig));
+};
+const createSmtpTransport = initialConfig => {
+  if (!initialConfig || typeof initialConfig !== "object" || Object.keys(initialConfig).length === 0) {
     throw new _error.default("There is no configuration for the SMTP transport.");
   }
-
+  const config = applyDefaults(initialConfig);
   const transporter = _nodemailer.default.createTransport(config);
-
   return {
     name: "smtp-default",
     transporter,
@@ -38,7 +48,6 @@ const createSmtpTransport = config => {
         from,
         subject
       } = params;
-
       try {
         const result = await transporter.sendMail({
           replyTo,
@@ -50,14 +59,12 @@ const createSmtpTransport = config => {
           to,
           subject
         });
-
         if (result.messageId) {
           return {
-            result: true,
+            result: result.response,
             error: null
           };
         }
-
         throw new _error.default({
           message: "nodemailer.sendMail does not have a messageId in the result. Something went wrong...",
           code: "MAILER_ERROR",
@@ -76,5 +83,4 @@ const createSmtpTransport = config => {
     }
   };
 };
-
 exports.createSmtpTransport = createSmtpTransport;

package/transports/createSmtpTransport.js.map

@@ -1 +1 @@
-{"version":3,"names":["createSmtpTransport","config","Object","keys","length","WebinyError","transporter","nodemailer","createTransport","name","send","params","replyTo","text","html","to","bcc","cc","from","subject","result","sendMail","messageId","error","message","code","data","ex"],"sources":["createSmtpTransport.ts"],"sourcesContent":["/**\n * Nodemailer docs\n * https://nodemailer.com/about/\n */\nimport { Transport } from \"~/types\";\nimport WebinyError from \"@webiny/error\";\nimport nodemailer, { Transporter } from \"nodemailer\";\nimport SMTPTransport, { Options } from \"nodemailer/lib/smtp-transport\";\n\nexport type SmtpTransportConfig = Options;\n\nexport interface SmtpTransport extends Transport {\n    transporter: Transporter<SMTPTransport.SentMessageInfo>;\n}\n\nexport const createSmtpTransport = (\n    config?: Partial<SmtpTransportConfig> | null\n): SmtpTransport => {\n    if (!config || typeof config !== \"object\" || Object.keys(config).length === 0) {\n        throw new WebinyError(\"There is no configuration for the SMTP transport.\");\n    }\n\n    const transporter = nodemailer.createTransport(config);\n\n    return {\n        name: \"smtp-default\",\n        transporter,\n        send: async params => {\n            const { replyTo, text, html, to, bcc, cc, from, subject } = params;\n\n            try {\n                const result = await transporter.sendMail({\n                    replyTo,\n                    bcc,\n                    cc,\n                    from,\n                    text,\n                    html,\n                    to,\n                    subject\n                });\n                if (result.messageId) {\n                    return {\n                        result: true,\n                        error: null\n                    };\n                }\n\n                throw new WebinyError({\n                    message:\n                        \"nodemailer.sendMail does not have a messageId in the result. Something went wrong...\",\n                    code: \"MAILER_ERROR\",\n                    data: {\n                        ...result\n                    }\n                });\n            } catch (ex) {\n                return {\n                    result: null,\n                    error: {\n                        message: ex.message,\n                        code: ex.code,\n                        data: {\n                            ...params,\n                            ...ex.data\n                        }\n                    }\n                };\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;;;;;;AAKA;;AACA;;AANA;AACA;AACA;AACA;AAYO,MAAMA,mBAAmB,GAC5BC,MAD+B,IAEf;EAChB,IAAI,CAACA,MAAD,IAAW,OAAOA,MAAP,KAAkB,QAA7B,IAAyCC,MAAM,CAACC,IAAP,CAAYF,MAAZ,EAAoBG,MAApB,KAA+B,CAA5E,EAA+E;IAC3E,MAAM,IAAIC,cAAJ,CAAgB,mDAAhB,CAAN;EACH;;EAED,MAAMC,WAAW,GAAGC,mBAAA,CAAWC,eAAX,CAA2BP,MAA3B,CAApB;;EAEA,OAAO;IACHQ,IAAI,EAAE,cADH;IAEHH,WAFG;IAGHI,IAAI,EAAE,MAAMC,MAAN,IAAgB;MAClB,MAAM;QAAEC,OAAF;QAAWC,IAAX;QAAiBC,IAAjB;QAAuBC,EAAvB;QAA2BC,GAA3B;QAAgCC,EAAhC;QAAoCC,IAApC;QAA0CC;MAA1C,IAAsDR,MAA5D;;MAEA,IAAI;QACA,MAAMS,MAAM,GAAG,MAAMd,WAAW,CAACe,QAAZ,CAAqB;UACtCT,OADsC;UAEtCI,GAFsC;UAGtCC,EAHsC;UAItCC,IAJsC;UAKtCL,IALsC;UAMtCC,IANsC;UAOtCC,EAPsC;UAQtCI;QARsC,CAArB,CAArB;;QAUA,IAAIC,MAAM,CAACE,SAAX,EAAsB;UAClB,OAAO;YACHF,MAAM,EAAE,IADL;YAEHG,KAAK,EAAE;UAFJ,CAAP;QAIH;;QAED,MAAM,IAAIlB,cAAJ,CAAgB;UAClBmB,OAAO,EACH,sFAFc;UAGlBC,IAAI,EAAE,cAHY;UAIlBC,IAAI,kCACGN,MADH;QAJc,CAAhB,CAAN;MAQH,CA1BD,CA0BE,OAAOO,EAAP,EAAW;QACT,OAAO;UACHP,MAAM,EAAE,IADL;UAEHG,KAAK,EAAE;YACHC,OAAO,EAAEG,EAAE,CAACH,OADT;YAEHC,IAAI,EAAEE,EAAE,CAACF,IAFN;YAGHC,IAAI,8DACGf,MADH,GAEGgB,EAAE,CAACD,IAFN;UAHD;QAFJ,CAAP;MAWH;IACJ;EA7CE,CAAP;AA+CH,CAxDM"}
+{"version":3,"names":["configDefaults","socketTimeout","connectionTimeout","greetingTimeout","applyDefaults","initialConfig","Object","keys","reduce","config","key","configKey","undefined","createSmtpTransport","length","WebinyError","transporter","nodemailer","createTransport","name","send","params","replyTo","text","html","to","bcc","cc","from","subject","result","sendMail","messageId","response","error","message","code","data","ex"],"sources":["createSmtpTransport.ts"],"sourcesContent":["/**\n * Nodemailer docs\n * https://nodemailer.com/about/\n */\nimport { Transport } from \"~/types\";\nimport WebinyError from \"@webiny/error\";\nimport nodemailer, { Transporter } from \"nodemailer\";\nimport SMTPTransport, { Options } from \"nodemailer/lib/smtp-transport\";\n\nexport type SmtpTransportConfig = Options;\n\nexport interface SmtpTransport extends Transport {\n    transporter: Transporter<SMTPTransport.SentMessageInfo>;\n}\n\nconst configDefaults: Partial<SmtpTransportConfig> = {\n    socketTimeout: 15000,\n    connectionTimeout: 15000,\n    greetingTimeout: 15000\n};\n\nconst applyDefaults = (\n    initialConfig: Partial<SmtpTransportConfig>\n): Partial<SmtpTransportConfig> => {\n    return Object.keys(configDefaults).reduce<Partial<SmtpTransportConfig>>(\n        (config, key) => {\n            const configKey = key as unknown as keyof SmtpTransportConfig;\n            if (config[configKey] === undefined || config[configKey] === null) {\n                // @ts-ignore\n                config[configKey] = configDefaults[configKey];\n            }\n\n            return config;\n        },\n        { ...initialConfig }\n    );\n};\n\nexport const createSmtpTransport = (\n    initialConfig?: Partial<SmtpTransportConfig> | null\n): SmtpTransport => {\n    if (\n        !initialConfig ||\n        typeof initialConfig !== \"object\" ||\n        Object.keys(initialConfig).length === 0\n    ) {\n        throw new WebinyError(\"There is no configuration for the SMTP transport.\");\n    }\n\n    const config = applyDefaults(initialConfig);\n\n    const transporter = nodemailer.createTransport(config);\n\n    return {\n        name: \"smtp-default\",\n        transporter,\n        send: async params => {\n            const { replyTo, text, html, to, bcc, cc, from, subject } = params;\n\n            try {\n                const result = await transporter.sendMail({\n                    replyTo,\n                    bcc,\n                    cc,\n                    from,\n                    text,\n                    html,\n                    to,\n                    subject\n                });\n                if (result.messageId) {\n                    return {\n                        result: result.response,\n                        error: null\n                    };\n                }\n\n                throw new WebinyError({\n                    message:\n                        \"nodemailer.sendMail does not have a messageId in the result. Something went wrong...\",\n                    code: \"MAILER_ERROR\",\n                    data: {\n                        ...result\n                    }\n                });\n            } catch (ex) {\n                return {\n                    result: null,\n                    error: {\n                        message: ex.message,\n                        code: ex.code,\n                        data: {\n                            ...params,\n                            ...ex.data\n                        }\n                    }\n                };\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;;;AAKA;AACA;AANA;AACA;AACA;AACA;;AAYA,MAAMA,cAA4C,GAAG;EACjDC,aAAa,EAAE,KAAK;EACpBC,iBAAiB,EAAE,KAAK;EACxBC,eAAe,EAAE;AACrB,CAAC;AAED,MAAMC,aAAa,GACfC,aAA2C,IACZ;EAC/B,OAAOC,MAAM,CAACC,IAAI,CAACP,cAAc,CAAC,CAACQ,MAAM,CACrC,CAACC,MAAM,EAAEC,GAAG,KAAK;IACb,MAAMC,SAAS,GAAGD,GAA2C;IAC7D,IAAID,MAAM,CAACE,SAAS,CAAC,KAAKC,SAAS,IAAIH,MAAM,CAACE,SAAS,CAAC,KAAK,IAAI,EAAE;MAC/D;MACAF,MAAM,CAACE,SAAS,CAAC,GAAGX,cAAc,CAACW,SAAS,CAAC;IACjD;IAEA,OAAOF,MAAM;EACjB,CAAC,kCACIJ,aAAa,EACrB;AACL,CAAC;AAEM,MAAMQ,mBAAmB,GAC5BR,aAAmD,IACnC;EAChB,IACI,CAACA,aAAa,IACd,OAAOA,aAAa,KAAK,QAAQ,IACjCC,MAAM,CAACC,IAAI,CAACF,aAAa,CAAC,CAACS,MAAM,KAAK,CAAC,EACzC;IACE,MAAM,IAAIC,cAAW,CAAC,mDAAmD,CAAC;EAC9E;EAEA,MAAMN,MAAM,GAAGL,aAAa,CAACC,aAAa,CAAC;EAE3C,MAAMW,WAAW,GAAGC,mBAAU,CAACC,eAAe,CAACT,MAAM,CAAC;EAEtD,OAAO;IACHU,IAAI,EAAE,cAAc;IACpBH,WAAW;IACXI,IAAI,EAAE,MAAMC,MAAM,IAAI;MAClB,MAAM;QAAEC,OAAO;QAAEC,IAAI;QAAEC,IAAI;QAAEC,EAAE;QAAEC,GAAG;QAAEC,EAAE;QAAEC,IAAI;QAAEC;MAAQ,CAAC,GAAGR,MAAM;MAElE,IAAI;QACA,MAAMS,MAAM,GAAG,MAAMd,WAAW,CAACe,QAAQ,CAAC;UACtCT,OAAO;UACPI,GAAG;UACHC,EAAE;UACFC,IAAI;UACJL,IAAI;UACJC,IAAI;UACJC,EAAE;UACFI;QACJ,CAAC,CAAC;QACF,IAAIC,MAAM,CAACE,SAAS,EAAE;UAClB,OAAO;YACHF,MAAM,EAAEA,MAAM,CAACG,QAAQ;YACvBC,KAAK,EAAE;UACX,CAAC;QACL;QAEA,MAAM,IAAInB,cAAW,CAAC;UAClBoB,OAAO,EACH,sFAAsF;UAC1FC,IAAI,EAAE,cAAc;UACpBC,IAAI,kCACGP,MAAM;QAEjB,CAAC,CAAC;MACN,CAAC,CAAC,OAAOQ,EAAE,EAAE;QACT,OAAO;UACHR,MAAM,EAAE,IAAI;UACZI,KAAK,EAAE;YACHC,OAAO,EAAEG,EAAE,CAACH,OAAO;YACnBC,IAAI,EAAEE,EAAE,CAACF,IAAI;YACbC,IAAI,8DACGhB,MAAM,GACNiB,EAAE,CAACD,IAAI;UAElB;QACJ,CAAC;MACL;IACJ;EACJ,CAAC;AACL,CAAC;AAAC"}

package/types.d.ts

@@ -140,6 +140,7 @@ export interface Transport<T = any> {
 }
 export interface TransportSettings {
     host: string;
+    port: number;
     user: string;
     password: string;
     from: string;

package/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import { CmsContext } from \"@webiny/api-headless-cms/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\n\nexport interface MailerTransporterContext<T extends Transport = Transport> {\n    onTransportBeforeSend: Topic<OnTransportBeforeSendParams>;\n    onTransportAfterSend: Topic<OnTransportAfterSendParams>;\n    onTransportError: Topic<OnTransportErrorParams>;\n    getTransport: () => Promise<T | null>;\n    sendMail: <D>(data: TransportSendData) => Promise<TransportSendResponse<D>>;\n}\n\nexport interface MailerSettingsCreateParams {\n    input: Partial<TransportSettings>;\n}\nexport interface MailerSettingsUpdateParams {\n    input: Partial<TransportSettings>;\n    original?: ExtendedTransportSettings | null;\n}\n\nexport interface MailerSettingsSaveParams {\n    input: Partial<TransportSettings>;\n}\n\nexport interface OnSettingsBeforeGetTopicParams {\n    tenant: string;\n}\n\nexport interface OnSettingsAfterGetTopicParams {\n    tenant: string;\n    settings: TransportSettings | null;\n}\n\nexport interface OnSettingsGetErrorTopicParams {\n    tenant: string;\n    error: Error;\n}\n\nexport interface OnSettingsBeforeCreateTopicParams {\n    settings: TransportSettings;\n}\n\nexport interface OnSettingsAfterCreateTopicParams {\n    settings: TransportSettings;\n}\n\nexport interface OnSettingsCreateErrorTopicParams {\n    settings: TransportSettings;\n    error: Error;\n}\n\nexport interface OnSettingsBeforeUpdateTopicParams {\n    settings: TransportSettings;\n    original: TransportSettings;\n}\n\nexport interface OnSettingsAfterUpdateTopicParams {\n    original: TransportSettings;\n    settings: TransportSettings;\n}\n\nexport interface OnSettingsUpdateErrorTopicParams {\n    original: TransportSettings;\n    settings: TransportSettings;\n    error: Error;\n}\n\nexport interface ExtendedTransportSettings extends TransportSettings {\n    id: string;\n}\n\nexport interface MailerSettingsContext {\n    getSettings: () => Promise<ExtendedTransportSettings | null>;\n    /**\n     * Method should not be used outside of mailer\n     * @internal\n     */\n    createSettings: (params: MailerSettingsCreateParams) => Promise<TransportSettings>;\n    /**\n     * Method should not be used outside of mailer\n     * @internal\n     */\n    updateSettings: (params: MailerSettingsUpdateParams) => Promise<TransportSettings>;\n    /**\n     * Use to store the settings data.\n     */\n    saveSettings: (params: MailerSettingsSaveParams) => Promise<TransportSettings>;\n    /**\n     * Lifecycle events\n     */\n    onSettingsBeforeGet: Topic<OnSettingsBeforeGetTopicParams>;\n    onSettingsAfterGet: Topic<OnSettingsAfterGetTopicParams>;\n    onSettingsGetError: Topic<OnSettingsGetErrorTopicParams>;\n    onSettingsBeforeCreate: Topic<OnSettingsBeforeCreateTopicParams>;\n    onSettingsAfterCreate: Topic<OnSettingsAfterCreateTopicParams>;\n    onSettingsCreateError: Topic<OnSettingsCreateErrorTopicParams>;\n    onSettingsBeforeUpdate: Topic<OnSettingsBeforeUpdateTopicParams>;\n    onSettingsAfterUpdate: Topic<OnSettingsAfterUpdateTopicParams>;\n    onSettingsUpdateError: Topic<OnSettingsUpdateErrorTopicParams>;\n}\n\nexport interface MailerContextObject<T extends Transport = Transport>\n    extends MailerTransporterContext<T>,\n        MailerSettingsContext {}\nexport interface MailerContext extends CmsContext {\n    mailer: MailerContextObject;\n}\n\nexport interface OnTransportBeforeSendParams {\n    data: TransportSendData;\n    transport: Transport;\n}\nexport interface OnTransportAfterSendParams {\n    data: TransportSendData;\n    transport: Transport;\n}\nexport interface OnTransportErrorParams {\n    error: Error;\n    data: TransportSendData;\n    transport: Transport;\n}\n\n/**\n * Interface to implement the actual mailer.\n */\nexport interface TransportSendResponse<T = any> {\n    result: T | null;\n    error: {\n        message: string;\n        code: string;\n        data?: {\n            [key: string]: any;\n        };\n    } | null;\n}\n\ninterface TransportSendToData {\n    to: string[];\n}\ninterface TransportSendCcData {\n    cc: string[];\n}\ninterface TransportSendBccData {\n    bcc: string[];\n}\n\ninterface BaseTransportSendData {\n    to?: string[];\n    cc?: string[];\n    bcc?: string[];\n    from?: string;\n    subject: string;\n    text: string;\n    html?: string;\n    replyTo?: string;\n}\n\nexport type TransportSendData = BaseTransportSendData &\n    (TransportSendToData | TransportSendBccData | TransportSendCcData);\nexport interface Transport<T = any> {\n    name: string;\n    send: (params: TransportSendData) => Promise<TransportSendResponse<T>>;\n}\n\nexport interface TransportSettings {\n    host: string;\n    user: string;\n    password: string;\n    from: string;\n    replyTo?: string;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import { CmsContext } from \"@webiny/api-headless-cms/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\n\nexport interface MailerTransporterContext<T extends Transport = Transport> {\n    onTransportBeforeSend: Topic<OnTransportBeforeSendParams>;\n    onTransportAfterSend: Topic<OnTransportAfterSendParams>;\n    onTransportError: Topic<OnTransportErrorParams>;\n    getTransport: () => Promise<T | null>;\n    sendMail: <D>(data: TransportSendData) => Promise<TransportSendResponse<D>>;\n}\n\nexport interface MailerSettingsCreateParams {\n    input: Partial<TransportSettings>;\n}\nexport interface MailerSettingsUpdateParams {\n    input: Partial<TransportSettings>;\n    original?: ExtendedTransportSettings | null;\n}\n\nexport interface MailerSettingsSaveParams {\n    input: Partial<TransportSettings>;\n}\n\nexport interface OnSettingsBeforeGetTopicParams {\n    tenant: string;\n}\n\nexport interface OnSettingsAfterGetTopicParams {\n    tenant: string;\n    settings: TransportSettings | null;\n}\n\nexport interface OnSettingsGetErrorTopicParams {\n    tenant: string;\n    error: Error;\n}\n\nexport interface OnSettingsBeforeCreateTopicParams {\n    settings: TransportSettings;\n}\n\nexport interface OnSettingsAfterCreateTopicParams {\n    settings: TransportSettings;\n}\n\nexport interface OnSettingsCreateErrorTopicParams {\n    settings: TransportSettings;\n    error: Error;\n}\n\nexport interface OnSettingsBeforeUpdateTopicParams {\n    settings: TransportSettings;\n    original: TransportSettings;\n}\n\nexport interface OnSettingsAfterUpdateTopicParams {\n    original: TransportSettings;\n    settings: TransportSettings;\n}\n\nexport interface OnSettingsUpdateErrorTopicParams {\n    original: TransportSettings;\n    settings: TransportSettings;\n    error: Error;\n}\n\nexport interface ExtendedTransportSettings extends TransportSettings {\n    id: string;\n}\n\nexport interface MailerSettingsContext {\n    getSettings: () => Promise<ExtendedTransportSettings | null>;\n    /**\n     * Method should not be used outside of mailer\n     * @internal\n     */\n    createSettings: (params: MailerSettingsCreateParams) => Promise<TransportSettings>;\n    /**\n     * Method should not be used outside of mailer\n     * @internal\n     */\n    updateSettings: (params: MailerSettingsUpdateParams) => Promise<TransportSettings>;\n    /**\n     * Use to store the settings data.\n     */\n    saveSettings: (params: MailerSettingsSaveParams) => Promise<TransportSettings>;\n    /**\n     * Lifecycle events\n     */\n    onSettingsBeforeGet: Topic<OnSettingsBeforeGetTopicParams>;\n    onSettingsAfterGet: Topic<OnSettingsAfterGetTopicParams>;\n    onSettingsGetError: Topic<OnSettingsGetErrorTopicParams>;\n    onSettingsBeforeCreate: Topic<OnSettingsBeforeCreateTopicParams>;\n    onSettingsAfterCreate: Topic<OnSettingsAfterCreateTopicParams>;\n    onSettingsCreateError: Topic<OnSettingsCreateErrorTopicParams>;\n    onSettingsBeforeUpdate: Topic<OnSettingsBeforeUpdateTopicParams>;\n    onSettingsAfterUpdate: Topic<OnSettingsAfterUpdateTopicParams>;\n    onSettingsUpdateError: Topic<OnSettingsUpdateErrorTopicParams>;\n}\n\nexport interface MailerContextObject<T extends Transport = Transport>\n    extends MailerTransporterContext<T>,\n        MailerSettingsContext {}\nexport interface MailerContext extends CmsContext {\n    mailer: MailerContextObject;\n}\n\nexport interface OnTransportBeforeSendParams {\n    data: TransportSendData;\n    transport: Transport;\n}\nexport interface OnTransportAfterSendParams {\n    data: TransportSendData;\n    transport: Transport;\n}\nexport interface OnTransportErrorParams {\n    error: Error;\n    data: TransportSendData;\n    transport: Transport;\n}\n\n/**\n * Interface to implement the actual mailer.\n */\nexport interface TransportSendResponse<T = any> {\n    result: T | null;\n    error: {\n        message: string;\n        code: string;\n        data?: {\n            [key: string]: any;\n        };\n    } | null;\n}\n\ninterface TransportSendToData {\n    to: string[];\n}\ninterface TransportSendCcData {\n    cc: string[];\n}\ninterface TransportSendBccData {\n    bcc: string[];\n}\n\ninterface BaseTransportSendData {\n    to?: string[];\n    cc?: string[];\n    bcc?: string[];\n    from?: string;\n    subject: string;\n    text: string;\n    html?: string;\n    replyTo?: string;\n}\n\nexport type TransportSendData = BaseTransportSendData &\n    (TransportSendToData | TransportSendBccData | TransportSendCcData);\nexport interface Transport<T = any> {\n    name: string;\n    send: (params: TransportSendData) => Promise<TransportSendResponse<T>>;\n}\n\nexport interface TransportSettings {\n    host: string;\n    port: number;\n    user: string;\n    password: string;\n    from: string;\n    replyTo?: string;\n}\n"],"mappings":""}

package/crud/mailer/onBeforeSend.d.ts

@@ -1,7 +0,0 @@
-import { Topic } from "@webiny/pubsub/types";
-import { OnBeforeMailerSendParams } from "../../types";
-interface AttachOnBeforeSendParams {
-    onBeforeSend: Topic<OnBeforeMailerSendParams>;
-}
-export declare const attachOnBeforeSend: (params: AttachOnBeforeSendParams) => void;
-export {};