feat(pdf-monkey): add delete document action

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/dropbox/actions/create-text-file/index.js

@@ -1,82 +0,0 @@
-import path from 'node:path';
-import defineAction from '../../../../helpers/define-action.js';
-
-export default defineAction({
-  name: 'Create a text file',
-  key: 'createTextFile',
-  description: 'Create a new text file from plain text content you specify.',
-  arguments: [
-    {
-      label: 'Folder',
-      key: 'parentFolder',
-      type: 'string',
-      required: true,
-      description:
-        'Enter the folder path that file will be saved, like /TextFiles/ or /Documents/Taxes/',
-      variables: true,
-    },
-    {
-      label: 'Folder Name',
-      key: 'folderName',
-      type: 'string',
-      required: true,
-      description:
-        "Enter the name for the new file. The file extension will be '.txt'.",
-      variables: true,
-    },
-    {
-      label: 'File Content',
-      key: 'fileContent',
-      type: 'string',
-      required: true,
-      description: 'Plain text content to insert into the new text file.',
-      variables: true,
-    },
-    {
-      label: 'Overwrite',
-      key: 'overwrite',
-      type: 'dropdown',
-      required: true,
-      description:
-        'Overwrite this file (if one of the same name exists) or not.',
-      variables: true,
-      options: [
-        { label: 'False', value: false },
-        { label: 'True', value: true },
-      ],
-    },
-  ],
-
-  async run($) {
-    const fileContent = $.step.parameters.fileContent;
-    const overwrite = $.step.parameters.overwrite;
-    const parentFolder = $.step.parameters.parentFolder;
-    const folderName = $.step.parameters.folderName;
-    const folderPath = path.join(parentFolder, folderName);
-
-    const headers = {
-      Authorization: `Bearer ${$.auth.data.accessToken}`,
-      'Content-Type': 'application/octet-stream',
-      'Dropbox-API-Arg': JSON.stringify({
-        autorename: false,
-        mode: overwrite ? 'overwrite' : 'add',
-        mute: false,
-        path: `${folderPath}.txt`,
-        strict_conflict: false,
-      }),
-    };
-
-    const response = await $.http.post(
-      'https://content.dropboxapi.com/2/files/upload',
-      fileContent,
-      {
-        headers,
-        additionalProperties: {
-          skipAddingAuthHeader: true,
-        },
-      }
-    );
-
-    $.setActionItem({ raw: response.data });
-  },
-});

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

@@ -1,5 +1,4 @@
 import createFolder from './create-folder/index.js';
-import createTextFile from './create-text-file/index.js';
 import renameFile from './rename-file/index.js';
 
-export default [createFolder, createTextFile, renameFile];
+export default [createFolder, renameFile];

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

@@ -1,10 +1,10 @@
 const addAuthHeader = ($, requestConfig) => {
+  requestConfig.headers['Content-Type'] = 'application/json';
+
   if (
     !requestConfig.additionalProperties?.skipAddingAuthHeader &&
     $.auth.data?.accessToken
   ) {
-    requestConfig.headers['Content-Type'] = 'application/json';
-
     requestConfig.headers.Authorization = `Bearer ${$.auth.data.accessToken}`;
   }
 

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

@@ -2,7 +2,6 @@ import defineApp from '../../helpers/define-app.js';
 import addAuthHeader from './common/add-auth-header.js';
 import auth from './auth/index.js';
 import actions from './actions/index.js';
-import triggers from './triggers/index.js';
 
 export default defineApp({
   name: 'Dropbox',
@@ -16,5 +15,4 @@ export default defineApp({
   beforeRequest: [addAuthHeader],
   auth,
   actions,
-  triggers,
 });

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

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

packages/backend/src/apps/dropbox/triggers/new-folders/index.js

@@ -1,61 +0,0 @@
-import defineTrigger from '../../../../helpers/define-trigger.js';
-
-export default defineTrigger({
-  name: 'New folders',
-  key: 'newFolders',
-  pollInterval: 15,
-  description:
-    'Triggers when any new folder is added. Ensure that the number of files/folders within the monitored directory remains below 4000.',
-  arguments: [
-    {
-      label: 'Folder',
-      key: 'folderPath',
-      type: 'string',
-      required: true,
-      description:
-        'Enter the folder path that you want to follow, like /TextFiles or /Documents/Taxes.',
-      variables: true,
-    },
-  ],
-
-  async run($) {
-    const folderPath = $.step.parameters.folderPath;
-    let endpoint = '/2/files/list_folder';
-    let next = false;
-
-    const params = {
-      path: folderPath,
-      recursive: false,
-      include_deleted: false,
-      include_has_explicit_shared_members: false,
-      include_mounted_folders: true,
-      limit: 2000,
-      include_non_downloadable_files: true,
-    };
-
-    do {
-      const { data } = await $.http.post(endpoint, params);
-
-      if (data.has_more) {
-        endpoint += '/continue';
-        params.cursor = data.cursor;
-        next = data.has_more;
-      } else {
-        next = false;
-      }
-
-      if (data.entries?.length) {
-        for (const entry of data.entries.reverse()) {
-          if (entry['.tag'] === 'folder') {
-            $.pushTriggerItem({
-              raw: entry,
-              meta: {
-                internalId: entry.id,
-              },
-            });
-          }
-        }
-      }
-    } while (next);
-  },
-});

packages/backend/src/apps/pdf-monkey/actions/delete-document/index.js

@@ -0,0 +1,29 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Delete document',
+  key: 'deleteDocument',
+  description: 'Deletes a document.',
+  arguments: [
+    {
+      label: 'Document ID',
+      key: 'documentId',
+      type: 'string',
+      required: true,
+      description: '',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const { documentId } = $.step.parameters;
+
+    await $.http.delete(`/v1/documents/${documentId}`);
+
+    $.setActionItem({
+      raw: {
+        result: 'successful',
+      },
+    });
+  },
+});

packages/backend/src/apps/pdf-monkey/actions/generate-document/index.js

@@ -0,0 +1,241 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Generate document',
+  key: 'generateDocument',
+  description: 'Creates a new document.',
+  arguments: [
+    {
+      label: 'Workspace',
+      key: 'workspaceId',
+      type: 'dropdown',
+      required: true,
+      description: '',
+      variables: true,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listWorkspaces',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Template',
+      key: 'templateId',
+      type: 'dropdown',
+      required: false,
+      depensOn: ['parameters.workspaceId'],
+      description: '',
+      variables: true,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listTemplates',
+          },
+          {
+            name: 'parameters.workspaceId',
+            value: '{parameters.workspaceId}',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Use a Custom Json Structure?',
+      key: 'useCustomJsonStructure',
+      type: 'dropdown',
+      required: true,
+      description:
+        'Please indicate "yes" if you would rather create a full JSON payload instead of relying on Automatisch mapping for the Document data.',
+      variables: true,
+      options: [
+        {
+          label: 'Yes',
+          value: true,
+        },
+        {
+          label: 'No',
+          value: false,
+        },
+      ],
+      additionalFields: {
+        type: 'query',
+        name: 'getDynamicFields',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listDocumentData',
+          },
+          {
+            name: 'parameters.useCustomJsonStructure',
+            value: '{parameters.useCustomJsonStructure}',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Add Line Items?',
+      key: 'addLineItems',
+      type: 'dropdown',
+      required: true,
+      description:
+        'Choose "yes" to include information for Line Items (such as in an invoice).',
+      variables: true,
+      options: [
+        {
+          label: 'Yes',
+          value: true,
+        },
+        {
+          label: 'No',
+          value: false,
+        },
+      ],
+      additionalFields: {
+        type: 'query',
+        name: 'getDynamicFields',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listLineItems',
+          },
+          {
+            name: 'parameters.addLineItems',
+            value: '{parameters.addLineItems}',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Custom Filename',
+      key: 'customFilename',
+      type: 'string',
+      required: false,
+      description:
+        'You have the option to define a custom filename for generated documents. If left blank, a random value will be assigned.',
+      variables: true,
+    },
+    {
+      label: 'Meta Data',
+      key: 'metaData',
+      type: 'dynamic',
+      required: false,
+      description:
+        'Extra information appended to the generated Document but not accessible within its Template.',
+      fields: [
+        {
+          label: 'Key',
+          key: 'metaDataKey',
+          type: 'string',
+          required: false,
+          description: '',
+          variables: true,
+        },
+        {
+          label: 'Value',
+          key: 'metaDataValue',
+          type: 'string',
+          required: false,
+          description: '',
+          variables: true,
+        },
+      ],
+    },
+  ],
+
+  async run($) {
+    const {
+      templateId,
+      useCustomJsonStructure,
+      customJsonPayload,
+      customFilename,
+      addLineItems,
+      lineItems,
+      documentData,
+      metaData,
+    } = $.step.parameters;
+    let payload = {};
+    let meta = {};
+
+    const documentDataObject = documentData.reduce((result, entry) => {
+      const key = entry.documentDataKey?.toLowerCase();
+      const value = entry.documentDataValue;
+
+      if (key && value) {
+        return {
+          ...result,
+          [entry.documentDataKey?.toLowerCase()]: entry.documentDataValue,
+        };
+      }
+
+      return result;
+    }, {});
+
+    const lineItemsObject = lineItems.reduce((result, entry) => {
+      const key = entry.lineItemKey?.toLowerCase();
+      const value = entry.lineItemValue;
+
+      if (key && value) {
+        return {
+          ...result,
+          [entry.lineItemKey?.toLowerCase()]: entry.lineItemValue,
+        };
+      }
+
+      return result;
+    }, {});
+
+    const metaDataObject = metaData.reduce((result, entry) => {
+      const key = entry.metaDataKey?.toLowerCase();
+      const value = entry.metaDataValue;
+
+      if (key && value) {
+        return {
+          ...result,
+          [entry.metaDataKey?.toLowerCase()]: entry.metaDataValue,
+        };
+      }
+
+      return result;
+    }, {});
+
+    if (metaDataObject) {
+      meta = metaDataObject;
+    }
+
+    if (customFilename) {
+      meta._filename = customFilename;
+    }
+
+    if (useCustomJsonStructure) {
+      payload = JSON.parse(customJsonPayload);
+    } else {
+      payload = documentDataObject;
+    }
+
+    if (addLineItems) {
+      payload.lineItems = [lineItemsObject];
+    }
+
+    const body = {
+      document: {
+        document_template_id: templateId,
+        meta: JSON.stringify(meta),
+        payload: JSON.stringify(payload),
+        status: 'pending',
+      },
+    };
+
+    const { data } = await $.http.post('/v1/documents', body);
+
+    $.setActionItem({
+      raw: data,
+    });
+  },
+});

packages/backend/src/apps/pdf-monkey/actions/index.js

@@ -0,0 +1,4 @@
+import deleteDocument from './delete-document/index.js';
+import generateDocument from './generate-document/index.js';
+
+export default [deleteDocument, generateDocument];

packages/backend/src/apps/pdf-monkey/auth/index.js

@@ -0,0 +1,21 @@
+import verifyCredentials from './verify-credentials.js';
+import isStillVerified from './is-still-verified.js';
+
+export default {
+  fields: [
+    {
+      key: 'apiKey',
+      label: 'API Key',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: 'PDFMonkey API secret key of your account.',
+      clickToCopy: false,
+    },
+  ],
+
+  verifyCredentials,
+  isStillVerified,
+};

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

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

packages/backend/src/apps/pdf-monkey/auth/verify-credentials.js

@@ -0,0 +1,15 @@
+import getCurrentUser from '../common/get-current-user.js';
+
+const verifyCredentials = async ($) => {
+  const currentUser = await getCurrentUser($);
+  const screenName = [currentUser.desired_name, currentUser.email]
+    .filter(Boolean)
+    .join(' @ ');
+
+  await $.auth.set({
+    screenName,
+    apiKey: $.auth.data.apiKey,
+  });
+};
+
+export default verifyCredentials;

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

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

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

@@ -0,0 +1,8 @@
+const getCurrentUser = async ($) => {
+  const response = await $.http.get('/v1/current_user');
+  const currentUser = response.data.current_user;
+
+  return currentUser;
+};
+
+export default getCurrentUser;

packages/backend/src/apps/pdf-monkey/dynamic-data/index.js

@@ -0,0 +1,4 @@
+import listTemplates from './list-templates/index.js';
+import listWorkspaces from './list-workspaces/index.js';
+
+export default [listTemplates, listWorkspaces];

packages/backend/src/apps/pdf-monkey/dynamic-data/list-templates/index.js

@@ -0,0 +1,39 @@
+export default {
+  name: 'List templates',
+  key: 'listTemplates',
+
+  async run($) {
+    const templates = {
+      data: [],
+    };
+    const workspaceId = $.step.parameters.workspaceId;
+    let next = false;
+
+    const params = {
+      page: 'all',
+      'q[workspace_id]': workspaceId,
+    };
+
+    if (!workspaceId) {
+      return templates;
+    }
+
+    do {
+      const { data } = await $.http.get('/v1/document_template_cards', params);
+      next = data.meta.next_page;
+
+      if (!data?.document_template_cards?.length) {
+        return;
+      }
+
+      for (const template of data.document_template_cards) {
+        templates.data.push({
+          value: template.id,
+          name: template.identifier,
+        });
+      }
+    } while (next);
+
+    return templates;
+  },
+};

packages/backend/src/apps/pdf-monkey/dynamic-data/list-workspaces/index.js

@@ -0,0 +1,29 @@
+export default {
+  name: 'List workspaces',
+  key: 'listWorkspaces',
+
+  async run($) {
+    const workspaces = {
+      data: [],
+    };
+    let next = false;
+
+    do {
+      const { data } = await $.http.get('/v1/workspace_cards');
+      next = data.meta.next_page;
+
+      if (!data?.workspace_cards?.length) {
+        return;
+      }
+
+      for (const workspace of data.workspace_cards) {
+        workspaces.data.push({
+          value: workspace.id,
+          name: workspace.identifier,
+        });
+      }
+    } while (next);
+
+    return workspaces;
+  },
+};

packages/backend/src/apps/pdf-monkey/dynamic-fields/index.js

@@ -0,0 +1,4 @@
+import listDocumentData from './list-document-data/index.js';
+import listLineItems from './list-line-items/index.js';
+
+export default [listDocumentData, listLineItems];

packages/backend/src/apps/pdf-monkey/dynamic-fields/list-document-data/index.js

@@ -0,0 +1,48 @@
+export default {
+  name: 'List document data',
+  key: 'listDocumentData',
+
+  async run($) {
+    if ($.step.parameters.useCustomJsonStructure) {
+      return [
+        {
+          label: 'Data for the Document (JSON Payload)',
+          key: 'customJsonPayload',
+          type: 'string',
+          required: false,
+          description:
+            'Use the JSON format { "firstname": "John", "lastname": "Doe" }.',
+          variables: true,
+        },
+      ];
+    } else {
+      return [
+        {
+          label: 'Data for the Document',
+          key: 'documentData',
+          type: 'dynamic',
+          required: false,
+          description: '',
+          fields: [
+            {
+              label: 'Key',
+              key: 'documentDataKey',
+              type: 'string',
+              required: false,
+              description: '',
+              variables: true,
+            },
+            {
+              label: 'Value',
+              key: 'documentDataValue',
+              type: 'string',
+              required: false,
+              description: '',
+              variables: true,
+            },
+          ],
+        },
+      ];
+    }
+  },
+};

packages/backend/src/apps/pdf-monkey/dynamic-fields/list-line-items/index.js

@@ -0,0 +1,37 @@
+export default {
+  name: 'List line items',
+  key: 'listLineItems',
+
+  async run($) {
+    if ($.step.parameters.addLineItems) {
+      return [
+        {
+          label: 'Line Items',
+          key: 'lineItems',
+          type: 'dynamic',
+          required: false,
+          description:
+            'Data for a single item. Available as "lineItems" in your PDFMonkey Template.',
+          fields: [
+            {
+              label: 'Key',
+              key: 'lineItemKey',
+              type: 'string',
+              required: false,
+              description: '',
+              variables: true,
+            },
+            {
+              label: 'Value',
+              key: 'lineItemValue',
+              type: 'string',
+              required: false,
+              description: '',
+              variables: true,
+            },
+          ],
+        },
+      ];
+    }
+  },
+};

packages/backend/src/apps/pdf-monkey/index.js

@@ -0,0 +1,24 @@
+import defineApp from '../../helpers/define-app.js';
+import addAuthHeader from './common/add-auth-header.js';
+import auth from './auth/index.js';
+import triggers from './triggers/index.js';
+import dynamicData from './dynamic-data/index.js';
+import actions from './actions/index.js';
+import dynamicFields from './dynamic-fields/index.js';
+
+export default defineApp({
+  name: 'PDFMonkey',
+  key: 'pdf-monkey',
+  iconUrl: '{BASE_URL}/apps/pdf-monkey/assets/favicon.svg',
+  authDocUrl: 'https://automatisch.io/docs/apps/pdf-monkey/connection',
+  supportsConnections: true,
+  baseUrl: 'https://pdfmonkey.io',
+  apiBaseUrl: 'https://api.pdfmonkey.io/api',
+  primaryColor: '376794',
+  beforeRequest: [addAuthHeader],
+  auth,
+  triggers,
+  dynamicData,
+  actions,
+  dynamicFields,
+});

packages/backend/src/apps/pdf-monkey/triggers/documents-generated/index.js

@@ -0,0 +1,99 @@
+import defineTrigger from '../../../../helpers/define-trigger.js';
+
+export default defineTrigger({
+  name: 'Documents Generated',
+  key: 'documentsGenerated',
+  pollInterval: 15,
+  description:
+    'Triggers upon the successful completion of document generation.',
+  arguments: [
+    {
+      label: 'Workspace',
+      key: 'workspaceId',
+      type: 'dropdown',
+      required: true,
+      description: '',
+      variables: true,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listWorkspaces',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Templates',
+      key: 'templateIds',
+      type: 'dynamic',
+      required: false,
+      description: 'Apply this trigger exclusively for particular templates.',
+      fields: [
+        {
+          label: 'Template',
+          key: 'templateId',
+          type: 'dropdown',
+          required: false,
+          depensOn: ['parameters.workspaceId'],
+          description: '',
+          variables: true,
+          source: {
+            type: 'query',
+            name: 'getDynamicData',
+            arguments: [
+              {
+                name: 'key',
+                value: 'listTemplates',
+              },
+              {
+                name: 'parameters.workspaceId',
+                value: '{parameters.workspaceId}',
+              },
+            ],
+          },
+        },
+      ],
+    },
+  ],
+
+  async run($) {
+    const workspaceId = $.step.parameters.workspaceId;
+    const templateIds = $.step.parameters.templateIds;
+    const allTemplates = templateIds
+      .map((templateId) => templateId.templateId)
+      .join(',');
+
+    const params = {
+      'page[size]': 100,
+      'q[workspace_id]': workspaceId,
+      'q[status]': 'success',
+    };
+
+    if (!templateIds.length) {
+      params['q[document_template_id]'] = allTemplates;
+    }
+
+    let next = false;
+    do {
+      const { data } = await $.http.get('/v1/document_cards', { params });
+
+      if (!data?.document_cards?.length) {
+        return;
+      }
+
+      next = data.meta.next_page;
+
+      for (const document of data.document_cards) {
+        $.pushTriggerItem({
+          raw: document,
+          meta: {
+            internalId: document.id,
+          },
+        });
+      }
+    } while (next);
+  },
+});

packages/backend/src/apps/pdf-monkey/triggers/index.js

@@ -0,0 +1,3 @@
+import documentsGenerated from './documents-generated/index.js';
+
+export default [documentsGenerated];

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,35 +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 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);
-    });
-  });
-});

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.test.js

@@ -5,7 +5,7 @@ import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by
 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 getSamlAuthProviderMock from '../../../../../../test/mocks/rest/api/v1/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', () => {

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

@@ -5,7 +5,7 @@ import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by
 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 getSamlAuthProvidersMock from '../../../../../../test/mocks/rest/api/v1/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', () => {

packages/backend/src/controllers/api/v1/admin/users/get-user.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';
-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);
-  });
-});

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,31 +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 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);
-  });
-});

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,71 +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 { 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);
-  });
-});

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/backend/src/helpers/authorization.js

@@ -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/renderer.js

@@ -13,11 +13,10 @@ const totalCount = (object) =>
 
 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 = serializers[type];

packages/backend/src/models/user.js

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

packages/backend/src/queues/action.js

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

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

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

packages/backend/src/queues/email.js

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

packages/backend/src/queues/flow.js

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

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

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

packages/backend/src/queues/trigger.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,26 @@
+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/users.js

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

packages/backend/src/routes/healthcheck.js

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

packages/backend/src/routes/index.js

@@ -5,14 +5,7 @@ import paddleRouter from './paddle.ee.js';
 import healthcheckRouter from './healthcheck.js';
 import automatischRouter from './api/v1/automatisch.js';
 import usersRouter from './api/v1/users.js';
-import paymentRouter from './api/v1/payment.ee.js';
-import appAuthClientsRouter from './api/v1/app-auth-clients.js';
-import flowsRouter from './api/v1/flows.js';
-import 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';
+import samlAuthProvidersRouter from './api/v1/saml-auth-providers.ee.js';
 
 const router = Router();
 
@@ -22,13 +15,6 @@ router.use('/paddle', paddleRouter);
 router.use('/healthcheck', healthcheckRouter);
 router.use('/api/v1/automatisch', automatischRouter);
 router.use('/api/v1/users', usersRouter);
-router.use('/api/v1/payment', paymentRouter);
-router.use('/api/v1/app-auth-clients', appAuthClientsRouter);
-router.use('/api/v1/flows', flowsRouter);
 router.use('/api/v1/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/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,18 +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';
 
 const serializers = {
   User: userSerializer,
   Role: roleSerializer,
   Permission: permissionSerializer,
   SamlAuthProvider: samlAuthProviderSerializer,
-  AppAuthClient: appAuthClientSerializer,
-  Flow: flowSerializer,
-  Step: stepSerializer,
 };
 
 export default serializers;

packages/backend/src/serializers/role.js

@@ -1,7 +1,5 @@
-import permissionSerializer from './permission.js';
-
 const roleSerializer = (role) => {
-  let roleData = {
+  return {
     id: role.id,
     name: role.name,
     key: role.key,
@@ -10,14 +8,6 @@ const roleSerializer = (role) => {
     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,26 +1,12 @@
 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', () => {
-  let role, permissionOne, permissionTwo;
+  let role;
 
   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 () => {
@@ -36,17 +22,4 @@ describe('roleSerializer', () => {
 
     expect(roleSerializer(role)).toEqual(expectedPayload);
   });
-
-  it('should return role data with the permissions', async () => {
-    role.permissions = [permissionOne, permissionTwo];
-
-    const expectedPayload = {
-      permissions: [
-        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

@@ -9,6 +9,7 @@ const userSerializer = (user) => {
     createdAt: user.createdAt,
     updatedAt: user.updatedAt,
     fullName: user.fullName,
+    roleId: user.roleId,
   };
 
   if (user.role) {

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;
@@ -35,6 +33,7 @@ describe('userSerializer', () => {
       email: user.email,
       fullName: user.fullName,
       id: user.id,
+      roleId: user.roleId,
       updatedAt: user.updatedAt,
     };
 
@@ -45,7 +44,7 @@ describe('userSerializer', () => {
     user.role = role;
 
     const expectedPayload = {
-      role: roleSerializer(role),
+      role,
     };
 
     expect(userSerializer(user)).toMatchObject(expectedPayload);
@@ -55,10 +54,7 @@ describe('userSerializer', () => {
     user.permissions = [permissionOne, permissionTwo];
 
     const expectedPayload = {
-      permissions: [
-        permissionSerializer(permissionOne),
-        permissionSerializer(permissionTwo),
-      ],
+      permissions: [permissionOne, permissionTwo],
     };
 
     expect(userSerializer(user)).toMatchObject(expectedPayload);

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/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;

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

@@ -1,26 +0,0 @@
-const getRolesMock = async (roles) => {
-  const data = roles.map((role) => {
-    return {
-      id: role.id,
-      key: role.key,
-      name: role.name,
-      isAdmin: role.isAdmin,
-      description: role.description,
-      createdAt: role.createdAt.toISOString(),
-      updatedAt: role.updatedAt.toISOString(),
-    };
-  });
-
-  return {
-    data: data,
-    meta: {
-      count: data.length,
-      currentPage: null,
-      isArray: true,
-      totalPages: null,
-      type: 'Role',
-    },
-  };
-};
-
-export default getRolesMock;

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;