feat(notion): add update database item action

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
       "version": "latest"
     },
     "ghcr.io/devcontainers/features/node:1": {
-      "version": 18
+      "version": 16
     },
     "ghcr.io/devcontainers/features/common-utils:1": {
       "username": "vscode",

package.json

@@ -6,7 +6,8 @@
     "start": "lerna run --stream --parallel --scope=@*/{web,backend} dev",
     "start:web": "lerna run --stream --scope=@*/web dev",
     "start:backend": "lerna run --stream --scope=@*/backend dev",
-    "lint": "lerna run --no-bail --stream --parallel --scope=@*/{web,backend} lint",
+    "lint": "lerna run --no-bail --stream --parallel --scope=@*/{web,backend,cli} lint",
+    "build:watch": "lerna run --no-bail --stream --parallel --scope=@*/{web,backend,cli} build:watch",
     "build:docs": "cd ./packages/docs && yarn install && yarn build"
   },
   "workspaces": {

packages/backend/package.json

@@ -33,6 +33,7 @@
     "axios": "1.6.0",
     "bcrypt": "^5.0.1",
     "bullmq": "^3.0.0",
+    "copyfiles": "^2.4.1",
     "cors": "^2.8.5",
     "crypto-js": "^4.1.1",
     "debug": "~2.6.9",
@@ -44,6 +45,7 @@
     "graphql-middleware": "^6.1.15",
     "graphql-shield": "^7.5.0",
     "graphql-tools": "^8.2.0",
+    "graphql-type-json": "^0.3.2",
     "handlebars": "^4.7.7",
     "http-errors": "~1.6.3",
     "http-proxy-agent": "^7.0.0",
@@ -66,6 +68,7 @@
     "pluralize": "^8.0.0",
     "raw-body": "^2.5.2",
     "showdown": "^2.1.0",
+    "stripe": "^11.13.0",
     "winston": "^3.7.1",
     "xmlrpc": "^1.3.2"
   },

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

@@ -1,120 +0,0 @@
-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,9 +1,4 @@
-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 [
+export default [sendMessageToChannel, createScheduledEvent];
-  changeScheduledEvent,
-  sendMessageToChannel,
-  createScheduledEvent,
-];

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

@@ -1,5 +1,4 @@
 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, listScheduledEvents, listVoiceChannels];
+export default [listChannels, listVoiceChannels];

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

@@ -1,24 +0,0 @@
-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,7 +1,3 @@
 import listExternalScheduledEventFields from './list-external-scheduled-event-fields/index.js';
-import listScheduledEventFieldsForChange from './list-scheduled-event-fields-for-change/index.js';
 
-export default [
+export default [listExternalScheduledEventFields];
-  listExternalScheduledEventFields,
-  listScheduledEventFieldsForChange,
-];

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

@@ -1,87 +0,0 @@
-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/formatter/actions/text/index.js

@@ -1,6 +1,5 @@
 import defineAction from '../../../../helpers/define-action.js';
 
-import base64ToString from './transformers/base64-to-string.js';
 import capitalize from './transformers/capitalize.js';
 import extractEmailAddress from './transformers/extract-email-address.js';
 import extractNumber from './transformers/extract-number.js';
@@ -9,12 +8,10 @@ import lowercase from './transformers/lowercase.js';
 import markdownToHtml from './transformers/markdown-to-html.js';
 import pluralize from './transformers/pluralize.js';
 import replace from './transformers/replace.js';
-import stringToBase64 from './transformers/string-to-base64.js';
 import trimWhitespace from './transformers/trim-whitespace.js';
 import useDefaultValue from './transformers/use-default-value.js';
 
 const transformers = {
-  base64ToString,
   capitalize,
   extractEmailAddress,
   extractNumber,
@@ -23,7 +20,6 @@ const transformers = {
   markdownToHtml,
   pluralize,
   replace,
-  stringToBase64,
   trimWhitespace,
   useDefaultValue,
 };
@@ -41,7 +37,6 @@ export default defineAction({
       required: true,
       variables: true,
       options: [
-        { label: 'Base64 to String', value: 'base64ToString' },
         { label: 'Capitalize', value: 'capitalize' },
         { label: 'Convert HTML to Markdown', value: 'htmlToMarkdown' },
         { label: 'Convert Markdown to HTML', value: 'markdownToHtml' },
@@ -50,7 +45,6 @@ export default defineAction({
         { label: 'Lowercase', value: 'lowercase' },
         { label: 'Pluralize', value: 'pluralize' },
         { label: 'Replace', value: 'replace' },
-        { label: 'String to Base64', value: 'stringToBase64' },
         { label: 'Trim Whitespace', value: 'trimWhitespace' },
         { label: 'Use Default Value', value: 'useDefaultValue' },
       ],

packages/backend/src/apps/formatter/actions/text/transformers/base64-to-string.js

@@ -1,8 +0,0 @@
-const base64ToString = ($) => {
-  const input = $.step.parameters.input;
-  const decodedString = Buffer.from(input, 'base64').toString('utf8');
-
-  return decodedString;
-};
-
-export default base64ToString;

packages/backend/src/apps/formatter/actions/text/transformers/string-to-base64.js

@@ -1,8 +0,0 @@
-const stringtoBase64 = ($) => {
-  const input = $.step.parameters.input;
-  const base64String = Buffer.from(input).toString('base64');
-
-  return base64String;
-};
-
-export default stringtoBase64;

packages/backend/src/apps/formatter/dynamic-fields/list-transform-options/index.js

@@ -1,4 +1,3 @@
-import base64ToString from './text/base64-to-string.js';
 import capitalize from './text/capitalize.js';
 import extractEmailAddress from './text/extract-email-address.js';
 import extractNumber from './text/extract-number.js';
@@ -7,7 +6,6 @@ import lowercase from './text/lowercase.js';
 import markdownToHtml from './text/markdown-to-html.js';
 import pluralize from './text/pluralize.js';
 import replace from './text/replace.js';
-import stringToBase64 from './text/string-to-base64.js';
 import trimWhitespace from './text/trim-whitespace.js';
 import useDefaultValue from './text/use-default-value.js';
 import performMathOperation from './numbers/perform-math-operation.js';
@@ -17,7 +15,6 @@ import formatPhoneNumber from './numbers/format-phone-number.js';
 import formatDateTime from './date-time/format-date-time.js';
 
 const options = {
-  base64ToString,
   capitalize,
   extractEmailAddress,
   extractNumber,
@@ -26,7 +23,6 @@ const options = {
   markdownToHtml,
   pluralize,
   replace,
-  stringToBase64,
   trimWhitespace,
   useDefaultValue,
   performMathOperation,

packages/backend/src/apps/formatter/dynamic-fields/list-transform-options/text/base64-to-string.js

@@ -1,12 +0,0 @@
-const base64ToString = [
-  {
-    label: 'Input',
-    key: 'input',
-    type: 'string',
-    required: true,
-    description: 'Text that will be converted from Base64 to string.',
-    variables: true,
-  },
-];
-
-export default base64ToString;

packages/backend/src/apps/formatter/dynamic-fields/list-transform-options/text/string-to-base64.js

@@ -1,12 +0,0 @@
-const stringToBase64 = [
-  {
-    label: 'Input',
-    key: 'input',
-    type: 'string',
-    required: true,
-    description: 'Text that will be converted to Base64.',
-    variables: true,
-  },
-];
-
-export default stringToBase64;

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

@@ -1,5 +1,11 @@
 import createDatabaseItem from './create-database-item/index.js';
 import createPage from './create-page/index.js';
 import findDatabaseItem from './find-database-item/index.js';
+import updateDatabaseItem from './update-database-item/index.js';
 
-export default [createDatabaseItem, createPage, findDatabaseItem];
+export default [
+  createDatabaseItem,
+  createPage,
+  findDatabaseItem,
+  updateDatabaseItem,
+];

packages/backend/src/apps/notion/actions/update-database-item/index.js

@@ -0,0 +1,157 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Update database item',
+  key: 'updateDatabaseItem',
+  description: 'Updates a database item.',
+  arguments: [
+    {
+      label: 'Database',
+      key: 'databaseId',
+      type: 'dropdown',
+      required: true,
+      variables: true,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listDatabases',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Item',
+      key: 'itemId',
+      type: 'dropdown',
+      required: true,
+      variables: true,
+      dependsOn: ['parameters.databaseId'],
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listDatabaseItems',
+          },
+          {
+            name: 'parameters.databaseId',
+            value: '{parameters.databaseId}',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Name',
+      key: 'name',
+      type: 'string',
+      required: false,
+      description:
+        'This field has a 2000 character limit. Any characters beyond 2000 will not be included.',
+      variables: true,
+    },
+    {
+      label: 'Tags',
+      key: 'tags',
+      type: 'dynamic',
+      required: false,
+      description: '',
+      fields: [
+        {
+          label: 'Tag',
+          key: 'tag',
+          type: 'dropdown',
+          required: true,
+          variables: true,
+          dependsOn: ['parameters.databaseId'],
+          source: {
+            type: 'query',
+            name: 'getDynamicData',
+            arguments: [
+              {
+                name: 'key',
+                value: 'listTags',
+              },
+              {
+                name: 'parameters.databaseId',
+                value: '{parameters.databaseId}',
+              },
+            ],
+          },
+        },
+      ],
+    },
+    {
+      label: 'Content',
+      key: 'content',
+      type: 'string',
+      required: false,
+      description:
+        'You can choose to add extra text to the database item, with a limit of up to 2000 characters if desired.',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const itemId = $.step.parameters.itemId;
+    const name = $.step.parameters.name;
+    const truncatedName = name.slice(0, 2000);
+    const content = $.step.parameters.content;
+    const truncatedContent = content.slice(0, 2000);
+    const tags = $.step.parameters.tags;
+    const formattedTags = tags
+      .filter((tag) => tag.tag !== '')
+      .map((tag) => tag.tag);
+
+    const body = {
+      properties: {},
+    };
+
+    if (truncatedName) {
+      body.properties.Name = {
+        title: [
+          {
+            text: {
+              content: truncatedName,
+            },
+          },
+        ],
+      };
+    }
+
+    if (formattedTags?.length) {
+      body.properties.Tags = {
+        multi_select: formattedTags.map((tag) => ({ name: tag })),
+      };
+    }
+
+    if (truncatedContent) {
+      const response = await $.http.get(`/v1/blocks/${itemId}/children`);
+      const firstBlockId = response.data.results[0].id;
+
+      const body = {
+        paragraph: {
+          rich_text: [
+            {
+              type: 'text',
+              text: {
+                content: truncatedContent,
+              },
+            },
+          ],
+        },
+      };
+
+      await $.http.patch(`/v1/blocks/${firstBlockId}`, body);
+    }
+
+    const { data } = await $.http.patch(`/v1/pages/${itemId}`, body);
+
+    $.setActionItem({
+      raw: data,
+    });
+  },
+});

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

@@ -1,4 +1,6 @@
+import listDatabaseItems from './list-database-items/index.js';
 import listDatabases from './list-databases/index.js';
 import listParentPages from './list-parent-pages/index.js';
+import listTags from './list-tags/index.js';
 
-export default [listDatabases, listParentPages];
+export default [listDatabaseItems, listDatabases, listParentPages, listTags];

packages/backend/src/apps/notion/dynamic-data/list-database-items/index.js

@@ -0,0 +1,38 @@
+export default {
+  name: 'List database items',
+  key: 'listDatabaseItems',
+
+  async run($) {
+    const databases = {
+      data: [],
+      error: null,
+    };
+    const payload = {
+      start_cursor: undefined,
+    };
+    const databaseId = $.step.parameters.databaseId;
+
+    if (!databaseId) {
+      return databases;
+    }
+
+    do {
+      const response = await $.http.post(
+        `/v1/databases/${databaseId}/query`,
+        payload
+      );
+
+      payload.start_cursor = response.data.next_cursor;
+
+      for (const database of response.data.results) {
+        databases.data.push({
+          value: database.id,
+          name:
+            database.properties.Name?.title?.[0]?.plain_text || 'Untitled Page',
+        });
+      }
+    } while (payload.start_cursor);
+
+    return databases;
+  },
+};

packages/backend/src/apps/notion/dynamic-data/list-databases/index.js

@@ -22,7 +22,7 @@ export default {
       for (const database of response.data.results) {
         databases.data.push({
           value: database.id,
-          name: database.title[0].plain_text,
+          name: database.title?.[0]?.plain_text || 'Untitled Database',
         });
       }
     } while (payload.start_cursor);

packages/backend/src/apps/notion/dynamic-data/list-tags/index.js

@@ -0,0 +1,38 @@
+export default {
+  name: 'List tags',
+  key: 'listTags',
+
+  async run($) {
+    const tags = {
+      data: [],
+      error: null,
+    };
+    const databaseId = $.step.parameters.databaseId;
+    let allTags;
+
+    if (!databaseId) {
+      return tags;
+    }
+
+    const response = await $.http.get(`/v1/databases/${databaseId}`);
+    const tagsExist =
+      response.data.properties.Tags.multi_select.options.length !== 0;
+
+    if (tagsExist) {
+      allTags = response.data.properties.Tags.multi_select.options.map(
+        (tag) => tag.name
+      );
+    } else {
+      return tags;
+    }
+
+    for (const tag of allTags) {
+      tags.data.push({
+        value: tag,
+        name: tag,
+      });
+    }
+
+    return tags;
+  },
+};

packages/backend/src/config/app.js

@@ -18,9 +18,7 @@ const port = process.env.PORT || '3000';
 const serveWebAppSeparately =
   process.env.SERVE_WEB_APP_SEPARATELY === 'true' ? true : false;
 
-let apiUrl = new URL(
+let apiUrl = new URL(`${protocol}://${host}:${port}`).toString();
-  process.env.API_URL || `${protocol}://${host}:${port}`
-).toString();
 apiUrl = apiUrl.substring(0, apiUrl.length - 1);
 
 // use apiUrl by default, which has less priority over the following cases
@@ -90,10 +88,6 @@ const appConfig = {
   licenseKey: process.env.LICENSE_KEY,
   sentryDsn: process.env.SENTRY_DSN,
   CI: process.env.CI === 'true',
-  disableNotificationsPage: process.env.DISABLE_NOTIFICATIONS_PAGE === 'true',
-  disableFavicon: process.env.DISABLE_FAVICON === 'true',
-  additionalDrawerLink: process.env.ADDITIONAL_DRAWER_LINK,
-  additionalDrawerLinkText: process.env.ADDITIONAL_DRAWER_LINK_TEXT,
 };
 
 if (!appConfig.encryptionKey) {

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

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

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

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

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

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

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

@@ -1,38 +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 { createPermission } from '../../../../../../test/factories/permission.js';
-import getRoleMock from '../../../../../../test/mocks/rest/api/v1/admin/roles/get-role.ee.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/roles/:roleId', () => {
-  let role, currentUser, token, permissionOne, permissionTwo;
-
-  beforeEach(async () => {
-    role = await createRole({ key: 'admin' });
-    permissionOne = await createPermission({ roleId: role.id });
-    permissionTwo = await createPermission({ roleId: role.id });
-    currentUser = await createUser({ roleId: role.id });
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return roles', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get(`/api/v1/admin/roles/${role.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getRoleMock(role, [
-      permissionOne,
-      permissionTwo,
-    ]);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

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

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

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

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

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

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

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

@@ -1,34 +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 getSamlAuthProviderMock from '../../../../../../test/mocks/rest/api/v1/admin/saml-auth-providers/get-saml-auth-provider.ee.js';
-import * as license from '../../../../../helpers/license.ee.js';
-
-describe('GET /api/v1/admin/saml-auth-provider/:samlAuthProviderId', () => {
-  let samlAuthProvider, currentUser, token;
-
-  beforeEach(async () => {
-    const role = await createRole({ key: 'admin' });
-    currentUser = await createUser({ roleId: role.id });
-    samlAuthProvider = await createSamlAuthProvider();
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return saml auth provider with specified id', async () => {
-    vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-
-    const response = await request(app)
-      .get(`/api/v1/admin/saml-auth-providers/${samlAuthProvider.id}`)
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = await getSamlAuthProviderMock(samlAuthProvider);
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

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

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

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

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

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

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

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

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

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

@@ -1,6 +0,0 @@
-import appConfig from '../../../../config/app.js';
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  renderObject(response, { version: appConfig.version });
-};

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

@@ -1,26 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-
-describe('GET /api/v1/automatisch/version', () => {
-  it('should return Automatisch version', async () => {
-    const response = await request(app)
-      .get('/api/v1/automatisch/version')
-      .expect(200);
-
-    const expectedPayload = {
-      data: {
-        version: '0.10.0',
-      },
-      meta: {
-        count: 1,
-        currentPage: null,
-        isArray: false,
-        totalPages: null,
-        type: 'Object',
-      },
-    };
-
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

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

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

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

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

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

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

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

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

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

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

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

@@ -1,26 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../test/factories/user';
-import getCurrentUserMock from '../../../../../test/mocks/rest/api/v1/users/get-current-user';
-
-describe('GET /api/v1/users/me', () => {
-  let role, currentUser, token;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-    role = await currentUser.$relatedQuery('role');
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return current user info', async () => {
-    const response = await request(app)
-      .get('/api/v1/users/me')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedPayload = getCurrentUserMock(currentUser, role);
-    expect(response.body).toEqual(expectedPayload);
-  });
-});

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

@@ -1,12 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const inTrial = await request.currentUser.inTrial();
-
-  const trialInfo = {
-    inTrial,
-    expireAt: request.currentUser.trialExpiryDate,
-  };
-
-  renderObject(response, trialInfo);
-};

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

@@ -1,38 +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 getUserTrialMock from '../../../../../test/mocks/rest/api/v1/users/get-user-trial.js';
-import appConfig from '../../../../config/app.js';
-import { DateTime } from 'luxon';
-import User from '../../../../models/user.js';
-
-describe('GET /api/v1/users/:userId/trial', () => {
-  let user, token;
-
-  beforeEach(async () => {
-    const trialExpiryDate = DateTime.now().plus({ days: 30 }).toISODate();
-    user = await createUser({ trialExpiryDate });
-    token = createAuthTokenByUserId(user.id);
-
-    vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
-  });
-
-  describe('should return in trial, active subscription and expire at info', () => {
-    beforeEach(async () => {
-      vi.spyOn(User.prototype, 'inTrial').mockResolvedValue(false);
-      vi.spyOn(User.prototype, 'hasActiveSubscription').mockResolvedValue(true);
-    });
-
-    it('should return null', async () => {
-      const response = await request(app)
-        .get(`/api/v1/users/${user.id}/trial`)
-        .set('Authorization', token)
-        .expect(200);
-
-      const expectedResponsePayload = await getUserTrialMock(user);
-      expect(response.body).toEqual(expectedResponsePayload);
-    });
-  });
-});

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

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

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

@@ -1,36 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { 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,18 +0,0 @@
-import { renderObject } from '../../../../helpers/renderer.js';
-import User from '../../../../models/user.js';
-import paginateRest from '../../../../helpers/pagination-rest.js';
-
-export default async (request, response) => {
-  const usersQuery = User.query()
-    .leftJoinRelated({
-      role: true,
-    })
-    .withGraphFetched({
-      role: true,
-    })
-    .orderBy('full_name', 'asc');
-
-  const users = await paginateRest(usersQuery, request.query.page);
-
-  renderObject(response, users);
-};

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

@@ -1,56 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app';
-import createAuthTokenByUserId from '../../../../helpers/create-auth-token-by-user-id';
-import { createRole } from '../../../../../test/factories/role';
-import { createPermission } from '../../../../../test/factories/permission';
-import { createUser } from '../../../../../test/factories/user';
-import getUsersMock from '../../../../../test/mocks/rest/api/v1/users/get-users';
-
-describe('GET /api/v1/users', () => {
-  let currentUser, currentUserRole, anotherUser, anotherUserRole, token;
-
-  beforeEach(async () => {
-    currentUserRole = await createRole({
-      key: 'currentUser',
-      name: 'Current user role',
-    });
-
-    await createPermission({
-      action: 'read',
-      subject: 'User',
-      roleId: currentUserRole.id,
-    });
-
-    currentUser = await createUser({
-      roleId: currentUserRole.id,
-      fullName: 'Current User',
-    });
-
-    anotherUserRole = await createRole({
-      key: 'anotherUser',
-      name: 'Another user role',
-    });
-
-    anotherUser = await createUser({
-      roleId: anotherUserRole.id,
-      fullName: 'Another User',
-    });
-
-    token = createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should return users data', async () => {
-    const response = await request(app)
-      .get('/api/v1/users')
-      .set('Authorization', token)
-      .expect(200);
-
-    const expectedResponsePayload = await getUsersMock(
-      [anotherUser, currentUser],
-      [anotherUserRole, currentUserRole]
-    );
-
-    expect(response.body).toEqual(expectedResponsePayload);
-  });
-});

packages/backend/src/controllers/healthcheck/index.js

@@ -1,3 +0,0 @@
-export default async (request, response) => {
-  response.status(200).end();
-};

packages/backend/src/controllers/healthcheck/index.test.js

@@ -1,9 +0,0 @@
-import { describe, it } from 'vitest';
-import request from 'supertest';
-import app from '../../app.js';
-
-describe('GET /healthcheck', () => {
-  it('should return 200 response with version data', async () => {
-    await request(app).get('/healthcheck').expect(200);
-  });
-});

packages/backend/src/graphql/mutations/register-user.ee.js

@@ -1,10 +1,7 @@
-import appConfig from '../../config/app.js';
 import User from '../../models/user.js';
 import Role from '../../models/role.js';
 
 const registerUser = async (_parent, params) => {
-  if (!appConfig.isCloud) return;
-
   const { fullName, email, password } = params.input;
 
   const existingUser = await User.query().findOne({

packages/backend/src/graphql/queries/get-config.ee.js

@@ -1,17 +1,9 @@
-import appConfig from '../../config/app.js';
 import { hasValidLicense } from '../../helpers/license.ee.js';
 import Config from '../../models/config.js';
 
 const getConfig = async (_parent, params) => {
   if (!(await hasValidLicense())) return {};
 
-  const defaultConfig = {
-    disableNotificationsPage: appConfig.disableNotificationsPage,
-    disableFavicon: appConfig.disableFavicon,
-    additionalDrawerLink: appConfig.additionalDrawerLink,
-    additionalDrawerLinkText: appConfig.additionalDrawerLinkText,
-  };
-
   const configQuery = Config.query();
 
   if (Array.isArray(params.keys)) {
@@ -26,7 +18,7 @@ const getConfig = async (_parent, params) => {
     computedConfig[key] = value?.data;
 
     return computedConfig;
-  }, defaultConfig);
+  }, {});
 };
 
 export default getConfig;

packages/backend/src/graphql/queries/get-config.ee.test.js

@@ -2,7 +2,6 @@ import { vi, describe, it, expect, beforeEach } from 'vitest';
 import request from 'supertest';
 import app from '../../app';
 import { createConfig } from '../../../test/factories/config';
-import appConfig from '../../config/app';
 import * as license from '../../helpers/license.ee';
 
 describe('graphQL getConfig query', () => {
@@ -57,10 +56,6 @@ describe('graphQL getConfig query', () => {
               [configOne.key]: configOne.value.data,
               [configTwo.key]: configTwo.value.data,
               [configThree.key]: configThree.value.data,
-              disableNotificationsPage: false,
-              disableFavicon: false,
-              additionalDrawerLink: undefined,
-              additionalDrawerLinkText: undefined,
             },
           },
         };
@@ -87,48 +82,6 @@ describe('graphQL getConfig query', () => {
             getConfig: {
               [configOne.key]: configOne.value.data,
               [configTwo.key]: configTwo.value.data,
-              disableNotificationsPage: false,
-              disableFavicon: false,
-              additionalDrawerLink: undefined,
-              additionalDrawerLinkText: undefined,
-            },
-          },
-        };
-
-        expect(response.body).toEqual(expectedResponsePayload);
-      });
-    });
-
-    describe('and with different defaults', () => {
-      beforeEach(async () => {
-        vi.spyOn(appConfig, 'disableNotificationsPage', 'get').mockReturnValue(
-          true
-        );
-        vi.spyOn(appConfig, 'disableFavicon', 'get').mockReturnValue(true);
-        vi.spyOn(appConfig, 'additionalDrawerLink', 'get').mockReturnValue(
-          'https://automatisch.io'
-        );
-        vi.spyOn(appConfig, 'additionalDrawerLinkText', 'get').mockReturnValue(
-          'Automatisch'
-        );
-      });
-
-      it('should return custom config', async () => {
-        const response = await request(app)
-          .post('/graphql')
-          .send({ query })
-          .expect(200);
-
-        const expectedResponsePayload = {
-          data: {
-            getConfig: {
-              [configOne.key]: configOne.value.data,
-              [configTwo.key]: configTwo.value.data,
-              [configThree.key]: configThree.value.data,
-              disableNotificationsPage: true,
-              disableFavicon: true,
-              additionalDrawerLink: 'https://automatisch.io',
-              additionalDrawerLinkText: 'Automatisch',
             },
           },
         };

packages/backend/src/graphql/queries/get-current-user.test.js

@@ -6,6 +6,31 @@ import { createRole } from '../../../test/factories/role';
 import { createUser } from '../../../test/factories/user';
 
 describe('graphQL getCurrentUser query', () => {
+  describe('with unauthenticated user', () => {
+    it('should throw not authorized error', async () => {
+      const invalidUserToken = 'invalid-token';
+
+      const query = `
+        query {
+          getCurrentUser {
+            id
+            email
+          }
+        }
+      `;
+
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', invalidUserToken)
+        .send({ query })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
+    });
+  });
+
+  describe('with authenticated user', () => {
     let role, currentUser, token, requestObject;
 
     beforeEach(async () => {
@@ -76,4 +101,5 @@ describe('graphQL getCurrentUser query', () => {
         'Cannot query field "password" on type "User".'
       );
     });
+  });
 });

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

@@ -40,7 +40,23 @@ describe('graphQL getExecutions query', () => {
     }
   `;
 
-  describe('and without correct permissions', () => {
+  const invalidToken = 'invalid-token';
+
+  describe('with unauthenticated user', () => {
+    it('should throw not authorized error', async () => {
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', invalidToken)
+        .send({ query })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
+    });
+  });
+
+  describe('with authenticated user', () => {
+    describe('and without permissions', () => {
       it('should throw not authorized error', async () => {
         const userWithoutPermissions = await createUser();
         const token = createAuthTokenByUserId(userWithoutPermissions.id);
@@ -469,4 +485,5 @@ describe('graphQL getExecutions query', () => {
         });
       });
     });
+  });
 });

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

@@ -40,6 +40,23 @@ describe('graphQL getFlow query', () => {
     `;
   };
 
+  describe('with unauthenticated user', () => {
+    it('should throw not authorized error', async () => {
+      const invalidToken = 'invalid-token';
+      const flow = await createFlow();
+
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', invalidToken)
+        .send({ query: query(flow.id) })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
+    });
+  });
+
+  describe('with authenticated user', () => {
     describe('and without permissions', () => {
       it('should throw not authorized error', async () => {
         const userWithoutPermissions = await createUser();
@@ -128,7 +145,9 @@ describe('graphQL getFlow query', () => {
                   {
                     appKey: actionStep.appKey,
                     connection: {
-                    createdAt: actionConnection.createdAt.getTime().toString(),
+                      createdAt: actionConnection.createdAt
+                        .getTime()
+                        .toString(),
                       id: actionConnection.id,
                       verified: actionConnection.verified,
                     },
@@ -215,7 +234,9 @@ describe('graphQL getFlow query', () => {
                   {
                     appKey: actionStep.appKey,
                     connection: {
-                    createdAt: actionConnection.createdAt.getTime().toString(),
+                      createdAt: actionConnection.createdAt
+                        .getTime()
+                        .toString(),
                       id: actionConnection.id,
                       verified: actionConnection.verified,
                     },
@@ -237,4 +258,5 @@ describe('graphQL getFlow query', () => {
         });
       });
     });
+  });
 });

packages/backend/src/graphql/queries/get-role.ee.test.js

@@ -17,6 +17,7 @@ describe('graphQL getRole query', () => {
     userWithoutPermissions,
     tokenWithPermissions,
     tokenWithoutPermissions,
+    invalidToken,
     permissionOne,
     permissionTwo;
 
@@ -73,8 +74,24 @@ describe('graphQL getRole query', () => {
     tokenWithoutPermissions = createAuthTokenByUserId(
       userWithoutPermissions.id
     );
+
+    invalidToken = 'invalid-token';
   });
 
+  describe('with unauthenticated user', () => {
+    it('should throw not authorized error', async () => {
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', invalidToken)
+        .send({ query: queryWithValidRole })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
+    });
+  });
+
+  describe('with authenticated user', () => {
     describe('and with valid license', () => {
       beforeEach(async () => {
         vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
@@ -161,4 +178,5 @@ describe('graphQL getRole query', () => {
         });
       });
     });
+  });
 });

packages/backend/src/graphql/queries/get-roles.ee.test.js

@@ -15,7 +15,8 @@ describe('graphQL getRoles query', () => {
     userWithPermissions,
     userWithoutPermissions,
     tokenWithPermissions,
-    tokenWithoutPermissions;
+    tokenWithoutPermissions,
+    invalidToken;
 
   beforeEach(async () => {
     currentUserRole = await createRole({ name: 'Current user role' });
@@ -52,8 +53,24 @@ describe('graphQL getRoles query', () => {
     tokenWithoutPermissions = createAuthTokenByUserId(
       userWithoutPermissions.id
     );
+
+    invalidToken = 'invalid-token';
   });
 
+  describe('with unauthenticated user', () => {
+    it('should throw not authorized error', async () => {
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', invalidToken)
+        .send({ query })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
+    });
+  });
+
+  describe('with authenticated user', () => {
     describe('and with valid license', () => {
       beforeEach(async () => {
         vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
@@ -131,4 +148,5 @@ describe('graphQL getRoles query', () => {
         });
       });
     });
+  });
 });

packages/backend/src/graphql/queries/get-trial-status.ee.test.js

@@ -16,6 +16,22 @@ describe('graphQL getTrialStatus query', () => {
     }
   `;
 
+  const invalidToken = 'invalid-token';
+
+  describe('with unauthenticated user', () => {
+    it('should throw not authorized error', async () => {
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', invalidToken)
+        .send({ query })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
+    });
+  });
+
+  describe('with authenticated user', () => {
     let user, userToken;
 
     beforeEach(async () => {
@@ -97,4 +113,5 @@ describe('graphQL getTrialStatus query', () => {
         });
       });
     });
+  });
 });

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

@@ -8,6 +8,31 @@ import { createPermission } from '../../../test/factories/permission';
 import { createUser } from '../../../test/factories/user';
 
 describe('graphQL getUser query', () => {
+  describe('with unauthenticated user', () => {
+    it('should throw not authorized error', async () => {
+      const invalidUserId = '123123123';
+
+      const query = `
+        query {
+          getUser(id: "${invalidUserId}") {
+            id
+            email
+          }
+        }
+      `;
+
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', 'invalid-token')
+        .send({ query })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
+    });
+  });
+
+  describe('with authenticated user', () => {
     describe('and without permissions', () => {
       it('should throw not authorized error', async () => {
         const userWithoutPermissions = await createUser();
@@ -59,7 +84,9 @@ describe('graphQL getUser query', () => {
         });
 
         token = createAuthTokenByUserId(currentUser.id);
-      requestObject = request(app).post('/graphql').set('Authorization', token);
+        requestObject = request(app)
+          .post('/graphql')
+          .set('Authorization', token);
       });
 
       it('should return user data for a valid user id', async () => {
@@ -143,4 +170,5 @@ describe('graphQL getUser query', () => {
         expect(response.body.errors[0].message).toEqual('NotFoundError');
       });
     });
+  });
 });

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

@@ -30,6 +30,20 @@ describe('graphQL getUsers query', () => {
     }
   `;
 
+  describe('with unauthenticated user', () => {
+    it('should throw not authorized error', async () => {
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', 'invalid-token')
+        .send({ query })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
+    });
+  });
+
+  describe('with authenticated user', () => {
     describe('and without permissions', () => {
       it('should throw not authorized error', async () => {
         const userWithoutPermissions = await createUser();
@@ -72,7 +86,9 @@ describe('graphQL getUsers query', () => {
         });
 
         token = createAuthTokenByUserId(currentUser.id);
-      requestObject = request(app).post('/graphql').set('Authorization', token);
+        requestObject = request(app)
+          .post('/graphql')
+          .set('Authorization', token);
       });
 
       it('should return users data', async () => {
@@ -145,4 +161,5 @@ describe('graphQL getUsers query', () => {
         );
       });
     });
+  });
 });

packages/backend/src/helpers/authentication.js

@@ -3,7 +3,7 @@ import jwt from 'jsonwebtoken';
 import appConfig from '../config/app.js';
 import User from '../models/user.js';
 
-export const isAuthenticated = async (_parent, _args, req) => {
+const isAuthenticated = rule()(async (_parent, _args, req) => {
   const token = req.headers['authorization'];
 
   if (token == null) return false;
@@ -20,28 +20,18 @@ export const isAuthenticated = async (_parent, _args, req) => {
       .withGraphFetched({
         role: true,
         permissions: true,
-      })
+      });
-      .throwIfNotFound();
 
     return true;
   } catch (error) {
     return false;
   }
-};
+});
 
-export const authenticateUser = async (request, response, next) => {
+const authentication = shield(
-  if (await isAuthenticated(null, null, request)) {
+  {
-    next();
-  } else {
-    return response.status(401).end();
-  }
-};
-
-const isAuthenticatedRule = rule()(isAuthenticated);
-
-export const authenticationRules = {
     Query: {
-    '*': isAuthenticatedRule,
+      '*': isAuthenticated,
       getAutomatischInfo: allow,
       getConfig: allow,
       getNotifications: allow,
@@ -49,18 +39,16 @@ export const authenticationRules = {
       listSamlAuthProviders: allow,
     },
     Mutation: {
-    '*': isAuthenticatedRule,
+      '*': isAuthenticated,
       forgotPassword: allow,
       login: allow,
       registerUser: allow,
       resetPassword: allow,
     },
-};
+  },
-
+  {
-const authenticationOptions = {
     allowExternalErrors: true,
-};
+  }
-
+);
-const authentication = shield(authenticationRules, authenticationOptions);
 
 export default authentication;

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

@@ -1,72 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { allow } from 'graphql-shield';
-import { isAuthenticated, authenticationRules } from './authentication.js';
-import { createUser } from '../../test/factories/user.js';
-import createAuthTokenByUserId from '../helpers/create-auth-token-by-user-id.js';
-
-describe('isAuthenticated', () => {
-  it('should return false if no token is provided', async () => {
-    const req = { headers: {} };
-    expect(await isAuthenticated(null, null, req)).toBe(false);
-  });
-
-  it('should return false if token is invalid', async () => {
-    const req = { headers: { authorization: 'invalidToken' } };
-    expect(await isAuthenticated(null, null, req)).toBe(false);
-  });
-
-  it('should return true if token is valid and there is a user', async () => {
-    const user = await createUser();
-    const token = createAuthTokenByUserId(user.id);
-
-    const req = { headers: { authorization: token } };
-    expect(await isAuthenticated(null, null, req)).toBe(true);
-  });
-
-  it('should return false if token is valid and but there is no user', async () => {
-    const user = await createUser();
-    const token = createAuthTokenByUserId(user.id);
-    await user.$query().delete();
-
-    const req = { headers: { authorization: token } };
-    expect(await isAuthenticated(null, null, req)).toBe(false);
-  });
-});
-
-describe('authentication rules', () => {
-  const getQueryAndMutationNames = (rules) => {
-    const queries = Object.keys(rules.Query || {});
-    const mutations = Object.keys(rules.Mutation || {});
-    return { queries, mutations };
-  };
-
-  const { queries, mutations } = getQueryAndMutationNames(authenticationRules);
-
-  describe('for queries', () => {
-    queries.forEach((query) => {
-      it(`should apply correct rule for query: ${query}`, () => {
-        const ruleApplied = authenticationRules.Query[query];
-
-        if (query === '*') {
-          expect(ruleApplied.func).toBe(isAuthenticated);
-        } else {
-          expect(ruleApplied).toEqual(allow);
-        }
-      });
-    });
-  });
-
-  describe('for mutations', () => {
-    mutations.forEach((mutation) => {
-      it(`should apply correct rule for mutation: ${mutation}`, () => {
-        const ruleApplied = authenticationRules.Mutation[mutation];
-
-        if (mutation === '*') {
-          expect(ruleApplied.func).toBe(isAuthenticated);
-        } else {
-          expect(ruleApplied).toBe(allow);
-        }
-      });
-    });
-  });
-});

packages/backend/src/helpers/authorization.js

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

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

@@ -1,11 +0,0 @@
-import appConfig from '../config/app.js';
-
-export const checkIsCloud = async (request, response, next) => {
-  if (appConfig.isCloud) {
-    next();
-  } else {
-    return response.status(404).end();
-  }
-};
-
-export default checkIsCloud;

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

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

packages/backend/src/helpers/compile-email.ee.js

@@ -1,9 +1,6 @@
-import path from 'path';
+import * as path from 'path';
-import fs from 'fs';
+import * as fs from 'fs';
-import handlebars from 'handlebars';
+import * as handlebars from 'handlebars';
-import { fileURLToPath } from 'url';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const compileEmail = (emailPath, replacements = {}) => {
   const filePath = path.join(__dirname, `../views/emails/${emailPath}.ee.hbs`);

packages/backend/src/helpers/logger.js

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

packages/backend/src/helpers/pagination-rest.js

@@ -1,25 +0,0 @@
-const paginateRest = async (query, page) => {
-  const pageSize = 10;
-
-  page = parseInt(page, 10);
-
-  if (isNaN(page) || page < 1) {
-    page = 1;
-  }
-
-  const [records, count] = await Promise.all([
-    query.limit(pageSize).offset((page - 1) * pageSize),
-    query.resultSize(),
-  ]);
-
-  return {
-    pageInfo: {
-      currentPage: page,
-      totalPages: Math.ceil(count / pageSize),
-    },
-    totalCount: count,
-    records,
-  };
-};
-
-export default paginateRest;

packages/backend/src/helpers/renderer.js

@@ -1,44 +0,0 @@
-import serializers from '../serializers/index.js';
-
-const isPaginated = (object) =>
-  object?.pageInfo &&
-  object?.totalCount !== undefined &&
-  Array.isArray(object?.records);
-
-const isArray = (object) =>
-  Array.isArray(object) || Array.isArray(object?.records);
-
-const totalCount = (object) =>
-  isPaginated(object) ? object.totalCount : isArray(object) ? object.length : 1;
-
-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.constructor.name;
-
-  const serializer = serializers[type];
-
-  if (serializer) {
-    data = Array.isArray(data)
-      ? data.map((item) => serializer(item))
-      : serializer(data);
-  }
-
-  const computedPayload = {
-    data,
-    meta: {
-      type,
-      count: totalCount(object),
-      isArray: isArray(object),
-      currentPage: isPaginated(object) ? object.pageInfo.currentPage : null,
-      totalPages: isPaginated(object) ? object.pageInfo.totalPages : null,
-    },
-  };
-
-  return response.json(computedPayload);
-};
-
-export { renderObject };

packages/backend/src/helpers/web-ui-handler.js

@@ -15,7 +15,7 @@ const webUIHandler = async (app) => {
   app.use(express.static(webBuildPath));
 
   app.get('*', (_req, res) => {
-    res.set('Content-Security-Policy', 'frame-ancestors \'none\';');
+    res.set('Content-Security-Policy', 'frame-ancestors: none;');
     res.set('X-Frame-Options', 'DENY');
 
     res.sendFile(indexHtml);

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

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

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

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

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

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

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

@@ -1,10 +0,0 @@
-import { Router } from 'express';
-import versionAction from '../../../controllers/api/v1/automatisch/version.js';
-import notificationsAction from '../../../controllers/api/v1/automatisch/notifications.js';
-
-const router = Router();
-
-router.get('/version', versionAction);
-router.get('/notifications', notificationsAction);
-
-export default router;

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

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

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

@@ -1,22 +0,0 @@
-import { Router } from 'express';
-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';
-
-const router = Router();
-
-router.get('/', authenticateUser, authorizeUser, getUsersAction);
-router.get('/me', authenticateUser, getCurrentUserAction);
-router.get('/:userId', authenticateUser, authorizeUser, getUserAction);
-router.get(
-  '/:userId/trial',
-  authenticateUser,
-  checkIsCloud,
-  getUserTrialAction
-);
-
-export default router;

packages/backend/src/routes/healthcheck.js

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

packages/backend/src/routes/index.js

@@ -2,25 +2,11 @@ import { Router } from 'express';
 import graphQLInstance from '../helpers/graphql-instance.js';
 import webhooksRouter from './webhooks.js';
 import paddleRouter from './paddle.ee.js';
-import healthcheckRouter from './healthcheck.js';
-import automatischRouter from './api/v1/automatisch.js';
-import usersRouter from './api/v1/users.js';
-import paymentRouter from './api/v1/payment.ee.js';
-import 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';
 
 const router = Router();
 
 router.use('/graphql', graphQLInstance);
 router.use('/webhooks', webhooksRouter);
 router.use('/paddle', paddleRouter);
-router.use('/healthcheck', healthcheckRouter);
-router.use('/api/v1/automatisch', automatischRouter);
-router.use('/api/v1/users', usersRouter);
-router.use('/api/v1/payment', paymentRouter);
-router.use('/api/v1/admin/saml-auth-providers', samlAuthProvidersRouter);
-router.use('/api/v1/admin/roles', rolesRouter);
-router.use('/api/v1/admin/permissions', permissionsRouter);
 
 export default router;

packages/backend/src/serializers/index.js

@@ -1,13 +0,0 @@
-import userSerializer from './user.js';
-import roleSerializer from './role.js';
-import permissionSerializer from './permission.js';
-import samlAuthProviderSerializer from './saml-auth-provider.ee.js';
-
-const serializers = {
-  User: userSerializer,
-  Role: roleSerializer,
-  Permission: permissionSerializer,
-  SamlAuthProvider: samlAuthProviderSerializer,
-};
-
-export default serializers;

packages/backend/src/serializers/permission.js

@@ -1,13 +0,0 @@
-const permissionSerializer = (permission) => {
-  return {
-    id: permission.id,
-    roleId: permission.roleId,
-    action: permission.action,
-    subject: permission.subject,
-    conditions: permission.conditions,
-    createdAt: permission.createdAt,
-    updatedAt: permission.updatedAt,
-  };
-};
-
-export default permissionSerializer;

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

@@ -1,25 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createPermission } from '../../test/factories/permission';
-import permissionSerializer from './permission';
-
-describe('permissionSerializer', () => {
-  let permission;
-
-  beforeEach(async () => {
-    permission = await createPermission();
-  });
-
-  it('should return permission data', async () => {
-    const expectedPayload = {
-      id: permission.id,
-      roleId: permission.roleId,
-      action: permission.action,
-      subject: permission.subject,
-      conditions: permission.conditions,
-      createdAt: permission.createdAt,
-      updatedAt: permission.updatedAt,
-    };
-
-    expect(permissionSerializer(permission)).toEqual(expectedPayload);
-  });
-});

packages/backend/src/serializers/role.js

@@ -1,23 +0,0 @@
-import permissionSerializer from './permission.js';
-
-const roleSerializer = (role) => {
-  let roleData = {
-    id: role.id,
-    name: role.name,
-    key: role.key,
-    description: role.description,
-    createdAt: role.createdAt,
-    updatedAt: role.updatedAt,
-    isAdmin: role.isAdmin,
-  };
-
-  if (role.permissions) {
-    roleData.permissions = role.permissions.map((permission) =>
-      permissionSerializer(permission)
-    );
-  }
-
-  return roleData;
-};
-
-export default roleSerializer;

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

@@ -1,48 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createRole } from '../../test/factories/role';
-import roleSerializer from './role';
-import { createPermission } from '../../test/factories/permission';
-
-describe('roleSerializer', () => {
-  let role, permissionOne, permissionTwo;
-
-  beforeEach(async () => {
-    role = await createRole();
-
-    permissionOne = await createPermission({
-      roleId: role.id,
-      action: 'read',
-      subject: 'User',
-    });
-
-    permissionTwo = await createPermission({
-      roleId: role.id,
-      action: 'read',
-      subject: 'Role',
-    });
-  });
-
-  it('should return role data', async () => {
-    const expectedPayload = {
-      id: role.id,
-      name: role.name,
-      key: role.key,
-      description: role.description,
-      createdAt: role.createdAt,
-      updatedAt: role.updatedAt,
-      isAdmin: role.isAdmin,
-    };
-
-    expect(roleSerializer(role)).toEqual(expectedPayload);
-  });
-
-  it('should return role data with the permissions', async () => {
-    role.permissions = [permissionOne, permissionTwo];
-
-    const expectedPayload = {
-      permissions: [permissionOne, permissionTwo],
-    };
-
-    expect(roleSerializer(role)).toMatchObject(expectedPayload);
-  });
-});

packages/backend/src/serializers/saml-auth-provider.ee.js

@@ -1,18 +0,0 @@
-const samlAuthProviderSerializer = (samlAuthProvider) => {
-  return {
-    id: samlAuthProvider.id,
-    name: samlAuthProvider.name,
-    certificate: samlAuthProvider.certificate,
-    signatureAlgorithm: samlAuthProvider.signatureAlgorithm,
-    issuer: samlAuthProvider.issuer,
-    entryPoint: samlAuthProvider.entryPoint,
-    firstnameAttributeName: samlAuthProvider.firstnameAttributeName,
-    surnameAttributeName: samlAuthProvider.surnameAttributeName,
-    emailAttributeName: samlAuthProvider.emailAttributeName,
-    roleAttributeName: samlAuthProvider.roleAttributeName,
-    active: samlAuthProvider.active,
-    defaultRoleId: samlAuthProvider.defaultRoleId,
-  };
-};
-
-export default samlAuthProviderSerializer;

packages/backend/src/serializers/saml-auth-provider.ee.test.js

@@ -1,32 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createSamlAuthProvider } from '../../test/factories/saml-auth-provider.ee.js';
-import samlAuthProviderSerializer from './saml-auth-provider.ee.js';
-
-describe('samlAuthProviderSerializer', () => {
-  let samlAuthProvider;
-
-  beforeEach(async () => {
-    samlAuthProvider = await createSamlAuthProvider();
-  });
-
-  it('should return saml auth provider data', async () => {
-    const expectedPayload = {
-      id: samlAuthProvider.id,
-      name: samlAuthProvider.name,
-      certificate: samlAuthProvider.certificate,
-      signatureAlgorithm: samlAuthProvider.signatureAlgorithm,
-      issuer: samlAuthProvider.issuer,
-      entryPoint: samlAuthProvider.entryPoint,
-      firstnameAttributeName: samlAuthProvider.firstnameAttributeName,
-      surnameAttributeName: samlAuthProvider.surnameAttributeName,
-      emailAttributeName: samlAuthProvider.emailAttributeName,
-      roleAttributeName: samlAuthProvider.roleAttributeName,
-      active: samlAuthProvider.active,
-      defaultRoleId: samlAuthProvider.defaultRoleId,
-    };
-
-    expect(samlAuthProviderSerializer(samlAuthProvider)).toEqual(
-      expectedPayload
-    );
-  });
-});

packages/backend/src/serializers/user.js

@@ -1,31 +0,0 @@
-import roleSerializer from './role.js';
-import permissionSerializer from './permission.js';
-import appConfig from '../config/app.js';
-
-const userSerializer = (user) => {
-  let userData = {
-    id: user.id,
-    email: user.email,
-    createdAt: user.createdAt,
-    updatedAt: user.updatedAt,
-    fullName: user.fullName,
-  };
-
-  if (user.role) {
-    userData.role = roleSerializer(user.role);
-  }
-
-  if (user.permissions) {
-    userData.permissions = user.permissions.map((permission) =>
-      permissionSerializer(permission)
-    );
-  }
-
-  if (appConfig.isCloud && user.trialExpiryDate) {
-    userData.trialExpiryDate = user.trialExpiryDate;
-  }
-
-  return userData;
-};
-
-export default userSerializer;

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

@@ -1,75 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { DateTime } from 'luxon';
-import appConfig from '../config/app';
-import { createUser } from '../../test/factories/user';
-import { createPermission } from '../../test/factories/permission';
-import userSerializer from './user';
-
-describe('userSerializer', () => {
-  let user, role, permissionOne, permissionTwo;
-
-  beforeEach(async () => {
-    user = await createUser();
-    role = await user.$relatedQuery('role');
-
-    permissionOne = await createPermission({
-      roleId: role.id,
-      action: 'read',
-      subject: 'User',
-    });
-
-    permissionTwo = await createPermission({
-      roleId: role.id,
-      action: 'read',
-      subject: 'Role',
-    });
-  });
-
-  it('should return user data', async () => {
-    vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
-
-    const expectedPayload = {
-      createdAt: user.createdAt,
-      email: user.email,
-      fullName: user.fullName,
-      id: user.id,
-      updatedAt: user.updatedAt,
-    };
-
-    expect(userSerializer(user)).toEqual(expectedPayload);
-  });
-
-  it('should return user data with the role', async () => {
-    user.role = role;
-
-    const expectedPayload = {
-      role,
-    };
-
-    expect(userSerializer(user)).toMatchObject(expectedPayload);
-  });
-
-  it('should return user data with the permissions', async () => {
-    user.permissions = [permissionOne, permissionTwo];
-
-    const expectedPayload = {
-      permissions: [permissionOne, permissionTwo],
-    };
-
-    expect(userSerializer(user)).toMatchObject(expectedPayload);
-  });
-
-  it('should return user data with trial expiry date', async () => {
-    vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
-
-    await user.$query().patch({
-      trialExpiryDate: DateTime.now().plus({ days: 30 }).toISODate(),
-    });
-
-    const expectedPayload = {
-      trialExpiryDate: user.trialExpiryDate,
-    };
-
-    expect(userSerializer(user)).toMatchObject(expectedPayload);
-  });
-});

packages/backend/test/factories/config.js

@@ -1,5 +1,4 @@
 import { faker } from '@faker-js/faker';
-import Config from '../../src/models/config';
 
 export const createConfig = async (params = {}) => {
   const configData = {
@@ -7,7 +6,10 @@ export const createConfig = async (params = {}) => {
     value: params?.value || { data: 'sampleConfig' },
   };
 
-  const config = await Config.query().insert(configData).returning('*');
+  const [config] = await global.knex
+    .table('config')
+    .insert(configData)
+    .returning('*');
 
   return config;
 };

packages/backend/test/factories/connection.js

@@ -1,6 +1,5 @@
 import appConfig from '../../src/config/app';
 import { AES } from 'crypto-js';
-import Connection from '../../src/models/connection';
 
 export const createConnection = async (params = {}) => {
   params.key = params?.key || 'deepl';
@@ -17,7 +16,10 @@ export const createConnection = async (params = {}) => {
     appConfig.encryptionKey
   ).toString();
 
-  const connection = await Connection.query().insert(params).returning('*');
+  const [connection] = await global.knex
+    .table('connections')
+    .insert(params)
+    .returning('*');
 
   return connection;
 };

packages/backend/test/factories/execution-step.js

@@ -1,4 +1,3 @@
-import ExecutionStep from '../../src/models/execution-step';
 import { createExecution } from './execution';
 import { createStep } from './step';
 
@@ -9,7 +8,8 @@ export const createExecutionStep = async (params = {}) => {
   params.dataIn = params?.dataIn || { dataIn: 'dataIn' };
   params.dataOut = params?.dataOut || { dataOut: 'dataOut' };
 
-  const executionStep = await ExecutionStep.query()
+  const [executionStep] = await global.knex
+    .table('executionSteps')
     .insert(params)
     .returning('*');
 

packages/backend/test/factories/execution.js

@@ -1,4 +1,3 @@
-import Execution from '../../src/models/execution';
 import { createFlow } from './flow';
 
 export const createExecution = async (params = {}) => {
@@ -7,7 +6,10 @@ export const createExecution = async (params = {}) => {
   params.createdAt = params?.createdAt || new Date().toISOString();
   params.updatedAt = params?.updatedAt || new Date().toISOString();
 
-  const execution = await Execution.query().insert(params).returning('*');
+  const [execution] = await global.knex
+    .table('executions')
+    .insert(params)
+    .returning('*');
 
   return execution;
 };

packages/backend/test/factories/flow.js

@@ -1,4 +1,3 @@
-import Flow from '../../src/models/flow';
 import { createUser } from './user';
 
 export const createFlow = async (params = {}) => {
@@ -7,7 +6,7 @@ export const createFlow = async (params = {}) => {
   params.createdAt = params?.createdAt || new Date().toISOString();
   params.updatedAt = params?.updatedAt || new Date().toISOString();
 
-  const flow = await Flow.query().insert(params).returning('*');
+  const [flow] = await global.knex.table('flows').insert(params).returning('*');
 
   return flow;
 };

packages/backend/test/factories/permission.js

@@ -1,4 +1,3 @@
-import Permission from '../../src/models/permission';
 import { createRole } from './role';
 
 export const createPermission = async (params = {}) => {
@@ -7,7 +6,10 @@ export const createPermission = async (params = {}) => {
   params.subject = params?.subject || 'User';
   params.conditions = params?.conditions || ['isCreator'];
 
-  const permission = await Permission.query().insert(params).returning('*');
+  const [permission] = await global.knex
+    .table('permissions')
+    .insert(params)
+    .returning('*');
 
   return permission;
 };

packages/backend/test/factories/role.js

@@ -1,10 +1,8 @@
-import Role from '../../src/models/role';
-
 export const createRole = async (params = {}) => {
   params.name = params?.name || 'Viewer';
   params.key = params?.key || 'viewer';
 
-  const role = await Role.query().insert(params).returning('*');
+  const [role] = await global.knex.table('roles').insert(params).returning('*');
 
   return role;
 };

packages/backend/test/factories/saml-auth-provider.ee.js

@@ -1,33 +0,0 @@
-import { createRole } from './role';
-import SamlAuthProvider from '../../src/models/saml-auth-provider.ee.js';
-
-export const createSamlAuthProvider = async (params = {}) => {
-  params.name = params?.name || 'Keycloak SAML';
-  params.certificate = params?.certificate || 'certificate';
-  params.signatureAlgorithm = params?.signatureAlgorithm || 'sha512';
-
-  params.entryPoint =
-    params?.entryPoint ||
-    'https://example.com/auth/realms/automatisch/protocol/saml';
-
-  params.issuer = params?.issuer || 'automatisch-client';
-
-  params.firstnameAttributeName =
-    params?.firstnameAttributeName || 'urn:oid:2.1.1.42';
-
-  params.surnameAttributeName =
-    params?.surnameAttributeName || 'urn:oid:2.1.1.4';
-
-  params.emailAttributeName =
-    params?.emailAttributeName || 'urn:oid:1.1.2342.19200300.100.1.1';
-
-  params.roleAttributeName = params?.roleAttributeName || 'Role';
-  params.defaultRoleId = params?.defaultRoleId || (await createRole()).id;
-  params.active = params?.active || true;
-
-  const samlAuthProvider = await SamlAuthProvider.query()
-    .insert(params)
-    .returning('*');
-
-  return samlAuthProvider;
-};

packages/backend/test/factories/step.js

@@ -1,4 +1,3 @@
-import Step from '../../src/models/step';
 import { createFlow } from './flow';
 
 export const createStep = async (params = {}) => {
@@ -17,7 +16,7 @@ export const createStep = async (params = {}) => {
   params.appKey =
     params?.appKey || (params.type === 'action' ? 'deepl' : 'webhook');
 
-  const step = await Step.query().insert(params).returning('*');
+  const [step] = await global.knex.table('steps').insert(params).returning('*');
 
   return step;
 };

packages/backend/test/factories/user.js

@@ -1,6 +1,5 @@
 import { createRole } from './role';
 import { faker } from '@faker-js/faker';
-import User from '../../src/models/user';
 
 export const createUser = async (params = {}) => {
   params.roleId = params?.roleId || (await createRole()).id;
@@ -8,7 +7,7 @@ export const createUser = async (params = {}) => {
   params.email = params?.email || faker.internet.email();
   params.password = params?.password || faker.internet.password();
 
-  const user = await User.query().insert(params).returning('*');
+  const [user] = await global.knex.table('users').insert(params).returning('*');
 
   return user;
 };

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

@@ -1,64 +0,0 @@
-const getPermissionsCatalogMock = async () => {
-  const data = {
-    actions: [
-      {
-        key: 'create',
-        label: 'Create',
-        subjects: ['Connection', 'Flow'],
-      },
-      {
-        key: 'read',
-        label: 'Read',
-        subjects: ['Connection', 'Execution', 'Flow'],
-      },
-      {
-        key: 'update',
-        label: 'Update',
-        subjects: ['Connection', 'Flow'],
-      },
-      {
-        key: 'delete',
-        label: 'Delete',
-        subjects: ['Connection', 'Flow'],
-      },
-      {
-        key: 'publish',
-        label: 'Publish',
-        subjects: ['Flow'],
-      },
-    ],
-    conditions: [
-      {
-        key: 'isCreator',
-        label: 'Is creator',
-      },
-    ],
-    subjects: [
-      {
-        key: 'Connection',
-        label: 'Connection',
-      },
-      {
-        key: 'Flow',
-        label: 'Flow',
-      },
-      {
-        key: 'Execution',
-        label: 'Execution',
-      },
-    ],
-  };
-
-  return {
-    data: data,
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default getPermissionsCatalogMock;

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

@@ -1,33 +0,0 @@
-const getRoleMock = async (role, permissions) => {
-  const data = {
-    id: role.id,
-    key: role.key,
-    name: role.name,
-    isAdmin: role.isAdmin,
-    description: role.description,
-    createdAt: role.createdAt.toISOString(),
-    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.toISOString(),
-      updatedAt: permission.updatedAt.toISOString(),
-    })),
-  };
-
-  return {
-    data: data,
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'Role',
-    },
-  };
-};
-
-export default getRoleMock;