feat(ftp): add ftp integration

packages/backend/package.json

@@ -31,6 +31,7 @@
     "accounting": "^0.4.1",
     "ajv-formats": "^2.1.1",
     "axios": "1.6.0",
+    "basic-ftp": "^5.0.5",
     "bcrypt": "^5.0.1",
     "bullmq": "^3.0.0",
     "cors": "^2.8.5",

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

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 122.88 109.36" style="enable-background:new 0 0 122.88 109.36" xml:space="preserve"><g><path d="M14.69,16.44h3.56V8.63c0-1.09,0.88-1.97,1.97-1.97h3.5V1.97C23.72,0.88,24.6,0,25.69,0h31.92c1.09,0,1.97,0.88,1.97,1.97 v4.69h43.05c1.09,0,1.97,0.88,1.97,1.97v7.82h3.59c1.09,0,1.97,0.88,1.97,1.97c0,0.14-0.01,0.28-0.04,0.42l-6.88,50.59 c-0.22,1.65-0.95,3.18-2.05,4.29c-1.1,1.1-2.54,1.78-4.25,1.78H70.95v5.86h2.12c1.54,0,2.8,1.26,2.8,2.8v5.06h10.44 c1.25,0,2.32,0.83,2.67,1.97h26.1c3.73,0,6.14,2.07,7.2,4.71c0.4,1,0.6,2.08,0.6,3.14c0,1.06-0.2,2.14-0.6,3.14 c-1.06,2.64-3.47,4.71-7.2,4.71H89.09c-0.15,1.4-1.35,2.49-2.78,2.49H72.63H38.8c-1.44,0-2.63-1.1-2.78-2.49H7.8 c-3.73,0-6.14-2.07-7.2-4.71c-0.4-1-0.6-2.08-0.6-3.14c0-1.06,0.2-2.14,0.6-3.14c1.06-2.64,3.47-4.71,7.2-4.71h28.32 c0.36-1.14,1.42-1.97,2.67-1.97h8.74v-5.06c0-1.54,1.26-2.8,2.8-2.8h1.69v-5.86H24.38c-1.71,0-3.19-0.69-4.3-1.79 c-1.11-1.11-1.83-2.66-2.01-4.33l-5.33-50.74c-0.11-1.08,0.67-2.04,1.75-2.15C14.56,16.45,14.63,16.45,14.69,16.44L14.69,16.44 L14.69,16.44L14.69,16.44z M31.38,34.43h16.29v4.58H38v3.72h8.26v4.3H38v8.71h-6.61V34.43L31.38,34.43z M50.08,34.43H70.1v5.27 h-6.72v16.05h-6.59V39.7h-6.71V34.43L50.08,34.43z M73.41,34.43h10.95c2.38,0,4.17,0.57,5.35,1.7c1.19,1.14,1.78,2.75,1.78,4.84 c0,2.15-0.65,3.84-1.94,5.05c-1.3,1.21-3.27,1.82-5.93,1.82h-3.6v7.91h-6.61V34.43L73.41,34.43z M80.03,43.52h1.61 c1.27,0,2.16-0.22,2.68-0.66c0.51-0.44,0.77-1,0.77-1.69c0-0.67-0.22-1.24-0.67-1.7c-0.44-0.47-1.28-0.7-2.51-0.7h-1.88V43.52 L80.03,43.52z M56.38,81.34h10.21v-5.79H56.38V81.34L56.38,81.34z M89.11,94.88v8.27h25.97c1.97,0,3.22-1.04,3.76-2.37 c0.22-0.54,0.33-1.15,0.33-1.76s-0.11-1.22-0.33-1.76c-0.54-1.33-1.79-2.37-3.76-2.37H89.11L89.11,94.88z M36,103.15v-8.27H7.8 c-1.97,0-3.22,1.04-3.76,2.37c-0.22,0.54-0.33,1.15-0.33,1.76s0.11,1.22,0.33,1.76c0.54,1.33,1.79,2.37,3.76,2.37H36L36,103.15z M20.23,20.38h-3.35l5.1,48.57c0.08,0.78,0.39,1.47,0.87,1.95c0.4,0.4,0.92,0.64,1.53,0.64h72.54c0.59,0,1.1-0.24,1.48-0.62 c0.49-0.49,0.82-1.22,0.93-2.03l6.6-48.51L20.23,20.38L20.23,20.38L20.23,20.38z M22.19,10.6v5.83l78.46-0.83v-5H57.61 c-1.09,0-1.97-0.88-1.97-1.97V3.94H27.66v4.69c0,1.09-0.88,1.97-1.97,1.97L22.19,10.6L22.19,10.6L22.19,10.6z"/></g></svg>

packages/backend/src/apps/ftp/auth/index.js

@@ -0,0 +1,91 @@
+import verifyCredentials from './verify-credentials.js';
+import isStillVerified from './is-still-verified.js';
+
+export default {
+  fields: [
+    {
+      key: 'screenName',
+      label: 'Screen Name',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description:
+        'Screen name of your connection to be used on Automatisch UI.',
+      clickToCopy: false,
+    },
+    {
+      key: 'host',
+      label: 'Host',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: 'The host information Automatisch will connect to.',
+      docUrl: 'https://automatisch.io/docs/ftp#host',
+      clickToCopy: false,
+    },
+    {
+      key: 'username',
+      label: 'Email/Username',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: 'Your FTP login credentials.',
+      docUrl: 'https://automatisch.io/docs/ftp#username',
+      clickToCopy: false,
+    },
+    {
+      key: 'password',
+      label: 'Password',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      docUrl: 'https://automatisch.io/docs/ftp#password',
+      clickToCopy: false,
+    },
+    {
+      key: 'secure',
+      label: 'Secure',
+      type: 'dropdown',
+      required: false,
+      readOnly: false,
+      value: false,
+      placeholder: null,
+      description: null,
+      docUrl: 'https://automatisch.io/docs/ftp#secure',
+      clickToCopy: false,
+      options: [
+        {
+          label: 'Yes',
+          value: true,
+        },
+        {
+          label: 'No',
+          value: false,
+        },
+      ],
+    },
+    {
+      key: 'port',
+      label: 'Port',
+      type: 'string',
+      required: false,
+      readOnly: false,
+      value: '21',
+      placeholder: null,
+      description: null,
+      docUrl: 'https://automatisch.io/docs/ftp#port',
+      clickToCopy: false,
+    },
+  ],
+  verifyCredentials,
+  isStillVerified,
+};

packages/backend/src/apps/ftp/auth/is-still-verified.js

@@ -0,0 +1,8 @@
+import verifyCredentials from './verify-credentials.js';
+
+const isStillVerified = async ($) => {
+  await verifyCredentials($);
+  return true;
+};
+
+export default isStillVerified;

packages/backend/src/apps/ftp/auth/verify-credentials.js

@@ -0,0 +1,19 @@
+import { Client } from 'basic-ftp';
+
+const verifyCredentials = async ($) => {
+  const client = new Client();
+  client.ftp.verbose = true;
+
+  await client.access({
+    host: $.auth.data.host,
+    user: $.auth.data.username,
+    password: $.auth.data.password,
+    secure: $.auth.data.secure,
+  });
+
+  await $.auth.set({
+    screenName: $.auth.data.screenName,
+  });
+};
+
+export default verifyCredentials;

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

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

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

@@ -1,4 +0,0 @@
-import replyToEmail from './reply-to-email/index.js';
-import sendEmail from './send-email/index.js';
-
-export default [replyToEmail, sendEmail];

packages/backend/src/apps/gmail/actions/reply-to-email/index.js

@@ -1,228 +0,0 @@
-import defineAction from '../../../../helpers/define-action.js';
-
-export default defineAction({
-  name: 'Reply to email',
-  key: 'replyToEmail',
-  description: 'Respond to an email.',
-  arguments: [
-    {
-      label: 'Thread',
-      key: 'threadId',
-      type: 'dropdown',
-      required: false,
-      description: '',
-      variables: true,
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listThreads',
-          },
-        ],
-      },
-    },
-    {
-      label: 'TOs',
-      key: 'tos',
-      type: 'dynamic',
-      required: false,
-      description: 'Who will receive this email?',
-      fields: [
-        {
-          label: 'To',
-          key: 'to',
-          type: 'string',
-          required: false,
-          variables: true,
-        },
-      ],
-    },
-    {
-      label: 'CCs',
-      key: 'ccs',
-      type: 'dynamic',
-      required: false,
-      description:
-        'Who else needs to be included in the CC field of this email?',
-      fields: [
-        {
-          label: 'CC',
-          key: 'cc',
-          type: 'string',
-          required: false,
-          variables: true,
-        },
-      ],
-    },
-    {
-      label: 'BCCs',
-      key: 'bccs',
-      type: 'dynamic',
-      required: false,
-      description:
-        'Who else needs to be included in the BCC field of this email?',
-      fields: [
-        {
-          label: 'BCC',
-          key: 'bcc',
-          type: 'string',
-          required: false,
-          variables: true,
-        },
-      ],
-    },
-    {
-      label: 'From',
-      key: 'from',
-      type: 'dropdown',
-      required: false,
-      description:
-        'Choose an email address or alias from your Gmail Account. This defaults to the primary email address.',
-      variables: true,
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listEmails',
-          },
-        ],
-      },
-    },
-    {
-      label: 'From Name',
-      key: 'fromName',
-      type: 'string',
-      required: false,
-      description: '',
-      variables: true,
-    },
-    {
-      label: 'Reply To',
-      key: 'replyTo',
-      type: 'string',
-      required: false,
-      description: 'Specify a single reply address other than your own.',
-      variables: true,
-    },
-    {
-      label: 'Body Type',
-      key: 'bodyType',
-      type: 'dropdown',
-      required: false,
-      description: '',
-      variables: true,
-      options: [
-        {
-          label: 'plain',
-          value: 'plain',
-        },
-        {
-          label: 'html',
-          value: 'html',
-        },
-      ],
-    },
-    {
-      label: 'Body',
-      key: 'emailBody',
-      type: 'string',
-      required: true,
-      description: '',
-      variables: true,
-    },
-    {
-      label: 'Label',
-      key: 'labelId',
-      type: 'dropdown',
-      required: false,
-      description: '',
-      variables: true,
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listLabels',
-          },
-        ],
-      },
-    },
-  ],
-
-  async run($) {
-    const {
-      tos,
-      ccs,
-      bccs,
-      from,
-      fromName,
-      replyTo,
-      threadId,
-      bodyType,
-      emailBody,
-      labelId,
-    } = $.step.parameters;
-    const userId = $.auth.data.userId;
-
-    const allTos = tos?.map((entry) => entry.to);
-    const allCcs = ccs?.map((entry) => entry.cc);
-    const allBccs = bccs?.map((entry) => entry.bcc);
-    const contentType =
-      bodyType === 'html'
-        ? 'text/html; charset="UTF-8"'
-        : 'text/plain; charset="UTF-8"';
-
-    const email =
-      'From: ' +
-      fromName +
-      ' <' +
-      from +
-      '>' +
-      '\r\n' +
-      'In-Reply-To: ' +
-      threadId +
-      '\r\n' +
-      'References: ' +
-      threadId +
-      '\r\n' +
-      'Reply-To: ' +
-      replyTo +
-      '\r\n' +
-      'To: ' +
-      allTos.join(',') +
-      '\r\n' +
-      'Cc: ' +
-      allCcs.join(',') +
-      '\r\n' +
-      'Bcc: ' +
-      allBccs.join(',') +
-      '\r\n' +
-      'Content-Type: ' +
-      contentType +
-      '\r\n' +
-      '\r\n' +
-      emailBody;
-
-    const base64EncodedEmailBody = Buffer.from(email).toString('base64');
-
-    const body = {
-      threadId: threadId,
-      labelIds: [labelId],
-      raw: base64EncodedEmailBody,
-    };
-
-    const { data } = await $.http.post(
-      `/gmail/v1/users/${userId}/messages/send`,
-      body
-    );
-
-    $.setActionItem({
-      raw: data,
-    });
-  },
-});

packages/backend/src/apps/gmail/actions/send-email/index.js

@@ -1,234 +0,0 @@
-import defineAction from '../../../../helpers/define-action.js';
-
-export default defineAction({
-  name: 'Send email',
-  key: 'sendEmail',
-  description: 'Send a new email message.',
-  arguments: [
-    {
-      label: 'TOs',
-      key: 'tos',
-      type: 'dynamic',
-      required: false,
-      description: '',
-      fields: [
-        {
-          label: 'To',
-          key: 'to',
-          type: 'string',
-          required: false,
-          variables: true,
-        },
-      ],
-    },
-    {
-      label: 'CCs',
-      key: 'ccs',
-      type: 'dynamic',
-      required: false,
-      description: '',
-      fields: [
-        {
-          label: 'CC',
-          key: 'cc',
-          type: 'string',
-          required: false,
-          variables: true,
-        },
-      ],
-    },
-    {
-      label: 'BCCs',
-      key: 'bccs',
-      type: 'dynamic',
-      required: false,
-      description: '',
-      fields: [
-        {
-          label: 'BCC',
-          key: 'bcc',
-          type: 'string',
-          required: false,
-          variables: true,
-        },
-      ],
-    },
-    {
-      label: 'From',
-      key: 'from',
-      type: 'dropdown',
-      required: false,
-      description:
-        'Select an email address or alias from your Gmail Account. Defaults to the primary email address.',
-      variables: true,
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listEmails',
-          },
-        ],
-      },
-    },
-    {
-      label: 'From Name',
-      key: 'fromName',
-      type: 'string',
-      required: false,
-      description: '',
-      variables: true,
-    },
-    {
-      label: 'Reply To',
-      key: 'replyTo',
-      type: 'string',
-      required: false,
-      description: 'Specify a single reply address other than your own.',
-      variables: true,
-    },
-    {
-      label: 'Subject',
-      key: 'subject',
-      type: 'string',
-      required: true,
-      description: '',
-      variables: true,
-    },
-    {
-      label: 'Body Type',
-      key: 'bodyType',
-      type: 'dropdown',
-      required: false,
-      description: '',
-      variables: true,
-      options: [
-        {
-          label: 'plain',
-          value: 'plain',
-        },
-        {
-          label: 'html',
-          value: 'html',
-        },
-      ],
-    },
-    {
-      label: 'Body',
-      key: 'emailBody',
-      type: 'string',
-      required: true,
-      description: '',
-      variables: true,
-    },
-    {
-      label: 'Signature',
-      key: 'signature',
-      type: 'dropdown',
-      required: false,
-      description: '',
-      variables: true,
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listSignatures',
-          },
-        ],
-      },
-    },
-    {
-      label: 'Label',
-      key: 'labelId',
-      type: 'dropdown',
-      required: false,
-      description: '',
-      variables: true,
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listLabels',
-          },
-        ],
-      },
-    },
-  ],
-
-  async run($) {
-    const {
-      tos,
-      ccs,
-      bccs,
-      from,
-      fromName,
-      replyTo,
-      subject,
-      bodyType,
-      emailBody,
-      signature,
-      labelId,
-    } = $.step.parameters;
-    const userId = $.auth.data.userId;
-
-    const allTos = tos?.map((entry) => entry.to);
-    const allCcs = ccs?.map((entry) => entry.cc);
-    const allBccs = bccs?.map((entry) => entry.bcc);
-    const contentType =
-      bodyType === 'html'
-        ? 'text/html; charset="UTF-8"'
-        : 'text/plain; charset="UTF-8"';
-
-    const email =
-      'From: ' +
-      fromName +
-      ' <' +
-      from +
-      '>' +
-      '\r\n' +
-      'Reply-To: ' +
-      replyTo +
-      '\r\n' +
-      'To: ' +
-      allTos.join(',') +
-      '\r\n' +
-      'Cc: ' +
-      allCcs.join(',') +
-      '\r\n' +
-      'Bcc: ' +
-      allBccs.join(',') +
-      '\r\n' +
-      'Subject: ' +
-      subject +
-      '\r\n' +
-      'Content-Type: ' +
-      contentType +
-      '\r\n' +
-      '\r\n' +
-      emailBody +
-      '\r\n' +
-      '\r\n' +
-      signature;
-
-    const base64EncodedEmailBody = Buffer.from(email).toString('base64');
-
-    const body = {
-      labelIds: [labelId],
-      raw: base64EncodedEmailBody,
-    };
-
-    const { data } = await $.http.post(
-      `/gmail/v1/users/${userId}/messages/send`,
-      body
-    );
-
-    $.setActionItem({
-      raw: data,
-    });
-  },
-});

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

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 49.4 512 399.42">
-  <g fill="none" fill-rule="evenodd">
-    <g fill-rule="nonzero">
-      <path fill="#4285f4" d="M34.91 448.818h81.454V251L0 163.727V413.91c0 19.287 15.622 34.91 34.91 34.91z"/>
-      <path fill="#34a853" d="M395.636 448.818h81.455c19.287 0 34.909-15.622 34.909-34.909V163.727L395.636 251z"/>
-      <path fill="#fbbc04" d="M395.636 99.727V251L512 163.727v-46.545c0-43.142-49.25-67.782-83.782-41.891z"/>
-    </g>
-    <path fill="#ea4335" d="M116.364 251V99.727L256 204.455 395.636 99.727V251L256 355.727z"/>
-    <path fill="#c5221f" fill-rule="nonzero" d="M0 117.182v46.545L116.364 251V99.727L83.782 75.291C49.25 49.4 0 74.04 0 117.18z"/>
-  </g>
-</svg>

packages/backend/src/apps/gmail/auth/generate-auth-url.js

@@ -1,23 +0,0 @@
-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({
-    client_id: $.auth.data.clientId,
-    redirect_uri: redirectUri,
-    prompt: 'select_account',
-    scope: authScope.join(' '),
-    response_type: 'code',
-    access_type: 'offline',
-  });
-
-  const url = `https://accounts.google.com/o/oauth2/v2/auth?${searchParams.toString()}`;
-
-  await $.auth.set({
-    url,
-  });
-}

packages/backend/src/apps/gmail/auth/index.js

@@ -1,48 +0,0 @@
-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/gmail/connections/add',
-      placeholder: null,
-      description:
-        'When asked to input a redirect URL in Google Cloud, enter the URL above.',
-      clickToCopy: true,
-    },
-    {
-      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/gmail/auth/is-still-verified.js

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

packages/backend/src/apps/gmail/auth/refresh-token.js

@@ -1,26 +0,0 @@
-import { URLSearchParams } from 'node:url';
-
-import authScope from '../common/auth-scope.js';
-
-const refreshToken = async ($) => {
-  const params = new URLSearchParams({
-    client_id: $.auth.data.clientId,
-    client_secret: $.auth.data.clientSecret,
-    grant_type: 'refresh_token',
-    refresh_token: $.auth.data.refreshToken,
-  });
-
-  const { data } = await $.http.post(
-    'https://oauth2.googleapis.com/token',
-    params.toString()
-  );
-
-  await $.auth.set({
-    accessToken: data.access_token,
-    expiresIn: data.expires_in,
-    scope: authScope.join(' '),
-    tokenType: data.token_type,
-  });
-};
-
-export default refreshToken;

packages/backend/src/apps/gmail/auth/verify-credentials.js

@@ -1,43 +0,0 @@
-import getCurrentUser from '../common/get-current-user.js';
-
-const verifyCredentials = async ($) => {
-  const oauthRedirectUrlField = $.app.auth.fields.find(
-    (field) => field.key == 'oAuthRedirectUrl'
-  );
-  const redirectUri = oauthRedirectUrlField.value;
-  const { data } = await $.http.post(`https://oauth2.googleapis.com/token`, {
-    client_id: $.auth.data.clientId,
-    client_secret: $.auth.data.clientSecret,
-    code: $.auth.data.code,
-    grant_type: 'authorization_code',
-    redirect_uri: redirectUri,
-  });
-
-  await $.auth.set({
-    accessToken: data.access_token,
-    tokenType: data.token_type,
-  });
-
-  const currentUser = await getCurrentUser($);
-
-  const { displayName } = currentUser.names.find(
-    (name) => name.metadata.primary
-  );
-  const { value: email } = currentUser.emailAddresses.find(
-    (emailAddress) => emailAddress.metadata.primary
-  );
-
-  await $.auth.set({
-    clientId: $.auth.data.clientId,
-    clientSecret: $.auth.data.clientSecret,
-    scope: $.auth.data.scope,
-    idToken: data.id_token,
-    expiresIn: data.expires_in,
-    refreshToken: data.refresh_token,
-    resourceName: currentUser.resourceName,
-    screenName: `${displayName} - ${email}`,
-    userId: email,
-  });
-};
-
-export default verifyCredentials;

packages/backend/src/apps/gmail/common/add-auth-header.js

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

packages/backend/src/apps/gmail/common/auth-scope.js

@@ -1,8 +0,0 @@
-const authScope = [
-  'https://www.googleapis.com/auth/gmail.compose',
-  'https://www.googleapis.com/auth/gmail.modify',
-  'https://www.googleapis.com/auth/userinfo.email',
-  'https://www.googleapis.com/auth/userinfo.profile',
-];
-
-export default authScope;

packages/backend/src/apps/gmail/common/get-current-user.js

@@ -1,8 +0,0 @@
-const getCurrentUser = async ($) => {
-  const { data: currentUser } = await $.http.get(
-    'https://people.googleapis.com/v1/people/me?personFields=names,emailAddresses'
-  );
-  return currentUser;
-};
-
-export default getCurrentUser;

packages/backend/src/apps/gmail/dynamic-data/index.js

@@ -1,6 +0,0 @@
-import listEmails from './list-emails/index.js';
-import listLabels from './list-labels/index.js';
-import listSignatures from './list-signatures/index.js';
-import listThreads from './list-threads/index.js';
-
-export default [listEmails, listLabels, listSignatures, listThreads];

packages/backend/src/apps/gmail/dynamic-data/list-emails/index.js

@@ -1,23 +0,0 @@
-import getCurrentUser from '../../common/get-current-user.js';
-
-export default {
-  name: 'List emails',
-  key: 'listEmails',
-
-  async run($) {
-    const emails = {
-      data: [],
-    };
-
-    const currentUser = await getCurrentUser($);
-
-    for (const emailAddress of currentUser.emailAddresses) {
-      emails.data.push({
-        value: emailAddress.value,
-        name: emailAddress.value,
-      });
-    }
-
-    return emails;
-  },
-};

packages/backend/src/apps/gmail/dynamic-data/list-labels/index.js

@@ -1,22 +0,0 @@
-export default {
-  name: 'List labels',
-  key: 'listLabels',
-
-  async run($) {
-    const labels = {
-      data: [],
-    };
-    const userId = $.auth.data.userId;
-
-    const { data } = await $.http.get(`/gmail/v1/users/${userId}/labels`);
-
-    for (const label of data.labels) {
-      labels.data.push({
-        value: label.id,
-        name: label.name,
-      });
-    }
-
-    return labels;
-  },
-};

packages/backend/src/apps/gmail/dynamic-data/list-signatures/index.js

@@ -1,24 +0,0 @@
-export default {
-  name: 'List signatures',
-  key: 'listSignatures',
-
-  async run($) {
-    const signatures = {
-      data: [],
-    };
-    const userId = $.auth.data.userId;
-
-    const { data } = await $.http.get(
-      `/gmail/v1/users/${userId}/settings/sendAs`
-    );
-
-    for (const sendAs of data.sendAs) {
-      signatures.data.push({
-        value: sendAs.signature,
-        name: sendAs.sendAsEmail,
-      });
-    }
-
-    return signatures;
-  },
-};

packages/backend/src/apps/gmail/dynamic-data/list-threads/index.js

@@ -1,31 +0,0 @@
-export default {
-  name: 'List threads',
-  key: 'listThreads',
-
-  async run($) {
-    const threads = {
-      data: [],
-    };
-    const userId = $.auth.data.userId;
-
-    const { data } = await $.http.get(`/gmail/v1/users/${userId}/threads`);
-
-    if (data.threads) {
-      for (const thread of data.threads) {
-        const { data: threadData } = await $.http.get(
-          `/gmail/v1/users/${userId}/threads/${thread.id}`
-        );
-        const subject = threadData.messages[0].payload.headers.find(
-          (header) => header.name === 'Subject'
-        );
-
-        threads.data.push({
-          value: thread.id,
-          name: subject?.value,
-        });
-      }
-    }
-
-    return threads;
-  },
-};

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

@@ -1,22 +0,0 @@
-import defineApp from '../../helpers/define-app.js';
-import addAuthHeader from './common/add-auth-header.js';
-import auth from './auth/index.js';
-import triggers from './triggers/index.js';
-import dynamicData from './dynamic-data/index.js';
-import actions from './actions/index.js';
-
-export default defineApp({
-  name: 'Gmail',
-  key: 'gmail',
-  baseUrl: 'https://mail.google.com',
-  apiBaseUrl: 'https://gmail.googleapis.com',
-  iconUrl: '{BASE_URL}/apps/gmail/assets/favicon.svg',
-  authDocUrl: 'https://automatisch.io/docs/apps/gmail/connection',
-  primaryColor: 'ea4335',
-  supportsConnections: true,
-  beforeRequest: [addAuthHeader],
-  auth,
-  triggers,
-  dynamicData,
-  actions,
-});

packages/backend/src/apps/gmail/triggers/index.js

@@ -1,3 +0,0 @@
-import newEmails from './new-emails/index.js';
-
-export default [newEmails];

packages/backend/src/apps/gmail/triggers/new-emails/index.js

@@ -1,68 +0,0 @@
-import defineTrigger from '../../../../helpers/define-trigger.js';
-
-export default defineTrigger({
-  name: 'New emails',
-  key: 'newEmails',
-  pollInterval: 15,
-  description:
-    'Triggers when a new email is received in the specified mailbox.',
-  arguments: [
-    {
-      label: 'Label',
-      key: 'labelId',
-      type: 'dropdown',
-      required: false,
-      description:
-        "If you don't choose a label, this Zap will trigger for all emails, including Drafts.",
-      variables: true,
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listLabels',
-          },
-        ],
-      },
-    },
-  ],
-
-  async run($) {
-    const userId = $.auth.data.userId;
-    const labelId = $.step.parameters.labelId;
-
-    const params = {
-      maxResults: 500,
-      pageToken: undefined,
-    };
-
-    if (labelId) {
-      params.labelIds = labelId;
-    }
-
-    do {
-      const { data } = await $.http.get(`/gmail/v1/users/${userId}/messages`, {
-        params,
-      });
-      params.pageToken = data.nextPageToken;
-
-      if (!data?.messages?.length) {
-        return;
-      }
-
-      for (const message of data.messages) {
-        const { data: messageData } = await $.http.get(
-          `/gmail/v1/users/${userId}/messages/${message.id}`
-        );
-
-        $.pushTriggerItem({
-          raw: messageData,
-          meta: {
-            internalId: messageData.id,
-          },
-        });
-      }
-    } while (params.pageToken);
-  },
-});

packages/backend/src/apps/http-request/actions/custom-request/index.js

@@ -90,7 +90,7 @@ export default defineAction({
 
   async run($) {
     const method = $.step.parameters.method;
-    const data = $.step.parameters.data || null;
+    const data = $.step.parameters.data;
     const url = $.step.parameters.url;
     const headers = $.step.parameters.headers;
 
@@ -108,17 +108,14 @@ export default defineAction({
       return result;
     }, {});
 
-    let expectedResponseContentType = headersObject.accept;
+    let contentType = headersObject['content-type'];
 
     // in case HEAD request is not supported by the URL
     try {
       const metadataResponse = await $.http.head(url, {
         headers: headersObject,
       });
-
+      contentType = metadataResponse.headers['content-type'];
-      if (!expectedResponseContentType) {
-        expectedResponseContentType = metadataResponse.headers['content-type'];
-      }
 
       throwIfFileSizeExceedsLimit(metadataResponse.headers['content-length']);
       // eslint-disable-next-line no-empty
@@ -131,7 +128,7 @@ export default defineAction({
       headers: headersObject,
     };
 
-    if (!isPossiblyTextBased(expectedResponseContentType)) {
+    if (!isPossiblyTextBased(contentType)) {
       requestData.responseType = 'arraybuffer';
     }
 
@@ -141,7 +138,7 @@ export default defineAction({
 
     let responseData = response.data;
 
-    if (!isPossiblyTextBased(expectedResponseContentType)) {
+    if (!isPossiblyTextBased(contentType)) {
       responseData = Buffer.from(responseData).toString('base64');
     }
 

packages/backend/src/apps/pipedrive/actions/create-deal/index.js

@@ -64,17 +64,32 @@ export default defineAction({
       value: '1',
       description:
         'The ID of the stage this deal will be added to. If omitted, the deal will be placed in the first stage of the default pipeline.',
-      variables: true,
+      options: [
-      source: {
+        {
-        type: 'query',
+          label: 'Qualified (Pipeline)',
-        name: 'getDynamicData',
+          value: 1,
-        arguments: [
+        },
-          {
+        {
-            name: 'key',
+          label: 'Contact Made (Pipeline)',
-            value: 'listStages',
+          value: 2,
-          },
+        },
-        ],
+        {
-      },
+          label: 'Prospect Qualified (Pipeline)',
+          value: 3,
+        },
+        {
+          label: 'Needs Defined (Pipeline)',
+          value: 4,
+        },
+        {
+          label: 'Proposal Made (Pipeline)',
+          value: 5,
+        },
+        {
+          label: 'Negotiations Started (Pipeline)',
+          value: 6,
+        },
+      ],
     },
     {
       label: 'Owner',

packages/backend/src/apps/pipedrive/dynamic-data/index.js

@@ -1,25 +1,23 @@
 import listActivityTypes from './list-activity-types/index.js';
 import listCurrencies from './list-currencies/index.js';
 import listDeals from './list-deals/index.js';
-import listLeadLabels from './list-lead-labels/index.js';
 import listLeads from './list-leads/index.js';
-import listOrganizationLabelField from './list-organization-label-field/index.js';
+import listLeadLabels from './list-lead-labels/index.js';
 import listOrganizations from './list-organizations/index.js';
+import listOrganizationLabelField from './list-organization-label-field/index.js';
 import listPersonLabelField from './list-person-label-field/index.js';
 import listPersons from './list-persons/index.js';
-import listStages from './list-stages/index.js';
 import listUsers from './list-users/index.js';
 
 export default [
   listActivityTypes,
   listCurrencies,
   listDeals,
-  listLeadLabels,
   listLeads,
-  listOrganizationLabelField,
+  listLeadLabels,
   listOrganizations,
+  listOrganizationLabelField,
   listPersonLabelField,
   listPersons,
-  listStages,
   listUsers,
 ];

packages/backend/src/apps/pipedrive/dynamic-data/list-stages/index.js

@@ -1,23 +0,0 @@
-export default {
-  name: 'List stages',
-  key: 'listStages',
-
-  async run($) {
-    const stages = {
-      data: [],
-    };
-
-    const { data } = await $.http.get('/api/v1/stages');
-
-    if (data.data?.length) {
-      for (const stage of data.data) {
-        stages.data.push({
-          value: stage.id,
-          name: stage.name,
-        });
-      }
-    }
-
-    return stages;
-  },
-};

packages/backend/src/controllers/api/v1/access-tokens/create-access-token.js

@@ -1,13 +0,0 @@
-import User from '../../../../models/user.js';
-import { renderObject, renderError } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const { email, password } = request.body;
-  const token = await User.authenticate(email, password);
-
-  if (token) {
-    return renderObject(response, { token });
-  }
-
-  renderError(response, [{ general: ['Incorrect email or password.'] }]);
-};

packages/backend/src/controllers/api/v1/access-tokens/create-access-token.test.js

@@ -1,39 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-import { createUser } from '../../../../../test/factories/user';
-
-describe('POST /api/v1/access-tokens', () => {
-  beforeEach(async () => {
-    await createUser({
-      email: 'user@automatisch.io',
-      password: 'password',
-    });
-  });
-
-  it('should return the token data with correct credentials', async () => {
-    const response = await request(app)
-      .post('/api/v1/access-tokens')
-      .send({
-        email: 'user@automatisch.io',
-        password: 'password',
-      })
-      .expect(200);
-
-    expect(response.body.data.token.length).toBeGreaterThan(0);
-  });
-
-  it('should return error with incorrect credentials', async () => {
-    const response = await request(app)
-      .post('/api/v1/access-tokens')
-      .send({
-        email: 'incorrect@email.com',
-        password: 'incorrectpassword',
-      })
-      .expect(422);
-
-    expect(response.body.errors.general).toEqual([
-      'Incorrect email or password.',
-    ]);
-  });
-});

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

@@ -4,7 +4,6 @@ import AppAuthClient from '../../../../../models/app-auth-client.js';
 export default async (request, response) => {
   const appAuthClient = await AppAuthClient.query()
     .findById(request.params.appAuthClientId)
-    .where({ app_key: request.params.appKey })
     .throwIfNotFound();
 
   renderObject(response, appAuthClient);

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

@@ -0,0 +1,52 @@
+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/app-auth-clients/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/app-auth-clients/get-app-auth-clients.ee.js

@@ -2,9 +2,10 @@ import { renderObject } from '../../../../../helpers/renderer.js';
 import AppAuthClient from '../../../../../models/app-auth-client.js';
 
 export default async (request, response) => {
-  const appAuthClients = await AppAuthClient.query()
+  const appAuthClients = await AppAuthClient.query().orderBy(
-    .where({ app_key: request.params.appKey })
+    'created_at',
-    .orderBy('created_at', 'desc');
+    'desc'
+  );
 
   renderObject(response, appAuthClients);
 };

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

@@ -0,0 +1,41 @@
+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 getAdminAppAuthClientsMock from '../../../../../../test/mocks/rest/api/v1/admin/app-auth-clients/get-app-auth-clients.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', () => {
+  let currentUser, currentUserRole, 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 });
+
+      token = createAuthTokenByUserId(currentUser.id);
+    });
+
+    it('should return app auth clients', async () => {
+      const appAuthClientOne = await createAppAuthClient();
+      const appAuthClientTwo = await createAppAuthClient();
+
+      const response = await request(app)
+        .get('/api/v1/admin/app-auth-clients')
+        .set('Authorization', token)
+        .expect(200);
+
+      const expectedPayload = getAdminAppAuthClientsMock([
+        appAuthClientTwo,
+        appAuthClientOne,
+      ]);
+
+      expect(response.body).toEqual(expectedPayload);
+    });
+  });
+});

packages/backend/src/controllers/api/v1/admin/apps/get-auth-client.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.js';
-import { createUser } from '../../../../../../test/factories/user.js';
-import { createRole } from '../../../../../../test/factories/role.js';
-import getAppAuthClientMock from '../../../../../../test/mocks/rest/api/v1/admin/apps/get-auth-client.js';
-import { createAppAuthClient } from '../../../../../../test/factories/app-auth-client.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/apps/:appKey/auth-clients/:appAuthClientId', () => {
-  let currentUser, adminRole, currentAppAuthClient, token;
-
-  beforeEach(async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    adminRole = await createRole({ key: 'admin' });
-    currentUser = await createUser({ roleId: adminRole.id });
-
-    currentAppAuthClient = await createAppAuthClient({
-      appKey: 'deepl',
-    });
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return specified app auth client', async () => {
-    const response = await request(app)
-      .get(`/api/v1/admin/apps/deepl/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/admin/apps/deepl/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/apps/deepl/auth-clients/invalidAppAuthClientUUID')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

packages/backend/src/controllers/api/v1/admin/apps/get-auth-clients.ee.test.js

@@ -1,44 +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 { createRole } from '../../../../../../test/factories/role.js';
-import getAuthClientsMock from '../../../../../../test/mocks/rest/api/v1/admin/apps/get-auth-clients.js';
-import { createAppAuthClient } from '../../../../../../test/factories/app-auth-client.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/apps/:appKey/auth-clients', () => {
-  let currentUser, adminRole, token;
-
-  beforeEach(async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    adminRole = await createRole({ key: 'admin' });
-    currentUser = await createUser({ roleId: adminRole.id });
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return specified app auth client info', async () => {
-    const appAuthClientOne = await createAppAuthClient({
-      appKey: 'deepl',
-    });
-
-    const appAuthClientTwo = await createAppAuthClient({
-      appKey: 'deepl',
-    });
-
-    const response = await request(app)
-      .get('/api/v1/admin/apps/deepl/auth-clients')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAuthClientsMock([
-      appAuthClientTwo,
-      appAuthClientOne,
-    ]);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

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

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

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

@@ -4,27 +4,25 @@ 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/apps/get-auth-client.js';
+import getAppAuthClientMock from '../../../../../test/mocks/rest/api/v1/app-auth-clients/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/apps/:appKey/auth-clients/:appAuthClientId', () => {
+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({
+    currentAppAuthClient = await createAppAuthClient();
-      appKey: 'deepl',
-    });
 
     token = createAuthTokenByUserId(currentUser.id);
   });
 
-  it('should return specified app auth client', async () => {
+  it('should return specified app auth client info', async () => {
     const response = await request(app)
-      .get(`/api/v1/apps/deepl/auth-clients/${currentAppAuthClient.id}`)
+      .get(`/api/v1/app-auth-clients/${currentAppAuthClient.id}`)
       .set('Authorization', token)
       .expect(200);
 
@@ -36,14 +34,14 @@ describe('GET /api/v1/apps/:appKey/auth-clients/:appAuthClientId', () => {
     const notExistingAppAuthClientUUID = Crypto.randomUUID();
 
     await request(app)
-      .get(`/api/v1/apps/deepl/auth-clients/${notExistingAppAuthClientUUID}`)
+      .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/apps/deepl/auth-clients/invalidAppAuthClientUUID')
+      .get('/api/v1/app-auth-clients/invalidAppAuthClientUUID')
       .set('Authorization', token)
       .expect(400);
   });

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

@@ -3,7 +3,7 @@ import AppAuthClient from '../../../../models/app-auth-client.js';
 
 export default async (request, response) => {
   const appAuthClients = await AppAuthClient.query()
-    .where({ app_key: request.params.appKey, active: true })
+    .where({ active: true })
     .orderBy('created_at', 'desc');
 
   renderObject(response, appAuthClients);

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

@@ -3,11 +3,11 @@ 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 getAuthClientsMock from '../../../../../test/mocks/rest/api/v1/apps/get-auth-clients.js';
+import getAppAuthClientsMock from '../../../../../test/mocks/rest/api/v1/app-auth-clients/get-app-auth-clients.js';
 import { createAppAuthClient } from '../../../../../test/factories/app-auth-client.js';
 import * as license from '../../../../helpers/license.ee.js';
 
-describe('GET /api/v1/apps/:appKey/auth-clients', () => {
+describe('GET /api/v1/app-auth-clients', () => {
   let currentUser, token;
 
   beforeEach(async () => {
@@ -19,20 +19,15 @@ describe('GET /api/v1/apps/:appKey/auth-clients', () => {
   });
 
   it('should return specified app auth client info', async () => {
-    const appAuthClientOne = await createAppAuthClient({
+    const appAuthClientOne = await createAppAuthClient();
-      appKey: 'deepl',
+    const appAuthClientTwo = await createAppAuthClient();
-    });
-
-    const appAuthClientTwo = await createAppAuthClient({
-      appKey: 'deepl',
-    });
 
     const response = await request(app)
-      .get('/api/v1/apps/deepl/auth-clients')
+      .get('/api/v1/app-auth-clients')
       .set('Authorization', token)
       .expect(200);
 
-    const expectedPayload = getAuthClientsMock([
+    const expectedPayload = getAppAuthClientsMock([
       appAuthClientTwo,
       appAuthClientOne,
     ]);

packages/backend/src/controllers/api/v1/app-configs/get-app-config.ee.js

@@ -3,9 +3,6 @@ import AppConfig from '../../../../models/app-config.js';
 
 export default async (request, response) => {
   const appConfig = await AppConfig.query()
-    .withGraphFetched({
-      appAuthClients: true,
-    })
     .findOne({
       key: request.params.appKey,
     })

packages/backend/src/controllers/api/v1/app-configs/get-app-config.ee.test.js

@@ -3,11 +3,11 @@ 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 getAppConfigMock from '../../../../../test/mocks/rest/api/v1/apps/get-config.js';
+import getAppConfigMock from '../../../../../test/mocks/rest/api/v1/app-configs/get-app-config.js';
 import { createAppConfig } from '../../../../../test/factories/app-config.js';
 import * as license from '../../../../helpers/license.ee.js';
 
-describe('GET /api/v1/apps/:appKey/config', () => {
+describe('GET /api/v1/app-configs/:appKey', () => {
   let currentUser, appConfig, token;
 
   beforeEach(async () => {
@@ -27,7 +27,7 @@ describe('GET /api/v1/apps/:appKey/config', () => {
 
   it('should return specified app config info', async () => {
     const response = await request(app)
-      .get(`/api/v1/apps/${appConfig.key}/config`)
+      .get(`/api/v1/app-configs/${appConfig.key}`)
       .set('Authorization', token)
       .expect(200);
 
@@ -37,7 +37,7 @@ describe('GET /api/v1/apps/:appKey/config', () => {
 
   it('should return not found response for not existing app key', async () => {
     await request(app)
-      .get('/api/v1/apps/not-existing-app-key/config')
+      .get('/api/v1/app-configs/not-existing-app-key')
       .set('Authorization', token)
       .expect(404);
   });

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

@@ -1,24 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-import App from '../../../../models/app.js';
-
-export default async (request, response) => {
-  const app = await App.findOneByKey(request.params.appKey);
-
-  const connections = await request.currentUser.authorizedConnections
-    .clone()
-    .select('connections.*')
-    .withGraphFetched({
-      appConfig: true,
-      appAuthClient: true,
-    })
-    .fullOuterJoinRelated('steps')
-    .where({
-      'connections.key': app.key,
-      'connections.draft': false,
-    })
-    .countDistinct('steps.flow_id as flowCount')
-    .groupBy('connections.id')
-    .orderBy('created_at', 'desc');
-
-  renderObject(response, connections);
-};

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

@@ -1,101 +0,0 @@
-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.js';
-import { createUser } from '../../../../../test/factories/user.js';
-import { createConnection } from '../../../../../test/factories/connection.js';
-import { createPermission } from '../../../../../test/factories/permission.js';
-import getConnectionsMock from '../../../../../test/mocks/rest/api/v1/apps/get-connections.js';
-
-describe('GET /api/v1/apps/:appKey/connections', () => {
-  let currentUser, currentUserRole, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    currentUserRole = await currentUser.$relatedQuery('role');
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return the connections data of specified app for current user', async () => {
-    const currentUserConnectionOne = await createConnection({
-      userId: currentUser.id,
-      key: 'deepl',
-      draft: false,
-    });
-
-    const currentUserConnectionTwo = await createConnection({
-      userId: currentUser.id,
-      key: 'deepl',
-      draft: false,
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    const response = await request(app)
-      .get('/api/v1/apps/deepl/connections')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getConnectionsMock([
-      currentUserConnectionTwo,
-      currentUserConnectionOne,
-    ]);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return the connections data of specified app for another user', async () => {
-    const anotherUser = await createUser();
-
-    const anotherUserConnectionOne = await createConnection({
-      userId: anotherUser.id,
-      key: 'deepl',
-      draft: false,
-    });
-
-    const anotherUserConnectionTwo = await createConnection({
-      userId: anotherUser.id,
-      key: 'deepl',
-      draft: false,
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const response = await request(app)
-      .get('/api/v1/apps/deepl/connections')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getConnectionsMock([
-      anotherUserConnectionTwo,
-      anotherUserConnectionOne,
-    ]);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for invalid connection UUID', async () => {
-    await createPermission({
-      action: 'update',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    await request(app)
-      .get('/api/v1/connections/invalid-connection-id/connections')
-      .set('Authorization', token)
-      .expect(404);
-  });
-});

packages/backend/src/controllers/api/v1/connections/create-test.js

@@ -1,14 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  let connection = await request.currentUser.authorizedConnections
-    .clone()
-    .findOne({
-      id: request.params.connectionId,
-    })
-    .throwIfNotFound();
-
-  connection = await connection.testAndUpdateConnection();
-
-  renderObject(response, connection);
-};

packages/backend/src/controllers/api/v1/connections/create-test.test.js

@@ -1,123 +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.js';
-import { createUser } from '../../../../../test/factories/user.js';
-import { createConnection } from '../../../../../test/factories/connection.js';
-import { createPermission } from '../../../../../test/factories/permission.js';
-
-describe('POST /api/v1/connections/:connectionId/test', () => {
-  let currentUser, currentUserRole, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    currentUserRole = await currentUser.$relatedQuery('role');
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should update the connection as not verified for current user', async () => {
-    const currentUserConnection = await createConnection({
-      userId: currentUser.id,
-      key: 'deepl',
-      verified: true,
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    await createPermission({
-      action: 'update',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    const response = await request(app)
-      .post(`/api/v1/connections/${currentUserConnection.id}/test`)
-      .set('Authorization', token)
-      .expect(200);
-
-    expect(response.body.data.verified).toEqual(false);
-  });
-
-  it('should update the connection as not verified for another user', async () => {
-    const anotherUser = await createUser();
-
-    const anotherUserConnection = await createConnection({
-      userId: anotherUser.id,
-      key: 'deepl',
-      verified: true,
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    await createPermission({
-      action: 'update',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const response = await request(app)
-      .post(`/api/v1/connections/${anotherUserConnection.id}/test`)
-      .set('Authorization', token)
-      .expect(200);
-
-    expect(response.body.data.verified).toEqual(false);
-  });
-
-  it('should return not found response for not existing connection UUID', async () => {
-    const notExistingConnectionUUID = Crypto.randomUUID();
-
-    await createPermission({
-      action: 'read',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    await createPermission({
-      action: 'update',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    await request(app)
-      .post(`/api/v1/connections/${notExistingConnectionUUID}/test`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    await createPermission({
-      action: 'read',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    await createPermission({
-      action: 'update',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    await request(app)
-      .post('/api/v1/connections/invalidConnectionUUID/test')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

packages/backend/src/controllers/api/v1/steps/create-dynamic-data.js

@@ -1,18 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const step = await request.currentUser.authorizedSteps
-    .clone()
-    .where('steps.id', request.params.stepId)
-    .whereNotNull('steps.app_key')
-    .whereNotNull('steps.connection_id')
-    .first()
-    .throwIfNotFound();
-
-  const dynamicData = await step.createDynamicData(
-    request.body.dynamicDataKey,
-    request.body.parameters
-  );
-
-  renderObject(response, dynamicData);
-};

packages/backend/src/controllers/api/v1/steps/create-dynamic-data.test.js

@@ -1,244 +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 { createConnection } from '../../../../../test/factories/connection';
-import { createFlow } from '../../../../../test/factories/flow';
-import { createStep } from '../../../../../test/factories/step';
-import { createPermission } from '../../../../../test/factories/permission';
-import listRepos from '../../../../apps/github/dynamic-data/list-repos/index.js';
-import HttpError from '../../../../errors/http.js';
-
-describe('POST /api/v1/steps/:stepId/dynamic-data', () => {
-  let currentUser, currentUserRole, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    currentUserRole = await currentUser.$relatedQuery('role');
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  describe('should return dynamically created data', () => {
-    let repositories;
-
-    beforeEach(async () => {
-      repositories = [
-        {
-          value: 'automatisch/automatisch',
-          name: 'automatisch/automatisch',
-        },
-        {
-          value: 'automatisch/sample',
-          name: 'automatisch/sample',
-        },
-      ];
-
-      vi.spyOn(listRepos, 'run').mockImplementation(async () => {
-        return {
-          data: repositories,
-        };
-      });
-    });
-
-    it('of the current users step', async () => {
-      const currentUserFlow = await createFlow({ userId: currentUser.id });
-      const connection = await createConnection({ userId: currentUser.id });
-
-      const actionStep = await createStep({
-        flowId: currentUserFlow.id,
-        connectionId: connection.id,
-        type: 'action',
-        appKey: 'github',
-        key: 'createIssue',
-      });
-
-      await createPermission({
-        action: 'read',
-        subject: 'Flow',
-        roleId: currentUserRole.id,
-        conditions: ['isCreator'],
-      });
-
-      await createPermission({
-        action: 'update',
-        subject: 'Flow',
-        roleId: currentUserRole.id,
-        conditions: ['isCreator'],
-      });
-
-      const response = await request(app)
-        .post(`/api/v1/steps/${actionStep.id}/dynamic-data`)
-        .set('Authorization', token)
-        .send({
-          dynamicDataKey: 'listRepos',
-          parameters: {},
-        })
-        .expect(200);
-
-      expect(response.body.data).toEqual(repositories);
-    });
-
-    it('of the another users step', async () => {
-      const anotherUser = await createUser();
-      const anotherUserFlow = await createFlow({ userId: anotherUser.id });
-      const connection = await createConnection({ userId: anotherUser.id });
-
-      const actionStep = await createStep({
-        flowId: anotherUserFlow.id,
-        connectionId: connection.id,
-        type: 'action',
-        appKey: 'github',
-        key: 'createIssue',
-      });
-
-      await createPermission({
-        action: 'read',
-        subject: 'Flow',
-        roleId: currentUserRole.id,
-        conditions: [],
-      });
-
-      await createPermission({
-        action: 'update',
-        subject: 'Flow',
-        roleId: currentUserRole.id,
-        conditions: [],
-      });
-
-      const response = await request(app)
-        .post(`/api/v1/steps/${actionStep.id}/dynamic-data`)
-        .set('Authorization', token)
-        .send({
-          dynamicDataKey: 'listRepos',
-          parameters: {},
-        })
-        .expect(200);
-
-      expect(response.body.data).toEqual(repositories);
-    });
-  });
-
-  describe('should return error for dynamically created data', () => {
-    let errors;
-
-    beforeEach(async () => {
-      errors = {
-        message: 'Not Found',
-        documentation_url:
-          'https://docs.github.com/rest/users/users#get-a-user',
-      };
-
-      vi.spyOn(listRepos, 'run').mockImplementation(async () => {
-        throw new HttpError({ message: errors });
-      });
-    });
-
-    it('of the current users step', async () => {
-      const currentUserFlow = await createFlow({ userId: currentUser.id });
-      const connection = await createConnection({ userId: currentUser.id });
-
-      const actionStep = await createStep({
-        flowId: currentUserFlow.id,
-        connectionId: connection.id,
-        type: 'action',
-        appKey: 'github',
-        key: 'createIssue',
-      });
-
-      await createPermission({
-        action: 'read',
-        subject: 'Flow',
-        roleId: currentUserRole.id,
-        conditions: ['isCreator'],
-      });
-
-      await createPermission({
-        action: 'update',
-        subject: 'Flow',
-        roleId: currentUserRole.id,
-        conditions: ['isCreator'],
-      });
-
-      const response = await request(app)
-        .post(`/api/v1/steps/${actionStep.id}/dynamic-data`)
-        .set('Authorization', token)
-        .send({
-          dynamicDataKey: 'listRepos',
-          parameters: {},
-        })
-        .expect(200);
-
-      expect(response.body.errors).toEqual(errors);
-    });
-  });
-
-  it('should return not found response for not existing step UUID', async () => {
-    await createPermission({
-      action: 'update',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const notExistingStepUUID = Crypto.randomUUID();
-
-    await request(app)
-      .get(`/api/v1/steps/${notExistingStepUUID}/dynamic-data`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return not found response for existing step UUID without app key', async () => {
-    await createPermission({
-      action: 'update',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const step = await createStep({ appKey: null });
-
-    await request(app)
-      .get(`/api/v1/steps/${step.id}/dynamic-data`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    await createPermission({
-      action: 'update',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    await request(app)
-      .post('/api/v1/steps/invalidStepUUID/dynamic-fields')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

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

@@ -1,7 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const apps = await request.currentUser.getApps(request.query.name);
-
-  renderObject(response, apps, { serializer: 'App' });
-};

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

@@ -1,210 +0,0 @@
-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 { createRole } from '../../../../../test/factories/role';
-import { createUser } from '../../../../../test/factories/user';
-import { createPermission } from '../../../../../test/factories/permission.js';
-import { createFlow } from '../../../../../test/factories/flow.js';
-import { createStep } from '../../../../../test/factories/step.js';
-import { createConnection } from '../../../../../test/factories/connection.js';
-import getAppsMock from '../../../../../test/mocks/rest/api/v1/users/get-apps.js';
-
-describe('GET /api/v1/users/:userId/apps', () => {
-  let currentUser, currentUserRole, token;
-
-  beforeEach(async () => {
-    currentUserRole = await createRole();
-    currentUser = await createUser({ roleId: currentUserRole.id });
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return all apps of the current user', async () => {
-    await createPermission({
-      action: 'read',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    const flowOne = await createFlow({ userId: currentUser.id });
-
-    await createStep({
-      flowId: flowOne.id,
-      appKey: 'webhook',
-    });
-
-    const flowOneActionStepConnection = await createConnection({
-      userId: currentUser.id,
-      key: 'deepl',
-      draft: false,
-    });
-
-    await createStep({
-      connectionId: flowOneActionStepConnection.id,
-      flowId: flowOne.id,
-      appKey: 'deepl',
-    });
-
-    const flowTwo = await createFlow({ userId: currentUser.id });
-
-    const flowTwoTriggerStepConnection = await createConnection({
-      userId: currentUser.id,
-      key: 'github',
-      draft: false,
-    });
-
-    await createStep({
-      connectionId: flowTwoTriggerStepConnection.id,
-      flowId: flowTwo.id,
-      appKey: 'github',
-    });
-
-    await createStep({
-      flowId: flowTwo.id,
-      appKey: 'slack',
-    });
-
-    const response = await request(app)
-      .get(`/api/v1/users/${currentUser.id}/apps`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAppsMock();
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return all apps of the another user', async () => {
-    const anotherUser = await createUser();
-
-    await createPermission({
-      action: 'read',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: [],
-    });
-
-    const flowOne = await createFlow({ userId: anotherUser.id });
-
-    await createStep({
-      flowId: flowOne.id,
-      appKey: 'webhook',
-    });
-
-    const flowOneActionStepConnection = await createConnection({
-      userId: anotherUser.id,
-      key: 'deepl',
-      draft: false,
-    });
-
-    await createStep({
-      connectionId: flowOneActionStepConnection.id,
-      flowId: flowOne.id,
-      appKey: 'deepl',
-    });
-
-    const flowTwo = await createFlow({ userId: anotherUser.id });
-
-    const flowTwoTriggerStepConnection = await createConnection({
-      userId: anotherUser.id,
-      key: 'github',
-      draft: false,
-    });
-
-    await createStep({
-      connectionId: flowTwoTriggerStepConnection.id,
-      flowId: flowTwo.id,
-      appKey: 'github',
-    });
-
-    await createStep({
-      flowId: flowTwo.id,
-      appKey: 'slack',
-    });
-
-    const response = await request(app)
-      .get(`/api/v1/users/${currentUser.id}/apps`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAppsMock();
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return specified app of the current user', async () => {
-    await createPermission({
-      action: 'read',
-      subject: 'Flow',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'Connection',
-      roleId: currentUserRole.id,
-      conditions: ['isCreator'],
-    });
-
-    const flowOne = await createFlow({ userId: currentUser.id });
-
-    await createStep({
-      flowId: flowOne.id,
-      appKey: 'webhook',
-    });
-
-    const flowOneActionStepConnection = await createConnection({
-      userId: currentUser.id,
-      key: 'deepl',
-      draft: false,
-    });
-
-    await createStep({
-      connectionId: flowOneActionStepConnection.id,
-      flowId: flowOne.id,
-      appKey: 'deepl',
-    });
-
-    const flowTwo = await createFlow({ userId: currentUser.id });
-
-    const flowTwoTriggerStepConnection = await createConnection({
-      userId: currentUser.id,
-      key: 'github',
-      draft: false,
-    });
-
-    await createStep({
-      connectionId: flowTwoTriggerStepConnection.id,
-      flowId: flowTwo.id,
-      appKey: 'github',
-    });
-
-    await createStep({
-      flowId: flowTwo.id,
-      appKey: 'slack',
-    });
-
-    const response = await request(app)
-      .get(`/api/v1/users/${currentUser.id}/apps?name=deepl`)
-      .set('Authorization', token)
-      .expect(200);
-
-    expect(response.body.data.length).toEqual(1);
-    expect(response.body.data[0].key).toEqual('deepl');
-  });
-});

packages/backend/src/db/migrations/20240326194638_add_app_key_to_app_auth_clients.js

@@ -1,11 +0,0 @@
-export async function up(knex) {
-  await knex.schema.table('app_auth_clients', (table) => {
-    table.string('app_key');
-  });
-}
-
-export async function down(knex) {
-  await knex.schema.table('app_auth_clients', (table) => {
-    table.dropColumn('app_key');
-  });
-}

packages/backend/src/db/migrations/20240326195028_migrate_app_config_id_to_app_key.js

@@ -1,17 +0,0 @@
-export async function up(knex) {
-  const appAuthClients = await knex('app_auth_clients').select('*');
-
-  for (const appAuthClient of appAuthClients) {
-    const appConfig = await knex('app_configs')
-      .where('id', appAuthClient.app_config_id)
-      .first();
-
-    await knex('app_auth_clients')
-      .where('id', appAuthClient.id)
-      .update({ app_key: appConfig.key });
-  }
-}
-
-export async function down() {
-  // void
-}

packages/backend/src/db/migrations/20240326195748_remove_app_config_id_from_app_auth_clients.js

@@ -1,11 +0,0 @@
-export async function up(knex) {
-  await knex.schema.table('app_auth_clients', (table) => {
-    table.dropColumn('app_config_id');
-  });
-}
-
-export async function down(knex) {
-  await knex.schema.table('app_auth_clients', (table) => {
-    table.uuid('app_config_id').references('id').inTable('app_configs');
-  });
-}

packages/backend/src/db/migrations/20240326202110_add_not_nullable_to_app_key_of_app_auth_clients.js

@@ -1,11 +0,0 @@
-export async function up(knex) {
-  await knex.schema.table('app_auth_clients', (table) => {
-    table.string('app_key').notNullable().alter();
-  });
-}
-
-export async function down(knex) {
-  await knex.schema.table('app_auth_clients', (table) => {
-    table.string('app_key').nullable().alter();
-  });
-}

packages/backend/src/graphql/queries/get-app-auth-client.ee.js

@@ -0,0 +1,24 @@
+import AppAuthClient from '../../models/app-auth-client.js';
+
+const getAppAuthClient = async (_parent, params, context) => {
+  let canSeeAllClients = false;
+  try {
+    context.currentUser.can('read', 'App');
+
+    canSeeAllClients = true;
+  } catch {
+    // void
+  }
+
+  const appAuthClient = AppAuthClient.query()
+    .findById(params.id)
+    .throwIfNotFound();
+
+  if (!canSeeAllClients) {
+    appAuthClient.where({ active: true });
+  }
+
+  return await appAuthClient;
+};
+
+export default getAppAuthClient;

packages/backend/src/graphql/queries/get-app-auth-clients.ee.js

@@ -0,0 +1,33 @@
+import AppConfig from '../../models/app-config.js';
+
+const getAppAuthClients = async (_parent, params, context) => {
+  let canSeeAllClients = false;
+  try {
+    context.currentUser.can('read', 'App');
+
+    canSeeAllClients = true;
+  } catch {
+    // void
+  }
+
+  const appConfig = await AppConfig.query()
+    .findOne({
+      key: params.appKey,
+    })
+    .throwIfNotFound();
+
+  const appAuthClients = appConfig
+    .$relatedQuery('appAuthClients')
+    .where({ active: params.active })
+    .skipUndefined();
+
+  if (!canSeeAllClients) {
+    appAuthClients.where({
+      active: true,
+    });
+  }
+
+  return await appAuthClients;
+};
+
+export default getAppAuthClients;

packages/backend/src/graphql/queries/get-app.js

@@ -0,0 +1,41 @@
+import App from '../../models/app.js';
+import Connection from '../../models/connection.js';
+
+const getApp = async (_parent, params, context) => {
+  const conditions = context.currentUser.can('read', 'Connection');
+
+  const userConnections = context.currentUser.$relatedQuery('connections');
+  const allConnections = Connection.query();
+  const connectionBaseQuery = conditions.isCreator
+    ? userConnections
+    : allConnections;
+
+  const app = await App.findOneByKey(params.key);
+
+  if (context.currentUser) {
+    const connections = await connectionBaseQuery
+      .clone()
+      .select('connections.*')
+      .withGraphFetched({
+        appConfig: true,
+        appAuthClient: true,
+      })
+      .fullOuterJoinRelated('steps')
+      .where({
+        'connections.key': params.key,
+        'connections.draft': false,
+      })
+      .countDistinct('steps.flow_id as flowCount')
+      .groupBy('connections.id')
+      .orderBy('created_at', 'desc');
+
+    return {
+      ...app,
+      connections,
+    };
+  }
+
+  return app;
+};
+
+export default getApp;

packages/backend/src/graphql/queries/get-billing-and-usage.ee.js

@@ -0,0 +1,101 @@
+import { DateTime } from 'luxon';
+import Billing from '../../helpers/billing/index.ee.js';
+import ExecutionStep from '../../models/execution-step.js';
+
+const getBillingAndUsage = async (_parent, _params, context) => {
+  const persistedSubscription = await context.currentUser.$relatedQuery(
+    'currentSubscription'
+  );
+
+  const subscription = persistedSubscription
+    ? paidSubscription(persistedSubscription)
+    : freeTrialSubscription();
+
+  return {
+    subscription,
+    usage: {
+      task: executionStepCount(context),
+    },
+  };
+};
+
+const paidSubscription = (subscription) => {
+  const currentPlan = Billing.paddlePlans.find(
+    (plan) => plan.productId === subscription.paddlePlanId
+  );
+
+  return {
+    status: subscription.status,
+    monthlyQuota: {
+      title: currentPlan.limit,
+      action: {
+        type: 'link',
+        text: 'Cancel plan',
+        src: subscription.cancelUrl,
+      },
+    },
+    nextBillAmount: {
+      title: subscription.nextBillAmount
+        ? '€' + subscription.nextBillAmount
+        : '---',
+      action: {
+        type: 'link',
+        text: 'Update payment method',
+        src: subscription.updateUrl,
+      },
+    },
+    nextBillDate: {
+      title: subscription.nextBillDate ? subscription.nextBillDate : '---',
+      action: {
+        type: 'text',
+        text: '(monthly payment)',
+      },
+    },
+  };
+};
+
+const freeTrialSubscription = () => {
+  return {
+    status: null,
+    monthlyQuota: {
+      title: 'Free Trial',
+      action: {
+        type: 'link',
+        text: 'Upgrade plan',
+        src: '/settings/billing/upgrade',
+      },
+    },
+    nextBillAmount: {
+      title: '---',
+      action: null,
+    },
+    nextBillDate: {
+      title: '---',
+      action: null,
+    },
+  };
+};
+
+const executionIds = async (context) => {
+  return (
+    await context.currentUser
+      .$relatedQuery('executions')
+      .select('executions.id')
+  ).map((execution) => execution.id);
+};
+
+const executionStepCount = async (context) => {
+  const executionStepCount = await ExecutionStep.query()
+    .whereIn('execution_id', await executionIds(context))
+    .andWhere(
+      'created_at',
+      '>=',
+      DateTime.now().minus({ days: 30 }).toISODate()
+    )
+    .count()
+    .first();
+
+  return executionStepCount.count;
+};
+
+export default getBillingAndUsage;

packages/backend/src/graphql/queries/get-connected-apps.js

@@ -0,0 +1,67 @@
+import App from '../../models/app.js';
+import Flow from '../../models/flow.js';
+import Connection from '../../models/connection.js';
+
+const getConnectedApps = async (_parent, params, context) => {
+  const conditions = context.currentUser.can('read', 'Connection');
+
+  const userConnections = context.currentUser.$relatedQuery('connections');
+  const allConnections = Connection.query();
+  const connectionBaseQuery = conditions.isCreator
+    ? userConnections
+    : allConnections;
+
+  const userFlows = context.currentUser.$relatedQuery('flows');
+  const allFlows = Flow.query();
+  const flowBaseQuery = conditions.isCreator ? userFlows : allFlows;
+
+  let apps = await App.findAll(params.name);
+
+  const connections = await connectionBaseQuery
+    .clone()
+    .select('connections.key')
+    .where({ draft: false })
+    .count('connections.id as count')
+    .groupBy('connections.key');
+
+  const flows = await flowBaseQuery
+    .clone()
+    .withGraphJoined('steps')
+    .orderBy('created_at', 'desc');
+
+  const duplicatedUsedApps = flows
+    .map((flow) => flow.steps.map((step) => step.appKey))
+    .flat()
+    .filter(Boolean);
+
+  const connectionKeys = connections.map((connection) => connection.key);
+  const usedApps = [...new Set([...duplicatedUsedApps, ...connectionKeys])];
+
+  apps = apps
+    .filter((app) => {
+      return usedApps.includes(app.key);
+    })
+    .map((app) => {
+      const connection = connections.find(
+        (connection) => connection.key === app.key
+      );
+
+      app.connectionCount = connection?.count || 0;
+      app.flowCount = 0;
+
+      flows.forEach((flow) => {
+        const usedFlow = flow.steps.find((step) => step.appKey === app.key);
+
+        if (usedFlow) {
+          app.flowCount += 1;
+        }
+      });
+
+      return app;
+    })
+    .sort((appA, appB) => appA.name.localeCompare(appB.name));
+
+  return apps;
+};
+
+export default getConnectedApps;

packages/backend/src/graphql/queries/get-dynamic-data.js

@@ -0,0 +1,65 @@
+import App from '../../models/app.js';
+import Step from '../../models/step.js';
+import ExecutionStep from '../../models/execution-step.js';
+import globalVariable from '../../helpers/global-variable.js';
+import computeParameters from '../../helpers/compute-parameters.js';
+
+const getDynamicData = async (_parent, params, context) => {
+  const conditions = context.currentUser.can('update', 'Flow');
+  const userSteps = context.currentUser.$relatedQuery('steps');
+  const allSteps = Step.query();
+  const stepBaseQuery = conditions.isCreator ? userSteps : allSteps;
+
+  const step = await stepBaseQuery
+    .clone()
+    .withGraphFetched({
+      connection: true,
+      flow: true,
+    })
+    .findById(params.stepId);
+
+  if (!step) return null;
+
+  const connection = step.connection;
+
+  if (!connection || !step.appKey) return null;
+
+  const flow = step.flow;
+  const app = await App.findOneByKey(step.appKey);
+  const $ = await globalVariable({ connection, app, flow, step });
+
+  const command = app.dynamicData.find((data) => data.key === params.key);
+
+  // apply run-time parameters that're not persisted yet
+  for (const parameterKey in params.parameters) {
+    const parameterValue = params.parameters[parameterKey];
+    $.step.parameters[parameterKey] = parameterValue;
+  }
+
+  const lastExecution = await flow.$relatedQuery('lastExecution');
+  const lastExecutionId = lastExecution?.id;
+
+  const priorExecutionSteps = lastExecutionId
+    ? await ExecutionStep.query().where({
+        execution_id: lastExecutionId,
+      })
+    : [];
+
+  // compute variables in parameters
+  const computedParameters = computeParameters(
+    $.step.parameters,
+    priorExecutionSteps
+  );
+
+  $.step.parameters = computedParameters;
+
+  const fetchedData = await command.run($);
+
+  if (fetchedData.error) {
+    throw new Error(JSON.stringify(fetchedData.error));
+  }
+
+  return fetchedData.data;
+};
+
+export default getDynamicData;

packages/backend/src/graphql/queries/get-dynamic-fields.js

@@ -0,0 +1,40 @@
+import App from '../../models/app.js';
+import Step from '../../models/step.js';
+import globalVariable from '../../helpers/global-variable.js';
+
+const getDynamicFields = async (_parent, params, context) => {
+  const conditions = context.currentUser.can('update', 'Flow');
+  const userSteps = context.currentUser.$relatedQuery('steps');
+  const allSteps = Step.query();
+  const stepBaseQuery = conditions.isCreator ? userSteps : allSteps;
+
+  const step = await stepBaseQuery
+    .clone()
+    .withGraphFetched({
+      connection: true,
+      flow: true,
+    })
+    .findById(params.stepId);
+
+  if (!step) return null;
+
+  const connection = step.connection;
+
+  if (!step.appKey) return null;
+
+  const app = await App.findOneByKey(step.appKey);
+  const $ = await globalVariable({ connection, app, flow: step.flow, step });
+
+  const command = app.dynamicFields.find((data) => data.key === params.key);
+
+  for (const parameterKey in params.parameters) {
+    const parameterValue = params.parameters[parameterKey];
+    $.step.parameters[parameterKey] = parameterValue;
+  }
+
+  const additionalFields = (await command.run($)) || [];
+
+  return additionalFields;
+};
+
+export default getDynamicFields;

packages/backend/src/graphql/queries/get-flow.js

@@ -0,0 +1,19 @@
+import Flow from '../../models/flow.js';
+
+const getFlow = async (_parent, params, context) => {
+  const conditions = context.currentUser.can('read', 'Flow');
+  const userFlows = context.currentUser.$relatedQuery('flows');
+  const allFlows = Flow.query();
+  const baseQuery = conditions.isCreator ? userFlows : allFlows;
+
+  const flow = await baseQuery
+    .clone()
+    .withGraphJoined('[steps.[connection]]')
+    .orderBy('steps.position', 'asc')
+    .findOne({ 'flows.id': params.id })
+    .throwIfNotFound();
+
+  return flow;
+};
+
+export default getFlow;

packages/backend/src/graphql/queries/get-flow.test.js

@@ -0,0 +1,240 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import request from 'supertest';
+import app from '../../app';
+import appConfig from '../../config/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 { createFlow } from '../../../test/factories/flow';
+import { createStep } from '../../../test/factories/step';
+import { createConnection } from '../../../test/factories/connection';
+
+describe('graphQL getFlow query', () => {
+  const query = (flowId) => {
+    return `
+      query {
+        getFlow(id: "${flowId}") {
+          id
+          name
+          active
+          status
+          steps {
+            id
+            type
+            key
+            appKey
+            iconUrl
+            webhookUrl
+            status
+            position
+            connection {
+              id
+              verified
+              createdAt
+            }
+            parameters
+          }
+        }
+      }
+    `;
+  };
+
+  describe('and without permissions', () => {
+    it('should throw not authorized error', async () => {
+      const userWithoutPermissions = await createUser();
+      const token = createAuthTokenByUserId(userWithoutPermissions.id);
+      const flow = await createFlow();
+
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', token)
+        .send({ query: query(flow.id) })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not authorized!');
+    });
+  });
+
+  describe('and with correct permission', () => {
+    let currentUser, currentUserRole, currentUserFlow;
+
+    beforeEach(async () => {
+      currentUserRole = await createRole();
+      currentUser = await createUser({ roleId: currentUserRole.id });
+      currentUserFlow = await createFlow({ userId: currentUser.id });
+    });
+
+    describe('and with isCreator condition', () => {
+      it('should return executions data of the current user', async () => {
+        await createPermission({
+          action: 'read',
+          subject: 'Flow',
+          roleId: currentUserRole.id,
+          conditions: ['isCreator'],
+        });
+
+        const triggerStep = await createStep({
+          flowId: currentUserFlow.id,
+          type: 'trigger',
+          key: 'catchRawWebhook',
+          webhookPath: `/webhooks/flows/${currentUserFlow.id}`,
+        });
+
+        const actionConnection = await createConnection({
+          userId: currentUser.id,
+          formattedData: {
+            screenName: 'Test',
+            authenticationKey: 'test key',
+          },
+        });
+
+        const actionStep = await createStep({
+          flowId: currentUserFlow.id,
+          type: 'action',
+          connectionId: actionConnection.id,
+          key: 'translateText',
+        });
+
+        const token = createAuthTokenByUserId(currentUser.id);
+
+        const response = await request(app)
+          .post('/graphql')
+          .set('Authorization', token)
+          .send({ query: query(currentUserFlow.id) })
+          .expect(200);
+
+        const expectedResponsePayload = {
+          data: {
+            getFlow: {
+              active: currentUserFlow.active,
+              id: currentUserFlow.id,
+              name: currentUserFlow.name,
+              status: 'draft',
+              steps: [
+                {
+                  appKey: triggerStep.appKey,
+                  connection: null,
+                  iconUrl: `${appConfig.baseUrl}/apps/${triggerStep.appKey}/assets/favicon.svg`,
+                  id: triggerStep.id,
+                  key: 'catchRawWebhook',
+                  parameters: {},
+                  position: 1,
+                  status: triggerStep.status,
+                  type: 'trigger',
+                  webhookUrl: `${appConfig.baseUrl}/webhooks/flows/${currentUserFlow.id}`,
+                },
+                {
+                  appKey: actionStep.appKey,
+                  connection: {
+                    createdAt: actionConnection.createdAt.getTime().toString(),
+                    id: actionConnection.id,
+                    verified: actionConnection.verified,
+                  },
+                  iconUrl: `${appConfig.baseUrl}/apps/${actionStep.appKey}/assets/favicon.svg`,
+                  id: actionStep.id,
+                  key: 'translateText',
+                  parameters: {},
+                  position: 2,
+                  status: actionStep.status,
+                  type: 'action',
+                  webhookUrl: 'http://localhost:3000/null',
+                },
+              ],
+            },
+          },
+        };
+
+        expect(response.body).toEqual(expectedResponsePayload);
+      });
+    });
+
+    describe('and without isCreator condition', () => {
+      it('should return executions data of all users', async () => {
+        await createPermission({
+          action: 'read',
+          subject: 'Flow',
+          roleId: currentUserRole.id,
+          conditions: [],
+        });
+
+        const anotherUser = await createUser();
+        const anotherUserFlow = await createFlow({ userId: anotherUser.id });
+
+        const triggerStep = await createStep({
+          flowId: anotherUserFlow.id,
+          type: 'trigger',
+          key: 'catchRawWebhook',
+          webhookPath: `/webhooks/flows/${anotherUserFlow.id}`,
+        });
+
+        const actionConnection = await createConnection({
+          userId: anotherUser.id,
+          formattedData: {
+            screenName: 'Test',
+            authenticationKey: 'test key',
+          },
+        });
+
+        const actionStep = await createStep({
+          flowId: anotherUserFlow.id,
+          type: 'action',
+          connectionId: actionConnection.id,
+          key: 'translateText',
+        });
+
+        const token = createAuthTokenByUserId(currentUser.id);
+
+        const response = await request(app)
+          .post('/graphql')
+          .set('Authorization', token)
+          .send({ query: query(anotherUserFlow.id) })
+          .expect(200);
+
+        const expectedResponsePayload = {
+          data: {
+            getFlow: {
+              active: anotherUserFlow.active,
+              id: anotherUserFlow.id,
+              name: anotherUserFlow.name,
+              status: 'draft',
+              steps: [
+                {
+                  appKey: triggerStep.appKey,
+                  connection: null,
+                  iconUrl: `${appConfig.baseUrl}/apps/${triggerStep.appKey}/assets/favicon.svg`,
+                  id: triggerStep.id,
+                  key: 'catchRawWebhook',
+                  parameters: {},
+                  position: 1,
+                  status: triggerStep.status,
+                  type: 'trigger',
+                  webhookUrl: `${appConfig.baseUrl}/webhooks/flows/${anotherUserFlow.id}`,
+                },
+                {
+                  appKey: actionStep.appKey,
+                  connection: {
+                    createdAt: actionConnection.createdAt.getTime().toString(),
+                    id: actionConnection.id,
+                    verified: actionConnection.verified,
+                  },
+                  iconUrl: `${appConfig.baseUrl}/apps/${actionStep.appKey}/assets/favicon.svg`,
+                  id: actionStep.id,
+                  key: 'translateText',
+                  parameters: {},
+                  position: 2,
+                  status: actionStep.status,
+                  type: 'action',
+                  webhookUrl: 'http://localhost:3000/null',
+                },
+              ],
+            },
+          },
+        };
+
+        expect(response.body).toEqual(expectedResponsePayload);
+      });
+    });
+  });
+});

packages/backend/src/graphql/queries/get-step-with-test-executions.js

@@ -0,0 +1,34 @@
+import { ref } from 'objection';
+import ExecutionStep from '../../models/execution-step.js';
+import Step from '../../models/step.js';
+
+const getStepWithTestExecutions = async (_parent, params, context) => {
+  const conditions = context.currentUser.can('update', 'Flow');
+  const userSteps = context.currentUser.$relatedQuery('steps');
+  const allSteps = Step.query();
+  const stepBaseQuery = conditions.isCreator ? userSteps : allSteps;
+
+  const step = await stepBaseQuery
+    .clone()
+    .findOne({ 'steps.id': params.stepId })
+    .throwIfNotFound();
+
+  const previousStepsWithCurrentStep = await stepBaseQuery
+    .clone()
+    .withGraphJoined('executionSteps')
+    .where('flow_id', '=', step.flowId)
+    .andWhere('position', '<', step.position)
+    .andWhere(
+      'executionSteps.created_at',
+      '=',
+      ExecutionStep.query()
+        .max('created_at')
+        .where('step_id', '=', ref('steps.id'))
+        .andWhere('status', 'success')
+    )
+    .orderBy('steps.position', 'asc');
+
+  return previousStepsWithCurrentStep;
+};
+
+export default getStepWithTestExecutions;

packages/backend/src/graphql/queries/test-connection.js

@@ -0,0 +1,38 @@
+import App from '../../models/app.js';
+import Connection from '../../models/connection.js';
+import globalVariable from '../../helpers/global-variable.js';
+
+const testConnection = async (_parent, params, context) => {
+  const conditions = context.currentUser.can('update', 'Connection');
+  const userConnections = context.currentUser.$relatedQuery('connections');
+  const allConnections = Connection.query();
+  const connectionBaseQuery = conditions.isCreator
+    ? userConnections
+    : allConnections;
+
+  let connection = await connectionBaseQuery
+    .clone()
+    .findOne({
+      id: params.id,
+    })
+    .throwIfNotFound();
+
+  const app = await App.findOneByKey(connection.key, false);
+  const $ = await globalVariable({ connection, app });
+
+  let isStillVerified;
+  try {
+    isStillVerified = !!(await app.auth.isStillVerified($));
+  } catch {
+    isStillVerified = false;
+  }
+
+  connection = await connection.$query().patchAndFetch({
+    formattedData: connection.formattedData,
+    verified: isStillVerified,
+  });
+
+  return connection;
+};
+
+export default testConnection;

packages/backend/src/graphql/query-resolvers.js

@@ -0,0 +1,25 @@
+import getApp from './queries/get-app.js';
+import getAppAuthClient from './queries/get-app-auth-client.ee.js';
+import getAppAuthClients from './queries/get-app-auth-clients.ee.js';
+import getBillingAndUsage from './queries/get-billing-and-usage.ee.js';
+import getConnectedApps from './queries/get-connected-apps.js';
+import getDynamicData from './queries/get-dynamic-data.js';
+import getDynamicFields from './queries/get-dynamic-fields.js';
+import getFlow from './queries/get-flow.js';
+import getStepWithTestExecutions from './queries/get-step-with-test-executions.js';
+import testConnection from './queries/test-connection.js';
+
+const queryResolvers = {
+  getApp,
+  getAppAuthClient,
+  getAppAuthClients,
+  getBillingAndUsage,
+  getConnectedApps,
+  getDynamicData,
+  getDynamicFields,
+  getFlow,
+  getStepWithTestExecutions,
+  testConnection,
+};
+
+export default queryResolvers;

packages/backend/src/graphql/resolvers.js

@@ -1,6 +1,8 @@
 import mutationResolvers from './mutation-resolvers.js';
+import queryResolvers from './query-resolvers.js';
 
 const resolvers = {
+  Query: queryResolvers,
   Mutation: mutationResolvers,
 };
 

packages/backend/src/graphql/schema.graphql

@@ -1,6 +1,24 @@
 type Query {
-  placeholderQuery(name: String): Boolean
+  getApp(key: String!): App
+  getAppAuthClient(id: String!): AppAuthClient
+  getAppAuthClients(appKey: String!, active: Boolean): [AppAuthClient]
+  getConnectedApps(name: String): [App]
+  testConnection(id: String!): Connection
+  getFlow(id: String!): Flow
+  getStepWithTestExecutions(stepId: String!): [Step]
+  getDynamicData(
+    stepId: String!
+    key: String!
+    parameters: JSONObject
+  ): JSONObject
+  getDynamicFields(
+    stepId: String!
+    key: String!
+    parameters: JSONObject
+  ): [SubstepArgument]
+  getBillingAndUsage: GetBillingAndUsage
 }
+
 type Mutation {
   createAppConfig(input: CreateAppConfigInput): AppConfig
   createAppAuthClient(input: CreateAppAuthClientInput): AppAuthClient
@@ -550,6 +568,43 @@ type License {
   verified: Boolean
 }
 
+type GetBillingAndUsage {
+  subscription: Subscription
+  usage: Usage
+}
+
+type MonthlyQuota {
+  title: String
+  action: BillingCardAction
+}
+
+type NextBillAmount {
+  title: String
+  action: BillingCardAction
+}
+
+type NextBillDate {
+  title: String
+  action: BillingCardAction
+}
+
+type BillingCardAction {
+  type: String
+  text: String
+  src: String
+}
+
+type Subscription {
+  status: String
+  monthlyQuota: MonthlyQuota
+  nextBillAmount: NextBillAmount
+  nextBillDate: NextBillDate
+}
+
+type Usage {
+  task: Int
+}
+
 type Permission {
   id: String
   action: String

packages/backend/src/helpers/authentication.js

@@ -40,6 +40,9 @@ export const authenticateUser = async (request, response, next) => {
 const isAuthenticatedRule = rule()(isAuthenticated);
 
 export const authenticationRules = {
+  Query: {
+    '*': isAuthenticatedRule,
+  },
   Mutation: {
     '*': isAuthenticatedRule,
     forgotPassword: allow,

packages/backend/src/helpers/authentication.test.js

@@ -42,21 +42,19 @@ describe('authentication rules', () => {
 
   const { queries, mutations } = getQueryAndMutationNames(authenticationRules);
 
-  if (queries.length) {
+  describe('for queries', () => {
-    describe('for queries', () => {
+    queries.forEach((query) => {
-      queries.forEach((query) => {
+      it(`should apply correct rule for query: ${query}`, () => {
-        it(`should apply correct rule for query: ${query}`, () => {
+        const ruleApplied = authenticationRules.Query[query];
-          const ruleApplied = authenticationRules.Query[query];
 
-          if (query === '*') {
+        if (query === '*') {
-            expect(ruleApplied.func).toBe(isAuthenticated);
+          expect(ruleApplied.func).toBe(isAuthenticated);
-          } else {
+        } else {
-            expect(ruleApplied).toEqual(allow);
+          expect(ruleApplied).toEqual(allow);
-          }
+        }
-        });
       });
     });
-  }
+  });
 
   describe('for mutations', () => {
     mutations.forEach((mutation) => {

packages/backend/src/helpers/authorization.js

@@ -7,10 +7,6 @@ const authorizationList = {
     action: 'read',
     subject: 'User',
   },
-  'GET /api/v1/users/:userId/apps': {
-    action: 'read',
-    subject: 'Connection',
-  },
   'GET /api/v1/flows/:flowId': {
     action: 'read',
     subject: 'Flow',
@@ -31,26 +27,14 @@ const authorizationList = {
     action: 'update',
     subject: 'Flow',
   },
-  'POST /api/v1/steps/:stepId/dynamic-data': {
-    action: 'update',
-    subject: 'Flow',
-  },
   'GET /api/v1/connections/:connectionId/flows': {
     action: 'read',
     subject: 'Flow',
   },
-  'POST /api/v1/connections/:connectionId/test': {
-    action: 'update',
-    subject: 'Connection',
-  },
   'GET /api/v1/apps/:appKey/flows': {
     action: 'read',
     subject: 'Flow',
   },
-  'GET /api/v1/apps/:appKey/connections': {
-    action: 'read',
-    subject: 'Connection',
-  },
   'GET /api/v1/executions/:executionId': {
     action: 'read',
     subject: 'Execution',

packages/backend/src/helpers/axios-with-proxy.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 import { HttpProxyAgent } from 'http-proxy-agent';
 
-const config = axios.defaults;
+const config = {};
 const httpProxyUrl = process.env.http_proxy;
 const httpsProxyUrl = process.env.https_proxy;
 const supportsProxy = httpProxyUrl || httpsProxyUrl;

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

@@ -2,7 +2,6 @@ import logger from './logger.js';
 import objection from 'objection';
 import * as Sentry from './sentry.ee.js';
 const { NotFoundError, DataError } = objection;
-import HttpError from '../errors/http.js';
 
 // Do not remove `next` argument as the function signature will not fit for an error handler middleware
 // eslint-disable-next-line no-unused-vars
@@ -19,17 +18,6 @@ const errorHandler = (error, request, response, next) => {
     response.status(400).end();
   }
 
-  if (error instanceof HttpError) {
-    const httpErrorPayload = {
-      errors: JSON.parse(error.message),
-      meta: {
-        type: 'HttpError',
-      },
-    };
-
-    response.status(200).json(httpErrorPayload);
-  }
-
   const statusCode = error.statusCode || 500;
 
   logger.error(request.method + ' ' + request.url + ' ' + statusCode);
@@ -49,7 +37,7 @@ const errorHandler = (error, request, response, next) => {
 
 const notFoundAppError = (error) => {
   return (
-    error.message.includes('An application with the') &&
+    error.message.includes('An application with the') ||
     error.message.includes("key couldn't be found.")
   );
 };

packages/backend/src/helpers/morgan.js

@@ -9,7 +9,7 @@ const stream = {
 const registerGraphQLToken = () => {
   morgan.token('graphql-query', (req) => {
     if (req.body.query) {
-      return `\n GraphQL ${req.body.query}`;
+      return `GraphQL ${req.body.query}`;
     }
   });
 };
@@ -17,7 +17,7 @@ const registerGraphQLToken = () => {
 registerGraphQLToken();
 
 const morganMiddleware = morgan(
-  ':method :url :status :res[content-length] - :response-time ms :graphql-query',
+  ':method :url :status :res[content-length] - :response-time ms\n:graphql-query',
   { stream }
 );
 

packages/backend/src/helpers/renderer.js

@@ -44,22 +44,4 @@ const renderObject = (response, object, options) => {
   return response.json(computedPayload);
 };
 
-const renderError = (response, errors, status, type) => {
+export { renderObject };
-  const errorStatus = status || 422;
-  const errorType = type || 'ValidationError';
-
-  const payload = {
-    errors: errors.reduce((acc, error) => {
-      const key = Object.keys(error)[0];
-      acc[key] = error[key];
-      return acc;
-    }, {}),
-    meta: {
-      type: errorType,
-    },
-  };
-
-  return response.status(errorStatus).send(payload);
-};
-
-export { renderObject, renderError };

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

@@ -1,6 +1,7 @@
 import AES from 'crypto-js/aes.js';
 import enc from 'crypto-js/enc-utf8.js';
 import appConfig from '../config/app.js';
+import AppConfig from './app-config.js';
 import Base from './base.js';
 
 class AppAuthClient extends Base {
@@ -8,11 +9,11 @@ class AppAuthClient extends Base {
 
   static jsonSchema = {
     type: 'object',
-    required: ['name', 'appKey', 'formattedAuthDefaults'],
+    required: ['name', 'appConfigId', 'formattedAuthDefaults'],
 
     properties: {
       id: { type: 'string', format: 'uuid' },
-      appKey: { type: 'string' },
+      appConfigId: { type: 'string', format: 'uuid' },
       active: { type: 'boolean' },
       authDefaults: { type: ['string', 'null'] },
       formattedAuthDefaults: { type: 'object' },
@@ -21,6 +22,17 @@ class AppAuthClient extends Base {
     },
   };
 
+  static relationMappings = () => ({
+    appConfig: {
+      relation: Base.BelongsToOneRelation,
+      modelClass: AppConfig,
+      join: {
+        from: 'app_auth_clients.app_config_id',
+        to: 'app_configs.id',
+      },
+    },
+  });
+
   encryptData() {
     if (!this.eligibleForEncryption()) return;
 

packages/backend/src/models/app-config.js

@@ -1,6 +1,6 @@
 import App from './app.js';
-import AppAuthClient from './app-auth-client.js';
 import Base from './base.js';
+import AppAuthClient from './app-auth-client.js';
 
 class AppConfig extends Base {
   static tableName = 'app_configs';
@@ -18,21 +18,21 @@ class AppConfig extends Base {
     },
   };
 
+  static get virtualAttributes() {
+    return ['canConnect', 'canCustomConnect'];
+  }
+
   static relationMappings = () => ({
     appAuthClients: {
       relation: Base.HasManyRelation,
       modelClass: AppAuthClient,
       join: {
-        from: 'app_configs.key',
+        from: 'app_configs.id',
-        to: 'app_auth_clients.app_key',
+        to: 'app_auth_clients.app_config_id',
       },
     },
   });
 
-  static get virtualAttributes() {
-    return ['canConnect', 'canCustomConnect'];
-  }
-
   get canCustomConnect() {
     return !this.disabled && this.allowCustomConnection;
   }

packages/backend/src/models/connection.js

@@ -153,24 +153,6 @@ class Connection extends Base {
     return await App.findOneByKey(this.key);
   }
 
-  async testAndUpdateConnection() {
-    const app = await this.getApp();
-    const $ = await globalVariable({ connection: this, app });
-
-    let isStillVerified;
-
-    try {
-      isStillVerified = !!(await app.auth.isStillVerified($));
-    } catch {
-      isStillVerified = false;
-    }
-
-    return await this.$query().patchAndFetch({
-      formattedData: this.formattedData,
-      verified: isStillVerified,
-    });
-  }
-
   async verifyWebhook(request) {
     if (!this.key) return true;
 

packages/backend/src/models/flow.js

@@ -160,7 +160,7 @@ class Flow extends Base {
   }
 
   async isPaused() {
-    const user = await this.$relatedQuery('user').withSoftDeleted();
+    const user = await this.$relatedQuery('user');
     const allowedToRunFlows = await user.isAllowedToRunFlows();
     return allowedToRunFlows ? false : true;
   }

packages/backend/src/models/step.js

@@ -8,7 +8,6 @@ import ExecutionStep from './execution-step.js';
 import Telemetry from '../helpers/telemetry/index.js';
 import appConfig from '../config/app.js';
 import globalVariable from '../helpers/global-variable.js';
-import computeParameters from '../helpers/compute-parameters.js';
 
 class Step extends Base {
   static tableName = 'steps';
@@ -218,39 +217,6 @@ class Step extends Base {
     return dynamicFields;
   }
 
-  async createDynamicData(dynamicDataKey, parameters) {
-    const connection = await this.$relatedQuery('connection');
-    const flow = await this.$relatedQuery('flow');
-    const app = await this.getApp();
-    const $ = await globalVariable({ connection, app, flow, step: this });
-
-    const command = app.dynamicData.find((data) => data.key === dynamicDataKey);
-
-    for (const parameterKey in parameters) {
-      const parameterValue = parameters[parameterKey];
-      $.step.parameters[parameterKey] = parameterValue;
-    }
-
-    const lastExecution = await flow.$relatedQuery('lastExecution');
-    const lastExecutionId = lastExecution?.id;
-
-    const priorExecutionSteps = lastExecutionId
-      ? await ExecutionStep.query().where({
-          execution_id: lastExecutionId,
-        })
-      : [];
-
-    const computedParameters = computeParameters(
-      $.step.parameters,
-      priorExecutionSteps
-    );
-
-    $.step.parameters = computedParameters;
-    const dynamicData = (await command.run($)).data;
-
-    return dynamicData;
-  }
-
   async updateWebhookUrl() {
     if (this.isAction) return this;
 

packages/backend/src/models/user.js

@@ -5,9 +5,7 @@ import crypto from 'node:crypto';
 import appConfig from '../config/app.js';
 import { hasValidLicense } from '../helpers/license.ee.js';
 import userAbility from '../helpers/user-ability.js';
-import createAuthTokenByUserId from '../helpers/create-auth-token-by-user-id.js';
 import Base from './base.js';
-import App from './app.js';
 import Connection from './connection.js';
 import Execution from './execution.js';
 import Flow from './flow.js';
@@ -156,13 +154,6 @@ class User extends Base {
     return conditions.isCreator ? this.$relatedQuery('steps') : Step.query();
   }
 
-  get authorizedConnections() {
-    const conditions = this.can('read', 'Connection');
-    return conditions.isCreator
-      ? this.$relatedQuery('connections')
-      : Connection.query();
-  }
-
   get authorizedExecutions() {
     const conditions = this.can('read', 'Execution');
     return conditions.isCreator
@@ -170,17 +161,6 @@ class User extends Base {
       : Execution.query();
   }
 
-  static async authenticate(email, password) {
-    const user = await User.query().findOne({
-      email: email?.toLowerCase() || null,
-    });
-
-    if (user && (await user.login(password))) {
-      const token = createAuthTokenByUserId(user.id);
-      return token;
-    }
-  }
-
   login(password) {
     return bcrypt.compare(password, this.password);
   }
@@ -314,56 +294,6 @@ class User extends Base {
     return invoices;
   }
 
-  async getApps(name) {
-    const connections = await this.authorizedConnections
-      .clone()
-      .select('connections.key')
-      .where({ draft: false })
-      .count('connections.id as count')
-      .groupBy('connections.key');
-
-    const flows = await this.authorizedFlows
-      .clone()
-      .withGraphJoined('steps')
-      .orderBy('created_at', 'desc');
-
-    const duplicatedUsedApps = flows
-      .map((flow) => flow.steps.map((step) => step.appKey))
-      .flat()
-      .filter(Boolean);
-
-    const connectionKeys = connections.map((connection) => connection.key);
-    const usedApps = [...new Set([...duplicatedUsedApps, ...connectionKeys])];
-
-    let apps = await App.findAll(name);
-
-    apps = apps
-      .filter((app) => {
-        return usedApps.includes(app.key);
-      })
-      .map((app) => {
-        const connection = connections.find(
-          (connection) => connection.key === app.key
-        );
-
-        app.connectionCount = connection?.count || 0;
-        app.flowCount = 0;
-
-        flows.forEach((flow) => {
-          const usedFlow = flow.steps.find((step) => step.appKey === app.key);
-
-          if (usedFlow) {
-            app.flowCount += 1;
-          }
-        });
-
-        return app;
-      })
-      .sort((appA, appB) => appA.name.localeCompare(appB.name));
-
-    return apps;
-  }
-
   async $beforeInsert(queryContext) {
     await super.$beforeInsert(queryContext);
 

packages/backend/src/routes/api/v1/access-tokens.js

@@ -1,9 +0,0 @@
-import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
-import createAccessTokenAction from '../../../controllers/api/v1/access-tokens/create-access-token.js';
-
-const router = Router();
-
-router.post('/', asyncHandler(createAccessTokenAction));
-
-export default router;

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

@@ -3,25 +3,25 @@ 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 getAuthClientsAction from '../../../../controllers/api/v1/admin/apps/get-auth-clients.ee.js';
+import getAdminAppAuthClientsAction from '../../../../controllers/api/v1/admin/app-auth-clients/get-app-auth-clients.ee.js';
-import getAuthClientAction from '../../../../controllers/api/v1/admin/apps/get-auth-client.ee.js';
+import getAdminAppAuthClientAction from '../../../../controllers/api/v1/admin/app-auth-clients/get-app-auth-client.ee.js';
 
 const router = Router();
 
 router.get(
-  '/:appKey/auth-clients',
+  '/',
   authenticateUser,
   authorizeAdmin,
   checkIsEnterprise,
-  asyncHandler(getAuthClientsAction)
+  asyncHandler(getAdminAppAuthClientsAction)
 );
 
 router.get(
-  '/:appKey/auth-clients/:appAuthClientId',
+  '/:appAuthClientId',
   authenticateUser,
   authorizeAdmin,
   checkIsEnterprise,
-  asyncHandler(getAuthClientAction)
+  asyncHandler(getAdminAppAuthClientAction)
 );
 
 export default router;

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

@@ -0,0 +1,24 @@
+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';
+import getAppAuthClientsAction from '../../../controllers/api/v1/app-auth-clients/get-app-auth-clients.js';
+
+const router = Router();
+
+router.get(
+  '/',
+  authenticateUser,
+  checkIsEnterprise,
+  asyncHandler(getAppAuthClientsAction)
+);
+
+router.get(
+  '/:appAuthClientId',
+  authenticateUser,
+  checkIsEnterprise,
+  asyncHandler(getAppAuthClientAction)
+);
+
+export default router;

packages/backend/src/routes/api/v1/app-configs.ee.js

@@ -0,0 +1,16 @@
+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 getAppConfigAction from '../../../controllers/api/v1/app-configs/get-app-config.ee.js';
+
+const router = Router();
+
+router.get(
+  '/:appKey',
+  authenticateUser,
+  checkIsEnterprise,
+  asyncHandler(getAppConfigAction)
+);
+
+export default router;

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

@@ -2,14 +2,9 @@ import { Router } from 'express';
 import asyncHandler from 'express-async-handler';
 import { authenticateUser } from '../../../helpers/authentication.js';
 import { authorizeUser } from '../../../helpers/authorization.js';
-import { checkIsEnterprise } from '../../../helpers/check-is-enterprise.js';
 import getAppAction from '../../../controllers/api/v1/apps/get-app.js';
 import getAppsAction from '../../../controllers/api/v1/apps/get-apps.js';
 import getAuthAction from '../../../controllers/api/v1/apps/get-auth.js';
-import getConnectionsAction from '../../../controllers/api/v1/apps/get-connections.js';
-import getConfigAction from '../../../controllers/api/v1/apps/get-config.ee.js';
-import getAuthClientsAction from '../../../controllers/api/v1/apps/get-auth-clients.ee.js';
-import getAuthClientAction from '../../../controllers/api/v1/apps/get-auth-client.ee.js';
 import getTriggersAction from '../../../controllers/api/v1/apps/get-triggers.js';
 import getTriggerSubstepsAction from '../../../controllers/api/v1/apps/get-trigger-substeps.js';
 import getActionsAction from '../../../controllers/api/v1/apps/get-actions.js';
@@ -22,34 +17,6 @@ router.get('/', authenticateUser, asyncHandler(getAppsAction));
 router.get('/:appKey', authenticateUser, asyncHandler(getAppAction));
 router.get('/:appKey/auth', authenticateUser, asyncHandler(getAuthAction));
 
-router.get(
-  '/:appKey/connections',
-  authenticateUser,
-  authorizeUser,
-  asyncHandler(getConnectionsAction)
-);
-
-router.get(
-  '/:appKey/config',
-  authenticateUser,
-  checkIsEnterprise,
-  asyncHandler(getConfigAction)
-);
-
-router.get(
-  '/:appKey/auth-clients',
-  authenticateUser,
-  checkIsEnterprise,
-  asyncHandler(getAuthClientsAction)
-);
-
-router.get(
-  '/:appKey/auth-clients/:appAuthClientId',
-  authenticateUser,
-  checkIsEnterprise,
-  asyncHandler(getAuthClientAction)
-);
-
 router.get(
   '/:appKey/triggers',
   authenticateUser,

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

@@ -3,7 +3,6 @@ import asyncHandler from 'express-async-handler';
 import { authenticateUser } from '../../../helpers/authentication.js';
 import { authorizeUser } from '../../../helpers/authorization.js';
 import getFlowsAction from '../../../controllers/api/v1/connections/get-flows.js';
-import createTestAction from '../../../controllers/api/v1/connections/create-test.js';
 
 const router = Router();
 
@@ -14,11 +13,4 @@ router.get(
   asyncHandler(getFlowsAction)
 );
 
-router.post(
-  '/:connectionId/test',
-  authenticateUser,
-  authorizeUser,
-  asyncHandler(createTestAction)
-);
-
 export default router;

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

@@ -5,7 +5,6 @@ import { authorizeUser } from '../../../helpers/authorization.js';
 import getConnectionAction from '../../../controllers/api/v1/steps/get-connection.js';
 import getPreviousStepsAction from '../../../controllers/api/v1/steps/get-previous-steps.js';
 import createDynamicFieldsAction from '../../../controllers/api/v1/steps/create-dynamic-fields.js';
-import createDynamicDataAction from '../../../controllers/api/v1/steps/create-dynamic-data.js';
 
 const router = Router();
 
@@ -30,11 +29,4 @@ router.post(
   asyncHandler(createDynamicFieldsAction)
 );
 
-router.post(
-  '/:stepId/dynamic-data',
-  authenticateUser,
-  authorizeUser,
-  asyncHandler(createDynamicDataAction)
-);
-
 export default router;

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

@@ -1,11 +1,9 @@
 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 getUserTrialAction from '../../../controllers/api/v1/users/get-user-trial.ee.js';
-import getAppsAction from '../../../controllers/api/v1/users/get-apps.js';
 import getInvoicesAction from '../../../controllers/api/v1/users/get-invoices.ee.js';
 import getSubscriptionAction from '../../../controllers/api/v1/users/get-subscription.ee.js';
 import getPlanAndUsageAction from '../../../controllers/api/v1/users/get-plan-and-usage.ee.js';
@@ -13,14 +11,6 @@ import getPlanAndUsageAction from '../../../controllers/api/v1/users/get-plan-an
 const router = Router();
 
 router.get('/me', authenticateUser, asyncHandler(getCurrentUserAction));
-
-router.get(
-  '/:userId/apps',
-  authenticateUser,
-  authorizeUser,
-  asyncHandler(getAppsAction)
-);
-
 router.get(
   '/invoices',
   authenticateUser,

packages/backend/src/routes/index.js

@@ -4,20 +4,21 @@ import webhooksRouter from './webhooks.js';
 import paddleRouter from './paddle.ee.js';
 import healthcheckRouter from './healthcheck.js';
 import automatischRouter from './api/v1/automatisch.js';
-import accessTokensRouter from './api/v1/access-tokens.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 appConfigsRouter from './api/v1/app-configs.ee.js';
 import flowsRouter from './api/v1/flows.js';
 import stepsRouter from './api/v1/steps.js';
 import appsRouter from './api/v1/apps.js';
 import connectionsRouter from './api/v1/connections.js';
 import executionsRouter from './api/v1/executions.js';
 import samlAuthProvidersRouter from './api/v1/saml-auth-providers.ee.js';
-import adminAppsRouter from './api/v1/admin/apps.ee.js';
 import adminSamlAuthProvidersRouter 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.ee.js';
 
 const router = Router();
 
@@ -26,19 +27,20 @@ router.use('/webhooks', webhooksRouter);
 router.use('/paddle', paddleRouter);
 router.use('/healthcheck', healthcheckRouter);
 router.use('/api/v1/automatisch', automatischRouter);
-router.use('/api/v1/access-tokens', accessTokensRouter);
 router.use('/api/v1/users', usersRouter);
 router.use('/api/v1/payment', paymentRouter);
-router.use('/api/v1/apps', appsRouter);
+router.use('/api/v1/app-auth-clients', appAuthClientsRouter);
-router.use('/api/v1/connections', connectionsRouter);
+router.use('/api/v1/app-configs', appConfigsRouter);
 router.use('/api/v1/flows', flowsRouter);
 router.use('/api/v1/steps', stepsRouter);
+router.use('/api/v1/apps', appsRouter);
+router.use('/api/v1/connections', connectionsRouter);
 router.use('/api/v1/executions', executionsRouter);
 router.use('/api/v1/saml-auth-providers', samlAuthProvidersRouter);
-router.use('/api/v1/admin/apps', adminAppsRouter);
+router.use('/api/v1/admin/saml-auth-providers', adminSamlAuthProvidersRouter);
-router.use('/api/v1/admin/users', adminUsersRouter);
 router.use('/api/v1/admin/roles', rolesRouter);
 router.use('/api/v1/admin/permissions', permissionsRouter);
-router.use('/api/v1/admin/saml-auth-providers', adminSamlAuthProvidersRouter);
+router.use('/api/v1/admin/users', adminUsersRouter);
+router.use('/api/v1/admin/app-auth-clients', adminAppAuthClientsRouter);
 
 export default router;

packages/backend/src/serializers/app.js

@@ -1,22 +1,12 @@
 const appSerializer = (app) => {
-  let appData = {
+  return {
-    key: app.key,
     name: app.name,
+    key: app.key,
     iconUrl: app.iconUrl,
-    primaryColor: app.primaryColor,
     authDocUrl: app.authDocUrl,
     supportsConnections: app.supportsConnections,
+    primaryColor: app.primaryColor,
   };
-
-  if (app.connectionCount) {
-    appData.connectionCount = app.connectionCount;
-  }
-
-  if (app.flowCount) {
-    appData.flowCount = app.flowCount;
-  }
-
-  return appData;
 };
 
 export default appSerializer;

packages/backend/src/serializers/flow.js

@@ -6,8 +6,6 @@ const flowSerializer = (flow) => {
     name: flow.name,
     active: flow.active,
     status: flow.status,
-    createdAt: flow.createdAt.getTime(),
-    updatedAt: flow.updatedAt.getTime(),
   };
 
   if (flow.steps?.length > 0) {

packages/backend/src/serializers/flow.test.js

@@ -27,8 +27,6 @@ describe('flowSerializer', () => {
       name: flow.name,
       active: flow.active,
       status: flow.status,
-      createdAt: flow.createdAt.getTime(),
-      updatedAt: flow.updatedAt.getTime(),
     };
 
     expect(flowSerializer(flow)).toEqual(expectedPayload);

packages/backend/test/factories/app-auth-client.js

@@ -1,4 +1,5 @@
 import { faker } from '@faker-js/faker';
+import { createAppConfig } from './app-config.js';
 import AppAuthClient from '../../src/models/app-auth-client';
 
 const formattedAuthDefaults = {
@@ -11,7 +12,7 @@ const formattedAuthDefaults = {
 export const createAppAuthClient = async (params = {}) => {
   params.name = params?.name || faker.person.fullName();
   params.id = params?.id || faker.string.uuid();
-  params.appKey = params?.appKey || 'deepl';
+  params.appConfigId = params?.appConfigId || (await createAppConfig()).id;
   params.active = params?.active ?? true;
   params.formattedAuthDefaults =
     params?.formattedAuthDefaults || formattedAuthDefaults;

packages/backend/test/factories/step.js

@@ -19,8 +19,6 @@ export const createStep = async (params = {}) => {
   params.appKey =
     params?.appKey || (params.type === 'action' ? 'deepl' : 'webhook');
 
-  params.parameters = params?.parameters || {};
-
   const step = await Step.query().insertAndFetch(params);
 
   return step;

packages/backend/test/mocks/rest/api/v1/admin/app-auth-clients/get-app-auth-client.js

@@ -1,9 +1,9 @@
-const getAppAuthClientMock = (appAuthClient) => {
+const getAdminAppAuthClientMock = (appAuthClient) => {
   return {
     data: {
+      appConfigId: appAuthClient.appConfigId,
       name: appAuthClient.name,
       id: appAuthClient.id,
-      appConfigId: appAuthClient.appConfigId,
       active: appAuthClient.active,
     },
     meta: {
@@ -16,4 +16,4 @@ const getAppAuthClientMock = (appAuthClient) => {
   };
 };
 
-export default getAppAuthClientMock;
+export default getAdminAppAuthClientMock;

packages/backend/test/mocks/rest/api/v1/admin/app-auth-clients/get-app-auth-clients.js

@@ -1,6 +1,7 @@
 const getAdminAppAuthClientsMock = (appAuthClients) => {
   return {
     data: appAuthClients.map((appAuthClient) => ({
+      appConfigId: appAuthClient.appConfigId,
       name: appAuthClient.name,
       id: appAuthClient.id,
       active: appAuthClient.active,