npm - n8n - Versions diffs - 1.57.0 → 1.58.1 - Mend

n8n 1.57.0 → 1.58.1

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.

Files changed (700) hide show

package/dist/user-management/email/templates/user-invited.handlebars ADDED Viewed

@@ -0,0 +1,201 @@
+<!doctype html>
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+<head>
+  <title></title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
+    p {
+      display: block;
+      margin: 13px 0;
+    }
+  </style>
+  <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+  <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+  <!--[if !mso]><!-->
+  <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+  </style>
+  <!--<![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+    }
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:479px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
+  </style>
+</head>
+<body style="word-spacing:normal;background-color:#fbfcfe;">
+  <div style="background-color:#fbfcfe;" lang="und" dir="auto">
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 0 0 0;word-break:break-word;">
+                        <div style="font-family:Open Sans, sans-serif;font-size:24px;font-weight:400;line-height:24px;text-align:center;color:#ff6f5c;">Welcome to n8n! 🎉</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#FFFFFF" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
+        <tbody>
+          <tr>
+            <td style="border:1px solid #ddd;direction:ltr;font-size:0px;padding:20px 0px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 0 0 0;word-break:break-word;">
+                        <div style="font-family:Open Sans, sans-serif;font-size:16px;font-weight:400;line-height:24px;text-align:center;color:#444444;">You have been invited to join n8n at <b>{{domain}}</b> .</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 0 0 0;word-break:break-word;">
+                        <div style="font-family:Open Sans, sans-serif;font-size:16px;font-weight:400;line-height:24px;text-align:center;color:#444444;">To accept, please click the button below.</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;padding-top:20px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                          <tbody>
+                            <tr>
+                              <td align="center" bgcolor="#ff6f5c" role="presentation" style="border:none;border-radius:4px;cursor:auto;mso-padding-alt:10px 25px;background:#ff6f5c;" valign="middle">
+                                <a href="{{inviteAcceptUrl}}" style="display:inline-block;background:#ff6f5c;color:#ffffff;font-family:Open Sans, sans-serif;font-size:18px;font-weight:600;line-height:24px;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:4px;" target="_blank"> Set up your n8n account </a>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                          <tbody>
+                            <tr>
+                              <td style="width:70px;">
+                                <img alt="" src="cid:n8n-logo" style="border:0;display:block;outline:none;text-decoration:none;height:40px;width:100%;font-size:13px;" width="70" height="40" />
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+  </div>
+</body>
+</html>

package/dist/user-management/email/templates/workflow-shared.handlebars ADDED Viewed

@@ -0,0 +1,201 @@
+<!doctype html>
+<html lang="und" dir="auto" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+<head>
+  <title></title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
+    p {
+      display: block;
+      margin: 13px 0;
+    }
+  </style>
+  <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+  <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+  <!--[if !mso]><!-->
+  <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+  </style>
+  <!--<![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+    }
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:479px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
+  </style>
+</head>
+<body style="word-spacing:normal;background-color:#fbfcfe;">
+  <div style="background-color:#fbfcfe;" lang="und" dir="auto">
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 0 0 0;word-break:break-word;">
+                        <div style="font-family:Open Sans, sans-serif;font-size:24px;font-weight:400;line-height:24px;text-align:center;color:#ff6f5c;">A workflow has been shared with you</div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" bgcolor="#FFFFFF" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
+        <tbody>
+          <tr>
+            <td style="border:1px solid #ddd;direction:ltr;font-size:0px;padding:20px 0px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:598px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 0 0 0;word-break:break-word;">
+                        <div style="font-family:Open Sans, sans-serif;font-size:16px;font-weight:400;line-height:24px;text-align:center;color:#444444;"><b>"{{ workflowName }}"</b> workflow has been shared with you.</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 0 0 0;word-break:break-word;">
+                        <div style="font-family:Open Sans, sans-serif;font-size:16px;font-weight:400;line-height:24px;text-align:center;color:#444444;">To access it, please click the button below.</div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;padding-top:20px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                          <tbody>
+                            <tr>
+                              <td align="center" bgcolor="#ff6f5c" role="presentation" style="border:none;border-radius:4px;cursor:auto;mso-padding-alt:10px 25px;background:#ff6f5c;" valign="middle">
+                                <a href="{{workflowUrl}}" style="display:inline-block;background:#ff6f5c;color:#ffffff;font-family:Open Sans, sans-serif;font-size:18px;font-weight:600;line-height:24px;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:4px;" target="_blank"> Open Workflow </a>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                          <tbody>
+                            <tr>
+                              <td style="width:70px;">
+                                <img alt="" src="cid:n8n-logo" style="border:0;display:block;outline:none;text-decoration:none;height:40px;width:100%;font-size:13px;" width="70" height="40" />
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
+  </div>
+</body>
+</html>

package/dist/user-management/email/user-management-mailer.d.ts CHANGED Viewed

@@ -1,22 +1,24 @@
 import { GlobalConfig } from '@n8n/config';
-import type { User } from '../../databases/entities/User';
+import type { User } from '../../databases/entities/user';
 import type { WorkflowEntity } from '../../databases/entities/workflow-entity';
 import { UserRepository } from '../../databases/repositories/user.repository';
+import { EventService } from '../../events/event.service';
 import { Logger } from '../../logger';
 import { UrlService } from '../../services/url.service';
-import type { InviteEmailData, PasswordResetData, SendEmailResult } from './Interfaces';
+import type { InviteEmailData, PasswordResetData, SendEmailResult } from './interfaces';
 import { NodeMailer } from './node-mailer';
 type Template = HandlebarsTemplateDelegate<unknown>;
-type TemplateName = 'invite' | 'passwordReset' | 'workflowShared' | 'credentialsShared';
+type TemplateName = 'user-invited' | 'password-reset-requested' | 'workflow-shared' | 'credentials-shared';
 export declare class UserManagementMailer {
     private readonly logger;
     private readonly userRepository;
     private readonly urlService;
+    private readonly eventService;
     readonly isEmailSetUp: boolean;
     readonly templateOverrides: GlobalConfig['userManagement']['emails']['template'];
     readonly templatesCache: Partial<Record<TemplateName, Template>>;
     readonly mailer: NodeMailer | undefined;
-    constructor(globalConfig: GlobalConfig, logger: Logger, userRepository: UserRepository, urlService: UrlService);
+    constructor(globalConfig: GlobalConfig, logger: Logger, userRepository: UserRepository, urlService: UrlService, eventService: EventService);
     invite(inviteEmailData: InviteEmailData): Promise<SendEmailResult>;
     passwordReset(passwordResetData: PasswordResetData): Promise<SendEmailResult>;
     notifyWorkflowShared({ sharer, newShareeIds, workflow, }: {
@@ -29,6 +31,7 @@ export declare class UserManagementMailer {
         newShareeIds: string[];
         credentialsName: string;
     }): Promise<SendEmailResult>;
-    getTemplate(templateName: TemplateName, defaultFilename?: string): Promise<Template>;
+    getTemplate(templateName: TemplateName): Promise<Template>;
+    private get basePayload();
 }
 export {};

package/dist/user-management/email/user-management-mailer.js CHANGED Viewed

@@ -20,17 +20,19 @@ const handlebars_1 = __importDefault(require("handlebars"));
 const path_1 = require("path");
 const config_1 = require("@n8n/config");
 const user_repository_1 = require("../../databases/repositories/user.repository");
+const event_service_1 = require("../../events/event.service");
 const logger_1 = require("../../logger");
 const url_service_1 = require("../../services/url.service");
 const internal_server_error_1 = require("../../errors/response-errors/internal-server.error");
 const utils_1 = require("../../utils");
 const node_mailer_1 = require("./node-mailer");
-const event_service_1 = require("../../events/event.service");
+const constants_1 = require("../../constants");
 let UserManagementMailer = class UserManagementMailer {
-    constructor(globalConfig, logger, userRepository, urlService) {
+    constructor(globalConfig, logger, userRepository, urlService, eventService) {
         this.logger = logger;
         this.userRepository = userRepository;
         this.urlService = urlService;
+        this.eventService = eventService;
         this.templatesCache = {};
         const emailsConfig = globalConfig.userManagement.emails;
         this.isEmailSetUp = emailsConfig.mode === 'smtp' && emailsConfig.smtp.host !== '';
@@ -42,24 +44,22 @@ let UserManagementMailer = class UserManagementMailer {
     async invite(inviteEmailData) {
         if (!this.mailer)
             return { emailSent: false };
-        const template = await this.getTemplate('invite');
-        const result = await this.mailer.sendMail({
+        const template = await this.getTemplate('user-invited');
+        return await this.mailer.sendMail({
             emailRecipients: inviteEmailData.email,
             subject: 'You have been invited to n8n',
-            body: template(inviteEmailData),
+            body: template({ ...this.basePayload, ...inviteEmailData }),
         });
-        return result !== null && result !== void 0 ? result : { emailSent: false };
     }
     async passwordReset(passwordResetData) {
         if (!this.mailer)
             return { emailSent: false };
-        const template = await this.getTemplate('passwordReset', 'passwordReset.html');
-        const result = await this.mailer.sendMail({
+        const template = await this.getTemplate('password-reset-requested');
+        return await this.mailer.sendMail({
             emailRecipients: passwordResetData.email,
             subject: 'n8n password reset',
-            body: template(passwordResetData),
+            body: template({ ...this.basePayload, ...passwordResetData }),
         });
-        return result !== null && result !== void 0 ? result : { emailSent: false };
     }
     async notifyWorkflowShared({ sharer, newShareeIds, workflow, }) {
         if (!this.mailer)
@@ -68,7 +68,7 @@ let UserManagementMailer = class UserManagementMailer {
         if (recipients.length === 0)
             return { emailSent: false };
         const emailRecipients = recipients.map(({ email }) => email);
-        const populateTemplate = await this.getTemplate('workflowShared', 'workflowShared.html');
+        const populateTemplate = await this.getTemplate('workflow-shared');
         const baseUrl = this.urlService.getInstanceBaseUrl();
         try {
             const result = await this.mailer.sendMail({
@@ -82,7 +82,7 @@ let UserManagementMailer = class UserManagementMailer {
             if (!result)
                 return { emailSent: false };
             this.logger.info('Sent workflow shared email successfully', { sharerId: sharer.id });
-            typedi_1.Container.get(event_service_1.EventService).emit('user-transactional-email-sent', {
+            this.eventService.emit('user-transactional-email-sent', {
                 userId: sharer.id,
                 messageType: 'Workflow shared',
                 publicApi: false,
@@ -90,7 +90,7 @@ let UserManagementMailer = class UserManagementMailer {
             return result;
         }
         catch (e) {
-            typedi_1.Container.get(event_service_1.EventService).emit('email-failed', {
+            this.eventService.emit('email-failed', {
                 user: sharer,
                 messageType: 'Workflow shared',
                 publicApi: false,
@@ -106,7 +106,7 @@ let UserManagementMailer = class UserManagementMailer {
         if (recipients.length === 0)
             return { emailSent: false };
         const emailRecipients = recipients.map(({ email }) => email);
-        const populateTemplate = await this.getTemplate('credentialsShared', 'credentialsShared.html');
+        const populateTemplate = await this.getTemplate('credentials-shared');
         const baseUrl = this.urlService.getInstanceBaseUrl();
         try {
             const result = await this.mailer.sendMail({
@@ -120,7 +120,7 @@ let UserManagementMailer = class UserManagementMailer {
             if (!result)
                 return { emailSent: false };
             this.logger.info('Sent credentials shared email successfully', { sharerId: sharer.id });
-            typedi_1.Container.get(event_service_1.EventService).emit('user-transactional-email-sent', {
+            this.eventService.emit('user-transactional-email-sent', {
                 userId: sharer.id,
                 messageType: 'Credentials shared',
                 publicApi: false,
@@ -128,7 +128,7 @@ let UserManagementMailer = class UserManagementMailer {
             return result;
         }
         catch (e) {
-            typedi_1.Container.get(event_service_1.EventService).emit('email-failed', {
+            this.eventService.emit('email-failed', {
                 user: sharer,
                 messageType: 'Credentials shared',
                 publicApi: false,
@@ -137,19 +137,25 @@ let UserManagementMailer = class UserManagementMailer {
             throw new internal_server_error_1.InternalServerError(`Please contact your administrator: ${error.message}`);
         }
     }
-    async getTemplate(templateName, defaultFilename = `${templateName}.html`) {
+    async getTemplate(templateName) {
         let template = this.templatesCache[templateName];
         if (!template) {
+            const fileExtension = constants_1.inTest ? 'mjml' : 'handlebars';
             const templateOverride = this.templateOverrides[templateName];
             const templatePath = templateOverride && (0, fs_1.existsSync)(templateOverride)
                 ? templateOverride
-                : (0, path_1.join)(__dirname, `templates/${defaultFilename}`);
+                : (0, path_1.join)(__dirname, `templates/${templateName}.${fileExtension}`);
             const markup = await (0, promises_1.readFile)(templatePath, 'utf-8');
             template = handlebars_1.default.compile(markup);
             this.templatesCache[templateName] = template;
         }
         return template;
     }
+    get basePayload() {
+        const baseUrl = this.urlService.getInstanceBaseUrl();
+        const domain = new URL(baseUrl).hostname;
+        return { baseUrl, domain };
+    }
 };
 exports.UserManagementMailer = UserManagementMailer;
 exports.UserManagementMailer = UserManagementMailer = __decorate([
@@ -157,6 +163,7 @@ exports.UserManagementMailer = UserManagementMailer = __decorate([
     __metadata("design:paramtypes", [config_1.GlobalConfig,
         logger_1.Logger,
         user_repository_1.UserRepository,
-        url_service_1.UrlService])
+        url_service_1.UrlService,
+        event_service_1.EventService])
 ], UserManagementMailer);
 //# sourceMappingURL=user-management-mailer.js.map

package/dist/user-management/email/user-management-mailer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"user-management-mailer.js","sourceRoot":"","sources":["../../../src/user-management/email/user-management-mailer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAA4C;AAC5C,2BAAgC;AAChC,0CAAuC;AACvC,4DAAoC;AACpC,+BAAwC;AACxC,wCAA2C;AAI3C,8EAA0E;AAC1E,qCAAkC;AAClC,wDAAoD;AACpD,0FAAqF;AACrF,mCAAkC;AAGlC,+CAA2C;AAC3C,~~0DAAsD~~;~~AAM/C~~,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAShC,YACC,YAA0B,EACT,MAAc,EACd,cAA8B,EAC9B,UAAsB;~~QAFtB~~,WAAM,GAAN,MAAM,CAAQ;QACd,mBAAc,GAAd,cAAc,CAAgB;QAC9B,eAAU,GAAV,UAAU,CAAY;~~QAR/B~~,mBAAc,GAA4C,EAAE,CAAC;~~QAUrE~~,MAAM,YAAY,GAAG,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC;QACxD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,IAAI,KAAK,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;QAClF,IAAI,CAAC,iBAAiB,GAAG,YAAY,CAAC,QAAQ,CAAC;QAG/C,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,kBAAS,CAAC,GAAG,CAAC,wBAAU,CAAC,CAAC;QACzC,CAAC;IACF,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,eAAgC;QAC5C,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAE9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,~~QAAQ~~,CAAC,CAAC;~~QAClD~~,~~MAAM~~,MAAM,~~GAAG,MAAM,~~IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;~~YACzC~~,eAAe,EAAE,eAAe,CAAC,KAAK;YACtC,OAAO,EAAE,8BAA8B;YACvC,IAAI,EAAE,QAAQ,CAAC,~~eAAe~~,~~CAAC;SAC/B~~,~~CAAC~~,CAAC~~;QAIH~~,~~OAAO~~,~~MAAM~~,~~aAAN~~,~~MAAM~~,~~cAAN,MAAM,GAAI,~~EAAE,~~SAAS~~,~~EAAE~~,~~KAAK,EAAE,~~CAAC;~~IACvC~~,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,iBAAoC;QACvD,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAE9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,~~eAAe~~,~~EAAE,oBAAoB,~~CAAC,CAAC;~~QAC/E~~,~~MAAM~~,MAAM,~~GAAG,MAAM,~~IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;~~YACzC~~,eAAe,EAAE,iBAAiB,CAAC,KAAK;YACxC,OAAO,EAAE,oBAAoB;YAC7B,IAAI,EAAE,QAAQ,CAAC,~~iBAAiB~~,~~CAAC;SACjC~~,~~CAAC~~,CAAC~~;QAIH~~,~~OAAO~~,~~MAAM~~,~~aAAN~~,~~MAAM~~,~~cAAN,MAAM,GAAI,~~EAAE,~~SAAS~~,~~EAAE~~,~~KAAK,EAAE,~~CAAC;~~IACvC~~,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,EAC1B,MAAM,EACN,YAAY,EACZ,QAAQ,GAKR;QACA,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAE9C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QAE1E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAEzD,MAAM,eAAe,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAE7D,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,~~gBAAgB~~,~~EAAE,qBAAqB,~~CAAC,CAAC;~~QAEzF~~,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QAErD,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACzC,eAAe;gBACf,OAAO,EAAE,GAAG,MAAM,CAAC,SAAS,sCAAsC;gBAClE,IAAI,EAAE,gBAAgB,CAAC;oBACtB,YAAY,EAAE,QAAQ,CAAC,IAAI;oBAC3B,WAAW,EAAE,GAAG,OAAO,aAAa,QAAQ,CAAC,EAAE,EAAE;iBACjD,CAAC;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM;gBAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;YAEzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;YAErF,~~kBAAS~~,CAAC,~~GAAG~~,CAAC,~~4BAAY,CAAC,CAAC,~~IAAI,CAAC,+BAA+B,EAAE;~~gBACjE~~,MAAM,EAAE,MAAM,CAAC,EAAE;gBACjB,WAAW,EAAE,iBAAiB;gBAC9B,SAAS,EAAE,KAAK;aAChB,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC;QACf,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,~~kBAAS~~,CAAC,~~GAAG~~,CAAC,~~4BAAY,CAAC,CAAC,~~IAAI,CAAC,cAAc,EAAE;~~gBAChD~~,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,iBAAiB;gBAC9B,SAAS,EAAE,KAAK;aAChB,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,IAAA,eAAO,EAAC,CAAC,CAAC,CAAC;YAEzB,MAAM,IAAI,2CAAmB,CAAC,sCAAsC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACtF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,EAC7B,MAAM,EACN,YAAY,EACZ,eAAe,GAKf;QACA,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAE9C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QAE1E,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAEzD,MAAM,eAAe,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAE7D,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,~~mBAAmB~~,~~EAAE,wBAAwB,~~CAAC,CAAC;~~QAE/F~~,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QAErD,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACzC,eAAe;gBACf,OAAO,EAAE,GAAG,MAAM,CAAC,SAAS,wCAAwC;gBACpE,IAAI,EAAE,gBAAgB,CAAC;oBACtB,eAAe;oBACf,kBAAkB,EAAE,GAAG,OAAO,mBAAmB;iBACjD,CAAC;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM;gBAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;YAEzC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;YAExF,~~kBAAS~~,CAAC,~~GAAG~~,CAAC,~~4BAAY,CAAC,CAAC,~~IAAI,CAAC,+BAA+B,EAAE;~~gBACjE~~,MAAM,EAAE,MAAM,CAAC,EAAE;gBACjB,WAAW,EAAE,oBAAoB;gBACjC,SAAS,EAAE,KAAK;aAChB,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC;QACf,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,~~kBAAS~~,CAAC,~~GAAG~~,CAAC,~~4BAAY,CAAC,CAAC,~~IAAI,CAAC,cAAc,EAAE;~~gBAChD~~,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,oBAAoB;gBACjC,SAAS,EAAE,KAAK;aAChB,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,IAAA,eAAO,EAAC,CAAC,CAAC,CAAC;YAEzB,MAAM,IAAI,2CAAmB,CAAC,sCAAsC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACtF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,WAAW,~~CAChB~~,YAA0B~~,EAC1B,eAAe,GAAG,GAAG,YAAY,OAAO~~;~~QAExC~~,IAAI,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;YAC9D,MAAM,YAAY,GACjB,gBAAgB,IAAI,IAAA,eAAU,EAAC,gBAAgB,CAAC;gBAC/C,CAAC,CAAC,gBAAgB;gBAClB,CAAC,CAAC,IAAA,WAAQ,EAAC,SAAS,EAAE,aAAa,~~eAAe~~,EAAE,CAAC,CAAC;~~YACxD~~,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAQ,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YACrD,QAAQ,GAAG,oBAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACtC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;QAC9C,CAAC;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC;CACD,CAAA;~~AAtLY~~,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,gBAAO,GAAE;qCAWM,qBAAY;QACD,eAAM;QACE,gCAAc;QAClB,wBAAU;~~GAb5B~~,oBAAoB,~~CAsLhC~~"}
1	+ {"version":3,"file":"user-management-mailer.js","sourceRoot":"","sources":["../../../src/user-management/email/user-management-mailer.ts"],"names":[],"mappings":"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"}

package/dist/user-management/permission-checker.js CHANGED Viewed

@@ -24,7 +24,7 @@ let PermissionChecker = class PermissionChecker {
     async check(workflowId, nodes) {
         const homeProject = await this.ownershipService.getWorkflowProjectCached(workflowId);
         const homeProjectOwner = await this.ownershipService.getProjectOwnerCached(homeProject.id);
-        if (homeProject.type === 'personal' && (homeProjectOwner === null || homeProjectOwner === void 0 ? void 0 : homeProjectOwner.hasGlobalScope('credential:list'))) {
+        if (homeProject.type === 'personal' && homeProjectOwner?.hasGlobalScope('credential:list')) {
             return;
         }
         const projectIds = await this.projectService.findProjectsWorkflowIsIn(workflowId);

package/dist/user-management/permission-checker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"permission-checker.js","sourceRoot":"","sources":["../../src/user-management/permission-checker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAEjC,+CAAyE;AAEzE,oEAAgE;AAChE,0GAAqG;AACrG,gEAA4D;AAGrD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,YACkB,2BAAwD,EACxD,gBAAkC,EAClC,cAA8B;QAF9B,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;IAC7C,CAAC;IAKJ,KAAK,CAAC,KAAK,CAAC,UAAkB,EAAE,KAAc;QAC7C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QACrF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC3F,IAAI,WAAW,CAAC,IAAI,KAAK,UAAU,~~KAAI~~,gBAAgB,~~aAAhB~~,~~gBAAgB,uBAAhB,gBAAgB,CAAE,~~cAAc,CAAC,iBAAiB,CAAC,~~CAAA,~~EAAE,CAAC;YAG5F,OAAO;QACR,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAClF,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAErD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEpD,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEzC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,gCAAgC,CACzF,UAAU,EACV,eAAe,CACf,CAAC;QAEF,KAAK,MAAM,aAAa,IAAI,eAAe,EAAE,CAAC;YAC7C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBACzC,MAAM,UAAU,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpD,MAAM,IAAI,oCAAqB,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;YACxE,CAAC;QACF,CAAC;IACF,CAAC;IAEO,iBAAiB,CAAC,KAAc;QACvC,OAAO,KAAK,CAAC,MAAM,CAAsC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACtE,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW;gBAAE,OAAO,GAAG,CAAC;YAEnD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChD,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;oBACd,MAAM,IAAI,iCAAkB,CAAC,IAAI,EAAE,8BAA8B,EAAE;wBAClE,WAAW,EAAE,iCAAiC;wBAC9C,KAAK,EAAE,SAAS;qBAChB,CAAC,CAAC;gBACJ,CAAC;gBAED,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC;QACZ,CAAC,EAAE,EAAE,CAAC,CAAC;IACR,CAAC;CACD,CAAA;AAxDY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,gBAAO,GAAE;qCAGsC,2DAA2B;QACtC,oCAAgB;QAClB,gCAAc;GAJpC,iBAAiB,CAwD7B"}
1	+ {"version":3,"file":"permission-checker.js","sourceRoot":"","sources":["../../src/user-management/permission-checker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AAEjC,+CAAyE;AAEzE,oEAAgE;AAChE,0GAAqG;AACrG,gEAA4D;AAGrD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,YACkB,2BAAwD,EACxD,gBAAkC,EAClC,cAA8B;QAF9B,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;IAC7C,CAAC;IAKJ,KAAK,CAAC,KAAK,CAAC,UAAkB,EAAE,KAAc;QAC7C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QACrF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC3F,IAAI,WAAW,CAAC,IAAI,KAAK,UAAU,IAAI,gBAAgB,EAAE,cAAc,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAG5F,OAAO;QACR,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAClF,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAErD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEpD,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEzC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,gCAAgC,CACzF,UAAU,EACV,eAAe,CACf,CAAC;QAEF,KAAK,MAAM,aAAa,IAAI,eAAe,EAAE,CAAC;YAC7C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBACzC,MAAM,UAAU,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpD,MAAM,IAAI,oCAAqB,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;YACxE,CAAC;QACF,CAAC;IACF,CAAC;IAEO,iBAAiB,CAAC,KAAc;QACvC,OAAO,KAAK,CAAC,MAAM,CAAsC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACtE,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW;gBAAE,OAAO,GAAG,CAAC;YAEnD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChD,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;oBACd,MAAM,IAAI,iCAAkB,CAAC,IAAI,EAAE,8BAA8B,EAAE;wBAClE,WAAW,EAAE,iCAAiC;wBAC9C,KAAK,EAAE,SAAS;qBAChB,CAAC,CAAC;gBACJ,CAAC;gBAED,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC;QACZ,CAAC,EAAE,EAAE,CAAC,CAAC;IACR,CAAC;CACD,CAAA;AAxDY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,gBAAO,GAAE;qCAGsC,2DAA2B;QACtC,oCAAgB;QAClB,gCAAc;GAJpC,iBAAiB,CAwD7B"}

package/dist/utils.js CHANGED Viewed

@@ -9,7 +9,7 @@ exports.rightDiff = rightDiff;
 const n8n_workflow_1 = require("n8n-workflow");
 const constants_1 = require("./constants");
 function isWorkflowIdValid(id) {
-    return typeof id === 'string' && (id === null || id === void 0 ? void 0 : id.length) <= 16;
+    return typeof id === 'string' && id?.length <= 16;
 }
 function findWorkflowStart(executionMode) {
     return function (nodes) {