feat: increase Snackbar z-index so it appears over chatbot icon

.github/workflows/docs-change.yml

@@ -1,32 +0,0 @@
-name: Automatisch Docs Change
-on:
-  pull_request:
-    paths:
-      - 'packages/docs/**'
-jobs:
-  label:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      - name: Label PR
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const { pull_request } = context.payload;
-
-            const label = 'documentation-change';
-            const hasLabel = pull_request.labels.some(({ name }) => name === label);
-
-            if (!hasLabel) {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pull_request.number,
-                labels: [label],
-              });
-
-              console.log(`Label "${label}" added to PR #${pull_request.number}`);
-            } else {
-              console.log(`Label "${label}" already exists on PR #${pull_request.number}`);
-            }

docker/Dockerfile

@@ -1,25 +1,14 @@
 # syntax=docker/dockerfile:1
 FROM node:18-alpine
-
-ENV PORT 3000
-
-RUN \
-  apk --no-cache add --virtual build-dependencies python3 build-base git
-
 WORKDIR /automatisch
 
-# copy the app, note .dockerignore
-COPY . /automatisch
-
-RUN yarn
-
-RUN cd packages/web && yarn build
-
 RUN \
+  apk --no-cache add --virtual build-dependencies python3 build-base && \
+  yarn global add @automatisch/cli@0.10.0 --network-timeout 1000000 && \
   rm -rf /usr/local/share/.cache/ && \
   apk del build-dependencies
 
-COPY ./docker/entrypoint.sh /entrypoint.sh
+COPY ./entrypoint.sh /entrypoint.sh
 
 EXPOSE 3000
 ENTRYPOINT ["sh", "/entrypoint.sh"]

docker/entrypoint.sh

@@ -2,12 +2,8 @@
 
 set -e
 
-cd packages/backend
-
 if [ -n "$WORKER" ]; then
-  yarn start:worker
+  automatisch start-worker
 else
-  yarn db:migrate
+  automatisch start
-  yarn db:seed:user
-  yarn start
 fi

packages/backend/package.json

@@ -31,7 +31,7 @@
     "accounting": "^0.4.1",
     "ajv-formats": "^2.1.1",
     "axios": "1.6.0",
-    "bcrypt": "^5.1.0",
+    "bcrypt": "^5.0.1",
     "bullmq": "^3.0.0",
     "cors": "^2.8.5",
     "crypto-js": "^4.1.1",
@@ -95,7 +95,6 @@
     "url": "https://github.com/automatisch/automatisch/issues"
   },
   "devDependencies": {
-    "node-gyp": "^10.1.0",
     "nodemon": "^2.0.13",
     "supertest": "^6.3.3",
     "vitest": "^1.1.3"

packages/backend/src/apps/azure-openai/index.js

@@ -11,7 +11,7 @@ export default defineApp({
     'https://azure.microsoft.com/en-us/products/ai-services/openai-service',
   apiBaseUrl: '',
   iconUrl: '{BASE_URL}/apps/azure-openai/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/azure-openai/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/azure-openai/connection',
   primaryColor: '000000',
   supportsConnections: true,
   beforeRequest: [setBaseUrl, addAuthHeader],

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

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'Carbone',
   key: 'carbone',
   iconUrl: '{BASE_URL}/apps/carbone/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/carbone/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/carbone/connection',
   supportsConnections: true,
   baseUrl: 'https://carbone.io',
   apiBaseUrl: 'https://api.carbone.io',

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

@@ -5,7 +5,7 @@ export default defineApp({
   name: 'Datastore',
   key: 'datastore',
   iconUrl: '{BASE_URL}/apps/datastore/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/datastore/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/datastore/connection',
   supportsConnections: false,
   baseUrl: '',
   apiBaseUrl: '',

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

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'DeepL',
   key: 'deepl',
   iconUrl: '{BASE_URL}/apps/deepl/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/deepl/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/deepl/connection',
   supportsConnections: true,
   baseUrl: 'https://deepl.com',
   apiBaseUrl: 'https://api.deepl.com',

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

@@ -5,7 +5,7 @@ export default defineApp({
   name: 'Delay',
   key: 'delay',
   iconUrl: '{BASE_URL}/apps/delay/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/delay/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/delay/connection',
   supportsConnections: false,
   baseUrl: '',
   apiBaseUrl: '',

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

@@ -10,7 +10,7 @@ export default defineApp({
   name: 'Discord',
   key: 'discord',
   iconUrl: '{BASE_URL}/apps/discord/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/discord/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/discord/connection',
   supportsConnections: true,
   baseUrl: 'https://discord.com',
   apiBaseUrl: 'https://discord.com/api',

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

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'Dropbox',
   key: 'dropbox',
   iconUrl: '{BASE_URL}/apps/dropbox/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/dropbox/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/dropbox/connection',
   supportsConnections: true,
   baseUrl: 'https://dropbox.com',
   apiBaseUrl: 'https://api.dropboxapi.com',

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

@@ -5,7 +5,7 @@ export default defineApp({
   name: 'Filter',
   key: 'filter',
   iconUrl: '{BASE_URL}/apps/filter/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/filter/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/filter/connection',
   supportsConnections: false,
   baseUrl: '',
   apiBaseUrl: '',

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

@@ -8,7 +8,7 @@ export default defineApp({
   name: 'Flickr',
   key: 'flickr',
   iconUrl: '{BASE_URL}/apps/flickr/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/flickr/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/flickr/connection',
   docUrl: 'https://automatisch.io/docs/flickr',
   primaryColor: '000000',
   supportsConnections: true,

packages/backend/src/apps/flowers-software/index.js

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'Flowers Software',
   key: 'flowers-software',
   iconUrl: '{BASE_URL}/apps/flowers-software/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/flowers-software/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/flowers-software/connection',
   supportsConnections: true,
   baseUrl: 'https://flowers-software.com',
   apiBaseUrl: 'https://webapp.flowers-software.com/api',

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

@@ -6,7 +6,7 @@ export default defineApp({
   name: 'Formatter',
   key: 'formatter',
   iconUrl: '{BASE_URL}/apps/formatter/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/formatter/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/formatter/connection',
   supportsConnections: false,
   baseUrl: '',
   apiBaseUrl: '',

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

@@ -10,7 +10,7 @@ export default defineApp({
   baseUrl: 'https://ghost.org',
   apiBaseUrl: '',
   iconUrl: '{BASE_URL}/apps/ghost/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/ghost/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/ghost/connection',
   primaryColor: '15171A',
   supportsConnections: true,
   beforeRequest: [setBaseUrl, addAuthHeader],

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

@@ -11,7 +11,7 @@ export default defineApp({
   baseUrl: 'https://github.com',
   apiBaseUrl: 'https://api.github.com',
   iconUrl: '{BASE_URL}/apps/github/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/github/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/github/connection',
   primaryColor: '000000',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

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

@@ -11,7 +11,7 @@ export default defineApp({
   baseUrl: 'https://gitlab.com',
   apiBaseUrl: 'https://gitlab.com',
   iconUrl: '{BASE_URL}/apps/gitlab/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/gitlab/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/gitlab/connection',
   primaryColor: 'FC6D26',
   supportsConnections: true,
   beforeRequest: [setBaseUrl, addAuthHeader],

packages/backend/src/apps/google-calendar/index.js

@@ -10,7 +10,7 @@ export default defineApp({
   baseUrl: 'https://calendar.google.com',
   apiBaseUrl: 'https://www.googleapis.com/calendar',
   iconUrl: '{BASE_URL}/apps/google-calendar/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/google-calendar/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/google-calendar/connection',
   primaryColor: '448AFF',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

packages/backend/src/apps/google-drive/index.js

@@ -10,7 +10,7 @@ export default defineApp({
   baseUrl: 'https://drive.google.com',
   apiBaseUrl: 'https://www.googleapis.com/drive',
   iconUrl: '{BASE_URL}/apps/google-drive/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/google-drive/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/google-drive/connection',
   primaryColor: '1FA463',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

packages/backend/src/apps/google-forms/index.js

@@ -10,7 +10,7 @@ export default defineApp({
   baseUrl: 'https://docs.google.com/forms',
   apiBaseUrl: 'https://forms.googleapis.com',
   iconUrl: '{BASE_URL}/apps/google-forms/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/google-forms/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/google-forms/connection',
   primaryColor: '673AB7',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

packages/backend/src/apps/google-sheets/index.js

@@ -12,7 +12,7 @@ export default defineApp({
   baseUrl: 'https://docs.google.com/spreadsheets',
   apiBaseUrl: 'https://sheets.googleapis.com',
   iconUrl: '{BASE_URL}/apps/google-sheets/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/google-sheets/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/google-sheets/connection',
   primaryColor: '0F9D58',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

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

@@ -10,7 +10,7 @@ export default defineApp({
   baseUrl: 'https://tryhelix.ai',
   apiBaseUrl: 'https://app.tryhelix.ai',
   iconUrl: '{BASE_URL}/apps/helix/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/helix/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/helix/connection',
   primaryColor: '000000',
   supportsConnections: true,
   beforeRequest: [setBaseUrl, addAuthHeader],

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/http-request/index.js

@@ -5,7 +5,7 @@ export default defineApp({
   name: 'HTTP Request',
   key: 'http-request',
   iconUrl: '{BASE_URL}/apps/http-request/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/http-request/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/http-request/connection',
   supportsConnections: false,
   baseUrl: '',
   apiBaseUrl: '',

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

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'HubSpot',
   key: 'hubspot',
   iconUrl: '{BASE_URL}/apps/hubspot/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/hubspot/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/hubspot/connection',
   supportsConnections: true,
   baseUrl: 'https://www.hubspot.com',
   apiBaseUrl: 'https://api.hubapi.com',

packages/backend/src/apps/invoice-ninja/index.js

@@ -12,7 +12,7 @@ export default defineApp({
   baseUrl: 'https://invoiceninja.com',
   apiBaseUrl: 'https://invoicing.co/api',
   iconUrl: '{BASE_URL}/apps/invoice-ninja/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/invoice-ninja/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/invoice-ninja/connection',
   primaryColor: '000000',
   supportsConnections: true,
   beforeRequest: [setBaseUrl, addAuthHeader],

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

@@ -10,7 +10,7 @@ export default defineApp({
   name: 'Mattermost',
   key: 'mattermost',
   iconUrl: '{BASE_URL}/apps/mattermost/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/mattermost/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/mattermost/connection',
   baseUrl: 'https://mattermost.com',
   apiBaseUrl: '', // there is no cloud version of this app, user always need to provide address of own instance when creating connection
   primaryColor: '4a154b',

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

@@ -10,7 +10,7 @@ export default defineApp({
   baseUrl: 'https://miro.com',
   apiBaseUrl: 'https://api.miro.com',
   iconUrl: '{BASE_URL}/apps/miro/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/miro/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/miro/connection',
   primaryColor: 'F2CA02',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

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

@@ -12,7 +12,7 @@ export default defineApp({
   baseUrl: 'https://notion.com',
   apiBaseUrl: 'https://api.notion.com',
   iconUrl: '{BASE_URL}/apps/notion/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/notion/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/notion/connection',
   primaryColor: '000000',
   supportsConnections: true,
   beforeRequest: [addAuthHeader, addNotionVersionHeader],

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

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'Ntfy',
   key: 'ntfy',
   iconUrl: '{BASE_URL}/apps/ntfy/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/ntfy/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/ntfy/connection',
   supportsConnections: true,
   baseUrl: 'https://ntfy.sh',
   apiBaseUrl: 'https://ntfy.sh',

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

@@ -6,7 +6,7 @@ export default defineApp({
   name: 'Odoo',
   key: 'odoo',
   iconUrl: '{BASE_URL}/apps/odoo/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/odoo/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/odoo/connection',
   supportsConnections: true,
   baseUrl: 'https://odoo.com',
   apiBaseUrl: '',

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

@@ -10,7 +10,7 @@ export default defineApp({
   baseUrl: 'https://openai.com',
   apiBaseUrl: 'https://api.openai.com',
   iconUrl: '{BASE_URL}/apps/openai/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/openai/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/openai/connection',
   primaryColor: '000000',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

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/apps/pipedrive/index.js

@@ -12,7 +12,7 @@ export default defineApp({
   baseUrl: '',
   apiBaseUrl: '',
   iconUrl: '{BASE_URL}/apps/pipedrive/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/pipedrive/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/pipedrive/connection',
   primaryColor: 'FFFFFF',
   supportsConnections: true,
   beforeRequest: [setBaseUrl, addAuthHeader],

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

@@ -8,7 +8,7 @@ export default defineApp({
   name: 'Placetel',
   key: 'placetel',
   iconUrl: '{BASE_URL}/apps/placetel/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/placetel/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/placetel/connection',
   supportsConnections: true,
   baseUrl: 'https://placetel.de',
   apiBaseUrl: 'https://api.placetel.de',

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

@@ -6,7 +6,7 @@ export default defineApp({
   name: 'PostgreSQL',
   key: 'postgresql',
   iconUrl: '{BASE_URL}/apps/postgresql/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/postgresql/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/postgresql/connection',
   supportsConnections: true,
   baseUrl: '',
   apiBaseUrl: '',

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

@@ -9,7 +9,7 @@ export default defineApp({
   baseUrl: 'https://pushover.net',
   apiBaseUrl: 'https://api.pushover.net',
   iconUrl: '{BASE_URL}/apps/pushover/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/pushover/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/pushover/connection',
   primaryColor: '249DF1',
   supportsConnections: true,
   auth,

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

@@ -10,7 +10,7 @@ export default defineApp({
   baseUrl: 'https://www.reddit.com',
   apiBaseUrl: 'https://oauth.reddit.com',
   iconUrl: '{BASE_URL}/apps/reddit/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/reddit/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/reddit/connection',
   primaryColor: 'FF4500',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

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

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'Remove.bg',
   key: 'removebg',
   iconUrl: '{BASE_URL}/apps/removebg/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/removebg/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/removebg/connection',
   supportsConnections: true,
   baseUrl: 'https://www.remove.bg',
   apiBaseUrl: 'https://api.remove.bg/v1.0',

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

@@ -5,7 +5,7 @@ export default defineApp({
   name: 'RSS',
   key: 'rss',
   iconUrl: '{BASE_URL}/apps/rss/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/rss/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/rss/connection',
   supportsConnections: false,
   baseUrl: '',
   apiBaseUrl: '',

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

@@ -9,7 +9,7 @@ export default defineApp({
   name: 'Salesforce',
   key: 'salesforce',
   iconUrl: '{BASE_URL}/apps/salesforce/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/connections/salesforce',
+  authDocUrl: 'https://automatisch.io/docs/connections/salesforce',
   supportsConnections: true,
   baseUrl: 'https://salesforce.com',
   apiBaseUrl: '',

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

@@ -6,7 +6,7 @@ export default defineApp({
   key: 'scheduler',
   iconUrl: '{BASE_URL}/apps/scheduler/assets/favicon.svg',
   docUrl: 'https://automatisch.io/docs/scheduler',
-  authDocUrl: '{DOCS_URL}/apps/scheduler/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/scheduler/connection',
   baseUrl: '',
   apiBaseUrl: '',
   primaryColor: '0059F7',

packages/backend/src/apps/self-hosted-llm/index.js

@@ -11,7 +11,7 @@ export default defineApp({
   baseUrl: '',
   apiBaseUrl: '',
   iconUrl: '{BASE_URL}/apps/self-hosted-llm/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/self-hosted-llm/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/self-hosted-llm/connection',
   primaryColor: '000000',
   supportsConnections: true,
   beforeRequest: [setBaseUrl, addAuthHeader],

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

@@ -9,7 +9,7 @@ export default defineApp({
   name: 'SignalWire',
   key: 'signalwire',
   iconUrl: '{BASE_URL}/apps/signalwire/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/signalwire/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/signalwire/connection',
   supportsConnections: true,
   baseUrl: 'https://signalwire.com',
   apiBaseUrl: '',

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

@@ -9,7 +9,7 @@ export default defineApp({
   name: 'Slack',
   key: 'slack',
   iconUrl: '{BASE_URL}/apps/slack/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/slack/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/slack/connection',
   supportsConnections: true,
   baseUrl: 'https://slack.com',
   apiBaseUrl: 'https://slack.com/api',

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

@@ -6,7 +6,7 @@ export default defineApp({
   name: 'SMTP',
   key: 'smtp',
   iconUrl: '{BASE_URL}/apps/smtp/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/smtp/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/smtp/connection',
   supportsConnections: true,
   baseUrl: '',
   apiBaseUrl: '',

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

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'Spotify',
   key: 'spotify',
   iconUrl: '{BASE_URL}/apps/spotify/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/spotify/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/spotify/connection',
   supportsConnections: true,
   baseUrl: 'https://spotify.com',
   apiBaseUrl: 'https://api.spotify.com',

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

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'Strava',
   key: 'strava',
   iconUrl: '{BASE_URL}/apps/strava/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/connections/strava',
+  authDocUrl: 'https://automatisch.io/docs/connections/strava',
   supportsConnections: true,
   baseUrl: 'https://www.strava.com',
   apiBaseUrl: 'https://www.strava.com/api',

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

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'Stripe',
   key: 'stripe',
   iconUrl: '{BASE_URL}/apps/stripe/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/stripe/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/stripe/connection',
   supportsConnections: true,
   baseUrl: 'https://stripe.com',
   apiBaseUrl: 'https://api.stripe.com',

packages/backend/src/apps/telegram-bot/index.js

@@ -7,7 +7,7 @@ export default defineApp({
   name: 'Telegram',
   key: 'telegram-bot',
   iconUrl: '{BASE_URL}/apps/telegram-bot/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/telegram-bot/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/telegram-bot/connection',
   supportsConnections: true,
   baseUrl: 'https://telegram.org',
   apiBaseUrl: 'https://api.telegram.org',

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

@@ -9,7 +9,7 @@ export default defineApp({
   name: 'Todoist',
   key: 'todoist',
   iconUrl: '{BASE_URL}/apps/todoist/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/todoist/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/todoist/connection',
   supportsConnections: true,
   baseUrl: 'https://todoist.com',
   apiBaseUrl: 'https://api.todoist.com/rest/v2',

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

@@ -10,7 +10,7 @@ export default defineApp({
   baseUrl: 'https://trello.com/',
   apiBaseUrl: 'https://api.trello.com',
   iconUrl: '{BASE_URL}/apps/trello/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/trello/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/trello/connection',
   supportsConnections: true,
   primaryColor: '0079bf',
   beforeRequest: [addAuthHeader],

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

@@ -9,7 +9,7 @@ export default defineApp({
   name: 'Twilio',
   key: 'twilio',
   iconUrl: '{BASE_URL}/apps/twilio/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/twilio/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/twilio/connection',
   supportsConnections: true,
   baseUrl: 'https://twilio.com',
   apiBaseUrl: 'https://api.twilio.com',

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

@@ -8,7 +8,7 @@ export default defineApp({
   name: 'Twitter',
   key: 'twitter',
   iconUrl: '{BASE_URL}/apps/twitter/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/twitter/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/twitter/connection',
   supportsConnections: true,
   baseUrl: 'https://twitter.com',
   apiBaseUrl: 'https://api.twitter.com',

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

@@ -8,7 +8,7 @@ export default defineApp({
   name: 'Typeform',
   key: 'typeform',
   iconUrl: '{BASE_URL}/apps/typeform/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/typeform/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/typeform/connection',
   supportsConnections: true,
   baseUrl: 'https://typeform.com',
   apiBaseUrl: 'https://api.typeform.com',

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

@@ -1,3 +0,0 @@
-import respondWith from './respond-with/index.js';
-
-export default [respondWith];

packages/backend/src/apps/webhook/actions/respond-with/index.js

@@ -1,69 +0,0 @@
-import defineAction from '../../../../helpers/define-action.js';
-
-export default defineAction({
-  name: 'Respond with',
-  key: 'respondWith',
-  description: 'Respond with defined JSON body.',
-  arguments: [
-    {
-      label: 'Status code',
-      key: 'statusCode',
-      type: 'string',
-      required: true,
-      variables: true,
-      value: '200',
-    },
-    {
-      label: 'Headers',
-      key: 'headers',
-      type: 'dynamic',
-      required: false,
-      description: 'Add or remove headers as needed',
-      fields: [
-        {
-          label: 'Key',
-          key: 'key',
-          type: 'string',
-          required: true,
-          description: 'Header key',
-          variables: true,
-        },
-        {
-          label: 'Value',
-          key: 'value',
-          type: 'string',
-          required: true,
-          description: 'Header value',
-          variables: true,
-        },
-      ],
-    },
-    {
-      label: 'Body',
-      key: 'body',
-      type: 'string',
-      required: true,
-      description: 'The content of the response body.',
-      variables: true,
-    },
-  ],
-
-  async run($) {
-    const statusCode = parseInt($.step.parameters.statusCode, 10);
-    const body = $.step.parameters.body;
-    const headers = $.step.parameters.headers.reduce((result, entry) => {
-      return {
-        ...result,
-        [entry.key]: entry.value,
-      };
-    }, {});
-
-    $.setActionItem({
-      raw: {
-        headers,
-        body,
-        statusCode,
-      },
-    });
-  },
-});

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

@@ -1,16 +1,14 @@
 import defineApp from '../../helpers/define-app.js';
-import actions from './actions/index.js';
 import triggers from './triggers/index.js';
 
 export default defineApp({
   name: 'Webhook',
   key: 'webhook',
   iconUrl: '{BASE_URL}/apps/webhook/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/webhook/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/webhook/connection',
   supportsConnections: false,
   baseUrl: '',
   apiBaseUrl: '',
   primaryColor: '0059F7',
-  actions,
   triggers,
 });

packages/backend/src/apps/webhook/triggers/catch-raw-webhook/index.js

@@ -7,20 +7,7 @@ export default defineTrigger({
   key: 'catchRawWebhook',
   type: 'webhook',
   showWebhookUrl: true,
-  description:
+  description: 'Triggers when the webhook receives a request.',
-    'Triggers (immediately if configured) when the webhook receives a request.',
-  arguments: [
-    {
-      label: 'Wait until flow is done',
-      key: 'workSynchronously',
-      type: 'dropdown',
-      required: true,
-      options: [
-        { label: 'Yes', value: true },
-        { label: 'No', value: false },
-      ],
-    },
-  ],
 
   async run($) {
     const dataItem = {

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

@@ -9,7 +9,7 @@ export default defineApp({
   name: 'WordPress',
   key: 'wordpress',
   iconUrl: '{BASE_URL}/apps/wordpress/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/wordpress/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/wordpress/connection',
   supportsConnections: true,
   baseUrl: 'https://wordpress.com',
   apiBaseUrl: '',

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

@@ -10,7 +10,7 @@ export default defineApp({
   baseUrl: 'https://go.xero.com',
   apiBaseUrl: 'https://api.xero.com',
   iconUrl: '{BASE_URL}/apps/xero/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/xero/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/xero/connection',
   primaryColor: '13B5EA',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

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

@@ -9,7 +9,7 @@ export default defineApp({
   baseUrl: 'https://www.youtube.com/',
   apiBaseUrl: 'https://www.googleapis.com/youtube',
   iconUrl: '{BASE_URL}/apps/youtube/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/youtube/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/youtube/connection',
   primaryColor: 'FF0000',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

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

@@ -11,7 +11,7 @@ export default defineApp({
   baseUrl: 'https://zendesk.com/',
   apiBaseUrl: '',
   iconUrl: '{BASE_URL}/apps/zendesk/assets/favicon.svg',
-  authDocUrl: '{DOCS_URL}/apps/zendesk/connection',
+  authDocUrl: 'https://automatisch.io/docs/apps/zendesk/connection',
   primaryColor: '17494d',
   supportsConnections: true,
   beforeRequest: [addAuthHeader],

packages/backend/src/config/app.js

@@ -38,9 +38,6 @@ if (process.env.WEB_APP_URL) {
 let webhookUrl = new URL(process.env.WEBHOOK_URL || apiUrl).toString();
 webhookUrl = webhookUrl.substring(0, webhookUrl.length - 1);
 
-const publicDocsUrl = 'https://automatisch.io/docs';
-const docsUrl = process.env.DOCS_URL || publicDocsUrl;
-
 const appEnv = process.env.APP_ENV || 'development';
 
 const appConfig = {
@@ -76,7 +73,6 @@ const appConfig = {
   baseUrl: apiUrl,
   webAppUrl,
   webhookUrl,
-  docsUrl,
   telemetryEnabled: process.env.TELEMETRY_ENABLED === 'false' ? false : true,
   requestBodySizeLimit: '1mb',
   smtpHost: process.env.SMTP_HOST,

packages/backend/src/config/cors-options.js

@@ -2,7 +2,7 @@ import appConfig from './app.js';
 
 const corsOptions = {
   origin: appConfig.webAppUrl,
-  methods: 'GET,HEAD,POST,DELETE',
+  methods: 'POST',
   credentials: true,
   optionsSuccessStatus: 200,
 };

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/access-tokens/revoke-access-token.js

@@ -1,15 +0,0 @@
-export default async (request, response) => {
-  const token = request.params.token;
-
-  const accessToken = await request.currentUser
-    .$relatedQuery('accessTokens')
-    .findOne({
-      token,
-      revoked_at: null,
-    })
-    .throwIfNotFound();
-
-  await accessToken.revoke();
-
-  response.status(204).send();
-};

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

@@ -1,54 +0,0 @@
-import { expect, describe, it, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user.js';
-import AccessToken from '../../../../models/access-token.js';
-
-describe('DELETE /api/v1/access-tokens/:token', () => {
-  let token;
-
-  beforeEach(async () => {
-    const currentUser = await createUser({
-      email: 'user@automatisch.io',
-      password: 'password',
-    });
-    token = await createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should respond with HTTP 204 with correct token', async () => {
-    await request(app)
-      .delete(`/api/v1/access-tokens/${token}`)
-      .set('Authorization', token)
-      .expect(204);
-
-    const revokedToken = await AccessToken.query().findOne({ token });
-
-    expect(revokedToken).toBeDefined();
-    expect(revokedToken.revokedAt).not.toBeNull();
-  });
-
-  it('should respond with HTTP 401 with incorrect credentials', async () => {
-    await request(app)
-      .delete(`/api/v1/access-tokens/${token}`)
-      .set('Authorization', 'wrong-token')
-      .expect(401);
-
-    const unrevokedToken = await AccessToken.query().findOne({ token });
-
-    expect(unrevokedToken).toBeDefined();
-    expect(unrevokedToken.revokedAt).toBeNull();
-  });
-
-  it('should respond with HTTP 404 with correct credentials, but non-valid token', async () => {
-    await request(app)
-      .delete('/api/v1/access-tokens/wrong-token')
-      .set('Authorization', token)
-      .expect(404);
-
-    const unrevokedToken = await AccessToken.query().findOne({ token });
-
-    expect(unrevokedToken).toBeDefined();
-    expect(unrevokedToken.revokedAt).toBeNull();
-  });
-});

packages/backend/src/controllers/api/v1/admin/app-auth-clients/get-app-auth-client.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.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/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/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 = await 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.js

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

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 = await 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/admin/permissions/get-permissions-catalog.ee.test.js

@@ -14,7 +14,7 @@ describe('GET /api/v1/admin/permissions/catalog', () => {
     role = await createRole({ key: 'admin' });
     currentUser = await createUser({ roleId: role.id });
 
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
   });
 
   it('should return roles', async () => {

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

@@ -18,7 +18,7 @@ describe('GET /api/v1/admin/roles/:roleId', () => {
     permissionTwo = await createPermission({ roleId: role.id });
     currentUser = await createUser({ roleId: role.id });
 
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
   });
 
   it('should return role', async () => {

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

@@ -15,7 +15,7 @@ describe('GET /api/v1/admin/roles', () => {
     roleTwo = await createRole({ key: 'user' });
     currentUser = await createUser({ roleId: roleOne.id });
 
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
   });
 
   it('should return roles', async () => {

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

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

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

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

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

@@ -6,7 +6,5 @@ export default async (request, response) => {
     .findById(request.params.samlAuthProviderId)
     .throwIfNotFound();
 
-  renderObject(response, samlAuthProvider, {
+  renderObject(response, samlAuthProvider);
-    serializer: 'AdminSamlAuthProvider',
-  });
 };

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

@@ -17,7 +17,7 @@ describe('GET /api/v1/admin/saml-auth-provider/:samlAuthProviderId', () => {
     currentUser = await createUser({ roleId: role.id });
     samlAuthProvider = await createSamlAuthProvider();
 
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
   });
 
   it('should return saml auth provider with specified id', async () => {

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

@@ -7,7 +7,5 @@ export default async (request, response) => {
     'desc'
   );
 
-  renderObject(response, samlAuthProviders, {
+  renderObject(response, samlAuthProviders);
-    serializer: 'AdminSamlAuthProvider',
-  });
 };

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

@@ -18,7 +18,7 @@ describe('GET /api/v1/admin/saml-auth-providers', () => {
     samlAuthProviderOne = await createSamlAuthProvider();
     samlAuthProviderTwo = await createSamlAuthProvider();
 
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
   });
 
   it('should return saml auth providers', async () => {

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

@@ -18,7 +18,7 @@ describe('GET /api/v1/admin/users/:userId', () => {
     anotherUser = await createUser();
     anotherUserRole = await anotherUser.$relatedQuery('role');
 
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
   });
 
   it('should return specified user info', async () => {

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

@@ -28,7 +28,7 @@ describe('GET /api/v1/admin/users', () => {
       fullName: 'Another User',
     });
 
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
   });
 
   it('should return users data', async () => {

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/admin/get-app-auth-client.js';
 import { createAppAuthClient } from '../../../../../test/factories/app-auth-client.js';
 import * as license from '../../../../helpers/license.ee.js';
 
-describe('GET /api/v1/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 = await createAuthTokenByUserId(currentUser.id);
+    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/apps/get-action-substeps.test.js

@@ -11,7 +11,7 @@ describe('GET /api/v1/apps/:appKey/actions/:actionKey/substeps', () => {
 
   beforeEach(async () => {
     currentUser = await createUser();
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
     exampleApp = await App.findOneByKey('github');
   });
 

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

@@ -11,7 +11,7 @@ describe('GET /api/v1/apps/:appKey/actions', () => {
 
   beforeEach(async () => {
     currentUser = await createUser();
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
   });
 
   it('should return the app actions', async () => {

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

@@ -11,7 +11,7 @@ describe('GET /api/v1/apps/:appKey', () => {
 
   beforeEach(async () => {
     currentUser = await createUser();
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
   });
 
   it('should return the app info', async () => {

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

@@ -11,7 +11,7 @@ describe('GET /api/v1/apps', () => {
 
   beforeEach(async () => {
     currentUser = await createUser();
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
     apps = await App.findAll();
   });
 

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

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

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

@@ -1,42 +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 getAuthClientsMock from '../../../../../test/mocks/rest/api/v1/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/apps/:appKey/auth-clients', () => {
-  let currentUser, token;
-
-  beforeEach(async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    currentUser = await createUser();
-
-    token = await 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/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/apps/get-auth.test.js

@@ -11,7 +11,7 @@ describe('GET /api/v1/apps/:appKey/auth', () => {
 
   beforeEach(async () => {
     currentUser = await createUser();
-    token = await createAuthTokenByUserId(currentUser.id);
+    token = createAuthTokenByUserId(currentUser.id);
   });
 
   it('should return the app auth info', async () => {

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

@@ -1,15 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-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,
-    })
-    .throwIfNotFound();
-
-  renderObject(response, appConfig);
-};

packages/backend/src/controllers/api/v1/apps/get-config.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 getAppConfigMock from '../../../../../test/mocks/rest/api/v1/apps/get-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', () => {
-  let currentUser, appConfig, token;
-
-  beforeEach(async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    currentUser = await createUser();
-
-    appConfig = await createAppConfig({
-      key: 'deepl',
-      allowCustomConnection: true,
-      shared: true,
-      disabled: false,
-    });
-
-    token = await createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return specified app config info', async () => {
-    const response = await request(app)
-      .get(`/api/v1/apps/${appConfig.key}/config`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getAppConfigMock(appConfig);
-    expect(response.body).toEqual(expectedPayload);
-  });
-
-  it('should return not found response for not existing app key', async () => {
-    await request(app)
-      .get('/api/v1/apps/not-existing-app-key/config')
-      .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);
-};