feat(bigin-by-zoho-crm): add create company action

docker/Dockerfile.cloud

@@ -6,7 +6,7 @@ ENV PORT 3000
 RUN \
   apk --no-cache add --virtual build-dependencies python3 build-base git
 
-RUN git clone -b helix-new-endpoint https://github.com/automatisch/automatisch.git
+RUN git clone https://github.com/automatisch/automatisch.git
 
 WORKDIR /automatisch
 

packages/backend/package.json

@@ -38,7 +38,6 @@
     "debug": "~2.6.9",
     "dotenv": "^10.0.0",
     "express": "~4.18.2",
-    "express-async-handler": "^1.2.0",
     "express-basic-auth": "^1.2.1",
     "express-graphql": "^0.12.0",
     "fast-xml-parser": "^4.0.11",
@@ -95,7 +94,6 @@
     "url": "https://github.com/automatisch/automatisch/issues"
   },
   "devDependencies": {
-    "@typescript-eslint/utils": "^7.0.2",
     "nodemon": "^2.0.13",
     "supertest": "^6.3.3",
     "vitest": "^1.1.3"

packages/backend/src/apps/bigin-by-zoho-crm/actions/create-company/index.js

@@ -0,0 +1,161 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Create company',
+  key: 'createCompany',
+  description: 'Creates a new company.',
+  arguments: [
+    {
+      label: 'Company Owner',
+      key: 'companyOwnerId',
+      type: 'dropdown',
+      required: false,
+      description: '',
+      variables: true,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listContactOwners',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Company Name',
+      key: 'companyName',
+      type: 'string',
+      required: true,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Phone',
+      key: 'phone',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Website',
+      key: 'website',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Tags',
+      key: 'tags',
+      type: 'dynamic',
+      required: false,
+      description: '',
+      fields: [
+        {
+          label: 'Tag',
+          key: 'tag',
+          type: 'string',
+          required: false,
+          variables: true,
+        },
+      ],
+    },
+    {
+      label: 'Description',
+      key: 'description',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Billing Street',
+      key: 'billingStreet',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Billing City',
+      key: 'billingCity',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Billing State',
+      key: 'billingState',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Billing Country',
+      key: 'billingCountry',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Billing Code',
+      key: 'billingCode',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const {
+      contactOwnerId,
+      companyName,
+      phone,
+      website,
+      tags,
+      description,
+      billingStreet,
+      billingCity,
+      billingState,
+      billingCountry,
+      billingCode,
+    } = $.step.parameters;
+
+    const allTags = tags.map((tag) => ({
+      name: tag.tag,
+    }));
+
+    const body = {
+      data: [
+        {
+          Owner: {
+            id: contactOwnerId,
+          },
+          Account_Name: companyName,
+          Phone: phone,
+          Website: website,
+          Tag: allTags,
+          Description: description,
+          Billing_Street: billingStreet,
+          Billing_City: billingCity,
+          Billing_State: billingState,
+          Billing_Country: billingCountry,
+          Billing_Code: billingCode,
+        },
+      ],
+    };
+
+    const { data } = await $.http.post(`/bigin/v2/Accounts`, body);
+
+    $.setActionItem({
+      raw: data[0],
+    });
+  },
+});

packages/backend/src/apps/bigin-by-zoho-crm/actions/create-contact/index.js

@@ -0,0 +1,217 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Create contact',
+  key: 'createContact',
+  description: 'Creates a new contact.',
+  arguments: [
+    {
+      label: 'Contact Owner',
+      key: 'contactOwnerId',
+      type: 'dropdown',
+      required: false,
+      description: '',
+      variables: true,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listContactOwners',
+          },
+        ],
+      },
+    },
+    {
+      label: 'First Name',
+      key: 'firstName',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Last Name',
+      key: 'lastName',
+      type: 'string',
+      required: true,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Title',
+      key: 'title',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Email',
+      key: 'email',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Company ID',
+      key: 'companyId',
+      type: 'dropdown',
+      required: false,
+      description: '',
+      variables: true,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listCompanies',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Mobile',
+      key: 'mobile',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Email Opt Out',
+      key: 'emailOptOut',
+      type: 'dropdown',
+      required: false,
+      description: '',
+      variables: true,
+      options: [
+        { label: 'True', value: true },
+        { label: 'False', value: false },
+      ],
+    },
+    {
+      label: 'Tags',
+      key: 'tags',
+      type: 'dynamic',
+      required: false,
+      description: '',
+      fields: [
+        {
+          label: 'Tag',
+          key: 'tag',
+          type: 'string',
+          required: false,
+          variables: true,
+        },
+      ],
+    },
+    {
+      label: 'Description',
+      key: 'description',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Mailing Street',
+      key: 'mailingStreet',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Mailing City',
+      key: 'mailingCity',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Mailing State',
+      key: 'mailingState',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Mailing Country',
+      key: 'mailingCountry',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Mailing Zip',
+      key: 'mailingZip',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const {
+      contactOwnerId,
+      firstName,
+      lastName,
+      title,
+      email,
+      companyId,
+      mobile,
+      emailOptOut,
+      tags,
+      description,
+      mailingStreet,
+      mailingCity,
+      mailingState,
+      mailingCountry,
+      mailingZip,
+    } = $.step.parameters;
+
+    const allTags = tags.map((tag) => ({
+      name: tag.tag,
+    }));
+
+    const body = {
+      data: [
+        {
+          Owner: {
+            id: contactOwnerId,
+          },
+          Account_Name: {
+            id: companyId,
+          },
+          First_Name: firstName,
+          Last_Name: lastName,
+          Title: title,
+          Email: email,
+          Mobile: mobile,
+          Email_Opt_Out: emailOptOut,
+          Tag: allTags,
+          Description: description,
+          Mailing_Street: mailingStreet,
+          Mailing_City: mailingCity,
+          Mailing_State: mailingState,
+          Mailing_Country: mailingCountry,
+          Mailing_Zip: mailingZip,
+        },
+      ],
+    };
+
+    const { data } = await $.http.post(`/bigin/v2/Contacts`, body);
+
+    $.setActionItem({
+      raw: data[0],
+    });
+  },
+});

packages/backend/src/apps/bigin-by-zoho-crm/actions/create-event/index.js

@@ -0,0 +1,293 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Create event',
+  key: 'createEvent',
+  description: 'Creates a new event.',
+  arguments: [
+    {
+      label: 'Host',
+      key: 'hostId',
+      type: 'dropdown',
+      required: false,
+      description: '',
+      variables: true,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listContactOwners',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Title',
+      key: 'title',
+      type: 'string',
+      required: true,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'From',
+      key: 'from',
+      type: 'string',
+      required: true,
+      description: 'The date format is ISO8601 (yyyy-mm-ddTHH:mm:ssZ).',
+      variables: true,
+    },
+    {
+      label: 'To',
+      key: 'to',
+      type: 'string',
+      required: true,
+      description: 'The date format is ISO8601 (yyyy-mm-ddTHH:mm:ssZ).',
+      variables: true,
+    },
+    {
+      label: 'All Day',
+      key: 'allDay',
+      type: 'dropdown',
+      required: false,
+      description: '',
+      variables: true,
+      options: [
+        { label: 'True', value: true },
+        { label: 'False', value: false },
+      ],
+    },
+    {
+      label: 'Frequency (Recurring Activity)',
+      key: 'frequency',
+      type: 'dropdown',
+      required: false,
+      description:
+        'Specifies the frequency of event recurrence. The options include DAILY, WEEKLY, MONTHLY, or YEARLY.',
+      variables: true,
+      options: [
+        { label: 'Daily Events', value: 'DAILY' },
+        { label: 'Weekly Events', value: 'WEEKLY' },
+        { label: 'Monthly Events', value: 'MONTHLY' },
+      ],
+    },
+    {
+      label: 'Interval (Recurring Activity)',
+      key: 'interval',
+      type: 'string',
+      required: false,
+      description:
+        'Specifies the time difference between individual events. The INTERVAL can be anywhere from 1 to 99. For instance, with a WEEKLY event set at an INTERVAL of 2, there will be a two-week gap between each occurrence.',
+      variables: true,
+    },
+    {
+      label: 'By Month Day (Recurring Activity)',
+      key: 'byMonthDay',
+      type: 'string',
+      required: false,
+      description:
+        'This specifies the date within the month when the event recurs. The BYMONTHDAY value can be any number from 1 to 31. This rule applies exclusively to events that repeat monthly or yearly.',
+      variables: true,
+    },
+    {
+      label: 'By Week (Recurring Activity)',
+      key: 'byWeek',
+      type: 'dropdown',
+      required: false,
+      description:
+        'Only relevant for events that occur on a monthly or yearly basis.',
+      variables: true,
+      options: [
+        { label: 'First week of the month', value: '1' },
+        { label: 'Second week of the month', value: '2' },
+        { label: 'Third week of the month', value: '3' },
+        { label: 'Fourth week of the month', value: '4' },
+        { label: 'Last week of the month', value: '-1' },
+      ],
+    },
+    {
+      label: 'By Day (Recurring Activity)',
+      key: 'byDay',
+      type: 'string',
+      required: false,
+      description:
+        'This signifies the weekday when the event recurs. The options include SU, MO, TU, WE, TH, FR, or SA. This rule applies to events that repeat daily, weekly, monthly, and yearly (should not be combined with INTERVAL).',
+      variables: true,
+    },
+    {
+      label: 'Count (Recurring Activity)',
+      key: 'count',
+      type: 'string',
+      required: false,
+      description:
+        'Specifies the number of events you wish to generate. The count value range from 1 to 99.',
+      variables: true,
+    },
+    {
+      label: 'Until (Recurring Activity)',
+      key: 'until',
+      type: 'string',
+      required: false,
+      description:
+        'Specifies the concluding date for the event recurrence. Please input the date in the YYYY-MM-DD format.',
+      variables: true,
+    },
+    {
+      label: 'Reminder',
+      key: 'reminder',
+      type: 'dropdown',
+      required: false,
+      description:
+        'Provide the reminder list to notify or prompt participants prior to the event.',
+      variables: true,
+      options: [
+        { label: '5 min', value: '5 minutes' },
+        { label: '10 min', value: '10 minutes' },
+        { label: '15 min', value: '15 minutes' },
+        { label: '1 hrs', value: '1 hours' },
+        { label: '2 hrs', value: '2 hours' },
+        { label: '1 days', value: '1 days' },
+        { label: '2 days', value: '2 days' },
+        { label: '1 weeks', value: '1 weeks' },
+      ],
+    },
+    {
+      label: 'Location',
+      key: 'location',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Related Module',
+      key: 'relatedModule',
+      type: 'dropdown',
+      required: false,
+      description: '',
+      variables: true,
+      options: [
+        { label: 'Companies', value: 'Accounts' },
+        { label: 'Contacts', value: 'Contacts' },
+        { label: 'Deals', value: 'Deals' },
+      ],
+    },
+    {
+      label: 'Participants',
+      key: 'participants',
+      type: 'dynamic',
+      required: false,
+      description: 'Email Address of participants.',
+      fields: [
+        {
+          label: 'Participant',
+          key: 'participant',
+          type: 'string',
+          required: false,
+          variables: true,
+        },
+      ],
+    },
+    {
+      label: 'Description',
+      key: 'description',
+      type: 'string',
+      required: false,
+      description: '',
+      variables: true,
+    },
+    {
+      label: 'Tags',
+      key: 'tags',
+      type: 'dynamic',
+      required: false,
+      description: '',
+      fields: [
+        {
+          label: 'Tag',
+          key: 'tag',
+          type: 'string',
+          required: false,
+          variables: true,
+        },
+      ],
+    },
+  ],
+
+  async run($) {
+    const {
+      hostId,
+      title,
+      from,
+      to,
+      allDay,
+      frequency,
+      interval,
+      byMonthDay,
+      byDay,
+      byWeek,
+      count,
+      until,
+      reminder,
+      location,
+      relatedModule,
+      participants,
+      description,
+      tags,
+    } = $.step.parameters;
+
+    const allTags = tags.map((tag) => ({
+      name: tag.tag,
+    }));
+
+    const allParticipants = participants.map((participant) => ({
+      type: 'email',
+      participant: participant.participant,
+    }));
+
+    const [unit, period] = reminder.split(' ');
+
+    let rrule = `FREQ=${frequency};INTERVAL=${interval};`;
+    if (count) rrule += `COUNT=${count};`;
+    if (byMonthDay) rrule += `BYMONTHDAY=${byMonthDay};`;
+    if (byDay) rrule += `BYDAY=${byDay};`;
+    if (byWeek) rrule += `BYSETPOS=${byWeek};`;
+    if (until) rrule += `UNTIL=${until};`;
+
+    const body = {
+      data: [
+        {
+          Owner: {
+            id: hostId,
+          },
+          Event_Title: title,
+          Start_DateTime: from,
+          End_DateTime: to,
+          All_day: allDay,
+          $se_module: relatedModule,
+          Recurring_Activity: {
+            RRULE: rrule,
+          },
+          Remind_At: [
+            {
+              unit: Number(unit),
+              period,
+            },
+          ],
+          Venue: location,
+          Participants: allParticipants,
+          Description: description,
+          Tag: allTags,
+        },
+      ],
+    };
+
+    const { data } = await $.http.post(`/bigin/v2/Events`, body);
+
+    $.setActionItem({
+      raw: data,
+    });
+  },
+});

packages/backend/src/apps/bigin-by-zoho-crm/actions/index.js

@@ -0,0 +1,5 @@
+import createCompany from './create-company/index.js';
+import createContact from './create-contact/index.js';
+import createEvent from './create-event/index.js';
+
+export default [createCompany, createContact, createEvent];

packages/backend/src/apps/bigin-by-zoho-crm/assets/favicon.svg

@@ -0,0 +1,32 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" id="b" data-name="Layer 2" width="327.714" height="120" viewBox="0 0 327.714 120">
+  <defs>
+    <style>
+      .d {
+        fill: #039649;
+      }
+    </style>
+  </defs>
+  <g id="c" data-name="Layer 1">
+    <g>
+      <path class="d" d="m52.39,120c-1.801,0-3.6-.6-5.101-1.5-2.1-1.5-3.6-4.2-3.6-6.9v-24.6L1.09,12.901C-.41,9.9-.41,6.601,1.391,4.2,2.891,1.5,5.89,0,8.89,0h78c2.999,0,5.698,1.5,7.199,4.2,1.801,2.702,1.801,6.3.301,9.002l-5.101,9h10.201c2.999,0,5.698,1.5,7.199,4.2,1.801,2.7,1.801,6.3.301,9l-29.701,51.3v18.599c0,3.899-2.399,6.9-5.999,8.099l-16.2,6.3c-.6.301-1.799.301-2.7.301M8.89,8.4q-.301.301-.301.602l42.301,73.798c1.199,2.1,1.199,3.299,1.199,4.501v23.998s.301.301.6,0l16.2-6.3h.6v-17.999c0-1.199,0-3.299,1.201-4.8l29.4-50.999c0-.301,0-.6-.301-.6l-53.699-.301,14.399,24.901,10.201-17.7c1.199-2.1,3.6-2.7,5.7-1.5,2.1,1.199,2.7,3.6,1.498,5.7l-11.998,20.699c-2.702,4.2-8.701,3.901-11.102.301l-17.4-30.9c-1.199-1.799-1.199-4.2,0-6.3,1.201-2.1,3.301-3.6,5.7-3.6h36.6l7.499-12.899s0-.301-.299-.602H8.89Z"/>
+      <g>
+        <path d="m181.725,48.737c0,3.089-.54,5.684-1.618,7.788-1.081,2.104-2.548,3.79-4.407,5.062-1.858,1.27-4.016,2.179-6.476,2.726-2.459.547-5.069.819-7.828.819h-24.591V6.521h23.034c2.676,0,5.198.24,7.561.718,2.364.479,4.427,1.311,6.189,2.5,1.762,1.189,3.149,2.787,4.16,4.795,1.011,2.008,1.517,4.53,1.517,7.562,0,3.17-.786,5.813-2.357,7.93-1.57,2.119-3.913,3.628-7.028,4.53,4.017.819,6.995,2.371,8.935,4.652s2.91,5.458,2.91,9.529Zm-33.813-17.624h10.533c1.612,0,3.033-.136,4.263-.41,1.23-.272,2.268-.738,3.115-1.393.846-.656,1.489-1.55,1.927-2.684.436-1.134.655-2.562.655-4.284,0-1.612-.267-2.923-.799-3.934-.532-1.01-1.25-1.809-2.152-2.398-.902-.587-1.967-.99-3.197-1.209s-2.542-.328-3.934-.328h-10.411v16.64Zm0,26.067h12.09c1.64,0,3.115-.169,4.427-.512,1.311-.342,2.424-.894,3.341-1.66.915-.764,1.612-1.748,2.091-2.951.478-1.202.716-2.663.716-4.385,0-1.802-.294-3.285-.881-4.447-.588-1.161-1.394-2.083-2.419-2.766s-2.227-1.154-3.606-1.414c-1.381-.26-2.863-.39-4.447-.39h-11.312v18.525Z"/>
+        <path d="m202.257,9.555c0,.847-.151,1.633-.451,2.356-.3.724-.716,1.34-1.25,1.844-.532.507-1.167.902-1.905,1.189s-1.53.431-2.377.431c-.819,0-1.598-.144-2.336-.431s-1.388-.69-1.947-1.209c-.56-.519-.998-1.133-1.311-1.844-.315-.711-.471-1.489-.471-2.336s.156-1.626.471-2.336c.314-.711.744-1.325,1.291-1.845.546-.519,1.187-.922,1.925-1.209s1.53-.431,2.377-.431c.821,0,1.598.144,2.336.431s1.373.69,1.907,1.209c.532.52.955,1.134,1.27,1.845.314.71.471,1.489.471,2.336Zm-.778,12.705v42.871h-10.246V22.261h10.246Z"/>
+        <path d="m254.186,61.935c0,3.361-.587,6.236-1.762,8.627-1.174,2.391-2.78,4.352-4.815,5.882-2.036,1.529-4.407,2.65-7.111,3.361-2.706.71-5.589,1.065-8.648,1.065-2.023,0-4.037-.157-6.045-.471-2.009-.314-3.908-.861-5.697-1.64-1.79-.778-3.395-1.837-4.816-3.175-1.421-1.34-2.555-3.021-3.402-5.042l8.074-3.525c.519,1.202,1.202,2.193,2.049,2.971.847.779,1.797,1.408,2.848,1.885,1.051.479,2.172.814,3.361,1.005s2.398.287,3.628.287c1.885,0,3.572-.232,5.062-.696,1.489-.466,2.752-1.169,3.79-2.111,1.039-.943,1.838-2.132,2.399-3.566.559-1.434.839-3.107.839-5.02v-6.393c-.71,1.229-1.592,2.336-2.643,3.319-1.053.983-2.207,1.824-3.464,2.52s-2.582,1.237-3.976,1.62c-1.393.383-2.814.574-4.263.574-3.033,0-5.737-.56-8.114-1.681-2.377-1.119-4.379-2.636-6.005-4.55-1.625-1.912-2.862-4.139-3.709-6.68-.847-2.542-1.27-5.233-1.27-8.074,0-2.814.451-5.491,1.353-8.033.901-2.542,2.192-4.775,3.873-6.702,1.68-1.927,3.709-3.464,6.086-4.611,2.376-1.147,5.054-1.721,8.033-1.721,2.923,0,5.621.594,8.094,1.782,2.472,1.189,4.473,3.082,6.004,5.677v-6.557h10.246v39.674Zm-33.198-19.017c0,1.666.252,3.265.758,4.795s1.237,2.876,2.193,4.037c.957,1.162,2.137,2.084,3.545,2.767s3.013,1.025,4.816,1.025c2.021,0,3.784-.355,5.287-1.066,1.502-.711,2.746-1.673,3.729-2.89.985-1.215,1.722-2.643,2.213-4.283.492-1.64.738-3.374.738-5.206,0-1.802-.239-3.49-.716-5.062-.479-1.57-1.203-2.93-2.173-4.077s-2.179-2.056-3.626-2.726c-1.449-.67-3.157-1.005-5.123-1.005-2.049,0-3.812.363-5.287,1.086-1.476.724-2.684,1.709-3.628,2.951-.943,1.243-1.633,2.699-2.069,4.365-.438,1.666-.656,3.429-.656,5.287Z"/>
+        <path d="m277.096,9.555c0,.847-.151,1.633-.451,2.356-.3.724-.716,1.34-1.25,1.844-.532.507-1.167.902-1.905,1.189s-1.53.431-2.377.431c-.819,0-1.598-.144-2.336-.431s-1.388-.69-1.947-1.209c-.56-.519-.998-1.133-1.311-1.844-.315-.711-.471-1.489-.471-2.336s.156-1.626.471-2.336c.314-.711.744-1.325,1.291-1.845.546-.519,1.187-.922,1.925-1.209s1.53-.431,2.377-.431c.821,0,1.598.144,2.336.431s1.373.69,1.907,1.209c.532.52.955,1.134,1.27,1.845.314.71.471,1.489.471,2.336Zm-.778,12.705v42.871h-10.246V22.261h10.246Z"/>
+        <path d="m308.451,29.801c-1.585,0-2.999.24-4.243.718-1.243.479-2.288,1.162-3.135,2.049-.847.889-1.496,1.961-1.947,3.217-.451,1.258-.676,2.651-.676,4.181v25.165h-10.246V22.261h10.246v6.803c.683-1.338,1.537-2.492,2.562-3.462,1.025-.97,2.165-1.769,3.422-2.399,1.257-.627,2.59-1.091,3.997-1.393,1.406-.3,2.82-.451,4.241-.451,2.623,0,4.884.431,6.783,1.291s3.464,2.049,4.694,3.565c1.229,1.517,2.131,3.307,2.704,5.37s.861,4.311.861,6.742v26.805h-10.328v-25.822c0-3.005-.711-5.341-2.132-7.008-1.421-1.666-3.688-2.5-6.803-2.5Z"/>
+      </g>
+      <g>
+        <path d="m152.871,102.12c0,1.138-.168,2.221-.507,3.25-.337,1.028-.828,1.935-1.471,2.72s-1.436,1.41-2.379,1.874-2.021.696-3.234.696c-.579,0-1.155-.061-1.723-.183-.569-.121-1.107-.306-1.613-.553-.505-.247-.974-.561-1.407-.941s-.801-.822-1.107-1.328v2.72h-2.625v-24.446h2.625v10.689c.273-.464.632-.882,1.076-1.257.442-.374.93-.696,1.463-.964.531-.27,1.082-.477,1.652-.626.569-.146,1.122-.22,1.66-.22,1.244,0,2.34.227,3.289.679.95.454,1.743,1.068,2.38,1.843s1.117,1.685,1.44,2.728c.321,1.044.482,2.151.482,3.321Zm-13.536.126c0,.917.123,1.756.371,2.515.249.759.614,1.415,1.1,1.968.485.553,1.079.984,1.787,1.289.706.306,1.517.459,2.435.459.991,0,1.813-.178,2.467-.53.653-.354,1.178-.828,1.573-1.424.395-.595.674-1.283.838-2.063.163-.78.245-1.603.245-2.467,0-.801-.104-1.576-.308-2.325-.206-.748-.52-1.415-.941-1.999-.422-.586-.958-1.055-1.605-1.407-.648-.354-1.415-.53-2.3-.53-.981,0-1.827.174-2.538.521-.711.349-1.3.818-1.764,1.409-.464.59-.806,1.28-1.028,2.071s-.332,1.629-.332,2.514Z"/>
+        <path d="m169.949,93.834l-9.141,22.297h-2.656l3.131-7.464-6.388-14.833h2.814l4.965,11.86,4.586-11.86h2.689Z"/>
+        <path d="m194.11,108.034v2.34h-16.414v-1.139l13.189-19.228h-12.05v-2.246h15.465v1.139l-12.84,19.134h12.65Z"/>
+        <path d="m213.229,102.215c0,1.202-.206,2.319-.617,3.352-.411,1.034-.986,1.927-1.723,2.681-.739.753-1.611,1.344-2.618,1.77-1.007.428-2.106.641-3.296.641-1.256,0-2.388-.222-3.4-.665s-1.874-1.053-2.585-1.834-1.257-1.697-1.637-2.752c-.38-1.053-.57-2.192-.57-3.416,0-1.191.201-2.3.601-3.329.4-1.028.964-1.92,1.692-2.68.727-.759,1.594-1.354,2.601-1.787s2.116-.648,3.329-.648c1.254,0,2.391.22,3.408.663s1.881,1.055,2.593,1.835,1.26,1.697,1.644,2.751c.385,1.055.578,2.192.578,3.416Zm-13.726.031c0,.886.117,1.708.349,2.467s.579,1.418,1.043,1.977c.464.558,1.038.995,1.723,1.311.685.317,1.481.476,2.388.476.938,0,1.753-.175,2.443-.522.691-.349,1.263-.816,1.717-1.407.452-.591.79-1.275,1.012-2.056.22-.78.332-1.602.332-2.466,0-.844-.117-1.646-.349-2.404-.232-.759-.579-1.429-1.043-2.008s-1.038-1.038-1.723-1.376c-.685-.337-1.481-.505-2.388-.505-.971,0-1.802.174-2.498.521-.696.349-1.265.82-1.708,1.416-.443.595-.77,1.288-.981,2.078-.21.792-.316,1.624-.316,2.498Z"/>
+        <path d="m224.423,95.827c-.696,0-1.323.105-1.881.316s-1.034.512-1.423.902c-.391.39-.691.864-.902,1.423s-.316,1.186-.316,1.881v10.026h-2.625v-24.446h2.625v10.531c.253-.516.564-.956.933-1.32s.777-.663,1.226-.902c.447-.237.933-.411,1.454-.521.522-.111,1.057-.166,1.605-.166,1.033,0,1.937.171,2.712.513.775.343,1.423.818,1.945,1.424.522.605.915,1.326,1.178,2.157.263.833.395,1.745.395,2.735v9.994h-2.625v-10.184c0-1.423-.36-2.506-1.083-3.25-.722-.742-1.795-1.114-3.217-1.114Z"/>
+        <path d="m251.685,102.215c0,1.202-.206,2.319-.617,3.352-.411,1.034-.986,1.927-1.723,2.681-.739.753-1.611,1.344-2.618,1.77-1.007.428-2.106.641-3.296.641-1.256,0-2.388-.222-3.4-.665s-1.874-1.053-2.585-1.834-1.257-1.697-1.637-2.752c-.38-1.053-.57-2.192-.57-3.416,0-1.191.201-2.3.601-3.329.4-1.028.964-1.92,1.692-2.68.727-.759,1.594-1.354,2.601-1.787s2.116-.648,3.329-.648c1.254,0,2.391.22,3.408.663s1.881,1.055,2.593,1.835,1.26,1.697,1.644,2.751c.385,1.055.578,2.192.578,3.416Zm-13.726.031c0,.886.117,1.708.349,2.467s.579,1.418,1.043,1.977c.464.558,1.038.995,1.723,1.311.685.317,1.481.476,2.388.476.938,0,1.753-.175,2.443-.522.691-.349,1.263-.816,1.717-1.407.452-.591.79-1.275,1.012-2.056.22-.78.332-1.602.332-2.466,0-.844-.117-1.646-.349-2.404-.232-.759-.579-1.429-1.043-2.008s-1.038-1.038-1.723-1.376c-.685-.337-1.481-.505-2.388-.505-.971,0-1.802.174-2.498.521-.696.349-1.265.82-1.708,1.416-.443.595-.77,1.288-.981,2.078-.21.792-.316,1.624-.316,2.498Z"/>
+        <path d="m281.097,103.923c-.38.959-.884,1.85-1.511,2.672-.627.823-1.346,1.534-2.157,2.135-.812.601-1.703,1.073-2.673,1.415-.969.342-1.976.514-3.02.514-1.76,0-3.312-.295-4.656-.886-1.345-.59-2.472-1.407-3.385-2.45-.912-1.044-1.603-2.279-2.072-3.709-.469-1.428-.704-2.98-.704-4.657,0-1.033.114-2.037.341-3.013.227-.974.553-1.889.98-2.743.428-.854.95-1.637,1.565-2.348.617-.711,1.318-1.32,2.104-1.827.785-.505,1.652-.901,2.601-1.186.949-.284,1.961-.426,3.036-.426,1.012,0,2.003.148,2.973.442.971.295,1.866.718,2.689,1.266.822.548,1.55,1.209,2.182,1.984s1.127,1.642,1.486,2.602l-2.246.98c-.295-.768-.673-1.468-1.13-2.095-.459-.627-.989-1.162-1.59-1.604-.601-.443-1.265-.785-1.992-1.029-.728-.242-1.508-.363-2.341-.363-1.359,0-2.532.268-3.518.806s-1.797,1.254-2.435,2.151c-.638.895-1.107,1.919-1.407,3.067-.301,1.149-.451,2.335-.451,3.558,0,1.244.166,2.424.498,3.543.333,1.117.833,2.098,1.503,2.94.669.844,1.507,1.513,2.514,2.008,1.007.496,2.18.744,3.518.744.801,0,1.576-.143,2.325-.428.749-.284,1.44-.671,2.072-1.162.632-.49,1.191-1.064,1.675-1.723.485-.658.864-1.357,1.139-2.095l2.088.917Z"/>
+        <path d="m287.991,100.539v9.835h-2.751v-22.613h7.431c1.044,0,2.042.111,2.997.332.954.222,1.795.586,2.522,1.092.728.505,1.307,1.168,1.74,1.984.431.818.648,1.822.648,3.013,0,.885-.137,1.673-.411,2.364-.275.691-.66,1.289-1.155,1.795-.496.507-1.086.925-1.771,1.257-.685.333-1.44.583-2.261.752l6.926,10.026h-3.068l-6.736-9.835h-4.112Zm0-2.183h4.871c.727,0,1.393-.075,1.999-.228s1.131-.402,1.574-.744c.442-.342.785-.785,1.028-1.328s.363-1.21.363-2.001c0-.801-.126-1.466-.378-1.992-.254-.527-.601-.943-1.044-1.25-.443-.305-.967-.521-1.573-.648s-1.262-.189-1.968-.189h-4.871v8.38Z"/>
+        <path d="m308.231,91.335v19.039h-2.529v-22.613h3.826l7.242,17.932,7.148-17.932h3.795v22.613h-2.752v-19.039l-7.653,19.039h-1.17l-7.907-19.039Z"/>
+      </g>
+    </g>
+  </g>
+</svg>

packages/backend/src/apps/bigin-by-zoho-crm/auth/generate-auth-url.js

@@ -0,0 +1,25 @@
+import { URLSearchParams } from 'url';
+import authScope from '../common/auth-scope.js';
+
+export default async function generateAuthUrl($) {
+  const oauthRedirectUrlField = $.app.auth.fields.find(
+    (field) => field.key == 'oAuthRedirectUrl'
+  );
+  const redirectUri = oauthRedirectUrlField.value;
+  const searchParams = new URLSearchParams({
+    scope: authScope.join(','),
+    client_id: $.auth.data.clientId,
+    response_type: 'code',
+    access_type: 'offline',
+    redirect_uri: redirectUri,
+  });
+
+  const domain =
+    $.auth.data.region !== 'cn' ? 'account.zoho.com' : 'accounts.zoho.com.cn';
+
+  const url = `https://${domain}/oauth/v2/auth?${searchParams.toString()}`;
+
+  await $.auth.set({
+    url,
+  });
+}

packages/backend/src/apps/bigin-by-zoho-crm/auth/index.js

@@ -0,0 +1,66 @@
+import generateAuthUrl from './generate-auth-url.js';
+import verifyCredentials from './verify-credentials.js';
+import refreshToken from './refresh-token.js';
+import isStillVerified from './is-still-verified.js';
+
+export default {
+  fields: [
+    {
+      key: 'oAuthRedirectUrl',
+      label: 'OAuth Redirect URL',
+      type: 'string',
+      required: true,
+      readOnly: true,
+      value: '{WEB_APP_URL}/app/bigin-by-zoho-crm/connections/add',
+      placeholder: null,
+      description:
+        'When asked to input a redirect URL in Bigin By Zoho CRM, enter the URL above.',
+      clickToCopy: true,
+    },
+    {
+      key: 'region',
+      label: 'Region',
+      type: 'dropdown',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: '',
+      options: [
+        { label: 'United States', value: 'us' },
+        { label: 'European Union', value: 'eu' },
+        { label: 'Australia', value: 'au' },
+        { label: 'India', value: 'in' },
+        { label: 'China', value: 'cn' },
+      ],
+      clickToCopy: false,
+    },
+    {
+      key: 'clientId',
+      label: 'Client ID',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      clickToCopy: false,
+    },
+    {
+      key: 'clientSecret',
+      label: 'Client Secret',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      clickToCopy: false,
+    },
+  ],
+
+  generateAuthUrl,
+  verifyCredentials,
+  isStillVerified,
+  refreshToken,
+};

packages/backend/src/apps/bigin-by-zoho-crm/auth/is-still-verified.js

@@ -0,0 +1,8 @@
+import getCurrentOrganization from '../common/get-current-organization.js';
+
+const isStillVerified = async ($) => {
+  const org = await getCurrentOrganization($);
+  return !!org.id;
+};
+
+export default isStillVerified;

packages/backend/src/apps/bigin-by-zoho-crm/auth/refresh-token.js

@@ -0,0 +1,34 @@
+import { URLSearchParams } from 'node:url';
+
+import authScope from '../common/auth-scope.js';
+import { regionUrlMap } from '../common/region-url-map.js';
+
+const refreshToken = async ($) => {
+  const location = $.auth.data.location;
+  const params = new URLSearchParams({
+    client_id: $.auth.data.clientId,
+    client_secret: $.auth.data.clientSecret,
+    refresh_token: $.auth.data.refreshToken,
+    grant_type: 'refresh_token',
+  });
+
+  const { data } = await $.http.post(
+    `${regionUrlMap[location]}/oauth/v2/token`,
+    params.toString(),
+    {
+      additionalProperties: {
+        skipAddingBaseUrl: true,
+      },
+    }
+  );
+
+  await $.auth.set({
+    accessToken: data.access_token,
+    apiDomain: data.api_domain,
+    scope: authScope.join(','),
+    tokenType: data.token_type,
+    expiresIn: data.expires_in,
+  });
+};
+
+export default refreshToken;

packages/backend/src/apps/bigin-by-zoho-crm/auth/verify-credentials.js

@@ -0,0 +1,46 @@
+import { URLSearchParams } from 'node:url';
+import { regionUrlMap } from '../common/region-url-map.js';
+import getCurrentOrganization from '../common/get-current-organization.js';
+
+const verifyCredentials = async ($) => {
+  const oauthRedirectUrlField = $.app.auth.fields.find(
+    (field) => field.key == 'oAuthRedirectUrl'
+  );
+  const redirectUri = oauthRedirectUrlField.value;
+  const location = $.auth.data.location;
+  const params = new URLSearchParams({
+    client_id: $.auth.data.clientId,
+    client_secret: $.auth.data.clientSecret,
+    code: $.auth.data.code,
+    redirect_uri: redirectUri,
+    grant_type: 'authorization_code',
+  });
+
+  const { data } = await $.http.post(
+    `${regionUrlMap[location]}/oauth/v2/token`,
+    params.toString()
+  );
+
+  await $.auth.set({
+    accessToken: data.access_token,
+    tokenType: data.token_type,
+    apiDomain: data.api_domain,
+  });
+
+  const organization = await getCurrentOrganization($);
+
+  const screenName = [organization.company_name, organization.primary_email]
+    .filter(Boolean)
+    .join(' @ ');
+
+  await $.auth.set({
+    clientId: $.auth.data.clientId,
+    clientSecret: $.auth.data.clientSecret,
+    scope: $.auth.data.scope,
+    expiresIn: data.expires_in,
+    refreshToken: data.refresh_token,
+    screenName,
+  });
+};
+
+export default verifyCredentials;

packages/backend/src/apps/bigin-by-zoho-crm/common/add-auth-header.js

@@ -0,0 +1,9 @@
+const addAuthHeader = ($, requestConfig) => {
+  if ($.auth.data?.accessToken) {
+    requestConfig.headers.Authorization = `Zoho-oauthtoken ${$.auth.data.accessToken}`;
+  }
+
+  return requestConfig;
+};
+
+export default addAuthHeader;

packages/backend/src/apps/bigin-by-zoho-crm/common/auth-scope.js

@@ -0,0 +1,10 @@
+const authScope = [
+  'ZohoBigin.notifications.ALL',
+  'ZohoBigin.users.ALL',
+  'ZohoBigin.modules.ALL',
+  'ZohoBigin.org.READ',
+  'ZohoBigin.settings.ALL',
+  'ZohoBigin.modules.ALL',
+];
+
+export default authScope;

packages/backend/src/apps/bigin-by-zoho-crm/common/get-current-organization.js

@@ -0,0 +1,6 @@
+const getCurrentOrganization = async ($) => {
+  const response = await $.http.get('/bigin/v2/org');
+  return response.data.org[0];
+};
+
+export default getCurrentOrganization;

packages/backend/src/apps/bigin-by-zoho-crm/common/region-url-map.js

@@ -0,0 +1,8 @@
+export const regionUrlMap = {
+  us: 'https://accounts.zoho.com',
+  au: 'https://accounts.zoho.com.au',
+  eu: 'https://accounts.zoho.eu',
+  in: 'https://accounts.zoho.in',
+  cn: 'https://accounts.zoho.com.cn',
+  jp: 'https://accounts.zoho.jp',
+};

packages/backend/src/apps/bigin-by-zoho-crm/common/set-base-url.js

@@ -0,0 +1,14 @@
+const setBaseUrl = ($, requestConfig) => {
+  if (requestConfig.additionalProperties?.skipAddingBaseUrl)
+    return requestConfig;
+
+  const apiDomain = $.auth.data.apiDomain;
+
+  if (apiDomain) {
+    requestConfig.baseURL = apiDomain;
+  }
+
+  return requestConfig;
+};
+
+export default setBaseUrl;

packages/backend/src/apps/bigin-by-zoho-crm/dynamic-data/index.js

@@ -0,0 +1,5 @@
+import listCompanies from './list-companies/index.js';
+import listOrganizations from './list-organizations/index.js';
+import listContactOwners from './list-contact-owners/index.js';
+
+export default [listCompanies, listOrganizations, listContactOwners];

packages/backend/src/apps/bigin-by-zoho-crm/dynamic-data/list-companies/index.js

@@ -0,0 +1,39 @@
+export default {
+  name: 'List companies',
+  key: 'listCompanies',
+
+  async run($) {
+    const companies = {
+      data: [],
+    };
+
+    const params = new URLSearchParams({
+      page: 1,
+      pageSize: 200,
+      fields: 'Account_Name',
+    });
+
+    let next = false;
+    do {
+      const { data } = await $.http.get('/bigin/v2/Accounts', { params });
+
+      if (data.info.more_records) {
+        params.page = params.page + 1;
+        next = true;
+      } else {
+        next = false;
+      }
+
+      if (data.data) {
+        for (const account of data.data) {
+          companies.data.push({
+            value: account.id,
+            name: account.Account_Name,
+          });
+        }
+      }
+    } while (next);
+
+    return companies;
+  },
+};

packages/backend/src/apps/bigin-by-zoho-crm/dynamic-data/list-contact-owners/index.js

@@ -0,0 +1,39 @@
+export default {
+  name: 'List contact owners',
+  key: 'listContactOwners',
+
+  async run($) {
+    const contactOwners = {
+      data: [],
+    };
+
+    const params = {
+      type: 'AllUsers',
+      page: 1,
+      pageSize: 200,
+    };
+
+    let next = false;
+    do {
+      const { data } = await $.http.get('/bigin/v2/users', params);
+
+      if (data.users.length === params.pageSize) {
+        next = true;
+        params.page = params.page + 1;
+      } else {
+        next = false;
+      }
+
+      if (data.users) {
+        for (const user of data.users) {
+          contactOwners.data.push({
+            value: user.id,
+            name: user.full_name,
+          });
+        }
+      }
+    } while (next);
+
+    return contactOwners;
+  },
+};

packages/backend/src/apps/bigin-by-zoho-crm/dynamic-data/list-organizations/index.js

@@ -0,0 +1,23 @@
+export default {
+  name: 'List organizations',
+  key: 'listOrganizations',
+
+  async run($) {
+    const organizations = {
+      data: [],
+    };
+
+    const { data } = await $.http.get('/bigin/v2/org');
+
+    if (data.org) {
+      for (const org of data.org) {
+        organizations.data.push({
+          value: org.id,
+          name: org.company_name,
+        });
+      }
+    }
+
+    return organizations;
+  },
+};

packages/backend/src/apps/bigin-by-zoho-crm/index.js

@@ -0,0 +1,23 @@
+import defineApp from '../../helpers/define-app.js';
+import addAuthHeader from './common/add-auth-header.js';
+import auth from './auth/index.js';
+import setBaseUrl from './common/set-base-url.js';
+import triggers from './triggers/index.js';
+import dynamicData from './dynamic-data/index.js';
+import actions from './actions/index.js';
+
+export default defineApp({
+  name: 'Bigin By Zoho CRM',
+  key: 'bigin-by-zoho-crm',
+  baseUrl: 'https://www.bigin.com',
+  apiBaseUrl: '',
+  iconUrl: '{BASE_URL}/apps/bigin-by-zoho-crm/assets/favicon.svg',
+  authDocUrl: 'https://automatisch.io/docs/apps/bigin-by-zoho-crm/connection',
+  primaryColor: '039649',
+  supportsConnections: true,
+  beforeRequest: [setBaseUrl, addAuthHeader],
+  auth,
+  triggers,
+  dynamicData,
+  actions,
+});

packages/backend/src/apps/bigin-by-zoho-crm/triggers/index.js

@@ -0,0 +1,7 @@
+import newCalls from './new-calls/index.js';
+import newCompanies from './new-companies/index.js';
+import newContacts from './new-contacts/index.js';
+import newProducts from './new-products/index.js';
+import newTasks from './new-tasks/index.js';
+
+export default [newCalls, newCompanies, newContacts, newProducts, newTasks];

packages/backend/src/apps/bigin-by-zoho-crm/triggers/new-calls/index.js

@@ -0,0 +1,89 @@
+import Crypto from 'crypto';
+import defineTrigger from '../../../../helpers/define-trigger.js';
+
+export default defineTrigger({
+  name: 'New calls',
+  key: 'newCalls',
+  type: 'webhook',
+  description: 'Triggers when a new call is added.',
+  arguments: [
+    {
+      label: 'Organization',
+      key: 'organizationId',
+      type: 'dropdown',
+      required: true,
+      description: '',
+      variables: false,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listOrganizations',
+          },
+        ],
+      },
+    },
+  ],
+
+  async run($) {
+    const dataItem = {
+      raw: $.request.body,
+      meta: {
+        internalId: Crypto.randomUUID(),
+      },
+    };
+
+    $.pushTriggerItem(dataItem);
+  },
+
+  async testRun($) {
+    const organizationId = $.step.parameters.organizationId;
+
+    const sampleEventData = {
+      ids: ['111111111111111111'],
+      token: null,
+      module: 'Calls',
+      operation: 'insert',
+      channel_id: organizationId,
+      server_time: 1708426963120,
+      query_params: {},
+      resource_uri: `${$.auth.data.apiDomain}/bigin/v1/Calls`,
+      affected_fields: [],
+    };
+
+    const dataItem = {
+      raw: sampleEventData,
+      meta: {
+        internalId: sampleEventData.channel_id,
+      },
+    };
+
+    $.pushTriggerItem(dataItem);
+  },
+
+  async registerHook($) {
+    const organizationId = $.step.parameters.organizationId;
+
+    const payload = {
+      watch: [
+        {
+          channel_id: organizationId,
+          notify_url: $.webhookUrl,
+          events: ['Calls.create'],
+        },
+      ],
+    };
+
+    await $.http.post('/bigin/v2/actions/watch', payload);
+
+    await $.flow.setRemoteWebhookId(organizationId);
+  },
+
+  async unregisterHook($) {
+    await $.http.delete(
+      `/bigin/v2/actions/watch?channel_ids=${$.flow.remoteWebhookId}`
+    );
+  },
+});

packages/backend/src/apps/bigin-by-zoho-crm/triggers/new-companies/index.js

@@ -0,0 +1,89 @@
+import Crypto from 'crypto';
+import defineTrigger from '../../../../helpers/define-trigger.js';
+
+export default defineTrigger({
+  name: 'New companies',
+  key: 'newCompanies',
+  type: 'webhook',
+  description: 'Triggers when a new company is created.',
+  arguments: [
+    {
+      label: 'Organization',
+      key: 'organizationId',
+      type: 'dropdown',
+      required: true,
+      description: '',
+      variables: false,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listOrganizations',
+          },
+        ],
+      },
+    },
+  ],
+
+  async run($) {
+    const dataItem = {
+      raw: $.request.body,
+      meta: {
+        internalId: Crypto.randomUUID(),
+      },
+    };
+
+    $.pushTriggerItem(dataItem);
+  },
+
+  async testRun($) {
+    const organizationId = $.step.parameters.organizationId;
+
+    const sampleEventData = {
+      ids: ['111111111111111111'],
+      token: null,
+      module: 'Accounts',
+      operation: 'insert',
+      channel_id: organizationId,
+      server_time: 1708426963120,
+      query_params: {},
+      resource_uri: `${$.auth.data.apiDomain}/bigin/v1/Accounts`,
+      affected_fields: [],
+    };
+
+    const dataItem = {
+      raw: sampleEventData,
+      meta: {
+        internalId: sampleEventData.channel_id,
+      },
+    };
+
+    $.pushTriggerItem(dataItem);
+  },
+
+  async registerHook($) {
+    const organizationId = $.step.parameters.organizationId;
+
+    const payload = {
+      watch: [
+        {
+          channel_id: organizationId,
+          notify_url: $.webhookUrl,
+          events: ['Accounts.create'],
+        },
+      ],
+    };
+
+    await $.http.post('/bigin/v2/actions/watch', payload);
+
+    await $.flow.setRemoteWebhookId(organizationId);
+  },
+
+  async unregisterHook($) {
+    await $.http.delete(
+      `/bigin/v2/actions/watch?channel_ids=${$.flow.remoteWebhookId}`
+    );
+  },
+});

packages/backend/src/apps/bigin-by-zoho-crm/triggers/new-contacts/index.js

@@ -0,0 +1,89 @@
+import Crypto from 'crypto';
+import defineTrigger from '../../../../helpers/define-trigger.js';
+
+export default defineTrigger({
+  name: 'New contacts',
+  key: 'newContacts',
+  type: 'webhook',
+  description: 'Triggers when a new contact is created.',
+  arguments: [
+    {
+      label: 'Organization',
+      key: 'organizationId',
+      type: 'dropdown',
+      required: true,
+      description: '',
+      variables: false,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listOrganizations',
+          },
+        ],
+      },
+    },
+  ],
+
+  async run($) {
+    const dataItem = {
+      raw: $.request.body,
+      meta: {
+        internalId: Crypto.randomUUID(),
+      },
+    };
+
+    $.pushTriggerItem(dataItem);
+  },
+
+  async testRun($) {
+    const organizationId = $.step.parameters.organizationId;
+
+    const sampleEventData = {
+      ids: ['111111111111111111'],
+      token: null,
+      module: 'Contacts',
+      operation: 'insert',
+      channel_id: organizationId,
+      server_time: 1708426963120,
+      query_params: {},
+      resource_uri: `${$.auth.data.apiDomain}/bigin/v1/Contacts`,
+      affected_fields: [],
+    };
+
+    const dataItem = {
+      raw: sampleEventData,
+      meta: {
+        internalId: sampleEventData.channel_id,
+      },
+    };
+
+    $.pushTriggerItem(dataItem);
+  },
+
+  async registerHook($) {
+    const organizationId = $.step.parameters.organizationId;
+
+    const payload = {
+      watch: [
+        {
+          channel_id: organizationId,
+          notify_url: $.webhookUrl,
+          events: ['Contacts.create'],
+        },
+      ],
+    };
+
+    await $.http.post('/bigin/v2/actions/watch', payload);
+
+    await $.flow.setRemoteWebhookId(organizationId);
+  },
+
+  async unregisterHook($) {
+    await $.http.delete(
+      `/bigin/v2/actions/watch?channel_ids=${$.flow.remoteWebhookId}`
+    );
+  },
+});

packages/backend/src/apps/bigin-by-zoho-crm/triggers/new-products/index.js

@@ -0,0 +1,89 @@
+import Crypto from 'crypto';
+import defineTrigger from '../../../../helpers/define-trigger.js';
+
+export default defineTrigger({
+  name: 'New products',
+  key: 'newProducts',
+  type: 'webhook',
+  description: 'Triggers when a new product is created.',
+  arguments: [
+    {
+      label: 'Organization',
+      key: 'organizationId',
+      type: 'dropdown',
+      required: true,
+      description: '',
+      variables: false,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listOrganizations',
+          },
+        ],
+      },
+    },
+  ],
+
+  async run($) {
+    const dataItem = {
+      raw: $.request.body,
+      meta: {
+        internalId: Crypto.randomUUID(),
+      },
+    };
+
+    $.pushTriggerItem(dataItem);
+  },
+
+  async testRun($) {
+    const organizationId = $.step.parameters.organizationId;
+
+    const sampleEventData = {
+      ids: ['111111111111111111'],
+      token: null,
+      module: 'Products',
+      operation: 'insert',
+      channel_id: organizationId,
+      server_time: 1708426963120,
+      query_params: {},
+      resource_uri: `${$.auth.data.apiDomain}/bigin/v1/Products`,
+      affected_fields: [],
+    };
+
+    const dataItem = {
+      raw: sampleEventData,
+      meta: {
+        internalId: sampleEventData.channel_id,
+      },
+    };
+
+    $.pushTriggerItem(dataItem);
+  },
+
+  async registerHook($) {
+    const organizationId = $.step.parameters.organizationId;
+
+    const payload = {
+      watch: [
+        {
+          channel_id: organizationId,
+          notify_url: $.webhookUrl,
+          events: ['Products.create'],
+        },
+      ],
+    };
+
+    await $.http.post('/bigin/v2/actions/watch', payload);
+
+    await $.flow.setRemoteWebhookId(organizationId);
+  },
+
+  async unregisterHook($) {
+    await $.http.delete(
+      `/bigin/v2/actions/watch?channel_ids=${$.flow.remoteWebhookId}`
+    );
+  },
+});

packages/backend/src/apps/bigin-by-zoho-crm/triggers/new-tasks/index.js

@@ -0,0 +1,89 @@
+import Crypto from 'crypto';
+import defineTrigger from '../../../../helpers/define-trigger.js';
+
+export default defineTrigger({
+  name: 'New tasks',
+  key: 'newTasks',
+  type: 'webhook',
+  description: 'Triggers when a new task is created.',
+  arguments: [
+    {
+      label: 'Organization',
+      key: 'organizationId',
+      type: 'dropdown',
+      required: true,
+      description: '',
+      variables: false,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listOrganizations',
+          },
+        ],
+      },
+    },
+  ],
+
+  async run($) {
+    const dataItem = {
+      raw: $.request.body,
+      meta: {
+        internalId: Crypto.randomUUID(),
+      },
+    };
+
+    $.pushTriggerItem(dataItem);
+  },
+
+  async testRun($) {
+    const organizationId = $.step.parameters.organizationId;
+
+    const sampleEventData = {
+      ids: ['111111111111111111'],
+      token: null,
+      module: 'Tasks',
+      operation: 'insert',
+      channel_id: organizationId,
+      server_time: 1708426963120,
+      query_params: {},
+      resource_uri: `${$.auth.data.apiDomain}/bigin/v1/Tasks`,
+      affected_fields: [],
+    };
+
+    const dataItem = {
+      raw: sampleEventData,
+      meta: {
+        internalId: sampleEventData.channel_id,
+      },
+    };
+
+    $.pushTriggerItem(dataItem);
+  },
+
+  async registerHook($) {
+    const organizationId = $.step.parameters.organizationId;
+
+    const payload = {
+      watch: [
+        {
+          channel_id: organizationId,
+          notify_url: $.webhookUrl,
+          events: ['Tasks.create'],
+        },
+      ],
+    };
+
+    await $.http.post('/bigin/v2/actions/watch', payload);
+
+    await $.flow.setRemoteWebhookId(organizationId);
+  },
+
+  async unregisterHook($) {
+    await $.http.delete(
+      `/bigin/v2/actions/watch?channel_ids=${$.flow.remoteWebhookId}`
+    );
+  },
+});

packages/backend/src/apps/datastore/actions/get-value/index.js

@@ -1,27 +0,0 @@
-import defineAction from '../../../../helpers/define-action.js';
-
-export default defineAction({
-  name: 'Get value',
-  key: 'getValue',
-  description: 'Get value from the persistent datastore.',
-  arguments: [
-    {
-      label: 'Key',
-      key: 'key',
-      type: 'string',
-      required: true,
-      description: 'The key of your value to get.',
-      variables: true,
-    },
-  ],
-
-  async run($) {
-    const keyValuePair = await $.datastore.get({
-      key: $.step.parameters.key,
-    });
-
-    $.setActionItem({
-      raw: keyValuePair,
-    });
-  },
-});

packages/backend/src/apps/datastore/actions/index.js

@@ -1,4 +0,0 @@
-import getValue from './get-value/index.js';
-import setValue from './set-value/index.js';
-
-export default [getValue, setValue];

packages/backend/src/apps/datastore/actions/set-value/index.js

@@ -1,36 +0,0 @@
-import defineAction from '../../../../helpers/define-action.js';
-
-export default defineAction({
-  name: 'Set value',
-  key: 'setValue',
-  description: 'Set value to the persistent datastore.',
-  arguments: [
-    {
-      label: 'Key',
-      key: 'key',
-      type: 'string',
-      required: true,
-      description: 'The key of your value to set.',
-      variables: true,
-    },
-    {
-      label: 'Value',
-      key: 'value',
-      type: 'string',
-      required: true,
-      description: 'The value to set.',
-      variables: true,
-    },
-  ],
-
-  async run($) {
-    const keyValuePair = await $.datastore.set({
-      key: $.step.parameters.key,
-      value: $.step.parameters.value,
-    });
-
-    $.setActionItem({
-      raw: keyValuePair,
-    });
-  },
-});

packages/backend/src/apps/datastore/assets/favicon.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" id="icon">
-  <defs>
-    <style>.cls-1{fill:none;}</style>
-  </defs>
-  <title>datastore</title>
-  <circle cx="23" cy="23" r="1"/>
-  <rect x="8" y="22" width="12" height="2"/>
-  <circle cx="23" cy="9" r="1"/>
-  <rect x="8" y="8" width="12" height="2"/>
-  <path d="M26,14a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H6A2,2,0,0,0,4,6v6a2,2,0,0,0,2,2H8v4H6a2,2,0,0,0-2,2v6a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2V20a2,2,0,0,0-2-2H24V14ZM6,6H26v6H6ZM26,26H6V20H26Zm-4-8H10V14H22Z"/>
-  <rect id="_Transparent_Rectangle_" data-name="&lt;Transparent Rectangle&gt;" class="cls-1" width="32" height="32"/>
-</svg>

packages/backend/src/apps/datastore/index.js

@@ -1,14 +0,0 @@
-import defineApp from '../../helpers/define-app.js';
-import actions from './actions/index.js';
-
-export default defineApp({
-  name: 'Datastore',
-  key: 'datastore',
-  iconUrl: '{BASE_URL}/apps/datastore/assets/favicon.svg',
-  authDocUrl: 'https://automatisch.io/docs/apps/datastore/connection',
-  supportsConnections: false,
-  baseUrl: '',
-  apiBaseUrl: '',
-  primaryColor: '001F52',
-  actions,
-});

packages/backend/src/apps/helix/actions/new-chat/index.js

@@ -1,3 +1,4 @@
+import FormData from 'form-data';
 import defineAction from '../../../../helpers/define-action.js';
 
 export default defineAction({
@@ -16,21 +17,34 @@ export default defineAction({
   ],
 
   async run($) {
-    const response = await $.http.post('/api/v1/sessions/chat', {
-      session_id: '',
-      messages: [
-        {
-          role: 'user',
-          content: {
-            content_type: 'text',
-            parts: [$.step.parameters.input],
-          },
-        },
-      ],
+    const formData = new FormData();
+    formData.append('input', $.step.parameters.input);
+    formData.append('mode', 'inference');
+    formData.append('type', 'text');
+
+    const sessionResponse = await $.http.post('/api/v1/sessions', formData, {
+      headers: {
+        ...formData.getHeaders(),
+      },
     });
 
-    $.setActionItem({
-      raw: response.data,
-    });
+    const sessionId = sessionResponse.data.id;
+
+    let chatGenerated = false;
+
+    while (!chatGenerated) {
+      const response = await $.http.get(`/api/v1/sessions/${sessionId}`);
+
+      const message =
+        response.data.interactions[response.data.interactions.length - 1];
+
+      if (message.creator === 'system' && message.state === 'complete') {
+        $.setActionItem({
+          raw: message,
+        });
+
+        chatGenerated = true;
+      }
+    }
   },
 });

packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-client.js

@@ -1,10 +0,0 @@
-import { renderObject } from '../../../../../helpers/renderer.js';
-import AppAuthClient from '../../../../../models/app-auth-client.js';
-
-export default async (request, response) => {
-  const appAuthClient = await AppAuthClient.query()
-    .findById(request.params.appAuthClientId)
-    .throwIfNotFound();
-
-  renderObject(response, appAuthClient);
-};

packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-client.test.js

@@ -1,52 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import Crypto from 'crypto';
-import app from '../../../../../app.js';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
-import { createUser } from '../../../../../../test/factories/user.js';
-import getAdminAppAuthClientMock from '../../../../../../test/mocks/rest/api/v1/admin/get-app-auth-client.js';
-import { createAppAuthClient } from '../../../../../../test/factories/app-auth-client.js';
-import { createRole } from '../../../../../../test/factories/role.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/app-auth-clients/:appAuthClientId', () => {
-  let currentUser, currentUserRole, currentAppAuthClient, token;
-
-  describe('with valid license key', () => {
-    beforeEach(async () => {
-      vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-      currentUserRole = await createRole({ key: 'admin' });
-      currentUser = await createUser({ roleId: currentUserRole.id });
-      currentAppAuthClient = await createAppAuthClient();
-
-      token = createAuthTokenByUserId(currentUser.id);
-    });
-
-    it('should return specified app auth client info', async () => {
-      const response = await request(app)
-        .get(`/api/v1/admin/app-auth-clients/${currentAppAuthClient.id}`)
-        .set('Authorization', token)
-        .expect(200);
-
-      const expectedPayload = getAdminAppAuthClientMock(currentAppAuthClient);
-      expect(response.body).toEqual(expectedPayload);
-    });
-
-    it('should return not found response for not existing app auth client UUID', async () => {
-      const notExistingAppAuthClientUUID = Crypto.randomUUID();
-
-      await request(app)
-        .get(`/api/v1/admin/app-auth-clients/${notExistingAppAuthClientUUID}`)
-        .set('Authorization', token)
-        .expect(404);
-    });
-
-    it('should return bad request response for invalid UUID', async () => {
-      await request(app)
-        .get('/api/v1/admin/app-auth-clients/invalidAppAuthClientUUID')
-        .set('Authorization', token)
-        .expect(400);
-    });
-  });
-});

packages/backend/src/controllers/api/v1/admin/permissions/get-permissions-catalog.ee.js

@@ -1,6 +0,0 @@
-import { renderObject } from '../../../../../helpers/renderer.js';
-import permissionCatalog from '../../../../../helpers/permission-catalog.ee.js';
-
-export default async (request, response) => {
-  renderObject(response, permissionCatalog);
-};

packages/backend/src/controllers/api/v1/admin/permissions/get-permissions-catalog.ee.test.js

@@ -1,32 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../../app.js';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
-import { createRole } from '../../../../../../test/factories/role.js';
-import { createUser } from '../../../../../../test/factories/user.js';
-import getPermissionsCatalogMock from '../../../../../../test/mocks/rest/api/v1/admin/permissions/get-permissions-catalog.ee.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/permissions/catalog', () => {
-  let role, currentUser, token;
-
-  beforeEach(async () => {
-    role = await createRole({ key: 'admin' });
-    currentUser = await createUser({ roleId: role.id });
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return roles', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get('/api/v1/admin/permissions/catalog')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getPermissionsCatalogMock();
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

packages/backend/src/controllers/api/v1/admin/roles/get-role.ee.js

@@ -1,16 +0,0 @@
-import { renderObject } from '../../../../../helpers/renderer.js';
-import Role from '../../../../../models/role.js';
-
-export default async (request, response) => {
-  const role = await Role.query()
-    .leftJoinRelated({
-      permissions: true,
-    })
-    .withGraphFetched({
-      permissions: true,
-    })
-    .findById(request.params.roleId)
-    .throwIfNotFound();
-
-  renderObject(response, role);
-};

packages/backend/src/controllers/api/v1/admin/roles/get-role.ee.test.js

@@ -1,59 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import Crypto from 'crypto';
-import app from '../../../../../app.js';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
-import { createRole } from '../../../../../../test/factories/role.js';
-import { createUser } from '../../../../../../test/factories/user.js';
-import { createPermission } from '../../../../../../test/factories/permission.js';
-import getRoleMock from '../../../../../../test/mocks/rest/api/v1/admin/roles/get-role.ee.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/roles/:roleId', () => {
-  let role, currentUser, token, permissionOne, permissionTwo;
-
-  beforeEach(async () => {
-    role = await createRole({ key: 'admin' });
-    permissionOne = await createPermission({ roleId: role.id });
-    permissionTwo = await createPermission({ roleId: role.id });
-    currentUser = await createUser({ roleId: role.id });
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return role', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get(`/api/v1/admin/roles/${role.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getRoleMock(role, [
-      permissionOne,
-      permissionTwo,
-    ]);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for not existing role UUID', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const notExistingRoleUUID = Crypto.randomUUID();
-
-    await request(app)
-      .get(`/api/v1/admin/roles/${notExistingRoleUUID}`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    await request(app)
-      .get('/api/v1/admin/roles/invalidRoleUUID')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

packages/backend/src/controllers/api/v1/admin/roles/get-roles.ee.js

@@ -1,8 +0,0 @@
-import { renderObject } from '../../../../../helpers/renderer.js';
-import Role from '../../../../../models/role.js';
-
-export default async (request, response) => {
-  const roles = await Role.query().orderBy('name');
-
-  renderObject(response, roles);
-};

packages/backend/src/controllers/api/v1/admin/roles/get-roles.ee.test.js

@@ -1,33 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../../app.js';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
-import { createRole } from '../../../../../../test/factories/role.js';
-import { createUser } from '../../../../../../test/factories/user.js';
-import getRolesMock from '../../../../../../test/mocks/rest/api/v1/admin/roles/get-roles.ee.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/roles', () => {
-  let roleOne, roleTwo, currentUser, token;
-
-  beforeEach(async () => {
-    roleOne = await createRole({ key: 'admin' });
-    roleTwo = await createRole({ key: 'user' });
-    currentUser = await createUser({ roleId: roleOne.id });
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return roles', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get('/api/v1/admin/roles')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getRolesMock([roleOne, roleTwo]);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

packages/backend/src/controllers/api/v1/admin/saml-auth-providers/get-saml-auth-provider.ee.js

@@ -1,10 +0,0 @@
-import { renderObject } from '../../../../../helpers/renderer.js';
-import SamlAuthProvider from '../../../../../models/saml-auth-provider.ee.js';
-
-export default async (request, response) => {
-  const samlAuthProvider = await SamlAuthProvider.query()
-    .findById(request.params.samlAuthProviderId)
-    .throwIfNotFound();
-
-  renderObject(response, samlAuthProvider);
-};

packages/backend/src/controllers/api/v1/admin/saml-auth-providers/get-saml-auth-provider.ee.test.js

@@ -1,57 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import Crypto from 'crypto';
-import app from '../../../../../app.js';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
-import { createRole } from '../../../../../../test/factories/role.js';
-import { createUser } from '../../../../../../test/factories/user.js';
-import { createSamlAuthProvider } from '../../../../../../test/factories/saml-auth-provider.ee.js';
-import getSamlAuthProviderMock from '../../../../../../test/mocks/rest/api/v1/admin/saml-auth-providers/get-saml-auth-provider.ee.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/saml-auth-provider/:samlAuthProviderId', () => {
-  let samlAuthProvider, currentUser, token;
-
-  beforeEach(async () => {
-    const role = await createRole({ key: 'admin' });
-    currentUser = await createUser({ roleId: role.id });
-    samlAuthProvider = await createSamlAuthProvider();
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return saml auth provider with specified id', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get(`/api/v1/admin/saml-auth-providers/${samlAuthProvider.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getSamlAuthProviderMock(samlAuthProvider);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for not existing saml auth provider UUID', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const notExistingSamlAuthProviderUUID = Crypto.randomUUID();
-
-    await request(app)
-      .get(
-        `/api/v1/admin/saml-auth-providers/${notExistingSamlAuthProviderUUID}`
-      )
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    await request(app)
-      .get('/api/v1/admin/saml-auth-providers/invalidSamlAuthProviderUUID')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

packages/backend/src/controllers/api/v1/admin/saml-auth-providers/get-saml-auth-providers.ee.js

@@ -1,11 +0,0 @@
-import { renderObject } from '../../../../../helpers/renderer.js';
-import SamlAuthProvider from '../../../../../models/saml-auth-provider.ee.js';
-
-export default async (request, response) => {
-  const samlAuthProviders = await SamlAuthProvider.query().orderBy(
-    'created_at',
-    'desc'
-  );
-
-  renderObject(response, samlAuthProviders);
-};

packages/backend/src/controllers/api/v1/admin/saml-auth-providers/get-saml-auth-providers.ee.test.js

@@ -1,39 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../../app.js';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
-import { createRole } from '../../../../../../test/factories/role.js';
-import { createUser } from '../../../../../../test/factories/user.js';
-import { createSamlAuthProvider } from '../../../../../../test/factories/saml-auth-provider.ee.js';
-import getSamlAuthProvidersMock from '../../../../../../test/mocks/rest/api/v1/admin/saml-auth-providers/get-saml-auth-providers.ee.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/saml-auth-providers', () => {
-  let samlAuthProviderOne, samlAuthProviderTwo, currentUser, token;
-
-  beforeEach(async () => {
-    const role = await createRole({ key: 'admin' });
-    currentUser = await createUser({ roleId: role.id });
-
-    samlAuthProviderOne = await createSamlAuthProvider();
-    samlAuthProviderTwo = await createSamlAuthProvider();
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return saml auth providers', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get('/api/v1/admin/saml-auth-providers')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getSamlAuthProvidersMock([
-      samlAuthProviderTwo,
-      samlAuthProviderOne,
-    ]);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

packages/backend/src/controllers/api/v1/admin/users/get-user.ee.test.js

@@ -1,55 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import Crypto from 'crypto';
-import app from '../../../../../app.js';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../../test/factories/user';
-import { createRole } from '../../../../../../test/factories/role';
-import getUserMock from '../../../../../../test/mocks/rest/api/v1/admin/users/get-user.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/users/:userId', () => {
-  let currentUser, currentUserRole, anotherUser, anotherUserRole, token;
-
-  beforeEach(async () => {
-    currentUserRole = await createRole({ key: 'admin' });
-    currentUser = await createUser({ roleId: currentUserRole.id });
-
-    anotherUser = await createUser();
-    anotherUserRole = await anotherUser.$relatedQuery('role');
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return specified user info', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get(`/api/v1/admin/users/${anotherUser.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getUserMock(anotherUser, anotherUserRole);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for not existing user UUID', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const notExistingUserUUID = Crypto.randomUUID();
-
-    await request(app)
-      .get(`/api/v1/admin/users/${notExistingUserUUID}`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    await request(app)
-      .get('/api/v1/admin/users/invalidUserUUID')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

packages/backend/src/controllers/api/v1/app-auth-clients/get-app-auth-client.js

@@ -1,11 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-import AppAuthClient from '../../../../models/app-auth-client.js';
-
-export default async (request, response) => {
-  const appAuthClient = await AppAuthClient.query()
-    .findById(request.params.appAuthClientId)
-    .where({ active: true })
-    .throwIfNotFound();
-
-  renderObject(response, appAuthClient);
-};

packages/backend/src/controllers/api/v1/app-auth-clients/get-app-auth-client.test.js

@@ -1,48 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import Crypto from 'crypto';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id.js';
-import { createUser } from '../../../../../test/factories/user.js';
-import getAppAuthClientMock from '../../../../../test/mocks/rest/api/v1/admin/get-app-auth-client.js';
-import { createAppAuthClient } from '../../../../../test/factories/app-auth-client.js';
-import * as license from '../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/app-auth-clients/:id', () => {
-  let currentUser, currentAppAuthClient, token;
-
-  beforeEach(async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    currentUser = await createUser();
-    currentAppAuthClient = await createAppAuthClient();
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return specified app auth client info', async () => {
-    const response = await request(app)
-      .get(`/api/v1/app-auth-clients/${currentAppAuthClient.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAppAuthClientMock(currentAppAuthClient);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for not existing app auth client ID', async () => {
-    const notExistingAppAuthClientUUID = Crypto.randomUUID();
-
-    await request(app)
-      .get(`/api/v1/app-auth-clients/${notExistingAppAuthClientUUID}`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    await request(app)
-      .get('/api/v1/app-auth-clients/invalidAppAuthClientUUID')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

packages/backend/src/controllers/api/v1/apps/get-app.js

@@ -1,8 +0,0 @@
-import App from '../../../../models/app.js';
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const app = await App.findOneByKey(request.params.appKey);
-
-  renderObject(response, app, { serializer: 'App' });
-};

packages/backend/src/controllers/api/v1/apps/get-app.test.js

@@ -1,35 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import App from '../../../../models/app';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import getAppMock from '../../../../../test/mocks/rest/api/v1/apps/get-app.js';
-
-describe('GET /api/v1/apps/:appKey', () => {
-  let currentUser, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return the app info', async () => {
-    const exampleApp = await App.findOneByKey('github');
-
-    const response = await request(app)
-      .get(`/api/v1/apps/${exampleApp.key}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAppMock(exampleApp);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for invalid app key', async () => {
-    await request(app)
-      .get('/api/v1/apps/invalid-app-key')
-      .set('Authorization', token)
-      .expect(404);
-  });
-});

packages/backend/src/controllers/api/v1/automatisch/info.js

@@ -1,13 +0,0 @@
-import appConfig from '../../../../config/app.js';
-import { hasValidLicense } from '../../../../helpers/license.ee.js';
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const info = {
-    isCloud: appConfig.isCloud,
-    isMation: appConfig.isMation,
-    isEnterprise: await hasValidLicense(),
-  };
-
-  renderObject(response, info);
-};

packages/backend/src/controllers/api/v1/automatisch/info.test.js

@@ -1,22 +0,0 @@
-import { vi, expect, describe, it } from 'vitest';
-import request from 'supertest';
-import appConfig from '../../../../config/app.js';
-import app from '../../../../app.js';
-import infoMock from '../../../../../test/mocks/rest/api/v1/automatisch/info.js';
-import * as license from '../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/automatisch/info', () => {
-  it('should return Automatisch info', async () => {
-    vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
-    vi.spyOn(appConfig, 'isMation', 'get').mockReturnValue(false);
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get('/api/v1/automatisch/info')
-      .expect(200);
-
-    const expectedPayload = infoMock();
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

packages/backend/src/controllers/api/v1/automatisch/license.js

@@ -1,15 +0,0 @@
-import { getLicense } from '../../../../helpers/license.ee.js';
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const license = await getLicense();
-
-  const computedLicense = {
-    id: license ? license.id : null,
-    name: license ? license.name : null,
-    expireAt: license ? license.expireAt : null,
-    verified: license ? true : false,
-  };
-
-  renderObject(response, computedLicense);
-};

packages/backend/src/controllers/api/v1/automatisch/license.test.js

@@ -1,23 +0,0 @@
-import { vi, expect, describe, it } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-import licenseMock from '../../../../../test/mocks/rest/api/v1/automatisch/license.js';
-import * as license from '../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/automatisch/license', () => {
-  it('should return Automatisch license info', async () => {
-    vi.spyOn(license, 'getLicense').mockResolvedValue({
-      id: '123',
-      name: 'license-name',
-      expireAt: '2025-12-31T23:59:59Z',
-    });
-
-    const response = await request(app)
-      .get('/api/v1/automatisch/license')
-      .expect(200);
-
-    const expectedPayload = licenseMock();
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

packages/backend/src/controllers/api/v1/automatisch/notifications.js

@@ -1,19 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-import axios from '../../../../helpers/axios-with-proxy.js';
-import logger from '../../../../helpers/logger.js';
-
-const NOTIFICATIONS_URL =
-  'https://notifications.automatisch.io/notifications.json';
-
-export default async (request, response) => {
-  let notifications = [];
-
-  try {
-    const response = await axios.get(NOTIFICATIONS_URL);
-    notifications = response.data;
-  } catch (error) {
-    logger.error('Error fetching notifications API endpoint!', error);
-  }
-
-  renderObject(response, notifications);
-};

packages/backend/src/controllers/api/v1/automatisch/notifications.test.js

@@ -1,9 +0,0 @@
-import { describe, it } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-
-describe('GET /api/v1/automatisch/notifications', () => {
-  it('should return Automatisch notifications', async () => {
-    await request(app).get('/api/v1/automatisch/notifications').expect(200);
-  });
-});

packages/backend/src/controllers/api/v1/flows/get-flow.js

@@ -1,11 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const flow = await request.currentUser.authorizedFlows
-    .withGraphJoined({ steps: true })
-    .orderBy('steps.position', 'asc')
-    .findOne({ 'flows.id': request.params.flowId })
-    .throwIfNotFound();
-
-  renderObject(response, flow);
-};

packages/backend/src/controllers/api/v1/flows/get-flow.test.js

@@ -1,102 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import Crypto from 'crypto';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import { createFlow } from '../../../../../test/factories/flow';
-import { createStep } from '../../../../../test/factories/step';
-import { createPermission } from '../../../../../test/factories/permission';
-import getFlowMock from '../../../../../test/mocks/rest/api/v1/flows/get-flow';
-
-describe('GET /api/v1/flows/:flowId', () => {
-  let currentUser, currentUserRole, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    currentUserRole = await currentUser.$relatedQuery('role');
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return the flow data of current user', async () => {
-    const currentUserflow = await createFlow({ userId: currentUser.id });
-    const triggerStep = await createStep({ flowId: currentUserflow.id });
-    const actionStep = await createStep({ flowId: currentUserflow.id });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    const response = await request(app)
-      .get(`/api/v1/flows/${currentUserflow.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getFlowMock(currentUserflow, [
-      triggerStep,
-      actionStep,
-    ]);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return the flow data of another user', async () => {
-    const anotherUser = await createUser();
-    const anotherUserFlow = await createFlow({ userId: anotherUser.id });
-    const triggerStep = await createStep({ flowId: anotherUserFlow.id });
-    const actionStep = await createStep({ flowId: anotherUserFlow.id });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const response = await request(app)
-      .get(`/api/v1/flows/${anotherUserFlow.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getFlowMock(anotherUserFlow, [
-      triggerStep,
-      actionStep,
-    ]);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for not existing flow UUID', async () => {
-    await createPermission({
-      action: 'read',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const notExistingFlowUUID = Crypto.randomUUID();
-
-    await request(app)
-      .get(`/api/v1/flows/${notExistingFlowUUID}`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    await createPermission({
-      action: 'read',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    await request(app)
-      .get('/api/v1/flows/invalidFlowUUID')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

packages/backend/src/controllers/api/v1/payment/get-paddle-info.ee.js

@@ -1,8 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-import Billing from '../../../../helpers/billing/index.ee.js';
-
-export default async (request, response) => {
-  const paddleInfo = Billing.paddleInfo;
-
-  renderObject(response, paddleInfo);
-};

packages/backend/src/controllers/api/v1/payment/get-paddle-info.ee.test.js

@@ -1,33 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id.js';
-import { createUser } from '../../../../../test/factories/user.js';
-import getPaddleInfoMock from '../../../../../test/mocks/rest/api/v1/payment/get-paddle-info.js';
-import appConfig from '../../../../config/app.js';
-import billing from '../../../../helpers/billing/index.ee.js';
-
-describe('GET /api/v1/payment/paddle-info', () => {
-  let user, token;
-
-  beforeEach(async () => {
-    user = await createUser();
-    token = createAuthTokenByUserId(user.id);
-
-    vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
-    vi.spyOn(billing.paddleInfo, 'vendorId', 'get').mockReturnValue(
-      'sampleVendorId'
-    );
-  });
-
-  it('should return payment plans', async () => {
-    const response = await request(app)
-      .get('/api/v1/payment/paddle-info')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedResponsePayload = await getPaddleInfoMock();
-
-    expect(response.body).toEqual(expectedResponsePayload);
-  });
-});

packages/backend/src/controllers/api/v1/payment/get-plans.ee.js

@@ -1,8 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-import Billing from '../../../../helpers/billing/index.ee.js';
-
-export default async (request, response) => {
-  const paymentPlans = Billing.paddlePlans;
-
-  renderObject(response, paymentPlans);
-};

packages/backend/src/controllers/api/v1/payment/get-plans.ee.test.js

@@ -1,29 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id.js';
-import { createUser } from '../../../../../test/factories/user.js';
-import getPaymentPlansMock from '../../../../../test/mocks/rest/api/v1/payment/get-plans.js';
-import appConfig from '../../../../config/app.js';
-
-describe('GET /api/v1/payment/plans', () => {
-  let user, token;
-
-  beforeEach(async () => {
-    user = await createUser();
-    token = createAuthTokenByUserId(user.id);
-
-    vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
-  });
-
-  it('should return payment plans', async () => {
-    const response = await request(app)
-      .get('/api/v1/payment/plans')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedResponsePayload = await getPaymentPlansMock();
-
-    expect(response.body).toEqual(expectedResponsePayload);
-  });
-});

packages/backend/src/controllers/api/v1/users/get-invoices.ee.js

@@ -1,7 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const invoices = await request.currentUser.getInvoices();
-
-  renderObject(response, invoices);
-};

packages/backend/src/controllers/api/v1/users/get-invoices.ee.test.js

@@ -1,34 +0,0 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import User from '../../../../models/user';
-import getInvoicesMock from '../../../../../test/mocks/rest/api/v1/users/get-invoices.ee';
-
-describe('GET /api/v1/user/invoices', () => {
-  let currentUser, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return current user invoices', async () => {
-    const invoices = [
-      { id: 1, amount: 100, description: 'Invoice 1' },
-      { id: 2, amount: 200, description: 'Invoice 2' },
-    ];
-
-    vi.spyOn(User.prototype, 'getInvoices').mockResolvedValue(invoices);
-
-    const response = await request(app)
-      .get('/api/v1/users/invoices')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getInvoicesMock(invoices);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

packages/backend/src/controllers/api/v1/users/get-user.js

@@ -1,8 +1,11 @@
-import { renderObject } from '../../../../../helpers/renderer.js';
-import User from '../../../../../models/user.js';
+import { renderObject } from '../../../../helpers/renderer.js';
+import User from '../../../../models/user.js';
 
 export default async (request, response) => {
   const user = await User.query()
+    .leftJoinRelated({
+      role: true,
+    })
     .withGraphFetched({
       role: true,
     })

packages/backend/src/controllers/api/v1/users/get-user.test.js

@@ -0,0 +1,36 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import request from 'supertest';
+import app from '../../../../app.js';
+import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
+import { createUser } from '../../../../../test/factories/user';
+import { createPermission } from '../../../../../test/factories/permission';
+import getUserMock from '../../../../../test/mocks/rest/api/v1/users/get-user';
+
+describe('GET /api/v1/users/:userId', () => {
+  let currentUser, currentUserRole, anotherUser, anotherUserRole, token;
+
+  beforeEach(async () => {
+    currentUser = await createUser();
+    anotherUser = await createUser();
+    currentUserRole = await currentUser.$relatedQuery('role');
+    anotherUserRole = await anotherUser.$relatedQuery('role');
+
+    await createPermission({
+      roleId: currentUserRole.id,
+      action: 'read',
+      subject: 'User',
+    });
+
+    token = createAuthTokenByUserId(currentUser.id);
+  });
+
+  it('should return specified user info', async () => {
+    const response = await request(app)
+      .get(`/api/v1/users/${anotherUser.id}`)
+      .set('Authorization', token)
+      .expect(200);
+
+    const expectedPayload = getUserMock(anotherUser, anotherUserRole);
+    expect(response.body).toEqual(expectedPayload);
+  });
+});

packages/backend/src/controllers/api/v1/users/get-users.js

@@ -1,9 +1,12 @@
-import { renderObject } from '../../../../../helpers/renderer.js';
-import User from '../../../../../models/user.js';
-import paginateRest from '../../../../../helpers/pagination-rest.js';
+import { renderObject } from '../../../../helpers/renderer.js';
+import User from '../../../../models/user.js';
+import paginateRest from '../../../../helpers/pagination-rest.js';
 
 export default async (request, response) => {
   const usersQuery = User.query()
+    .leftJoinRelated({
+      role: true,
+    })
     .withGraphFetched({
       role: true,
     })

packages/backend/src/controllers/api/v1/users/get-users.test.js

@@ -1,17 +1,26 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
-import app from '../../../../../app';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id';
-import { createRole } from '../../../../../../test/factories/role';
-import { createUser } from '../../../../../../test/factories/user';
-import getUsersMock from '../../../../../../test/mocks/rest/api/v1/admin/users/get-users.js';
-import * as license from '../../../../../helpers/license.ee.js';
+import app from '../../../../app';
+import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
+import { createRole } from '../../../../../test/factories/role';
+import { createPermission } from '../../../../../test/factories/permission';
+import { createUser } from '../../../../../test/factories/user';
+import getUsersMock from '../../../../../test/mocks/rest/api/v1/users/get-users';
 
-describe('GET /api/v1/admin/users', () => {
+describe('GET /api/v1/users', () => {
   let currentUser, currentUserRole, anotherUser, anotherUserRole, token;
 
   beforeEach(async () => {
-    currentUserRole = await createRole({ key: 'admin' });
+    currentUserRole = await createRole({
+      key: 'currentUser',
+      name: 'Current user role',
+    });
+
+    await createPermission({
+      action: 'read',
+      subject: 'User',
+      roleId: currentUserRole.id,
+    });
 
     currentUser = await createUser({
       roleId: currentUserRole.id,
@@ -32,10 +41,8 @@ describe('GET /api/v1/admin/users', () => {
   });
 
   it('should return users data', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
     const response = await request(app)
-      .get('/api/v1/admin/users')
+      .get('/api/v1/users')
       .set('Authorization', token)
       .expect(200);
 

packages/backend/src/db/migrations/20240227164849_create_datastore_model.js

@@ -1,16 +0,0 @@
-export async function up(knex) {
-  return knex.schema.createTable('datastore', (table) => {
-    table.uuid('id').primary().defaultTo(knex.raw('gen_random_uuid()'));
-    table.string('key').notNullable();
-    table.string('value');
-    table.string('scope').notNullable();
-    table.uuid('scope_id').notNullable();
-    table.index(['key', 'scope', 'scope_id']);
-
-    table.timestamps(true, true);
-  });
-}
-
-export async function down(knex) {
-  return knex.schema.dropTable('datastore');
-}

packages/backend/src/graphql/mutations/delete-step.js

@@ -1,13 +1,8 @@
-import Step from '../../models/flow.js';
-
 const deleteStep = async (_parent, params, context) => {
-  const conditions = context.currentUser.can('update', 'Flow');
-  const isCreator = conditions.isCreator;
-  const allSteps = Step.query();
-  const userSteps = context.currentUser.$relatedQuery('steps');
-  const baseQuery = isCreator ? userSteps : allSteps;
+  context.currentUser.can('update', 'Flow');
 
-  const step = await baseQuery
+  const step = await context.currentUser
+    .$relatedQuery('steps')
     .withGraphFetched('flow')
     .findOne({
       'steps.id': params.input.id,

packages/backend/src/helpers/authorization.js

@@ -1,21 +1,16 @@
 const authorizationList = {
-  'GET /api/v1/users/:userId': {
+  '/api/v1/users/:userId': {
     action: 'read',
     subject: 'User',
   },
-  'GET /api/v1/users/': {
+  '/api/v1/users/': {
     action: 'read',
     subject: 'User',
   },
-  'GET /api/v1/flows/:flowId': {
-    action: 'read',
-    subject: 'Flow',
-  },
 };
 
 export const authorizeUser = async (request, response, next) => {
-  const currentRoute =
-    request.method + ' ' + request.baseUrl + request.route.path;
+  const currentRoute = request.baseUrl + request.route.path;
   const currentRouteRule = authorizationList[currentRoute];
 
   try {
@@ -25,13 +20,3 @@ export const authorizeUser = async (request, response, next) => {
     return response.status(403).end();
   }
 };
-
-export const authorizeAdmin = async (request, response, next) => {
-  const role = await request.currentUser.$relatedQuery('role');
-
-  if (role?.isAdmin) {
-    next();
-  } else {
-    return response.status(403).end();
-  }
-};

packages/backend/src/helpers/check-is-enterprise.js

@@ -1,9 +0,0 @@
-import { hasValidLicense } from './license.ee.js';
-
-export const checkIsEnterprise = async (request, response, next) => {
-  if (await hasValidLicense()) {
-    next();
-  } else {
-    return response.status(404).end();
-  }
-};

packages/backend/src/helpers/error-handler.js

@@ -1,31 +1,14 @@
 import logger from './logger.js';
-import objection from 'objection';
-const { NotFoundError, DataError } = objection;
 
 // Do not remove `next` argument as the function signature will not fit for an error handler middleware
 // eslint-disable-next-line no-unused-vars
-const errorHandler = (error, request, response, next) => {
-  if (error.message === 'Not Found' || error instanceof NotFoundError) {
-    response.status(404).end();
+const errorHandler = (err, req, res, next) => {
+  if (err.message === 'Not Found') {
+    res.status(404).end();
+  } else {
+    logger.error(err.message + '\n' + err.stack);
+    res.status(err.statusCode || 500).send(err.message);
   }
-
-  if (notFoundAppError(error)) {
-    response.status(404).end();
-  }
-
-  if (error instanceof DataError) {
-    response.status(400).end();
-  }
-
-  logger.error(error.message + '\n' + error.stack);
-  response.status(error.statusCode || 500).end();
-};
-
-const notFoundAppError = (error) => {
-  return (
-    error.message.includes('An application with the') ||
-    error.message.includes("key couldn't be found.")
-  );
 };
 
 export default errorHandler;

packages/backend/src/helpers/global-variable.js

@@ -1,7 +1,6 @@
 import createHttpClient from './http-client/index.js';
 import EarlyExitError from '../errors/early-exit.js';
 import AlreadyProcessedError from '../errors/already-processed.js';
-import Datastore from '../models/datastore.js';
 
 const globalVariable = async (options) => {
   const {
@@ -89,43 +88,6 @@ const globalVariable = async (options) => {
     setActionItem: (actionItem) => {
       $.actionOutput.data = actionItem;
     },
-    datastore: {
-      get: async ({ key }) => {
-        const datastore = await Datastore.query().findOne({
-          key,
-          scope: 'flow',
-          scope_id: $.flow.id,
-        });
-
-        return {
-          key: datastore.key,
-          value: datastore.value,
-          [datastore.key]: datastore.value,
-        };
-      },
-      set: async ({ key, value }) => {
-        let datastore = await Datastore.query()
-          .where({ key, scope: 'flow', scope_id: $.flow.id })
-          .first();
-
-        if (datastore) {
-          await datastore.$query().patchAndFetch({ value: value });
-        } else {
-          datastore = await Datastore.query().insert({
-            key,
-            value,
-            scope: 'flow',
-            scopeId: $.flow.id,
-          });
-        }
-
-        return {
-          key: datastore.key,
-          value: datastore.value,
-          [datastore.key]: datastore.value,
-        };
-      },
-    },
   };
 
   if (request) {

packages/backend/src/helpers/logger.js

@@ -4,8 +4,8 @@ import appConfig from '../config/app.js';
 const levels = {
   error: 0,
   warn: 1,
-  http: 2,
-  info: 3,
+  info: 2,
+  http: 3,
   debug: 4,
 };
 

packages/backend/src/helpers/renderer.js

@@ -11,18 +11,13 @@ const isArray = (object) =>
 const totalCount = (object) =>
   isPaginated(object) ? object.totalCount : isArray(object) ? object.length : 1;
 
-const renderObject = (response, object, options) => {
+const renderObject = (response, object) => {
   let data = isPaginated(object) ? object.records : object;
-
   const type = isPaginated(object)
     ? object.records[0].constructor.name
-    : Array.isArray(object)
-    ? object?.[0]?.constructor?.name || 'Object'
     : object.constructor.name;
 
-  const serializer = options?.serializer
-    ? serializers[options.serializer]
-    : serializers[type];
+  const serializer = serializers[type];
 
   if (serializer) {
     data = Array.isArray(data)

packages/backend/src/models/datastore.js

@@ -1,24 +0,0 @@
-import Base from './base.js';
-
-class Datastore extends Base {
-  static tableName = 'datastore';
-
-  static jsonSchema = {
-    type: 'object',
-    required: ['key', 'value', 'scope', 'scopeId'],
-
-    properties: {
-      id: { type: 'string', format: 'uuid' },
-      key: { type: 'string', minLength: 1 },
-      value: { type: 'string' },
-      scope: {
-        type: 'string',
-        enum: ['flow'],
-        default: 'flow',
-      },
-      scopeId: { type: 'string', format: 'uuid' },
-    },
-  };
-}
-
-export default Datastore;

packages/backend/src/models/user.js

@@ -15,7 +15,6 @@ import Role from './role.js';
 import Step from './step.js';
 import Subscription from './subscription.ee.js';
 import UsageData from './usage-data.ee.js';
-import Billing from '../helpers/billing/index.ee.js';
 
 class User extends Base {
   static tableName = 'users';
@@ -144,11 +143,6 @@ class User extends Base {
     },
   });
 
-  get authorizedFlows() {
-    const conditions = this.can('read', 'Flow');
-    return conditions.isCreator ? this.$relatedQuery('flows') : Flow.query();
-  }
-
   login(password) {
     return bcrypt.compare(password, this.password);
   }
@@ -243,20 +237,6 @@ class User extends Base {
     return currentUsageData.consumedTaskCount < plan.quota;
   }
 
-  async getInvoices() {
-    const subscription = await this.$relatedQuery('currentSubscription');
-
-    if (!subscription) {
-      return [];
-    }
-
-    const invoices = await Billing.paddleClient.getInvoices(
-      Number(subscription.paddleSubscriptionId)
-    );
-
-    return invoices;
-  }
-
   async $beforeInsert(queryContext) {
     await super.$beforeInsert(queryContext);
 

packages/backend/src/queues/action.js

@@ -15,17 +15,11 @@ process.on('SIGTERM', async () => {
   await actionQueue.close();
 });
 
-actionQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
+actionQueue.on('error', (err) => {
+  if (err.code === CONNECTION_REFUSED) {
+    logger.error('Make sure you have installed Redis and it is running.', err);
     process.exit();
   }
-
-  logger.error('Error happened in action queue!', error);
 });
 
 export default actionQueue;

packages/backend/src/queues/delete-user.ee.js

@@ -15,17 +15,11 @@ process.on('SIGTERM', async () => {
   await deleteUserQueue.close();
 });
 
-deleteUserQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
+deleteUserQueue.on('error', (err) => {
+  if (err.code === CONNECTION_REFUSED) {
+    logger.error('Make sure you have installed Redis and it is running.', err);
     process.exit();
   }
-
-  logger.error('Error happened in delete user queue!', error);
 });
 
 export default deleteUserQueue;

packages/backend/src/queues/email.js

@@ -15,17 +15,11 @@ process.on('SIGTERM', async () => {
   await emailQueue.close();
 });
 
-emailQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
+emailQueue.on('error', (err) => {
+  if (err.code === CONNECTION_REFUSED) {
+    logger.error('Make sure you have installed Redis and it is running.', err);
     process.exit();
   }
-
-  logger.error('Error happened in email queue!', error);
 });
 
 export default emailQueue;

packages/backend/src/queues/flow.js

@@ -15,17 +15,11 @@ process.on('SIGTERM', async () => {
   await flowQueue.close();
 });
 
-flowQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
+flowQueue.on('error', (err) => {
+  if (err.code === CONNECTION_REFUSED) {
+    logger.error('Make sure you have installed Redis and it is running.', err);
     process.exit();
   }
-
-  logger.error('Error happened in flow queue!', error);
 });
 
 export default flowQueue;

packages/backend/src/queues/remove-cancelled-subscriptions.ee.js

@@ -18,20 +18,11 @@ process.on('SIGTERM', async () => {
   await removeCancelledSubscriptionsQueue.close();
 });
 
-removeCancelledSubscriptionsQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
+removeCancelledSubscriptionsQueue.on('error', (err) => {
+  if (err.code === CONNECTION_REFUSED) {
+    logger.error('Make sure you have installed Redis and it is running.', err);
     process.exit();
   }
-
-  logger.error(
-    'Error happened in remove cancelled subscriptions queue!',
-    error
-  );
 });
 
 removeCancelledSubscriptionsQueue.add('remove-cancelled-subscriptions', null, {

packages/backend/src/queues/trigger.js

@@ -15,17 +15,11 @@ process.on('SIGTERM', async () => {
   await triggerQueue.close();
 });
 
-triggerQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
+triggerQueue.on('error', (err) => {
+  if (err.code === CONNECTION_REFUSED) {
+    logger.error('Make sure you have installed Redis and it is running.', err);
     process.exit();
   }
-
-  logger.error('Error happened in trigger queue!', error);
 });
 
 export default triggerQueue;

packages/backend/src/routes/api/v1/admin/app-auth-clients.js

@@ -1,18 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import { authenticateUser } from '../../../../helpers/authentication.js';
-import { authorizeAdmin } from '../../../../helpers/authorization.js';
-import { checkIsEnterprise } from '../../../../helpers/check-is-enterprise.js';
-import getAdminAppAuthClientsAction from '../../../../controllers/api/v1/admin/app-auth-clients/get-app-auth-client.js';
-
-const router = Router();
-
-router.get(
-  '/:appAuthClientId',
-  authenticateUser,
-  authorizeAdmin,
-  checkIsEnterprise,
-  asyncHandler(getAdminAppAuthClientsAction)
-);
-
-export default router;

packages/backend/src/routes/api/v1/admin/permissions.ee.js

@@ -1,18 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import { authenticateUser } from '../../../../helpers/authentication.js';
-import { authorizeAdmin } from '../../../../helpers/authorization.js';
-import { checkIsEnterprise } from '../../../../helpers/check-is-enterprise.js';
-import getPermissionsCatalogAction from '../../../../controllers/api/v1/admin/permissions/get-permissions-catalog.ee.js';
-
-const router = Router();
-
-router.get(
-  '/catalog',
-  authenticateUser,
-  authorizeAdmin,
-  checkIsEnterprise,
-  asyncHandler(getPermissionsCatalogAction)
-);
-
-export default router;

packages/backend/src/routes/api/v1/admin/roles.ee.js

@@ -1,27 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import { authenticateUser } from '../../../../helpers/authentication.js';
-import { authorizeAdmin } from '../../../../helpers/authorization.js';
-import { checkIsEnterprise } from '../../../../helpers/check-is-enterprise.js';
-import getRolesAction from '../../../../controllers/api/v1/admin/roles/get-roles.ee.js';
-import getRoleAction from '../../../../controllers/api/v1/admin/roles/get-role.ee.js';
-
-const router = Router();
-
-router.get(
-  '/',
-  authenticateUser,
-  authorizeAdmin,
-  checkIsEnterprise,
-  asyncHandler(getRolesAction)
-);
-
-router.get(
-  '/:roleId',
-  authenticateUser,
-  authorizeAdmin,
-  checkIsEnterprise,
-  asyncHandler(getRoleAction)
-);
-
-export default router;

packages/backend/src/routes/api/v1/admin/saml-auth-providers.ee.js

@@ -1,27 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import { authenticateUser } from '../../../../helpers/authentication.js';
-import { authorizeAdmin } from '../../../../helpers/authorization.js';
-import { checkIsEnterprise } from '../../../../helpers/check-is-enterprise.js';
-import getSamlAuthProvidersAction from '../../../../controllers/api/v1/admin/saml-auth-providers/get-saml-auth-providers.ee.js';
-import getSamlAuthProviderAction from '../../../../controllers/api/v1/admin/saml-auth-providers/get-saml-auth-provider.ee.js';
-
-const router = Router();
-
-router.get(
-  '/',
-  authenticateUser,
-  authorizeAdmin,
-  checkIsEnterprise,
-  asyncHandler(getSamlAuthProvidersAction)
-);
-
-router.get(
-  '/:samlAuthProviderId',
-  authenticateUser,
-  authorizeAdmin,
-  checkIsEnterprise,
-  asyncHandler(getSamlAuthProviderAction)
-);
-
-export default router;

packages/backend/src/routes/api/v1/admin/users.ee.js

@@ -1,27 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import { authenticateUser } from '../../../../helpers/authentication.js';
-import { authorizeAdmin } from '../../../../helpers/authorization.js';
-import { checkIsEnterprise } from '../../../../helpers/check-is-enterprise.js';
-import getUsersAction from '../../../../controllers/api/v1/admin/users/get-users.ee.js';
-import getUserAction from '../../../../controllers/api/v1/admin/users/get-user.ee.js';
-
-const router = Router();
-
-router.get(
-  '/',
-  authenticateUser,
-  authorizeAdmin,
-  checkIsEnterprise,
-  asyncHandler(getUsersAction)
-);
-
-router.get(
-  '/:userId',
-  authenticateUser,
-  authorizeAdmin,
-  checkIsEnterprise,
-  asyncHandler(getUserAction)
-);
-
-export default router;

packages/backend/src/routes/api/v1/app-auth-clients.js

@@ -1,16 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import { authenticateUser } from '../../../helpers/authentication.js';
-import { checkIsEnterprise } from '../../../helpers/check-is-enterprise.js';
-import getAppAuthClientAction from '../../../controllers/api/v1/app-auth-clients/get-app-auth-client.js';
-
-const router = Router();
-
-router.get(
-  '/:appAuthClientId',
-  authenticateUser,
-  checkIsEnterprise,
-  asyncHandler(getAppAuthClientAction)
-);
-
-export default router;

packages/backend/src/routes/api/v1/apps.js

@@ -1,10 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import { authenticateUser } from '../../../helpers/authentication.js';
-import getAppAction from '../../../controllers/api/v1/apps/get-app.js';
-
-const router = Router();
-
-router.get('/:appKey', authenticateUser, asyncHandler(getAppAction));
-
-export default router;

packages/backend/src/routes/api/v1/automatisch.js

@@ -1,15 +1,8 @@
 import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
 import versionAction from '../../../controllers/api/v1/automatisch/version.js';
-import notificationsAction from '../../../controllers/api/v1/automatisch/notifications.js';
-import infoAction from '../../../controllers/api/v1/automatisch/info.js';
-import licenseAction from '../../../controllers/api/v1/automatisch/license.js';
 
 const router = Router();
 
-router.get('/version', asyncHandler(versionAction));
-router.get('/notifications', asyncHandler(notificationsAction));
-router.get('/info', asyncHandler(infoAction));
-router.get('/license', asyncHandler(licenseAction));
+router.get('/version', versionAction);
 
 export default router;

packages/backend/src/routes/api/v1/flows.js

@@ -1,16 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import { authenticateUser } from '../../../helpers/authentication.js';
-import { authorizeUser } from '../../../helpers/authorization.js';
-import getFlowAction from '../../../controllers/api/v1/flows/get-flow.js';
-
-const router = Router();
-
-router.get(
-  '/:flowId',
-  authenticateUser,
-  authorizeUser,
-  asyncHandler(getFlowAction)
-);
-
-export default router;

packages/backend/src/routes/api/v1/payment.ee.js

@@ -1,24 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import { authenticateUser } from '../../../helpers/authentication.js';
-import checkIsCloud from '../../../helpers/check-is-cloud.js';
-import getPlansAction from '../../../controllers/api/v1/payment/get-plans.ee.js';
-import getPaddleInfoAction from '../../../controllers/api/v1/payment/get-paddle-info.ee.js';
-
-const router = Router();
-
-router.get(
-  '/plans',
-  authenticateUser,
-  checkIsCloud,
-  asyncHandler(getPlansAction)
-);
-
-router.get(
-  '/paddle-info',
-  authenticateUser,
-  checkIsCloud,
-  asyncHandler(getPaddleInfoAction)
-);
-
-export default router;

packages/backend/src/routes/api/v1/users.js

@@ -1,26 +1,22 @@
 import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
 import { authenticateUser } from '../../../helpers/authentication.js';
+import { authorizeUser } from '../../../helpers/authorization.js';
 import checkIsCloud from '../../../helpers/check-is-cloud.js';
 import getCurrentUserAction from '../../../controllers/api/v1/users/get-current-user.js';
+import getUserAction from '../../../controllers/api/v1/users/get-user.js';
+import getUsersAction from '../../../controllers/api/v1/users/get-users.js';
 import getUserTrialAction from '../../../controllers/api/v1/users/get-user-trial.ee.js';
-import getInvoicesAction from '../../../controllers/api/v1/users/get-invoices.ee.js';
 
 const router = Router();
 
-router.get('/me', authenticateUser, asyncHandler(getCurrentUserAction));
-router.get(
-  '/invoices',
-  authenticateUser,
-  checkIsCloud,
-  asyncHandler(getInvoicesAction)
-);
-
+router.get('/', authenticateUser, authorizeUser, getUsersAction);
+router.get('/me', authenticateUser, getCurrentUserAction);
+router.get('/:userId', authenticateUser, authorizeUser, getUserAction);
 router.get(
   '/:userId/trial',
   authenticateUser,
   checkIsCloud,
-  asyncHandler(getUserTrialAction)
+  getUserTrialAction
 );
 
 export default router;

packages/backend/src/routes/healthcheck.js

@@ -1,9 +1,8 @@
 import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
 import indexAction from '../controllers/healthcheck/index.js';
 
 const router = Router();
 
-router.get('/', asyncHandler(indexAction));
+router.get('/', indexAction);
 
 export default router;

packages/backend/src/routes/index.js

@@ -5,15 +5,6 @@ import paddleRouter from './paddle.ee.js';
 import healthcheckRouter from './healthcheck.js';
 import automatischRouter from './api/v1/automatisch.js';
 import usersRouter from './api/v1/users.js';
-import paymentRouter from './api/v1/payment.ee.js';
-import appAuthClientsRouter from './api/v1/app-auth-clients.js';
-import flowsRouter from './api/v1/flows.js';
-import appsRouter from './api/v1/apps.js';
-import samlAuthProvidersRouter from './api/v1/admin/saml-auth-providers.ee.js';
-import rolesRouter from './api/v1/admin/roles.ee.js';
-import permissionsRouter from './api/v1/admin/permissions.ee.js';
-import adminUsersRouter from './api/v1/admin/users.ee.js';
-import adminAppAuthClientsRouter from './api/v1/admin/app-auth-clients.js';
 
 const router = Router();
 
@@ -23,14 +14,5 @@ router.use('/paddle', paddleRouter);
 router.use('/healthcheck', healthcheckRouter);
 router.use('/api/v1/automatisch', automatischRouter);
 router.use('/api/v1/users', usersRouter);
-router.use('/api/v1/payment', paymentRouter);
-router.use('/api/v1/app-auth-clients', appAuthClientsRouter);
-router.use('/api/v1/flows', flowsRouter);
-router.use('/api/v1/apps', appsRouter);
-router.use('/api/v1/admin/saml-auth-providers', samlAuthProvidersRouter);
-router.use('/api/v1/admin/roles', rolesRouter);
-router.use('/api/v1/admin/permissions', permissionsRouter);
-router.use('/api/v1/admin/users', adminUsersRouter);
-router.use('/api/v1/admin/app-auth-clients', adminAppAuthClientsRouter);
 
 export default router;

packages/backend/src/routes/paddle.ee.js

@@ -1,9 +1,16 @@
 import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
 import webhooksHandler from '../controllers/paddle/webhooks.ee.js';
 
 const router = Router();
 
-router.post('/webhooks', asyncHandler(webhooksHandler));
+const exposeError = (handler) => async (req, res, next) => {
+  try {
+    await handler(req, res, next);
+  } catch (err) {
+    next(err);
+  }
+};
+
+router.post('/webhooks', exposeError(webhooksHandler));
 
 export default router;

packages/backend/src/serializers/app-auth-client.js

@@ -1,10 +0,0 @@
-const appAuthClientSerializer = (appAuthClient) => {
-  return {
-    id: appAuthClient.id,
-    appConfigId: appAuthClient.appConfigId,
-    name: appAuthClient.name,
-    active: appAuthClient.active,
-  };
-};
-
-export default appAuthClientSerializer;