feat(discord): add change scheduled event action

docker/Dockerfile.cloud

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

packages/backend/package.json

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

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

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

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

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

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

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

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

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

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

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

packages/backend/src/apps/discord/actions/change-scheduled-event/index.js

@@ -0,0 +1,120 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Change a scheduled event',
+  key: 'changeScheduledEvent',
+  description: 'Changes a scheduled event',
+  arguments: [
+    {
+      label: 'Scheduled Event',
+      key: 'scheduledEventId',
+      type: 'dropdown',
+      required: true,
+      description: '',
+      variables: false,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listScheduledEvents',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Status',
+      key: 'status',
+      type: 'dropdown',
+      required: false,
+      description:
+        'After the status has been changed to COMPLETED or CANCELED, it becomes immutable and cannot be modified further.',
+      variables: true,
+      options: [
+        { label: 'SCHEDULED', value: 1 },
+        { label: 'ACTIVE', value: 2 },
+        { label: 'COMPLETED', value: 3 },
+        { label: 'CANCELED', value: 4 },
+      ],
+    },
+    {
+      label: 'Type',
+      key: 'entityType',
+      type: 'dropdown',
+      required: true,
+      variables: true,
+      options: [
+        { label: 'Stage channel', value: 1 },
+        { label: 'Voice channel', value: 2 },
+        { label: 'External', value: 3 },
+      ],
+      additionalFields: {
+        type: 'query',
+        name: 'getDynamicFields',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listScheduledEventFieldsForChange',
+          },
+          {
+            name: 'parameters.entityType',
+            value: '{parameters.entityType}',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Name',
+      key: 'name',
+      type: 'string',
+      required: false,
+      variables: true,
+    },
+    {
+      label: 'Description',
+      key: 'description',
+      type: 'string',
+      required: false,
+      variables: true,
+    },
+    {
+      label: 'Image',
+      key: 'image',
+      type: 'string',
+      required: false,
+      description:
+        'Image as DataURI scheme [data:image/<jpeg/png/gif>;base64,BASE64_ENCODED_<JPEG/PNG/GIF>_IMAGE_DATA]',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const data = {
+      channel_id: $.step.parameters.channel_id,
+      name: $.step.parameters.name,
+      scheduled_start_time: $.step.parameters.scheduledStartTime,
+      scheduled_end_time: $.step.parameters.scheduledEndTime,
+      description: $.step.parameters.description,
+      entity_type: $.step.parameters.entityType,
+      image: $.step.parameters.image,
+    };
+
+    const isExternal = $.step.parameters.entityType === 3;
+
+    if (isExternal) {
+      data.entity_metadata = {
+        location: $.step.parameters.location,
+      };
+
+      data.channel_id = null;
+    }
+
+    const response = await $.http?.patch(
+      `/guilds/${$.auth.data.guildId}/scheduled-events/${$.step.parameters.scheduledEventId}`,
+      data
+    );
+
+    $.setActionItem({ raw: response.data });
+  },
+});

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

@@ -1,4 +1,9 @@
+import changeScheduledEvent from './change-scheduled-event/index.js';
 import sendMessageToChannel from './send-message-to-channel/index.js';
 import createScheduledEvent from './create-scheduled-event/index.js';
 
-export default [sendMessageToChannel, createScheduledEvent];
+export default [
+  changeScheduledEvent,
+  sendMessageToChannel,
+  createScheduledEvent,
+];

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

@@ -1,4 +1,5 @@
 import listChannels from './list-channels/index.js';
+import listScheduledEvents from './list-scheduled-events/index.js';
 import listVoiceChannels from './list-voice-channels/index.js';
 
-export default [listChannels, listVoiceChannels];
+export default [listChannels, listScheduledEvents, listVoiceChannels];

packages/backend/src/apps/discord/dynamic-data/list-scheduled-events/index.js

@@ -0,0 +1,24 @@
+export default {
+  name: 'List scheduled events',
+  key: 'listScheduledEvents',
+
+  async run($) {
+    const scheduledEvents = {
+      data: [],
+      error: null,
+    };
+
+    const response = await $.http.get(
+      `/guilds/${$.auth.data.guildId}/scheduled-events`
+    );
+
+    scheduledEvents.data = response.data.map((scheduledEvent) => {
+      return {
+        value: scheduledEvent.id,
+        name: scheduledEvent.name,
+      };
+    });
+
+    return scheduledEvents;
+  },
+};

packages/backend/src/apps/discord/dynamic-fields/index.js

@@ -1,3 +1,7 @@
 import listExternalScheduledEventFields from './list-external-scheduled-event-fields/index.js';
+import listScheduledEventFieldsForChange from './list-scheduled-event-fields-for-change/index.js';
 
-export default [listExternalScheduledEventFields];
+export default [
+  listExternalScheduledEventFields,
+  listScheduledEventFieldsForChange,
+];

packages/backend/src/apps/discord/dynamic-fields/list-scheduled-event-fields-for-change/index.js

@@ -0,0 +1,87 @@
+export default {
+  name: 'List scheduled event fields for change',
+  key: 'listScheduledEventFieldsForChange',
+
+  async run($) {
+    const isExternal = $.step.parameters.entityType === 3;
+
+    if (isExternal) {
+      return [
+        {
+          label: 'Location',
+          key: 'location',
+          type: 'string',
+          required: true,
+          description:
+            'The location of the event (1-100 characters). This will be omitted if type is NOT EXTERNAL',
+          variables: true,
+        },
+        {
+          label: 'Start-Time',
+          key: 'scheduledStartTime',
+          type: 'string',
+          required: false,
+          description: 'The time the event will start [ISO8601]',
+          variables: true,
+        },
+        {
+          label: 'End-Time',
+          key: 'scheduledEndTime',
+          type: 'string',
+          required: true,
+          description:
+            'The time the event will end [ISO8601]. This will be omitted if type is NOT EXTERNAL',
+          variables: true,
+        },
+      ];
+    }
+
+    return [
+      {
+        label: 'Channel',
+        key: 'channel_id',
+        type: 'dropdown',
+        required: true,
+        description:
+          'Pick a voice or stage channel to link the event to. This will be omitted if type is EXTERNAL',
+        variables: true,
+        source: {
+          type: 'query',
+          name: 'getDynamicData',
+          arguments: [
+            {
+              name: 'key',
+              value: 'listVoiceChannels',
+            },
+          ],
+        },
+      },
+      {
+        label: 'Location',
+        key: 'location',
+        type: 'string',
+        required: false,
+        description:
+          'The location of the event (1-100 characters). This will be omitted if type is NOT EXTERNAL',
+        variables: true,
+      },
+      {
+        label: 'Start-Time',
+        key: 'scheduledStartTime',
+        type: 'string',
+        required: false,
+        description: 'The time the event will start [ISO8601]',
+        variables: true,
+      },
+      {
+        label: 'End-Time',
+        key: 'scheduledEndTime',
+        type: 'string',
+        required: false,
+        description:
+          'The time the event will end [ISO8601]. This will be omitted if type is NOT EXTERNAL',
+        variables: true,
+      },
+    ];
+  },
+};

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

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

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

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

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

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

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

@@ -1,6 +1,5 @@
 import { vi, describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
-import Crypto from 'crypto';
 import app from '../../../../../app.js';
 import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
 import { createRole } from '../../../../../../test/factories/role.js';
@@ -21,7 +20,7 @@ describe('GET /api/v1/admin/roles/:roleId', () => {
     token = createAuthTokenByUserId(currentUser.id);
   });
 
-  it('should return role', async () => {
+  it('should return roles', async () => {
     vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
 
     const response = await request(app)
@@ -36,24 +35,4 @@ describe('GET /api/v1/admin/roles/:roleId', () => {
 
     expect(response.body).toEqual(expectedPayload);
   });
-
-  it('should return not found response for not existing role UUID', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const notExistingRoleUUID = Crypto.randomUUID();
-
-    await request(app)
-      .get(`/api/v1/admin/roles/${notExistingRoleUUID}`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    await request(app)
-      .get('/api/v1/admin/roles/invalidRoleUUID')
-      .set('Authorization', token)
-      .expect(400);
-  });
 });

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

@@ -1,6 +1,5 @@
 import { vi, describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
-import Crypto from 'crypto';
 import app from '../../../../../app.js';
 import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id.js';
 import { createRole } from '../../../../../../test/factories/role.js';
@@ -32,26 +31,4 @@ describe('GET /api/v1/admin/saml-auth-provider/:samlAuthProviderId', () => {
 
     expect(response.body).toEqual(expectedPayload);
   });
-
-  it('should return not found response for not existing saml auth provider UUID', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const notExistingSamlAuthProviderUUID = Crypto.randomUUID();
-
-    await request(app)
-      .get(
-        `/api/v1/admin/saml-auth-providers/${notExistingSamlAuthProviderUUID}`
-      )
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    await request(app)
-      .get('/api/v1/admin/saml-auth-providers/invalidSamlAuthProviderUUID')
-      .set('Authorization', token)
-      .expect(400);
-  });
 });

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/backend/src/helpers/authorization.js

@@ -7,10 +7,6 @@ const authorizationList = {
     action: 'read',
     subject: 'User',
   },
-  'GET /api/v1/flows/:flowId': {
-    action: 'read',
-    subject: 'Flow',
-  },
 };
 
 export const authorizeUser = async (request, response, next) => {

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

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

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

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

packages/backend/src/helpers/renderer.js

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

packages/backend/src/models/datastore.js

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

packages/backend/src/models/user.js

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

packages/backend/src/queues/action.js

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

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

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

packages/backend/src/queues/email.js

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

packages/backend/src/queues/flow.js

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

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

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

packages/backend/src/queues/trigger.js

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

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

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

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

@@ -1,5 +1,4 @@
 import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
 import { authenticateUser } from '../../../../helpers/authentication.js';
 import { authorizeAdmin } from '../../../../helpers/authorization.js';
 import { checkIsEnterprise } from '../../../../helpers/check-is-enterprise.js';
@@ -12,7 +11,7 @@ router.get(
   authenticateUser,
   authorizeAdmin,
   checkIsEnterprise,
-  asyncHandler(getPermissionsCatalogAction)
+  getPermissionsCatalogAction
 );
 
 export default router;

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

@@ -1,5 +1,4 @@
 import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
 import { authenticateUser } from '../../../../helpers/authentication.js';
 import { authorizeAdmin } from '../../../../helpers/authorization.js';
 import { checkIsEnterprise } from '../../../../helpers/check-is-enterprise.js';
@@ -13,7 +12,7 @@ router.get(
   authenticateUser,
   authorizeAdmin,
   checkIsEnterprise,
-  asyncHandler(getRolesAction)
+  getRolesAction
 );
 
 router.get(
@@ -21,7 +20,7 @@ router.get(
   authenticateUser,
   authorizeAdmin,
   checkIsEnterprise,
-  asyncHandler(getRoleAction)
+  getRoleAction
 );
 
 export default router;

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

@@ -1,5 +1,4 @@
 import { Router } from 'express';
-import asyncHandler from 'express-async-handler';
 import { authenticateUser } from '../../../../helpers/authentication.js';
 import { authorizeAdmin } from '../../../../helpers/authorization.js';
 import { checkIsEnterprise } from '../../../../helpers/check-is-enterprise.js';
@@ -13,7 +12,7 @@ router.get(
   authenticateUser,
   authorizeAdmin,
   checkIsEnterprise,
-  asyncHandler(getSamlAuthProvidersAction)
+  getSamlAuthProvidersAction
 );
 
 router.get(
@@ -21,7 +20,7 @@ router.get(
   authenticateUser,
   authorizeAdmin,
   checkIsEnterprise,
-  asyncHandler(getSamlAuthProviderAction)
+  getSamlAuthProviderAction
 );
 
 export default router;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/backend/src/routes/healthcheck.js

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

packages/backend/src/routes/index.js

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

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

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

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

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

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

@@ -1,22 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createAppAuthClient } from '../../test/factories/app-auth-client';
-import appAuthClientSerializer from './app-auth-client';
-
-describe('appAuthClient serializer', () => {
-  let appAuthClient;
-
-  beforeEach(async () => {
-    appAuthClient = await createAppAuthClient();
-  });
-
-  it('should return app auth client data', async () => {
-    const expectedPayload = {
-      id: appAuthClient.id,
-      appConfigId: appAuthClient.appConfigId,
-      name: appAuthClient.name,
-      active: appAuthClient.active,
-    };
-
-    expect(appAuthClientSerializer(appAuthClient)).toEqual(expectedPayload);
-  });
-});

packages/backend/src/serializers/app.js

@@ -1,12 +0,0 @@
-const appSerializer = (app) => {
-  return {
-    name: app.name,
-    key: app.key,
-    iconUrl: app.iconUrl,
-    authDocUrl: app.authDocUrl,
-    supportsConnections: app.supportsConnections,
-    primaryColor: app.primaryColor,
-  };
-};
-
-export default appSerializer;

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

@@ -1,20 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import App from '../models/app';
-import appSerializer from './app';
-
-describe('appSerializer', () => {
-  it('should return permission data', async () => {
-    const app = await App.findOneByKey('deepl');
-
-    const expectedPayload = {
-      name: app.name,
-      key: app.key,
-      iconUrl: app.iconUrl,
-      authDocUrl: app.authDocUrl,
-      supportsConnections: app.supportsConnections,
-      primaryColor: app.primaryColor,
-    };
-
-    expect(appSerializer(app)).toEqual(expectedPayload);
-  });
-});

packages/backend/src/serializers/flow.js

@@ -1,18 +0,0 @@
-import stepSerializer from './step.js';
-
-const flowSerializer = (flow) => {
-  let flowData = {
-    id: flow.id,
-    name: flow.name,
-    active: flow.active,
-    status: flow.status,
-  };
-
-  if (flow.steps) {
-    flowData.steps = flow.steps.map((step) => stepSerializer(step));
-  }
-
-  return flowData;
-};
-
-export default flowSerializer;

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

@@ -1,44 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createFlow } from '../../test/factories/flow';
-import flowSerializer from './flow';
-import stepSerializer from './step';
-import { createStep } from '../../test/factories/step';
-
-describe('flowSerializer', () => {
-  let flow, stepOne, stepTwo;
-
-  beforeEach(async () => {
-    flow = await createFlow();
-
-    stepOne = await createStep({
-      flowId: flow.id,
-      type: 'trigger',
-    });
-
-    stepTwo = await createStep({
-      flowId: flow.id,
-      type: 'action',
-    });
-  });
-
-  it('should return flow data', async () => {
-    const expectedPayload = {
-      id: flow.id,
-      name: flow.name,
-      active: flow.active,
-      status: flow.status,
-    };
-
-    expect(flowSerializer(flow)).toEqual(expectedPayload);
-  });
-
-  it('should return flow data with the steps', async () => {
-    flow.steps = [stepOne, stepTwo];
-
-    const expectedPayload = {
-      steps: [stepSerializer(stepOne), stepSerializer(stepTwo)],
-    };
-
-    expect(flowSerializer(flow)).toMatchObject(expectedPayload);
-  });
-});

packages/backend/src/serializers/index.js

@@ -2,20 +2,12 @@ import userSerializer from './user.js';
 import roleSerializer from './role.js';
 import permissionSerializer from './permission.js';
 import samlAuthProviderSerializer from './saml-auth-provider.ee.js';
-import appAuthClientSerializer from './app-auth-client.js';
-import flowSerializer from './flow.js';
-import stepSerializer from './step.js';
-import appSerializer from './app.js';
 
 const serializers = {
   User: userSerializer,
   Role: roleSerializer,
   Permission: permissionSerializer,
   SamlAuthProvider: samlAuthProviderSerializer,
-  AppAuthClient: appAuthClientSerializer,
-  Flow: flowSerializer,
-  Step: stepSerializer,
-  App: appSerializer,
 };
 
 export default serializers;

packages/backend/src/serializers/permission.js

@@ -5,8 +5,8 @@ const permissionSerializer = (permission) => {
     action: permission.action,
     subject: permission.subject,
     conditions: permission.conditions,
-    createdAt: permission.createdAt.getTime(),
+    createdAt: permission.createdAt,
-    updatedAt: permission.updatedAt.getTime(),
+    updatedAt: permission.updatedAt,
   };
 };
 

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

@@ -16,8 +16,8 @@ describe('permissionSerializer', () => {
       action: permission.action,
       subject: permission.subject,
       conditions: permission.conditions,
-      createdAt: permission.createdAt.getTime(),
+      createdAt: permission.createdAt,
-      updatedAt: permission.updatedAt.getTime(),
+      updatedAt: permission.updatedAt,
     };
 
     expect(permissionSerializer(permission)).toEqual(expectedPayload);

packages/backend/src/serializers/role.js

@@ -6,8 +6,8 @@ const roleSerializer = (role) => {
     name: role.name,
     key: role.key,
     description: role.description,
-    createdAt: role.createdAt.getTime(),
+    createdAt: role.createdAt,
-    updatedAt: role.updatedAt.getTime(),
+    updatedAt: role.updatedAt,
     isAdmin: role.isAdmin,
   };
 

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

@@ -1,7 +1,6 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import { createRole } from '../../test/factories/role';
 import roleSerializer from './role';
-import permissionSerializer from './permission';
 import { createPermission } from '../../test/factories/permission';
 
 describe('roleSerializer', () => {
@@ -29,8 +28,8 @@ describe('roleSerializer', () => {
       name: role.name,
       key: role.key,
       description: role.description,
-      createdAt: role.createdAt.getTime(),
+      createdAt: role.createdAt,
-      updatedAt: role.updatedAt.getTime(),
+      updatedAt: role.updatedAt,
       isAdmin: role.isAdmin,
     };
 
@@ -41,10 +40,7 @@ describe('roleSerializer', () => {
     role.permissions = [permissionOne, permissionTwo];
 
     const expectedPayload = {
-      permissions: [
+      permissions: [permissionOne, permissionTwo],
-        permissionSerializer(permissionOne),
-        permissionSerializer(permissionTwo),
-      ],
     };
 
     expect(roleSerializer(role)).toMatchObject(expectedPayload);

packages/backend/src/serializers/step.js

@@ -1,15 +0,0 @@
-const stepSerializer = (step) => {
-  return {
-    id: step.id,
-    type: step.type,
-    key: step.key,
-    appKey: step.appKey,
-    iconUrl: step.iconUrl,
-    webhookUrl: step.webhookUrl,
-    status: step.status,
-    position: step.position,
-    parameters: step.parameters,
-  };
-};
-
-export default stepSerializer;

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

@@ -1,27 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createStep } from '../../test/factories/step';
-import stepSerializer from './step';
-
-describe('stepSerializer', () => {
-  let step;
-
-  beforeEach(async () => {
-    step = await createStep();
-  });
-
-  it('should return step data', async () => {
-    const expectedPayload = {
-      id: step.id,
-      type: step.type,
-      key: step.key,
-      appKey: step.appKey,
-      iconUrl: step.iconUrl,
-      webhookUrl: step.webhookUrl,
-      status: step.status,
-      position: step.position,
-      parameters: step.parameters,
-    };
-
-    expect(stepSerializer(step)).toEqual(expectedPayload);
-  });
-});

packages/backend/src/serializers/user.js

@@ -6,8 +6,8 @@ const userSerializer = (user) => {
   let userData = {
     id: user.id,
     email: user.email,
-    createdAt: user.createdAt.getTime(),
+    createdAt: user.createdAt,
-    updatedAt: user.updatedAt.getTime(),
+    updatedAt: user.updatedAt,
     fullName: user.fullName,
   };
 

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

@@ -4,8 +4,6 @@ import appConfig from '../config/app';
 import { createUser } from '../../test/factories/user';
 import { createPermission } from '../../test/factories/permission';
 import userSerializer from './user';
-import roleSerializer from './role';
-import permissionSerializer from './permission';
 
 describe('userSerializer', () => {
   let user, role, permissionOne, permissionTwo;
@@ -31,11 +29,11 @@ describe('userSerializer', () => {
     vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
 
     const expectedPayload = {
-      createdAt: user.createdAt.getTime(),
+      createdAt: user.createdAt,
       email: user.email,
       fullName: user.fullName,
       id: user.id,
-      updatedAt: user.updatedAt.getTime(),
+      updatedAt: user.updatedAt,
     };
 
     expect(userSerializer(user)).toEqual(expectedPayload);
@@ -45,7 +43,7 @@ describe('userSerializer', () => {
     user.role = role;
 
     const expectedPayload = {
-      role: roleSerializer(role),
+      role,
     };
 
     expect(userSerializer(user)).toMatchObject(expectedPayload);
@@ -55,10 +53,7 @@ describe('userSerializer', () => {
     user.permissions = [permissionOne, permissionTwo];
 
     const expectedPayload = {
-      permissions: [
+      permissions: [permissionOne, permissionTwo],
-        permissionSerializer(permissionOne),
-        permissionSerializer(permissionTwo),
-      ],
     };
 
     expect(userSerializer(user)).toMatchObject(expectedPayload);
@@ -67,7 +62,7 @@ describe('userSerializer', () => {
   it('should return user data with trial expiry date', async () => {
     vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
 
-    await user.$query().patchAndFetch({
+    await user.$query().patch({
       trialExpiryDate: DateTime.now().plus({ days: 30 }).toISODate(),
     });
 

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

@@ -1,25 +0,0 @@
-import { faker } from '@faker-js/faker';
-import { createAppConfig } from './app-config.js';
-import AppAuthClient from '../../src/models/app-auth-client';
-
-const formattedAuthDefaults = {
-  oAuthRedirectUrl: faker.internet.url(),
-  instanceUrl: faker.internet.url(),
-  clientId: faker.string.uuid(),
-  clientSecret: faker.string.uuid(),
-};
-
-export const createAppAuthClient = async (params = {}) => {
-  params.name = params?.name || faker.person.fullName();
-  params.id = params?.id || faker.string.uuid();
-  params.appConfigId = params?.appConfigId || (await createAppConfig()).id;
-  params.active = params?.active ?? true;
-  params.formattedAuthDefaults =
-    params?.formattedAuthDefaults || formattedAuthDefaults;
-
-  const appAuthClient = await AppAuthClient.query()
-    .insert(params)
-    .returning('*');
-
-  return appAuthClient;
-};

packages/backend/test/factories/app-config.js

@@ -1,13 +0,0 @@
-import AppConfig from '../../src/models/app-config.js';
-
-export const createAppConfig = async (params = {}) => {
-  const appConfigData = {
-    key: params?.key || 'gitlab',
-  };
-
-  const appConfig = await AppConfig.query()
-    .insert(appConfigData)
-    .returning('*');
-
-  return appConfig;
-};

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

@@ -1,19 +0,0 @@
-const getAdminAppAuthClientMock = (appAuthClient) => {
-  return {
-    data: {
-      appConfigId: appAuthClient.appConfigId,
-      name: appAuthClient.name,
-      id: appAuthClient.id,
-      active: appAuthClient.active,
-    },
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'AppAuthClient',
-    },
-  };
-};
-
-export default getAdminAppAuthClientMock;

packages/backend/test/mocks/rest/api/v1/admin/roles/get-role.ee.js

@@ -5,16 +5,16 @@ const getRoleMock = async (role, permissions) => {
     name: role.name,
     isAdmin: role.isAdmin,
     description: role.description,
-    createdAt: role.createdAt.getTime(),
+    createdAt: role.createdAt.toISOString(),
-    updatedAt: role.updatedAt.getTime(),
+    updatedAt: role.updatedAt.toISOString(),
     permissions: permissions.map((permission) => ({
       id: permission.id,
       action: permission.action,
       conditions: permission.conditions,
       roleId: permission.roleId,
       subject: permission.subject,
-      createdAt: permission.createdAt.getTime(),
+      createdAt: permission.createdAt.toISOString(),
-      updatedAt: permission.updatedAt.getTime(),
+      updatedAt: permission.updatedAt.toISOString(),
     })),
   };
 

packages/backend/test/mocks/rest/api/v1/admin/roles/get-roles.ee.js

@@ -6,8 +6,8 @@ const getRolesMock = async (roles) => {
       name: role.name,
       isAdmin: role.isAdmin,
       description: role.description,
-      createdAt: role.createdAt.getTime(),
+      createdAt: role.createdAt.toISOString(),
-      updatedAt: role.updatedAt.getTime(),
+      updatedAt: role.updatedAt.toISOString(),
     };
   });
 

packages/backend/test/mocks/rest/api/v1/apps/get-app.js

@@ -1,21 +0,0 @@
-const getAppMock = (app) => {
-  return {
-    data: {
-      authDocUrl: app.authDocUrl,
-      iconUrl: app.iconUrl,
-      key: app.key,
-      name: app.name,
-      primaryColor: app.primaryColor,
-      supportsConnections: app.supportsConnections,
-    },
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default getAppMock;

packages/backend/test/mocks/rest/api/v1/automatisch/info.js

@@ -1,18 +0,0 @@
-const infoMock = () => {
-  return {
-    data: {
-      isCloud: false,
-      isMation: false,
-      isEnterprise: true,
-    },
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default infoMock;

packages/backend/test/mocks/rest/api/v1/automatisch/license.js

@@ -1,19 +0,0 @@
-const licenseMock = () => {
-  return {
-    data: {
-      expireAt: '2025-12-31T23:59:59Z',
-      id: '123',
-      name: 'license-name',
-      verified: true,
-    },
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default licenseMock;

packages/backend/test/mocks/rest/api/v1/flows/get-flow.js

@@ -1,32 +0,0 @@
-const getFlowMock = async (flow, steps) => {
-  const data = {
-    active: flow.active,
-    id: flow.id,
-    name: flow.name,
-    status: flow.active ? 'published' : 'draft',
-    steps: steps.map((step) => ({
-      appKey: step.appKey,
-      iconUrl: step.iconUrl,
-      id: step.id,
-      key: step.key,
-      parameters: step.parameters,
-      position: step.position,
-      status: step.status,
-      type: step.type,
-      webhookUrl: step.webhookUrl,
-    })),
-  };
-
-  return {
-    data: data,
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'Flow',
-    },
-  };
-};
-
-export default getFlowMock;

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

@@ -1,19 +0,0 @@
-const getAppAuthClientMock = (appAuthClient) => {
-  return {
-    data: {
-      name: appAuthClient.name,
-      id: appAuthClient.id,
-      appConfigId: appAuthClient.appConfigId,
-      active: appAuthClient.active,
-    },
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'AppAuthClient',
-    },
-  };
-};
-
-export default getAppAuthClientMock;

packages/backend/test/mocks/rest/api/v1/users/get-current-user.js

@@ -1,22 +1,22 @@
 const getCurrentUserMock = (currentUser, role) => {
   return {
     data: {
-      createdAt: currentUser.createdAt.getTime(),
+      createdAt: currentUser.createdAt.toISOString(),
       email: currentUser.email,
       fullName: currentUser.fullName,
       id: currentUser.id,
       permissions: [],
       role: {
-        createdAt: role.createdAt.getTime(),
+        createdAt: role.createdAt.toISOString(),
         description: null,
         id: role.id,
         isAdmin: role.isAdmin,
         key: role.key,
         name: role.name,
-        updatedAt: role.updatedAt.getTime(),
+        updatedAt: role.updatedAt.toISOString(),
       },
       trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
-      updatedAt: currentUser.updatedAt.getTime(),
+      updatedAt: currentUser.updatedAt.toISOString(),
     },
     meta: {
       count: 1,

packages/backend/test/mocks/rest/api/v1/users/get-invoices.ee.js

@@ -1,14 +0,0 @@
-const getInvoicesMock = async (invoices) => {
-  return {
-    data: invoices,
-    meta: {
-      count: invoices.length,
-      currentPage: null,
-      isArray: true,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default getInvoicesMock;

packages/backend/test/mocks/rest/api/v1/users/get-user.js

@@ -1,21 +1,21 @@
 const getUserMock = (currentUser, role) => {
   return {
     data: {
-      createdAt: currentUser.createdAt.getTime(),
+      createdAt: currentUser.createdAt.toISOString(),
       email: currentUser.email,
       fullName: currentUser.fullName,
       id: currentUser.id,
       role: {
-        createdAt: role.createdAt.getTime(),
+        createdAt: role.createdAt.toISOString(),
         description: null,
         id: role.id,
         isAdmin: role.isAdmin,
         key: role.key,
         name: role.name,
-        updatedAt: role.updatedAt.getTime(),
+        updatedAt: role.updatedAt.toISOString(),
       },
       trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
-      updatedAt: currentUser.updatedAt.getTime(),
+      updatedAt: currentUser.updatedAt.toISOString(),
     },
     meta: {
       count: 1,

packages/backend/test/mocks/rest/api/v1/users/get-users.js

@@ -3,23 +3,23 @@ const getUsersMock = async (users, roles) => {
     const role = roles.find((r) => r.id === user.roleId);
 
     return {
-      createdAt: user.createdAt.getTime(),
+      createdAt: user.createdAt.toISOString(),
       email: user.email,
       fullName: user.fullName,
       id: user.id,
       role: role
         ? {
-            createdAt: role.createdAt.getTime(),
+            createdAt: role.createdAt.toISOString(),
             description: role.description,
             id: role.id,
             isAdmin: role.isAdmin,
             key: role.key,
             name: role.name,
-            updatedAt: role.updatedAt.getTime(),
+            updatedAt: role.updatedAt.toISOString(),
           }
         : null,
       trialExpiryDate: user.trialExpiryDate.toISOString(),
-      updatedAt: user.updatedAt.getTime(),
+      updatedAt: user.updatedAt.toISOString(),
     };
   });
 

packages/docs/pages/.vitepress/config.js

@@ -41,15 +41,6 @@ export default defineConfig({
             { text: 'Connection', link: '/apps/carbone/connection' },
           ],
         },
-        {
-          text: 'Datastore',
-          collapsible: true,
-          collapsed: true,
-          items: [
-            { text: 'Actions', link: '/apps/datastore/actions' },
-            { text: 'Connection', link: '/apps/datastore/connection' },
-          ],
-        },
         {
           text: 'DeepL',
           collapsible: true,
@@ -314,7 +305,7 @@ export default defineConfig({
           collapsed: true,
           items: [
             { text: 'Actions', link: '/apps/removebg/actions' },
-            { text: 'Connection', link: '/apps/removebg/connection' },
+            { text: 'Connection', link: '/apps/removebg/connection' }
           ],
         },
         {

packages/docs/pages/apps/datastore/actions.md

@@ -1,14 +0,0 @@
----
-favicon: /favicons/datastore.svg
-items:
-  - name: Get value
-    desc: Get value from the persistent datastore.
-  - name: Set value
-    desc: Set value to the persistent datastore.
----
-
-<script setup>
-  import CustomListing from '../../components/CustomListing.vue'
-</script>
-
-<CustomListing />

packages/docs/pages/apps/datastore/connection.md

@@ -1,3 +0,0 @@
-# Datastore
-
-Datastore is a persistent key-value storage system that allows you to store and retrieve data. Currently you can use it within the scope of the flow, meaning you can store and retrieve data within the same flow.

packages/docs/pages/apps/discord/actions.md

@@ -1,6 +1,8 @@
 ---
 favicon: /favicons/discord.svg
 items:
+  - name: Change a scheduled event
+    desc: Changes a scheduled event.
   - name: Send a message to channel
     desc: Sends a message to a specific channel you specify.
   - name: Create a scheduled event

packages/docs/pages/public/favicons/datastore.svg

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

yarn.lock

@@ -1742,13 +1742,6 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.11.tgz#a5d300008960bb39677c46bf16f53ec70d8dee04"
   integrity sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==
 
-"@eslint-community/eslint-utils@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
-  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
-  dependencies:
-    eslint-visitor-keys "^3.3.0"
-
 "@eslint/eslintrc@^1.0.5":
   version "1.0.5"
   resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz"
@@ -3909,11 +3902,6 @@
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
 
-"@types/json-schema@^7.0.12":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
-
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
@@ -4090,11 +4078,6 @@
   resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
-"@types/semver@^7.5.0":
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
-  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
-
 "@types/send@*":
   version "0.17.1"
   resolved "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz"
@@ -4250,14 +4233,6 @@
     "@typescript-eslint/types" "5.10.0"
     "@typescript-eslint/visitor-keys" "5.10.0"
 
-"@typescript-eslint/scope-manager@7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.0.2.tgz#6ec4cc03752758ddd1fdaae6fbd0ed9a2ca4fe63"
-  integrity sha512-l6sa2jF3h+qgN2qUMjVR3uCNGjWw4ahGfzIYsCtFrQJCjhbrDPdiihYT8FnnqFwsWX+20hK592yX9I2rxKTP4g==
-  dependencies:
-    "@typescript-eslint/types" "7.0.2"
-    "@typescript-eslint/visitor-keys" "7.0.2"
-
 "@typescript-eslint/type-utils@5.10.0":
   version "5.10.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz"
@@ -4272,11 +4247,6 @@
   resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.0.tgz"
   integrity sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==
 
-"@typescript-eslint/types@7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.0.2.tgz#b6edd108648028194eb213887d8d43ab5750351c"
-  integrity sha512-ZzcCQHj4JaXFjdOql6adYV4B/oFOFjPOC9XYwCaZFRvqN8Llfvv4gSxrkQkd2u4Ci62i2c6W6gkDwQJDaRc4nA==
-
 "@typescript-eslint/typescript-estree@5.10.0":
   version "5.10.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz"
@@ -4290,20 +4260,6 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.2.tgz#3c6dc8a3b9799f4ef7eca0d224ded01974e4cb39"
-  integrity sha512-3AMc8khTcELFWcKcPc0xiLviEvvfzATpdPj/DXuOGIdQIIFybf4DMT1vKRbuAEOFMwhWt7NFLXRkbjsvKZQyvw==
-  dependencies:
-    "@typescript-eslint/types" "7.0.2"
-    "@typescript-eslint/visitor-keys" "7.0.2"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    minimatch "9.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
 "@typescript-eslint/utils@5.10.0":
   version "5.10.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.0.tgz"
@@ -4316,19 +4272,6 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/utils@^7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.0.2.tgz#8756123054cd934c8ba7db6a6cffbc654b10b5c4"
-  integrity sha512-PZPIONBIB/X684bhT1XlrkjNZJIEevwkKDsdwfiu1WeqBxYEEdIgVDgm8/bbKHVu+6YOpeRqcfImTdImx/4Bsw==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "7.0.2"
-    "@typescript-eslint/types" "7.0.2"
-    "@typescript-eslint/typescript-estree" "7.0.2"
-    semver "^7.5.4"
-
 "@typescript-eslint/visitor-keys@5.10.0":
   version "5.10.0"
   resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz"
@@ -4337,14 +4280,6 @@
     "@typescript-eslint/types" "5.10.0"
     eslint-visitor-keys "^3.0.0"
 
-"@typescript-eslint/visitor-keys@7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.0.2.tgz#2899b716053ad7094962beb895d11396fc12afc7"
-  integrity sha512-8Y+YiBmqPighbm5xA2k4wKTxRzx9EkBu7Rlw+WHqMvRJ3RPz/BMBO9b2ru0LUNmXg120PHUXD5+SWFy2R8DqlQ==
-  dependencies:
-    "@typescript-eslint/types" "7.0.2"
-    eslint-visitor-keys "^3.4.1"
-
 "@ucast/core@^1.0.0", "@ucast/core@^1.4.1", "@ucast/core@^1.6.1":
   version "1.10.2"
   resolved "https://registry.npmjs.org/@ucast/core/-/core-1.10.2.tgz"
@@ -7815,11 +7750,6 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint-visitor-keys@^3.4.1:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
-  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
-
 eslint-webpack-plugin@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz"
@@ -8047,11 +7977,6 @@ expect@^27.4.6:
     jest-matcher-utils "^27.4.6"
     jest-message-util "^27.4.6"
 
-express-async-handler@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/express-async-handler/-/express-async-handler-1.2.0.tgz#ffc9896061d90f8d2e71a2d2b8668db5b0934391"
-  integrity sha512-rCSVtPXRmQSW8rmik/AIb2P0op6l7r1fMW538yyvTMltCO4xQEWMmobfrIxN2V1/mVrgxB8Az3reYF6yUZw37w==
-
 express-basic-auth@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/express-basic-auth/-/express-basic-auth-1.2.1.tgz"
@@ -8770,7 +8695,7 @@ globals@^13.6.0, globals@^13.9.0:
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4, globby@^11.1.0:
+globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4:
   version "11.1.0"
   resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -11107,13 +11032,6 @@ minimatch@3.0.4, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@9.0.3:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimatch@^5.0.1:
   version "5.1.0"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"
@@ -14209,13 +14127,6 @@ semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semve
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.5.4:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
-
 send@0.17.2:
   version "0.17.2"
   resolved "https://registry.npmjs.org/send/-/send-0.17.2.tgz"
@@ -15352,11 +15263,6 @@ tryer@^1.0.1:
   resolved "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz"
   integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
-ts-api-utils@^1.0.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.2.1.tgz#f716c7e027494629485b21c0df6180f4d08f5e8b"
-  integrity sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==
-
 ts-invariant@^0.10.3:
   version "0.10.3"
   resolved "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.10.3.tgz"