feat(bluesky): add bluesky integration

.github/workflows/playwright.yml

@@ -71,6 +71,9 @@ jobs:
       - name: Migrate database
         working-directory: ./packages/backend
         run: yarn db:migrate
+      - name: Seed user
+        working-directory: ./packages/backend
+        run: yarn db:seed:user &
       - name: Install certutils
         run: sudo apt install -y libnss3-tools
       - name: Install mkcert

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-50 -50 430 390" fill="#1185fd" aria-hidden="true">
+  <path d="M180 141.964C163.699 110.262 119.308 51.1817 78.0347 22.044C38.4971 -5.86834 23.414 -1.03207 13.526 3.43594C2.08093 8.60755 0 26.1785 0 36.5164C0 46.8542 5.66748 121.272 9.36416 133.694C21.5786 174.738 65.0603 188.607 105.104 184.156C107.151 183.852 109.227 183.572 111.329 183.312C109.267 183.642 107.19 183.924 105.104 184.156C46.4204 192.847 -5.69621 214.233 62.6582 290.33C137.848 368.18 165.705 273.637 180 225.702C194.295 273.637 210.76 364.771 295.995 290.33C360 225.702 313.58 192.85 254.896 184.158C252.81 183.926 250.733 183.645 248.671 183.315C250.773 183.574 252.849 183.855 254.896 184.158C294.94 188.61 338.421 174.74 350.636 133.697C354.333 121.275 360 46.8568 360 36.519C360 26.1811 357.919 8.61012 346.474 3.43851C336.586 -1.02949 321.503 -5.86576 281.965 22.0466C240.692 51.1843 196.301 110.262 180 141.964Z">
+  </path>
+</svg>

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

@@ -0,0 +1,34 @@
+import verifyCredentials from './verify-credentials.js';
+import isStillVerified from './is-still-verified.js';
+import refreshToken from './refresh-token.js';
+
+export default {
+  fields: [
+    {
+      key: 'handle',
+      label: 'Your Bluesky Handle',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: '',
+      clickToCopy: false,
+    },
+    {
+      key: 'password',
+      label: 'Your Bluesky Password',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: '',
+      clickToCopy: false,
+    },
+  ],
+
+  verifyCredentials,
+  isStillVerified,
+  refreshToken,
+};

packages/backend/src/apps/bluesky/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.did;
+};
+
+export default isStillVerified;

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

@@ -0,0 +1,24 @@
+const refreshToken = async ($) => {
+  const { refreshJwt } = $.auth.data;
+
+  const { data } = await $.http.post(
+    '/com.atproto.server.refreshSession',
+    null,
+    {
+      headers: {
+        Authorization: `Bearer ${refreshJwt}`,
+      },
+      additionalProperties: {
+        skipAddingAuthHeader: true,
+      },
+    }
+  );
+
+  await $.auth.set({
+    accessJwt: data.accessJwt,
+    refreshJwt: data.refreshJwt,
+    did: data.did,
+  });
+};
+
+export default refreshToken;

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

@@ -0,0 +1,20 @@
+const verifyCredentials = async ($) => {
+  const handle = $.auth.data.handle;
+  const password = $.auth.data.password;
+
+  const body = {
+    identifier: handle,
+    password,
+  };
+
+  const { data } = await $.http.post('/com.atproto.server.createSession', body);
+
+  await $.auth.set({
+    accessJwt: data.accessJwt,
+    refreshJwt: data.refreshJwt,
+    did: data.did,
+    screenName: data.handle,
+  });
+};
+
+export default verifyCredentials;

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

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

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

@@ -0,0 +1,15 @@
+const getCurrentUser = async ($) => {
+  const handle = $.auth.data.handle;
+
+  const params = {
+    actor: handle,
+  };
+
+  const { data: currentUser } = await $.http.get('/app.bsky.actor.getProfile', {
+    params,
+  });
+
+  return currentUser;
+};
+
+export default getCurrentUser;

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

@@ -0,0 +1,16 @@
+import defineApp from '../../helpers/define-app.js';
+import addAuthHeader from './common/add-auth-header.js';
+import auth from './auth/index.js';
+
+export default defineApp({
+  name: 'Bluesky',
+  key: 'bluesky',
+  iconUrl: '{BASE_URL}/apps/bluesky/assets/favicon.svg',
+  authDocUrl: '{DOCS_URL}/apps/bluesky/connection',
+  supportsConnections: true,
+  baseUrl: 'https://bluesky.app',
+  apiBaseUrl: 'https://bsky.social/xrpc',
+  primaryColor: '1185fd',
+  beforeRequest: [addAuthHeader],
+  auth,
+});

packages/backend/src/apps/cryptography/actions/create-hmac/index.js

@@ -1,64 +0,0 @@
-import { createHmac } from 'node:crypto';
-import defineAction from '../../../../helpers/define-action.js';
-
-export default defineAction({
-  name: 'Create HMAC',
-  key: 'createHmac',
-  description: 'Create a Hash-based Message Authentication Code (HMAC) using the specified algorithm, secret key, and message.',
-  arguments: [
-    {
-      label: 'Algorithm',
-      key: 'algorithm',
-      type: 'dropdown',
-      required: true,
-      value: 'sha256',
-      description: 'Specifies the cryptographic hash function to use for HMAC generation.',
-      options: [
-        { label: 'SHA-256', value: 'sha256' },
-      ],
-      variables: true,
-    },
-    {
-      label: 'Message',
-      key: 'message',
-      type: 'string',
-      required: true,
-      description: 'The input message to be hashed. This is the value that will be processed to generate the HMAC.',
-      variables: true,
-    },
-    {
-      label: 'Secret Key',
-      key: 'secretKey',
-      type: 'string',
-      required: true,
-      description: 'The secret key used to create the HMAC.',
-      variables: true,
-    },
-    {
-      label: 'Output Encoding',
-      key: 'outputEncoding',
-      type: 'dropdown',
-      required: true,
-      value: 'hex',
-      description: 'Specifies the encoding format for the HMAC digest output.',
-      options: [
-        { label: 'base64', value: 'base64' },
-        { label: 'base64url', value: 'base64url' },
-        { label: 'hex', value: 'hex' },
-      ],
-      variables: true,
-    },
-  ],
-
-  async run($) {
-    const hash = createHmac($.step.parameters.algorithm, $.step.parameters.secretKey)
-      .update($.step.parameters.message)
-      .digest($.step.parameters.outputEncoding);
-
-    $.setActionItem({
-      raw: {
-        hash
-      },
-    });
-  },
-});

packages/backend/src/apps/cryptography/actions/create-rsa-sha256-signature/index.js

@@ -1,65 +0,0 @@
-import crypto from 'node:crypto';
-import defineAction from '../../../../helpers/define-action.js';
-
-export default defineAction({
-  name: 'Create Signature',
-  key: 'createSignature',
-  description: 'Create a digital signature using the specified algorithm, secret key, and message.',
-  arguments: [
-    {
-      label: 'Algorithm',
-      key: 'algorithm',
-      type: 'dropdown',
-      required: true,
-      value: 'RSA-SHA256',
-      description: 'Specifies the cryptographic hash function to use for HMAC generation.',
-      options: [
-        { label: 'RSA-SHA256', value: 'RSA-SHA256' },
-      ],
-      variables: true,
-    },
-    {
-      label: 'Message',
-      key: 'message',
-      type: 'string',
-      required: true,
-      description: 'The input message to be signed.',
-      variables: true,
-    },
-    {
-      label: 'Private Key',
-      key: 'privateKey',
-      type: 'string',
-      required: true,
-      description: 'The RSA private key in PEM format used for signing.',
-      variables: true,
-    },
-    {
-      label: 'Output Encoding',
-      key: 'outputEncoding',
-      type: 'dropdown',
-      required: true,
-      value: 'hex',
-      description: 'Specifies the encoding format for the digital signature output. This determines how the generated signature will be represented as a string.',
-      options: [
-        { label: 'base64', value: 'base64' },
-        { label: 'base64url', value: 'base64url' },
-        { label: 'hex', value: 'hex' },
-      ],
-      variables: true,
-    },
-  ],
-
-  async run($) {
-    const signer = crypto.createSign($.step.parameters.algorithm);
-    signer.update($.step.parameters.message);
-    signer.end();
-    const signature = signer.sign($.step.parameters.privateKey, $.step.parameters.outputEncoding);
-
-    $.setActionItem({
-      raw: {
-        signature
-      },
-    });
-  },
-});

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

@@ -1,4 +0,0 @@
-import createHmac from './create-hmac/index.js';
-import createRsaSha256Signature from './create-rsa-sha256-signature/index.js';
-
-export default [createHmac, createRsaSha256Signature];

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

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="100pt" height="100pt" version="1.1" viewBox="0 0 100 100">
- <path d="m66.012 33h-3.0117v-11c0-7.1719-5.8281-13-13-13s-13 5.8281-13 13v11h-3.0117c-2.75 0-4.9883 2.2383-4.9883 4.9883v28.012c0 2.75 2.2383 4.9883 4.9883 4.9883h32.012c2.75 0 4.9883-2.2383 4.9883-4.9883v-28.012c0.011719-2.75-2.2266-4.9883-4.9766-4.9883zm-27.012-11c0-6.0703 4.9297-11 11-11s11 4.9297 11 11v11h-22zm30 44.012c0 1.6484-1.3398 2.9883-2.9883 2.9883h-32.023c-1.6484 0-2.9883-1.3398-2.9883-2.9883v-28.023c0-1.6484 1.3398-2.9883 2.9883-2.9883h32.023c1.6484 0 2.9883 1.3398 2.9883 2.9883zm-18 9.9883v14c0 0.55078-0.44922 1-1 1s-1-0.44922-1-1v-14c0-0.55078 0.44922-1 1-1s1 0.44922 1 1zm20 8c0 0.55078-0.44922 1-1 1h-8c-0.55078 0-1-0.44922-1-1v-8c0-0.55078 0.44922-1 1-1s1 0.44922 1 1v7h7c0.55078 0 1 0.44922 1 1zm-32-8v8c0 0.55078-0.44922 1-1 1h-8c-0.55078 0-1-0.44922-1-1s0.44922-1 1-1h7v-7c0-0.55078 0.44922-1 1-1s1 0.44922 1 1zm-14-26c0 0.55078-0.44922 1-1 1h-14c-0.55078 0-1-0.44922-1-1s0.44922-1 1-1h14c0.55078 0 1 0.44922 1 1zm0-12c0 0.55078-0.44922 1-1 1h-8c-0.55078 0-1-0.44922-1-1v-8c0-0.55078 0.44922-1 1-1s1 0.44922 1 1v7h7c0.55078 0 1 0.44922 1 1zm0 24c0 0.55078-0.44922 1-1 1h-7v7c0 0.55078-0.44922 1-1 1s-1-0.44922-1-1v-8c0-0.55078 0.44922-1 1-1h8c0.55078 0 1 0.44922 1 1zm66-12c0 0.55078-0.44922 1-1 1h-14c-0.55078 0-1-0.44922-1-1s0.44922-1 1-1h14c0.55078 0 1 0.44922 1 1zm-16-12c0-0.55078 0.44922-1 1-1h7v-7c0-0.55078 0.44922-1 1-1s1 0.44922 1 1v8c0 0.55078-0.44922 1-1 1h-8c-0.55078 0-1-0.44922-1-1zm10 24v8c0 0.55078-0.44922 1-1 1s-1-0.44922-1-1v-7h-7c-0.55078 0-1-0.44922-1-1s0.44922-1 1-1h8c0.55078 0 1 0.44922 1 1zm-35-17c-2.7617 0-5 2.2383-5 5 0 2.4102 1.7188 4.4297 4 4.8984v5.1016c0 0.55078 0.44922 1 1 1s1-0.44922 1-1v-5.1016c2.2812-0.46094 4-2.4805 4-4.8984 0-2.7617-2.2383-5-5-5zm0 8c-1.6484 0-3-1.3516-3-3s1.3516-3 3-3 3 1.3516 3 3-1.3516 3-3 3z"/>
-</svg>

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

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

packages/backend/src/apps/formatter/actions/date-time/index.js

@@ -1,10 +1,8 @@
 import defineAction from '../../../../helpers/define-action.js';
 import formatDateTime from './transformers/format-date-time.js';
-import getCurrentTimestamp from './transformers/get-current-timestamp.js';
 
 const transformers = {
   formatDateTime,
-  getCurrentTimestamp,
 };
 
 export default defineAction({
@@ -18,16 +16,7 @@ export default defineAction({
       type: 'dropdown',
       required: true,
       variables: true,
-      options: [
-        {
-          label: 'Get current timestamp',
-          value: 'getCurrentTimestamp',
-        },
-        {
-          label: 'Format Date / Time',
-          value: 'formatDateTime',
-        },
-      ],
+      options: [{ label: 'Format Date / Time', value: 'formatDateTime' }],
       additionalFields: {
         type: 'query',
         name: 'getDynamicFields',

packages/backend/src/apps/formatter/actions/date-time/transformers/get-current-timestamp.js

@@ -1,5 +0,0 @@
-const getCurrentTimestamp = () => {
-  return Date.now();
-};
-
-export default getCurrentTimestamp;

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

@@ -14,8 +14,6 @@ import stringToBase64 from './transformers/string-to-base64.js';
 import encodeUri from './transformers/encode-uri.js';
 import trimWhitespace from './transformers/trim-whitespace.js';
 import useDefaultValue from './transformers/use-default-value.js';
-import parseStringifiedJson from './transformers/parse-stringified-json.js';
-import createUuid from './transformers/create-uuid.js';
 
 const transformers = {
   base64ToString,
@@ -32,8 +30,6 @@ const transformers = {
   encodeUri,
   trimWhitespace,
   useDefaultValue,
-  parseStringifiedJson,
-  createUuid,
 };
 
 export default defineAction({
@@ -51,21 +47,19 @@ export default defineAction({
       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' },
-        { label: 'Create UUID', value: 'createUuid' },
-        { label: 'Encode URI', value: 'encodeUri' },
         {
           label: 'Encode URI Component',
           value: 'encodeUriComponent',
         },
+        { label: 'Convert HTML to Markdown', value: 'htmlToMarkdown' },
+        { label: 'Convert Markdown to HTML', value: 'markdownToHtml' },
         { label: 'Extract Email Address', value: 'extractEmailAddress' },
         { label: 'Extract Number', value: 'extractNumber' },
         { label: 'Lowercase', value: 'lowercase' },
-        { label: 'Parse stringified JSON', value: 'parseStringifiedJson' },
         { label: 'Pluralize', value: 'pluralize' },
         { label: 'Replace', value: 'replace' },
         { label: 'String to Base64', value: 'stringToBase64' },
+        { label: 'Encode URI', value: 'encodeUri' },
         { label: 'Trim Whitespace', value: 'trimWhitespace' },
         { label: 'Use Default Value', value: 'useDefaultValue' },
       ],

packages/backend/src/apps/formatter/actions/text/transformers/create-uuid.js

@@ -1,7 +0,0 @@
-import { v4 as uuidv4 } from 'uuid';
-
-const createUuidV4 = () => {
-  return uuidv4();
-};
-
-export default createUuidV4;

packages/backend/src/apps/formatter/actions/text/transformers/parse-stringified-json.js

@@ -1,7 +0,0 @@
-const parseStringifiedJson = ($) => {
-  const input = $.step.parameters.input;
-
-  return JSON.parse(input);
-};
-
-export default parseStringifiedJson;

packages/backend/src/apps/formatter/actions/text/transformers/replace.js

@@ -1,26 +1,8 @@
 const replace = ($) => {
   const input = $.step.parameters.input;
+
   const find = $.step.parameters.find;
   const replace = $.step.parameters.replace;
-  const useRegex = $.step.parameters.useRegex;
-
-  if (useRegex) {
-    const ignoreCase = $.step.parameters.ignoreCase;
-
-    const flags = [ignoreCase && 'i', 'g'].filter(Boolean).join('');
-
-    const timeoutId = setTimeout(() => {
-      $.execution.exit();
-    }, 100);
-
-    const regex = new RegExp(find, flags);
-
-    const replacedValue = input.replaceAll(regex, replace);
-
-    clearTimeout(timeoutId);
-
-    return replacedValue;
-  }
 
   return input.replaceAll(find, replace);
 };

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

@@ -1,4 +1,3 @@
 import listTransformOptions from './list-transform-options/index.js';
-import listReplaceRegexOptions from './list-replace-regex-options/index.js';
 
-export default [listTransformOptions, listReplaceRegexOptions];
+export default [listTransformOptions];

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

@@ -1,23 +0,0 @@
-export default {
-  name: 'List replace regex options',
-  key: 'listReplaceRegexOptions',
-
-  async run($) {
-    if (!$.step.parameters.useRegex) return [];
-
-    return [
-      {
-        label: 'Ignore case',
-        key: 'ignoreCase',
-        type: 'dropdown',
-        required: true,
-        description: 'Ignore case sensitivity.',
-        variables: true,
-        options: [
-          { label: 'Yes', value: true },
-          { label: 'No', value: false },
-        ],
-      },
-    ];
-  },
-};

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

@@ -12,7 +12,6 @@ import stringToBase64 from './text/string-to-base64.js';
 import encodeUri from './text/encode-uri.js';
 import trimWhitespace from './text/trim-whitespace.js';
 import useDefaultValue from './text/use-default-value.js';
-import parseStringifiedJson from './text/parse-stringified-json.js';
 import performMathOperation from './numbers/perform-math-operation.js';
 import randomNumber from './numbers/random-number.js';
 import formatNumber from './numbers/format-number.js';
@@ -39,7 +38,6 @@ const options = {
   formatNumber,
   formatPhoneNumber,
   formatDateTime,
-  parseStringifiedJson,
 };
 
 export default {

packages/backend/src/apps/formatter/dynamic-fields/list-transform-options/text/parse-stringified-json.js

@@ -1,12 +0,0 @@
-const useDefaultValue = [
-  {
-    label: 'Input',
-    key: 'input',
-    type: 'string',
-    required: true,
-    description: 'Stringified JSON you want to parse.',
-    variables: true,
-  },
-];
-
-export default useDefaultValue;

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

@@ -23,33 +23,6 @@ const replace = [
     description: 'Text that will replace the found text.',
     variables: true,
   },
-  {
-    label: 'Use Regular Expression',
-    key: 'useRegex',
-    type: 'dropdown',
-    required: true,
-    description: 'Use regex to search values.',
-    variables: true,
-    value: false,
-    options: [
-      { label: 'Yes', value: true },
-      { label: 'No', value: false },
-    ],
-    additionalFields: {
-      type: 'query',
-      name: 'getDynamicFields',
-      arguments: [
-        {
-          name: 'key',
-          value: 'listReplaceRegexOptions',
-        },
-        {
-          name: 'parameters.useRegex',
-          value: '{parameters.useRegex}',
-        },
-      ],
-    },
-  },
 ];
 
 export default replace;

packages/backend/src/apps/ntfy/actions/send-message/index.js

@@ -89,8 +89,6 @@ export default defineAction({
 
     const response = await $.http.post('/', payload);
 
-    console.log(response.config.additionalProperties.extraData);
-
     $.setActionItem({
       raw: response.data,
     });

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

@@ -1,7 +1,4 @@
 const addAuthHeader = ($, requestConfig) => {
-  console.log('requestConfig', requestConfig)
-  if (requestConfig.additionalProperties?.skip) return requestConfig;
-
   if ($.auth.data.serverUrl) {
     requestConfig.baseURL = $.auth.data.serverUrl;
   }

packages/backend/src/apps/ntfy/common/async-before-request.js

@@ -1,23 +0,0 @@
-const asyncBeforeRequest = async ($, requestConfig) => {
-  if (requestConfig.additionalProperties?.skip)
-    return requestConfig;
-
-  const response = await $.http.post(
-    'http://localhost:3000/webhooks/flows/8a040f4e-817f-4076-80ba-3c1c0af7e65e/sync',
-    null,
-    {
-      additionalProperties: {
-        skip: true,
-      },
-    }
-  );
-
-  console.log(response);
-  requestConfig.additionalProperties = {
-    extraData: response.data
-  }
-
-  return requestConfig;
-};
-
-export default asyncBeforeRequest;

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

@@ -1,6 +1,5 @@
 import defineApp from '../../helpers/define-app.js';
 import addAuthHeader from './common/add-auth-header.js';
-import asyncBeforeRequest from './common/async-before-request.js';
 import auth from './auth/index.js';
 import actions from './actions/index.js';
 
@@ -13,7 +12,7 @@ export default defineApp({
   baseUrl: 'https://ntfy.sh',
   apiBaseUrl: 'https://ntfy.sh',
   primaryColor: '56bda8',
-  beforeRequest: [asyncBeforeRequest, addAuthHeader],
+  beforeRequest: [addAuthHeader],
   auth,
   actions,
 });

packages/backend/src/apps/salesforce/actions/find-partially-matching-record/index.js

@@ -1,101 +0,0 @@
-import defineAction from '../../../../helpers/define-action.js';
-import listObjects from '../../dynamic-data/list-objects/index.js';
-import listFields from '../../dynamic-data/list-fields/index.js';
-
-export default defineAction({
-  name: 'Find partially matching record',
-  key: 'findPartiallyMatchingRecord',
-  description: 'Finds a record of a specified object by a field containing a value.',
-  arguments: [
-    {
-      label: 'Object',
-      key: 'object',
-      type: 'dropdown',
-      required: true,
-      variables: true,
-      description: 'Pick which type of object you want to search for.',
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listObjects',
-          },
-        ],
-      },
-    },
-    {
-      label: 'Field',
-      key: 'field',
-      type: 'dropdown',
-      description: 'Pick which field to search by',
-      required: true,
-      variables: true,
-      dependsOn: ['parameters.object'],
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listFields',
-          },
-          {
-            name: 'parameters.object',
-            value: '{parameters.object}',
-          },
-        ],
-      },
-    },
-    {
-      label: 'Search value to contain',
-      key: 'searchValue',
-      type: 'string',
-      required: true,
-      variables: true,
-      description: 'The value to search for in the field.',
-    },
-  ],
-
-  async run($) {
-    const sanitizedSearchValue = $.step.parameters.searchValue.replaceAll(`'`, `\\'`);
-
-    // validate given object
-    const objects = await listObjects.run($);
-    const validObject = objects.data.find((object) => object.value === $.step.parameters.object);
-
-    if (!validObject) {
-      throw new Error(`The "${$.step.parameters.object}" object does not exist.`);
-    }
-
-    // validate given object field
-    const fields = await listFields.run($);
-    const validField = fields.data.find((field) => field.value === $.step.parameters.field);
-
-    if (!validField) {
-      throw new Error(`The "${$.step.parameters.field}" field does not exist on the "${$.step.parameters.object}" object.`);
-    }
-
-    const query = `
-      SELECT
-        FIELDS(ALL)
-      FROM
-        ${$.step.parameters.object}
-      WHERE
-        ${$.step.parameters.field} LIKE '%${sanitizedSearchValue}%'
-      LIMIT 1
-    `;
-
-    const options = {
-      params: {
-        q: query,
-      },
-    };
-
-    const { data } = await $.http.get('/services/data/v61.0/query', options);
-    const record = data.records[0];
-
-    $.setActionItem({ raw: record });
-  },
-});

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

@@ -1,6 +1,5 @@
 import createAttachment from './create-attachment/index.js';
 import executeQuery from './execute-query/index.js';
 import findRecord from './find-record/index.js';
-import findPartiallyMatchingRecord from './find-partially-matching-record/index.js';
 
-export default [findRecord, findPartiallyMatchingRecord, createAttachment, executeQuery];
+export default [findRecord, createAttachment, executeQuery];

packages/backend/src/config/app.js

@@ -52,7 +52,7 @@ const appConfig = {
   isDev: appEnv === 'development',
   isTest: appEnv === 'test',
   isProd: appEnv === 'production',
-  version: '0.12.0',
+  version: '0.11.0',
   postgresDatabase: process.env.POSTGRES_DATABASE || 'automatisch_development',
   postgresSchema: process.env.POSTGRES_SCHEMA || 'public',
   postgresPort: parseInt(process.env.POSTGRES_PORT || '5432'),
@@ -97,12 +97,8 @@ const appConfig = {
   disableNotificationsPage: process.env.DISABLE_NOTIFICATIONS_PAGE === 'true',
   disableFavicon: process.env.DISABLE_FAVICON === 'true',
   additionalDrawerLink: process.env.ADDITIONAL_DRAWER_LINK,
-  additionalDrawerLinkIcon: process.env.ADDITIONAL_DRAWER_LINK_ICON,
   additionalDrawerLinkText: process.env.ADDITIONAL_DRAWER_LINK_TEXT,
   disableSeedUser: process.env.DISABLE_SEED_USER === 'true',
-  httpProxy: process.env.http_proxy,
-  httpsProxy: process.env.https_proxy,
-  noProxy: process.env.no_proxy,
 };
 
 if (!appConfig.encryptionKey) {

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

@@ -1,10 +0,0 @@
-import User from '../../../../../models/user.js';
-
-export default async (request, response) => {
-  const id = request.params.userId;
-
-  const user = await User.query().findById(id).throwIfNotFound();
-  await user.softRemove();
-
-  response.status(204).end();
-};

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

@@ -1,43 +0,0 @@
-import { describe, it, beforeEach } from 'vitest';
-import request from 'supertest';
-import Crypto from 'crypto';
-import app from '../../../../../app.js';
-import createAuthTokenByUserId from '../../../../../helpers/create-auth-token-by-user-id';
-import { createUser } from '../../../../../../test/factories/user';
-import { createRole } from '../../../../../../test/factories/role';
-
-describe('DELETE /api/v1/admin/users/:userId', () => {
-  let currentUser, currentUserRole, anotherUser, token;
-
-  beforeEach(async () => {
-    currentUserRole = await createRole({ key: 'admin' });
-    currentUser = await createUser({ roleId: currentUserRole.id });
-
-    anotherUser = await createUser();
-
-    token = await createAuthTokenByUserId(currentUser.id);
-  });
-
-  it('should soft delete user and respond with no content', async () => {
-    await request(app)
-      .delete(`/api/v1/admin/users/${anotherUser.id}`)
-      .set('Authorization', token)
-      .expect(204);
-  });
-
-  it('should return not found response for not existing user UUID', async () => {
-    const notExistingUserUUID = Crypto.randomUUID();
-
-    await request(app)
-      .delete(`/api/v1/admin/users/${notExistingUserUUID}`)
-      .set('Authorization', token)
-      .expect(404);
-  });
-
-  it('should return bad request response for invalid UUID', async () => {
-    await request(app)
-      .delete('/api/v1/admin/users/invalidUserUUID')
-      .set('Authorization', token)
-      .expect(400);
-  });
-});

packages/backend/src/controllers/api/v1/automatisch/config.ee.js

@@ -7,7 +7,6 @@ export default async (request, response) => {
     disableNotificationsPage: appConfig.disableNotificationsPage,
     disableFavicon: appConfig.disableFavicon,
     additionalDrawerLink: appConfig.additionalDrawerLink,
-    additionalDrawerLinkIcon: appConfig.additionalDrawerLinkIcon,
     additionalDrawerLinkText: appConfig.additionalDrawerLinkText,
   };
 

packages/backend/src/controllers/api/v1/automatisch/config.ee.test.js

@@ -4,7 +4,6 @@ import { createConfig } from '../../../../../test/factories/config.js';
 import app from '../../../../app.js';
 import configMock from '../../../../../test/mocks/rest/api/v1/automatisch/config.js';
 import * as license from '../../../../helpers/license.ee.js';
-import appConfig from '../../../../config/app.js';
 
 describe('GET /api/v1/automatisch/config', () => {
   it('should return Automatisch config', async () => {
@@ -49,18 +48,4 @@ describe('GET /api/v1/automatisch/config', () => {
 
     expect(response.body).toEqual(expectedPayload);
   });
-
-  it('should return additional environment variables', async () => {
-    vi.spyOn(appConfig, 'disableNotificationsPage', 'get').mockReturnValue(true);
-    vi.spyOn(appConfig, 'disableFavicon', 'get').mockReturnValue(true);
-    vi.spyOn(appConfig, 'additionalDrawerLink', 'get').mockReturnValue('link');
-    vi.spyOn(appConfig, 'additionalDrawerLinkIcon', 'get').mockReturnValue('icon');
-    vi.spyOn(appConfig, 'additionalDrawerLinkText', 'get').mockReturnValue('text');
-
-    expect(appConfig.disableNotificationsPage).toEqual(true);
-    expect(appConfig.disableFavicon).toEqual(true);
-    expect(appConfig.additionalDrawerLink).toEqual('link');
-    expect(appConfig.additionalDrawerLinkIcon).toEqual('icon');
-    expect(appConfig.additionalDrawerLinkText).toEqual('text');
-  });
 });

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

@@ -7,7 +7,6 @@ export default async (request, response) => {
     isCloud: appConfig.isCloud,
     isMation: appConfig.isMation,
     isEnterprise: await hasValidLicense(),
-    docsUrl: appConfig.docsUrl,
   };
 
   renderObject(response, info);

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

@@ -10,7 +10,6 @@ describe('GET /api/v1/automatisch/info', () => {
     vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
     vi.spyOn(appConfig, 'isMation', 'get').mockReturnValue(false);
     vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-    vi.spyOn(appConfig, 'docsUrl', 'get').mockReturnValue('https://automatisch.io/docs');
 
     const response = await request(app)
       .get('/api/v1/automatisch/info')

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

@@ -10,7 +10,7 @@ describe('GET /api/v1/automatisch/version', () => {
 
     const expectedPayload = {
       data: {
-        version: '0.12.0',
+        version: '0.11.0',
       },
       meta: {
         count: 1,

packages/backend/src/controllers/api/v1/users/accept-invitation.js

@@ -1,21 +0,0 @@
-import User from '../../../../models/user.js';
-
-export default async (request, response) => {
-  const { token, password } = request.body;
-
-  if (!token) {
-    throw new Error('Invitation token is required!');
-  }
-
-  const user = await User.query()
-    .findOne({ invitation_token: token })
-    .throwIfNotFound();
-
-  if (!user.isInvitationTokenValid()) {
-    return response.status(422).end();
-  }
-
-  await user.acceptInvitation(password);
-
-  response.status(204).end();
-};

packages/backend/src/controllers/api/v1/users/forgot-password.js

@@ -1,13 +0,0 @@
-import User from '../../../../models/user.js';
-
-export default async (request, response) => {
-  const { email } = request.body;
-
-  const user = await User.query()
-    .findOne({ email: email.toLowerCase() })
-    .throwIfNotFound();
-
-  await user.sendResetPasswordEmail();
-
-  response.status(204).end();
-};

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

@@ -1,30 +0,0 @@
-import { describe, it, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../../../app.js';
-import { createUser } from '../../../../../test/factories/user';
-
-describe('POST /api/v1/users/forgot-password', () => {
-  let currentUser;
-
-  beforeEach(async () => {
-    currentUser = await createUser();
-  });
-
-  it('should respond with no content', async () => {
-    await request(app)
-      .post('/api/v1/users/forgot-password')
-      .send({
-        email: currentUser.email,
-      })
-      .expect(204);
-  });
-
-  it('should return not found response for not existing user UUID', async () => {
-    await request(app)
-      .post('/api/v1/users/forgot-password')
-      .send({
-        email: 'nonexisting@automatisch.io',
-      })
-      .expect(404);
-  });
-});

packages/backend/src/controllers/api/v1/users/reset-password.js

@@ -1,23 +0,0 @@
-import User from '../../../../models/user.js';
-import { renderError } from '../../../../helpers/renderer.js';
-
-export default async (request, response) => {
-  const { token, password } = request.body;
-
-  const user = await User.query()
-    .findOne({
-      reset_password_token: token,
-    })
-    .throwIfNotFound();
-
-  if (!user.isResetPasswordTokenValid()) {
-    return renderError(response, [{ general: [invalidTokenErrorMessage] }]);
-  }
-
-  await user.resetPassword(password);
-
-  response.status(204).end();
-};
-
-const invalidTokenErrorMessage =
-  'Reset password link is not valid or expired. Try generating a new link.';

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

@@ -1,49 +0,0 @@
-import { describe, it, beforeEach } from 'vitest';
-import request from 'supertest';
-import { DateTime } from 'luxon';
-import app from '../../../../app.js';
-import { createUser } from '../../../../../test/factories/user';
-
-describe('POST /api/v1/users/reset-password', () => {
-  let currentUser;
-
-  beforeEach(async () => {
-    currentUser = await createUser({
-      resetPasswordToken: 'sampleResetPasswordToken',
-      resetPasswordTokenSentAt: DateTime.now().toISO(),
-    });
-  });
-
-  it('should respond with no content', async () => {
-    await request(app)
-      .post('/api/v1/users/reset-password')
-      .send({
-        token: currentUser.resetPasswordToken,
-        password: 'newPassword',
-      })
-      .expect(204);
-  });
-
-  it('should return not found response for not existing user', async () => {
-    await request(app)
-      .post('/api/v1/users/reset-password')
-      .send({
-        token: 'nonExistingResetPasswordToken',
-      })
-      .expect(404);
-  });
-
-  it('should return unprocessable entity for existing user with expired reset password token', async () => {
-    const user = await createUser({
-      resetPasswordToken: 'anotherResetPasswordToken',
-      resetPasswordTokenSentAt: DateTime.now().minus({ days: 2 }).toISO(),
-    });
-
-    await request(app)
-      .post('/api/v1/users/reset-password')
-      .send({
-        token: user.resetPasswordToken,
-      })
-      .expect(422);
-  });
-});

packages/backend/src/db/migrations/20220105151725_remove_constraints_from_steps.js

@@ -5,11 +5,9 @@ export async function up(knex) {
   });
 }
 
-export async function down() {
-  // We can't use down migration here since there are null values which needs to be set!
-  // We don't want to set those values by default key and app key since it will mislead users.
-  // return knex.schema.alterTable('steps', (table) => {
-  //   table.string('key').notNullable().alter();
-  //   table.string('app_key').notNullable().alter();
-  // });
+export async function down(knex) {
+  return knex.schema.alterTable('steps', (table) => {
+    table.string('key').notNullable().alter();
+    table.string('app_key').notNullable().alter();
+  });
 }

packages/backend/src/db/migrations/20240509202750_make_value_column_text_in_datastore.js

@@ -1,11 +0,0 @@
-export async function up(knex) {
-  return knex.schema.alterTable('datastore', (table) => {
-    table.text('value').alter();
-  });
-}
-
-export async function down(knex) {
-  return knex.schema.alterTable('datastore', (table) => {
-    table.string('value').alter();
-  });
-}

packages/backend/src/db/migrations/20240708140250_add_status_to_users.js

@@ -1,11 +0,0 @@
-export async function up(knex) {
-  return knex.schema.table('users', (table) => {
-    table.string('status').defaultTo('active');
-  });
-}
-
-export async function down(knex) {
-  return knex.schema.table('users', (table) => {
-    table.dropColumn('status');
-  });
-}

packages/backend/src/db/migrations/20240708141218_add_invitation_token_to_users.js

@@ -1,13 +0,0 @@
-export async function up(knex) {
-  return knex.schema.table('users', (table) => {
-    table.string('invitation_token');
-    table.timestamp('invitation_token_sent_at');
-  });
-}
-
-export async function down(knex) {
-  return knex.schema.table('users', (table) => {
-    table.dropColumn('invitation_token');
-    table.dropColumn('invitation_token_sent_at');
-  });
-}

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

@@ -10,11 +10,15 @@ import deleteCurrentUser from './mutations/delete-current-user.ee.js';
 import deleteFlow from './mutations/delete-flow.js';
 import deleteRole from './mutations/delete-role.ee.js';
 import deleteStep from './mutations/delete-step.js';
+import deleteUser from './mutations/delete-user.ee.js';
 import duplicateFlow from './mutations/duplicate-flow.js';
 import executeFlow from './mutations/execute-flow.js';
+import forgotPassword from './mutations/forgot-password.ee.js';
 import generateAuthUrl from './mutations/generate-auth-url.js';
+import login from './mutations/login.js';
 import registerUser from './mutations/register-user.ee.js';
 import resetConnection from './mutations/reset-connection.js';
+import resetPassword from './mutations/reset-password.ee.js';
 import updateAppAuthClient from './mutations/update-app-auth-client.ee.js';
 import updateAppConfig from './mutations/update-app-config.ee.js';
 import updateConfig from './mutations/update-config.ee.js';
@@ -42,11 +46,15 @@ const mutationResolvers = {
   deleteFlow,
   deleteRole,
   deleteStep,
+  deleteUser,
   duplicateFlow,
   executeFlow,
+  forgotPassword,
   generateAuthUrl,
+  login,
   registerUser,
   resetConnection,
+  resetPassword,
   updateAppAuthClient,
   updateAppConfig,
   updateConfig,

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

@@ -1,16 +1,10 @@
-import appConfig from '../../config/app.js';
 import User from '../../models/user.js';
 import Role from '../../models/role.js';
-import emailQueue from '../../queues/email.js';
-import {
-  REMOVE_AFTER_30_DAYS_OR_150_JOBS,
-  REMOVE_AFTER_7_DAYS_OR_50_JOBS,
-} from '../../helpers/remove-job-configuration.js';
 
 const createUser = async (_parent, params, context) => {
   context.currentUser.can('create', 'User');
 
-  const { fullName, email } = params.input;
+  const { fullName, email, password } = params.input;
 
   const existingUser = await User.query().findOne({
     email: email.toLowerCase(),
@@ -23,7 +17,7 @@ const createUser = async (_parent, params, context) => {
   const userPayload = {
     fullName,
     email,
-    status: 'invited',
+    password,
   };
 
   try {
@@ -38,29 +32,7 @@ const createUser = async (_parent, params, context) => {
 
   const user = await User.query().insert(userPayload);
 
-  await user.generateInvitationToken();
-
-  const jobName = `Invitation Email - ${user.id}`;
-  const acceptInvitationUrl = `${appConfig.webAppUrl}/accept-invitation?token=${user.invitationToken}`;
-
-  const jobPayload = {
-    email: user.email,
-    subject: 'You are invited!',
-    template: 'invitation-instructions',
-    params: {
-      fullName: user.fullName,
-      acceptInvitationUrl,
-    },
-  };
-
-  const jobOptions = {
-    removeOnComplete: REMOVE_AFTER_7_DAYS_OR_50_JOBS,
-    removeOnFail: REMOVE_AFTER_30_DAYS_OR_150_JOBS,
-  };
-
-  await emailQueue.add(jobName, jobPayload, jobOptions);
-
-  return { user, acceptInvitationUrl };
+  return user;
 };
 
 export default createUser;

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

@@ -0,0 +1,24 @@
+import { Duration } from 'luxon';
+import User from '../../models/user.js';
+import deleteUserQueue from '../../queues/delete-user.ee.js';
+
+const deleteUser = async (_parent, params, context) => {
+  context.currentUser.can('delete', 'User');
+
+  const id = params.input.id;
+
+  await User.query().deleteById(id);
+
+  const jobName = `Delete user - ${id}`;
+  const jobPayload = { id };
+  const millisecondsFor30Days = Duration.fromObject({ days: 30 }).toMillis();
+  const jobOptions = {
+    delay: millisecondsFor30Days,
+  };
+
+  await deleteUserQueue.add(jobName, jobPayload, jobOptions);
+
+  return true;
+};
+
+export default deleteUser;

packages/backend/src/graphql/mutations/forgot-password.ee.js

@@ -0,0 +1,43 @@
+import appConfig from '../../config/app.js';
+import User from '../../models/user.js';
+import emailQueue from '../../queues/email.js';
+import {
+  REMOVE_AFTER_30_DAYS_OR_150_JOBS,
+  REMOVE_AFTER_7_DAYS_OR_50_JOBS,
+} from '../../helpers/remove-job-configuration.js';
+
+const forgotPassword = async (_parent, params) => {
+  const { email } = params.input;
+
+  const user = await User.query().findOne({ email: email.toLowerCase() });
+
+  if (!user) {
+    throw new Error('Email address not found!');
+  }
+
+  await user.generateResetPasswordToken();
+
+  const jobName = `Reset Password Email - ${user.id}`;
+
+  const jobPayload = {
+    email: user.email,
+    subject: 'Reset Password',
+    template: 'reset-password-instructions',
+    params: {
+      token: user.resetPasswordToken,
+      webAppUrl: appConfig.webAppUrl,
+      fullName: user.fullName,
+    },
+  };
+
+  const jobOptions = {
+    removeOnComplete: REMOVE_AFTER_7_DAYS_OR_50_JOBS,
+    removeOnFail: REMOVE_AFTER_30_DAYS_OR_150_JOBS,
+  };
+
+  await emailQueue.add(jobName, jobPayload, jobOptions);
+
+  return true;
+};
+
+export default forgotPassword;

packages/backend/src/graphql/mutations/login.js

@@ -0,0 +1,17 @@
+import User from '../../models/user.js';
+import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id.js';
+
+const login = async (_parent, params) => {
+  const user = await User.query().findOne({
+    email: params.input.email.toLowerCase(),
+  });
+
+  if (user && (await user.login(params.input.password))) {
+    const token = await createAuthTokenByUserId(user.id);
+    return { token, user };
+  }
+
+  throw new Error('User could not be found.');
+};
+
+export default login;

packages/backend/src/graphql/mutations/reset-password.ee.js

@@ -0,0 +1,23 @@
+import User from '../../models/user.js';
+
+const resetPassword = async (_parent, params) => {
+  const { token, password } = params.input;
+
+  if (!token) {
+    throw new Error('Reset password token is required!');
+  }
+
+  const user = await User.query().findOne({ reset_password_token: token });
+
+  if (!user || !user.isResetPasswordTokenValid()) {
+    throw new Error(
+      'Reset password link is not valid or expired. Try generating a new link.'
+    );
+  }
+
+  await user.resetPassword(password);
+
+  return true;
+};
+
+export default resetPassword;

packages/backend/src/graphql/schema.graphql

@@ -8,17 +8,21 @@ type Mutation {
   createFlow(input: CreateFlowInput): Flow
   createRole(input: CreateRoleInput): Role
   createStep(input: CreateStepInput): Step
-  createUser(input: CreateUserInput): UserWithAcceptInvitationUrl
+  createUser(input: CreateUserInput): User
   deleteConnection(input: DeleteConnectionInput): Boolean
   deleteCurrentUser: Boolean
   deleteFlow(input: DeleteFlowInput): Boolean
   deleteRole(input: DeleteRoleInput): Boolean
   deleteStep(input: DeleteStepInput): Step
+  deleteUser(input: DeleteUserInput): Boolean
   duplicateFlow(input: DuplicateFlowInput): Flow
   executeFlow(input: ExecuteFlowInput): executeFlowType
+  forgotPassword(input: ForgotPasswordInput): Boolean
   generateAuthUrl(input: GenerateAuthUrlInput): AuthLink
+  login(input: LoginInput): Auth
   registerUser(input: RegisterUserInput): User
   resetConnection(input: ResetConnectionInput): Connection
+  resetPassword(input: ResetPasswordInput): Boolean
   updateAppAuthClient(input: UpdateAppAuthClientInput): AppAuthClient
   updateAppConfig(input: UpdateAppConfigInput): AppConfig
   updateConfig(input: JSONObject): JSONObject
@@ -150,6 +154,11 @@ enum ArgumentEnumType {
   string
 }
 
+type Auth {
+  user: User
+  token: String
+}
+
 type AuthenticationStep {
   type: String
   name: String
@@ -366,6 +375,7 @@ input DeleteStepInput {
 input CreateUserInput {
   fullName: String!
   email: String!
+  password: String!
   role: UserRoleInput!
 }
 
@@ -380,6 +390,10 @@ input UpdateUserInput {
   role: UserRoleInput
 }
 
+input DeleteUserInput {
+  id: String!
+}
+
 input RegisterUserInput {
   fullName: String!
   email: String!
@@ -392,6 +406,20 @@ input UpdateCurrentUserInput {
   fullName: String
 }
 
+input ForgotPasswordInput {
+  email: String!
+}
+
+input ResetPasswordInput {
+  token: String!
+  password: String!
+}
+
+input LoginInput {
+  email: String!
+  password: String!
+}
+
 input PermissionInput {
   action: String!
   subject: String!
@@ -492,11 +520,6 @@ type User {
   updatedAt: String
 }
 
-type UserWithAcceptInvitationUrl {
-  user: User
-  acceptInvitationUrl: String
-}
-
 type Role {
   id: String
   name: String

packages/backend/src/helpers/authentication.js

@@ -53,7 +53,10 @@ const isAuthenticatedRule = rule()(isAuthenticated);
 export const authenticationRules = {
   Mutation: {
     '*': isAuthenticatedRule,
+    forgotPassword: allow,
+    login: allow,
     registerUser: allow,
+    resetPassword: allow,
   },
 };
 

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

@@ -1,102 +1,43 @@
 import axios from 'axios';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 import { HttpProxyAgent } from 'http-proxy-agent';
-import appConfig from '../config/app.js';
 
-export function createInstance(customConfig = {}, { requestInterceptor, responseErrorInterceptor } = {}) {
-  const config = {
-    ...axios.defaults,
-    ...customConfig
-  };
-  const httpProxyUrl = appConfig.httpProxy;
-  const httpsProxyUrl = appConfig.httpsProxy;
-  const supportsProxy = httpProxyUrl || httpsProxyUrl;
-  const noProxyEnv = appConfig.noProxy;
-  const noProxyHosts = noProxyEnv ? noProxyEnv.split(',').map(host => host.trim()) : [];
+const config = axios.defaults;
+const httpProxyUrl = process.env.http_proxy;
+const httpsProxyUrl = process.env.https_proxy;
+const supportsProxy = httpProxyUrl || httpsProxyUrl;
+const noProxyEnv = process.env.no_proxy;
+const noProxyHosts = noProxyEnv ? noProxyEnv.split(',').map(host => host.trim()) : [];
 
-  if (supportsProxy) {
-    if (httpProxyUrl) {
-      config.httpAgent = new HttpProxyAgent(httpProxyUrl);
-    }
-
-    if (httpsProxyUrl) {
-      config.httpsAgent = new HttpsProxyAgent(httpsProxyUrl);
-    }
-
-    config.proxy = false;
+if (supportsProxy) {
+  if (httpProxyUrl) {
+    config.httpAgent = new HttpProxyAgent(httpProxyUrl);
   }
 
-  const instance = axios.create(config);
-
-  function shouldSkipProxy(hostname) {
-    return noProxyHosts.some(noProxyHost => {
-      return hostname.endsWith(noProxyHost) || hostname === noProxyHost;
-    });
-  };
-
-  /**
-   * The interceptors are executed in the reverse order they are added.
-   */
-  instance.interceptors.request.use(
-    function skipProxyIfInNoProxy(requestConfig) {
-      const hostname = new URL(requestConfig.baseURL).hostname;
-
-      if (supportsProxy && shouldSkipProxy(hostname)) {
-        requestConfig.httpAgent = undefined;
-        requestConfig.httpsAgent = undefined;
-      }
-
-      return requestConfig;
-    },
-    (error) => Promise.reject(error)
-  );
-
-  // not always we have custom request interceptors
-  if (requestInterceptor) {
-    instance.interceptors.request.use(
-      async function customInterceptor(requestConfig) {
-        let newRequestConfig = requestConfig;
-
-        for (const interceptor of requestInterceptor) {
-          newRequestConfig = await interceptor(newRequestConfig);
-        }
-
-        return newRequestConfig;
-      }
-    );
+  if (httpsProxyUrl) {
+    config.httpsAgent = new HttpsProxyAgent(httpsProxyUrl);
   }
 
-  instance.interceptors.request.use(
-    function removeBaseUrlForAbsoluteUrls(requestConfig) {
-      /**
-       * If the URL is an absolute URL, we remove its origin out of the URL
-       * and set it as baseURL. This lets us streamlines the requests made by Automatisch
-       * and requests made by app integrations.
-       */
-      try {
-        const url = new URL(requestConfig.url);
-        requestConfig.baseURL = url.origin;
-        requestConfig.url = url.pathname + url.search;
-
-        return requestConfig;
-      } catch (err) {
-        return requestConfig;
-      }
-    },
-    (error) => Promise.reject(error)
-  );
-
-  // not always we have custom response error interceptor
-  if (responseErrorInterceptor) {
-    instance.interceptors.response.use(
-      (response) => response,
-      responseErrorInterceptor
-    );
-  }
-
-  return instance;
+  config.proxy = false;
 }
 
-const defaultInstance = createInstance();
+const axiosWithProxyInstance = axios.create(config);
 
-export default defaultInstance;
+function shouldSkipProxy(hostname) {
+  return noProxyHosts.some(noProxyHost => {
+    return hostname.endsWith(noProxyHost) || hostname === noProxyHost;
+  });
+};
+
+axiosWithProxyInstance.interceptors.request.use(function skipProxyIfInNoProxy(requestConfig) {
+  const hostname = new URL(requestConfig.url).hostname;
+
+  if (supportsProxy && shouldSkipProxy(hostname)) {
+    requestConfig.httpAgent = undefined;
+    requestConfig.httpsAgent = undefined;
+  }
+
+  return requestConfig;
+});
+
+export default axiosWithProxyInstance;

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

@@ -1,169 +0,0 @@
-import { beforeEach, describe, it, expect, vi } from 'vitest';
-
-describe('Custom default axios with proxy', () => {
-  beforeEach(() => {
-    vi.resetModules();
-  });
-
-  it('should have two interceptors by default', async () => {
-    const axios = (await import('./axios-with-proxy.js')).default;
-    const requestInterceptors = axios.interceptors.request.handlers;
-
-    expect(requestInterceptors.length).toBe(2);
-  });
-
-  it('should have default interceptors in a certain order', async () => {
-    const axios = (await import('./axios-with-proxy.js')).default;
-
-    const requestInterceptors = axios.interceptors.request.handlers;
-    const firstRequestInterceptor = requestInterceptors[0];
-    const secondRequestInterceptor = requestInterceptors[1];
-
-    expect(firstRequestInterceptor.fulfilled.name).toBe('skipProxyIfInNoProxy');
-    expect(secondRequestInterceptor.fulfilled.name).toBe('removeBaseUrlForAbsoluteUrls');
-  });
-
-  it('should throw with invalid url (consisting of path alone)', async () => {
-    const axios = (await import('./axios-with-proxy.js')).default;
-
-    await expect(() => axios('/just-a-path')).rejects.toThrowError('Invalid URL');
-  });
-
-  describe('with skipProxyIfInNoProxy interceptor', () => {
-    let appConfig, axios;
-    beforeEach(async() => {
-      appConfig = (await import('../config/app.js')).default;
-
-      vi.spyOn(appConfig, 'httpProxy', 'get').mockReturnValue('http://proxy.automatisch.io');
-      vi.spyOn(appConfig, 'httpsProxy', 'get').mockReturnValue('http://proxy.automatisch.io');
-      vi.spyOn(appConfig, 'noProxy', 'get').mockReturnValue('name.tld,automatisch.io');
-
-      axios = (await import('./axios-with-proxy.js')).default;
-    });
-
-    it('should skip proxy for hosts in no_proxy environment variable', async () => {
-      const skipProxyIfInNoProxy = axios.interceptors.request.handlers[0].fulfilled;
-
-      const mockRequestConfig = {
-        ...axios.defaults,
-        baseURL: 'https://automatisch.io'
-      };
-
-      const interceptedRequestConfig = skipProxyIfInNoProxy(mockRequestConfig);
-
-      expect(interceptedRequestConfig.httpAgent).toBeUndefined();
-      expect(interceptedRequestConfig.httpsAgent).toBeUndefined();
-      expect(interceptedRequestConfig.proxy).toBe(false);
-    });
-
-    it('should not skip proxy for hosts not in no_proxy environment variable', async () => {
-      const skipProxyIfInNoProxy = axios.interceptors.request.handlers[0].fulfilled;
-
-      const mockRequestConfig = {
-        ...axios.defaults,
-        // beware the intentional typo!
-        baseURL: 'https://automatish.io'
-      };
-
-      const interceptedRequestConfig = skipProxyIfInNoProxy(mockRequestConfig);
-
-      expect(interceptedRequestConfig.httpAgent).toBeDefined();
-      expect(interceptedRequestConfig.httpsAgent).toBeDefined();
-      expect(interceptedRequestConfig.proxy).toBe(false);
-    });
-  });
-
-  describe('with removeBaseUrlForAbsoluteUrls interceptor', () => {
-    let axios;
-    beforeEach(async() => {
-      axios = (await import('./axios-with-proxy.js')).default;
-    });
-
-    it('should trim the baseUrl from absolute urls', async () => {
-      const removeBaseUrlForAbsoluteUrls = axios.interceptors.request.handlers[1].fulfilled;
-
-      const mockRequestConfig = {
-        ...axios.defaults,
-        url: 'https://automatisch.io/path'
-      };
-
-      const interceptedRequestConfig = removeBaseUrlForAbsoluteUrls(mockRequestConfig);
-
-      expect(interceptedRequestConfig.baseURL).toBe('https://automatisch.io');
-      expect(interceptedRequestConfig.url).toBe('/path');
-    });
-
-    it('should not mutate separate baseURL and urls', async () => {
-      const removeBaseUrlForAbsoluteUrls = axios.interceptors.request.handlers[1].fulfilled;
-
-      const mockRequestConfig = {
-        ...axios.defaults,
-        baseURL: 'https://automatisch.io',
-        url: '/path?query=1'
-      };
-
-      const interceptedRequestConfig = removeBaseUrlForAbsoluteUrls(mockRequestConfig);
-
-      expect(interceptedRequestConfig.baseURL).toBe('https://automatisch.io');
-      expect(interceptedRequestConfig.url).toBe('/path?query=1');
-    });
-
-    it('should not strip querystring from url', async () => {
-      const removeBaseUrlForAbsoluteUrls = axios.interceptors.request.handlers[1].fulfilled;
-
-      const mockRequestConfig = {
-        ...axios.defaults,
-        url: 'https://automatisch.io/path?query=1'
-      };
-
-      const interceptedRequestConfig = removeBaseUrlForAbsoluteUrls(mockRequestConfig);
-
-      expect(interceptedRequestConfig.baseURL).toBe('https://automatisch.io');
-      expect(interceptedRequestConfig.url).toBe('/path?query=1');
-    });
-  });
-
-  describe('with extra requestInterceptors', () => {
-    it('should apply extra request interceptors in the middle', async () => {
-      const { createInstance } = await import('./axios-with-proxy.js');
-
-      const interceptor = (config) => {
-        config.test = true;
-        return config;
-      }
-
-      const instance = createInstance({}, {
-        requestInterceptor: [
-          interceptor
-        ]
-      });
-      const requestInterceptors = instance.interceptors.request.handlers;
-      const customInterceptor = requestInterceptors[1].fulfilled;
-
-      expect(requestInterceptors.length).toBe(3);
-      await expect(customInterceptor({})).resolves.toStrictEqual({ test: true });
-    });
-
-    it('should work with a custom interceptor setting a baseURL and a request to path', async () => {
-      const { createInstance } = await import('./axios-with-proxy.js');
-
-      const interceptor = (config) => {
-        config.baseURL = 'http://localhost';
-        return config;
-      }
-
-      const instance = createInstance({}, {
-        requestInterceptor: [
-          interceptor
-        ]
-      });
-
-      try {
-        await instance.get('/just-a-path');
-      } catch (error) {
-        expect(error.config.baseURL).toBe('http://localhost');
-        expect(error.config.url).toBe('/just-a-path');
-      }
-    })
-  });
-});

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

@@ -6,7 +6,7 @@ import { fileURLToPath } from 'url';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const compileEmail = (emailPath, replacements = {}) => {
-  const filePath = path.join(__dirname, `../views/emails/${emailPath}.hbs`);
+  const filePath = path.join(__dirname, `../views/emails/${emailPath}.ee.hbs`);
   const source = fs.readFileSync(filePath, 'utf-8').toString();
   const template = handlebars.compile(source);
   return template(replacements);

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

@@ -98,9 +98,9 @@ const globalVariable = async (options) => {
         });
 
         return {
-          key: key,
-          value: datastore?.value ?? null,
-          [key]: datastore?.value ?? null,
+          key: datastore.key,
+          value: datastore.value,
+          [datastore.key]: datastore.value,
         };
       },
       set: async ({ key, value }) => {

packages/backend/src/helpers/http-client/index.js

@@ -1,43 +1,68 @@
+import { URL } from 'node:url';
 import HttpError from '../../errors/http.js';
-import { createInstance } from '../axios-with-proxy.js';
+import axios from '../axios-with-proxy.js';
+
+const removeBaseUrlForAbsoluteUrls = (requestConfig) => {
+  try {
+    const url = new URL(requestConfig.url);
+    requestConfig.baseURL = url.origin;
+    requestConfig.url = url.pathname + url.search;
+
+    return requestConfig;
+  } catch {
+    return requestConfig;
+  }
+};
 
 export default function createHttpClient({ $, baseURL, beforeRequest = [] }) {
-  async function interceptResponseError(error) {
-    const { config, response } = error;
-    // Do not destructure `status` from `error.response` because it might not exist
-    const status = response?.status;
+  const instance = axios.create({
+    baseURL,
+  });
 
-    if (
-      // TODO: provide a `shouldRefreshToken` function in the app
-      (status === 401 || status === 403) &&
-      $.app.auth &&
-      $.app.auth.refreshToken &&
-      !$.app.auth.isRefreshTokenRequested
-    ) {
-      $.app.auth.isRefreshTokenRequested = true;
-      await $.app.auth.refreshToken($);
+  instance.interceptors.request.use((requestConfig) => {
+    const newRequestConfig = removeBaseUrlForAbsoluteUrls(requestConfig);
 
-      // retry the previous request before the expired token error
-      const newResponse = await instance.request(config);
-      $.app.auth.isRefreshTokenRequested = false;
+    const result = beforeRequest.reduce((newConfig, beforeRequestFunc) => {
+      return beforeRequestFunc($, newConfig);
+    }, newRequestConfig);
 
-      return newResponse;
+    /**
+     * axios seems to want InternalAxiosRequestConfig returned not AxioRequestConfig
+     * anymore even though requests do require AxiosRequestConfig.
+     *
+     * Since both interfaces are very similar (InternalAxiosRequestConfig
+     * extends AxiosRequestConfig), we can utilize an assertion below
+     **/
+    return result;
+  });
+
+  instance.interceptors.response.use(
+    (response) => response,
+    async (error) => {
+      const { config, response } = error;
+      // Do not destructure `status` from `error.response` because it might not exist
+      const status = response?.status;
+
+      if (
+        // TODO: provide a `shouldRefreshToken` function in the app
+        (status === 401 || status === 403) &&
+        $.app.auth &&
+        $.app.auth.refreshToken &&
+        !$.app.auth.isRefreshTokenRequested
+      ) {
+        $.app.auth.isRefreshTokenRequested = true;
+        await $.app.auth.refreshToken($);
+
+        // retry the previous request before the expired token error
+        const newResponse = await instance.request(config);
+        $.app.auth.isRefreshTokenRequested = false;
+
+        return newResponse;
+      }
+
+      throw new HttpError(error);
     }
-
-    throw new HttpError(error);
-  };
-
-  const instance = createInstance(
-    {
-      baseURL,
-    },
-    {
-      requestInterceptor: beforeRequest.map((originalBeforeRequest) => {
-        return async (requestConfig) => await originalBeforeRequest($, requestConfig);
-      }),
-      responseErrorInterceptor: interceptResponseError,
-    }
-  )
+  );
 
   return instance;
 }

packages/backend/src/helpers/webhook-handler-sync.js

@@ -63,8 +63,6 @@ export default async (flowId, request, response) => {
     });
 
     if (testRun) {
-      response.status(204).end();
-
       // in case of testing, we do not process the whole process.
       continue;
     }
@@ -76,12 +74,6 @@ export default async (flowId, request, response) => {
         executionId,
       });
 
-      if (actionStep.appKey === 'filter' && !actionExecutionStep.dataOut) {
-        response.status(422).end();
-
-        break;
-      }
-
       if (actionStep.key === 'respondWith' && !response.headersSent) {
         const { headers, statusCode, body } = actionExecutionStep.dataOut;
 

packages/backend/src/models/user.js

@@ -1,5 +1,5 @@
 import bcrypt from 'bcrypt';
-import { DateTime, Duration } from 'luxon';
+import { DateTime } from 'luxon';
 import crypto from 'node:crypto';
 
 import appConfig from '../config/app.js';
@@ -21,13 +21,6 @@ import Subscription from './subscription.ee.js';
 import UsageData from './usage-data.ee.js';
 import Billing from '../helpers/billing/index.ee.js';
 
-import deleteUserQueue from '../queues/delete-user.ee.js';
-import emailQueue from '../queues/email.js';
-import {
-  REMOVE_AFTER_30_DAYS_OR_150_JOBS,
-  REMOVE_AFTER_7_DAYS_OR_50_JOBS,
-} from '../helpers/remove-job-configuration.js';
-
 class User extends Base {
   static tableName = 'users';
 
@@ -40,21 +33,8 @@ class User extends Base {
       fullName: { type: 'string', minLength: 1 },
       email: { type: 'string', format: 'email', minLength: 1, maxLength: 255 },
       password: { type: 'string' },
-      status: {
-        type: 'string',
-        enum: ['active', 'invited'],
-        default: 'active',
-      },
-      resetPasswordToken: { type: ['string', 'null'] },
-      resetPasswordTokenSentAt: {
-        type: ['string', 'null'],
-        format: 'date-time',
-      },
-      invitationToken: { type: ['string', 'null'] },
-      invitationTokenSentAt: {
-        type: ['string', 'null'],
-        format: 'date-time',
-      },
+      resetPasswordToken: { type: 'string' },
+      resetPasswordTokenSentAt: { type: 'string' },
       trialExpiryDate: { type: 'string' },
       roleId: { type: 'string', format: 'uuid' },
       deletedAt: { type: 'string' },
@@ -222,13 +202,6 @@ class User extends Base {
     await this.$query().patch({ resetPasswordToken, resetPasswordTokenSentAt });
   }
 
-  async generateInvitationToken() {
-    const invitationToken = crypto.randomBytes(64).toString('hex');
-    const invitationTokenSentAt = new Date().toISOString();
-
-    await this.$query().patch({ invitationToken, invitationTokenSentAt });
-  }
-
   async resetPassword(password) {
     return await this.$query().patch({
       resetPasswordToken: null,
@@ -237,53 +210,7 @@ class User extends Base {
     });
   }
 
-  async acceptInvitation(password) {
-    return await this.$query().patch({
-      invitationToken: null,
-      invitationTokenSentAt: null,
-      status: 'active',
-      password,
-    });
-  }
-
-  async softRemove() {
-    await this.$query().delete();
-
-    const jobName = `Delete user - ${this.id}`;
-    const jobPayload = { id: this.id };
-    const millisecondsFor30Days = Duration.fromObject({ days: 30 }).toMillis();
-    const jobOptions = {
-      delay: millisecondsFor30Days,
-    };
-
-    await deleteUserQueue.add(jobName, jobPayload, jobOptions);
-  }
-
-  async sendResetPasswordEmail() {
-    await this.generateResetPasswordToken();
-
-    const jobName = `Reset Password Email - ${this.id}`;
-
-    const jobPayload = {
-      email: this.email,
-      subject: 'Reset Password',
-      template: 'reset-password-instructions.ee',
-      params: {
-        token: this.resetPasswordToken,
-        webAppUrl: appConfig.webAppUrl,
-        fullName: this.fullName,
-      },
-    };
-
-    const jobOptions = {
-      removeOnComplete: REMOVE_AFTER_7_DAYS_OR_50_JOBS,
-      removeOnFail: REMOVE_AFTER_30_DAYS_OR_150_JOBS,
-    };
-
-    await emailQueue.add(jobName, jobPayload, jobOptions);
-  }
-
-  isResetPasswordTokenValid() {
+  async isResetPasswordTokenValid() {
     if (!this.resetPasswordTokenSentAt) {
       return false;
     }
@@ -295,18 +222,6 @@ class User extends Base {
     return now.getTime() - sentAt.getTime() < fourHoursInMilliseconds;
   }
 
-  isInvitationTokenValid() {
-    if (!this.invitationTokenSentAt) {
-      return false;
-    }
-
-    const sentAt = new Date(this.invitationTokenSentAt);
-    const now = new Date();
-    const seventyTwoHoursInMilliseconds = 1000 * 60 * 60 * 72;
-
-    return now.getTime() - sentAt.getTime() < seventyTwoHoursInMilliseconds;
-  }
-
   async generateHash() {
     if (this.password) {
       this.password = await bcrypt.hash(this.password, 10);
@@ -466,7 +381,7 @@ class User extends Base {
       email,
       password,
       fullName,
-      roleId: adminRole.id,
+      roleId: adminRole.id
     });
 
     await Config.markInstallationCompleted();

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

@@ -4,7 +4,6 @@ import { authenticateUser } from '../../../../helpers/authentication.js';
 import { authorizeAdmin } from '../../../../helpers/authorization.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';
-import deleteUserAction from '../../../../controllers/api/v1/admin/users/delete-user.js';
 
 const router = Router();
 
@@ -17,11 +16,4 @@ router.get(
   asyncHandler(getUserAction)
 );
 
-router.delete(
-  '/:userId',
-  authenticateUser,
-  authorizeAdmin,
-  asyncHandler(deleteUserAction)
-);
-
 export default router;

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

@@ -9,9 +9,6 @@ import getAppsAction from '../../../controllers/api/v1/users/get-apps.js';
 import getInvoicesAction from '../../../controllers/api/v1/users/get-invoices.ee.js';
 import getSubscriptionAction from '../../../controllers/api/v1/users/get-subscription.ee.js';
 import getPlanAndUsageAction from '../../../controllers/api/v1/users/get-plan-and-usage.ee.js';
-import acceptInvitationAction from '../../../controllers/api/v1/users/accept-invitation.js';
-import forgotPasswordAction from '../../../controllers/api/v1/users/forgot-password.js';
-import resetPasswordAction from '../../../controllers/api/v1/users/reset-password.js';
 
 const router = Router();
 
@@ -52,9 +49,4 @@ router.get(
   asyncHandler(getPlanAndUsageAction)
 );
 
-router.post('/invitation', asyncHandler(acceptInvitationAction));
-router.post('/forgot-password', asyncHandler(forgotPasswordAction));
-
-router.post('/reset-password', asyncHandler(resetPasswordAction));
-
 export default router;

packages/backend/src/serializers/user.js

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

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

@@ -35,7 +35,6 @@ describe('userSerializer', () => {
       email: user.email,
       fullName: user.fullName,
       id: user.id,
-      status: user.status,
       updatedAt: user.updatedAt.getTime(),
     };
 

packages/backend/src/views/emails/invitation-instructions.hbs

@@ -1,23 +0,0 @@
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Invitation instructions</title>
-</head>
-<body>
-  <p>
-    Hello {{ fullName }},
-  </p>
-
-  <p>
-    You have been invited to join our platform. To accept the invitation, click the link below.
-  </p>
-
-  <p>
-    <a href="{{ acceptInvitationUrl }}">Accept invitation</a>
-  </p>
-
-  <p>
-    If you did not expect this invitation, you can ignore this email.
-  </p>
-</body>
-</html>

packages/backend/src/views/emails/reset-password-instructions.ee.hbs

@@ -9,7 +9,7 @@
   </p>
 
   <p>
-    Someone has requested a link to change your password, and you can do this through the link below within 72 hours.
+    Someone has requested a link to change your password, and you can do this through the link below.
   </p>
 
   <p>

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

@@ -40,7 +40,6 @@ export const worker = new Worker(
       await user.$relatedQuery('usageData').withSoftDeleted().hardDelete();
     }
 
-    await user.$relatedQuery('accessTokens').withSoftDeleted().hardDelete();
     await user.$query().withSoftDeleted().hardDelete();
   },
   { connection: redisConfig }

packages/backend/src/workers/email.js

@@ -21,7 +21,7 @@ export const worker = new Worker(
   async (job) => {
     const { email, subject, template, params } = job.data;
 
-    if (isCloudSandbox() && !isAutomatischEmail(email)) {
+    if (isCloudSandbox && !isAutomatischEmail(email)) {
       logger.info(
         'Only Automatisch emails are allowed for non-production environments!'
       );

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

@@ -14,7 +14,6 @@ const getUserMock = (currentUser, role) => {
         name: role.name,
         updatedAt: role.updatedAt.getTime(),
       },
-      status: currentUser.status,
       trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
       updatedAt: currentUser.updatedAt.getTime(),
     },

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

@@ -18,7 +18,6 @@ const getUsersMock = async (users, roles) => {
             updatedAt: role.updatedAt.getTime(),
           }
         : null,
-      status: user.status,
       trialExpiryDate: user.trialExpiryDate.toISOString(),
       updatedAt: user.updatedAt.getTime(),
     };

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

@@ -4,7 +4,6 @@ const infoMock = () => {
       isCloud: false,
       isMation: false,
       isEnterprise: true,
-      docsUrl: 'https://automatisch.io/docs',
     },
     meta: {
       count: 1,

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

@@ -23,7 +23,6 @@ const getCurrentUserMock = (currentUser, role, permissions) => {
         name: role.name,
         updatedAt: role.updatedAt.getTime(),
       },
-      status: currentUser.status,
       trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
       updatedAt: currentUser.updatedAt.getTime(),
     },

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

@@ -50,6 +50,12 @@ export default defineConfig({
             { text: 'Connection', link: '/apps/appwrite/connection' },
           ],
         },
+        {
+          text: 'Bluesky',
+          collapsible: true,
+          collapsed: true,
+          items: [{ text: 'Connection', link: '/apps/bluesky/connection' }],
+        },
         {
           text: 'Carbone',
           collapsible: true,
@@ -59,15 +65,6 @@ export default defineConfig({
             { text: 'Connection', link: '/apps/carbone/connection' },
           ],
         },
-        {
-          text: 'Cryptography',
-          collapsible: true,
-          collapsed: true,
-          items: [
-            { text: 'Actions', link: '/apps/cryptography/actions' },
-            { text: 'Connection', link: '/apps/cryptography/connection' },
-          ],
-        },
         {
           text: 'Datastore',
           collapsible: true,

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

@@ -14,7 +14,7 @@ connection in Automatisch. If any of the steps are outdated, please let us know!
 7. Click on the **Select all** and then click on the **Create** button.
 8. Now, copy your **API key secret** and paste the key into the **API Key** field in Automatisch.
 9. Write any screen name to be displayed in Automatisch.
-10. You can find your project ID next to your project name. Paste the id into **Project ID** field in Automatisch.
-11. If you are using self-hosted Appwrite project, you can paste the instance url into **Appwrite instance URL** field in Automatisch.
+10. You can find your project ID next to your project name. Paste the id into **Project ID** field in Automatsich.
+11. If you are using self-hosted Appwrite project, you can paste the instace url into **Appwrite instance URL** field in Automatisch.
 12. Fill the host name field with the hostname of your instance URL. It's either `cloud.appwrite.io` or hostname of your instance URL.
 13. Start using Appwrite integration with Automatisch!

packages/docs/pages/apps/appwrite/triggers.md

@@ -1,7 +1,7 @@
 ---
 favicon: /favicons/appwrite.svg
 items:
-  - name: New documents
+  - name: New documets
     desc: Triggers when a new document is created.
 ---
 

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

@@ -0,0 +1,10 @@
+# Bluesky
+
+:::info
+This page explains the steps you need to follow to set up the Bluesky connection in Automatisch. If any of the steps are outdated, please let us know!
+:::
+
+1. Enter your `Bluesky Handle` from the page to the `Your Bluesky Handle` field on Automatisch.
+1. Enter your `Bluesky Password` from the page to the `Your Bluesky Password` field on Automatisch.
+1. Click **Submit** button on Automatisch.
+1. Congrats! Start using your new Bluesky connection within the flows.

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

@@ -1,14 +0,0 @@
----
-favicon: /favicons/cryptography.svg
-items:
-  - name: Create HMAC
-    desc: Create a Hash-based Message Authentication Code (HMAC) using the specified algorithm, secret key, and message.
-  - name: Create Signature
-    desc: Create a digital signature using the specified algorithm, secret key, and message.
----
-
-<script setup>
-  import CustomListing from '../../components/CustomListing.vue'
-</script>
-
-<CustomListing />

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

@@ -1,3 +0,0 @@
-# Cryptography
-
-Cryptography is a built-in app shipped with Automatisch, allowing you to perform cryptographic operations without needing to connect to any external services.

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

@@ -5,8 +5,6 @@ items:
     desc: Creates an attachment of a specified object by given parent ID.
   - name: Find record
     desc: Finds a record of a specified object by a field and value.
-  - name: Find partially matching record
-    desc: Finds a record of a specified object by a field containing a value.
   - name: Execute query
     desc: Executes a SOQL query in Salesforce.
 ---

packages/docs/pages/contributing/repository-structure.md

@@ -6,12 +6,16 @@ We use `lerna` with `yarn workspaces` to manage the mono repository. We have the
 .
 ├── packages
 │   ├── backend
+│   ├── cli
 │   ├── docs
 │   ├── e2e-tests
+│   ├── types
 │   └── web
 ```
 
 - `backend` - The backend package contains the backend application and all integrations.
+- `cli` - The cli package contains the CLI application of Automatisch.
 - `docs` - The docs package contains the documentation website.
 - `e2e-tests` - The e2e-tests package contains the end-to-end tests for the internal usage.
+- `types` - The types package contains the shared types for both the backend and web packages.
 - `web` - The web package contains the frontend application of Automatisch.

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-50 -50 430 390" fill="#1185fd" aria-hidden="true">
+  <path d="M180 141.964C163.699 110.262 119.308 51.1817 78.0347 22.044C38.4971 -5.86834 23.414 -1.03207 13.526 3.43594C2.08093 8.60755 0 26.1785 0 36.5164C0 46.8542 5.66748 121.272 9.36416 133.694C21.5786 174.738 65.0603 188.607 105.104 184.156C107.151 183.852 109.227 183.572 111.329 183.312C109.267 183.642 107.19 183.924 105.104 184.156C46.4204 192.847 -5.69621 214.233 62.6582 290.33C137.848 368.18 165.705 273.637 180 225.702C194.295 273.637 210.76 364.771 295.995 290.33C360 225.702 313.58 192.85 254.896 184.158C252.81 183.926 250.733 183.645 248.671 183.315C250.773 183.574 252.849 183.855 254.896 184.158C294.94 188.61 338.421 174.74 350.636 133.697C354.333 121.275 360 46.8568 360 36.519C360 26.1811 357.919 8.61012 346.474 3.43851C336.586 -1.02949 321.503 -5.86576 281.965 22.0466C240.692 51.1843 196.301 110.262 180 141.964Z">
+  </path>
+</svg>

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

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="100pt" height="100pt" version="1.1" viewBox="0 0 100 100">
- <path d="m66.012 33h-3.0117v-11c0-7.1719-5.8281-13-13-13s-13 5.8281-13 13v11h-3.0117c-2.75 0-4.9883 2.2383-4.9883 4.9883v28.012c0 2.75 2.2383 4.9883 4.9883 4.9883h32.012c2.75 0 4.9883-2.2383 4.9883-4.9883v-28.012c0.011719-2.75-2.2266-4.9883-4.9766-4.9883zm-27.012-11c0-6.0703 4.9297-11 11-11s11 4.9297 11 11v11h-22zm30 44.012c0 1.6484-1.3398 2.9883-2.9883 2.9883h-32.023c-1.6484 0-2.9883-1.3398-2.9883-2.9883v-28.023c0-1.6484 1.3398-2.9883 2.9883-2.9883h32.023c1.6484 0 2.9883 1.3398 2.9883 2.9883zm-18 9.9883v14c0 0.55078-0.44922 1-1 1s-1-0.44922-1-1v-14c0-0.55078 0.44922-1 1-1s1 0.44922 1 1zm20 8c0 0.55078-0.44922 1-1 1h-8c-0.55078 0-1-0.44922-1-1v-8c0-0.55078 0.44922-1 1-1s1 0.44922 1 1v7h7c0.55078 0 1 0.44922 1 1zm-32-8v8c0 0.55078-0.44922 1-1 1h-8c-0.55078 0-1-0.44922-1-1s0.44922-1 1-1h7v-7c0-0.55078 0.44922-1 1-1s1 0.44922 1 1zm-14-26c0 0.55078-0.44922 1-1 1h-14c-0.55078 0-1-0.44922-1-1s0.44922-1 1-1h14c0.55078 0 1 0.44922 1 1zm0-12c0 0.55078-0.44922 1-1 1h-8c-0.55078 0-1-0.44922-1-1v-8c0-0.55078 0.44922-1 1-1s1 0.44922 1 1v7h7c0.55078 0 1 0.44922 1 1zm0 24c0 0.55078-0.44922 1-1 1h-7v7c0 0.55078-0.44922 1-1 1s-1-0.44922-1-1v-8c0-0.55078 0.44922-1 1-1h8c0.55078 0 1 0.44922 1 1zm66-12c0 0.55078-0.44922 1-1 1h-14c-0.55078 0-1-0.44922-1-1s0.44922-1 1-1h14c0.55078 0 1 0.44922 1 1zm-16-12c0-0.55078 0.44922-1 1-1h7v-7c0-0.55078 0.44922-1 1-1s1 0.44922 1 1v8c0 0.55078-0.44922 1-1 1h-8c-0.55078 0-1-0.44922-1-1zm10 24v8c0 0.55078-0.44922 1-1 1s-1-0.44922-1-1v-7h-7c-0.55078 0-1-0.44922-1-1s0.44922-1 1-1h8c0.55078 0 1 0.44922 1 1zm-35-17c-2.7617 0-5 2.2383-5 5 0 2.4102 1.7188 4.4297 4 4.8984v5.1016c0 0.55078 0.44922 1 1 1s1-0.44922 1-1v-5.1016c2.2812-0.46094 4-2.4805 4-4.8984 0-2.7617-2.2383-5-5-5zm0 8c-1.6484 0-3-1.3516-3-3s1.3516-3 3-3 3 1.3516 3 3-1.3516 3-3 3z"/>
-</svg>

packages/e2e-tests/.env-example

@@ -1,5 +0,0 @@
-POSTGRES_DB=automatisch
-POSTGRES_USER=automatisch_user
-POSTGRES_PASSWORD=automatisch_password
-POSTGRES_PORT=5432
-POSTGRES_HOST=localhost

packages/e2e-tests/.eslintignore

@@ -1,6 +0,0 @@
-node_modules
-build
-
-.eslintrc.js
-
-playwright-report/*

packages/e2e-tests/.eslintrc.json

@@ -1,25 +0,0 @@
-{
-  "root": true,
-  "env": {
-    "node": true,
-    "es6": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "prettier"
-  ],
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module"
-  },
-  "rules": {
-    "semi": [
-      2,
-      "always"
-    ],
-    "indent": [
-      "error",
-      2
-    ]
-  }
-}

packages/e2e-tests/README.md

@@ -44,14 +44,6 @@ and it should install the associated browsers for the test running. For more inf
 
 We recommend using [Playwright Test for VSCode](https://marketplace.visualstudio.com/items?itemName=ms-playwright.playwright) maintained by Microsoft. This lets you run playwright tests from within the code editor, giving you access to additional tools, such as easily running subsets of tests.
 
-[Global setup and teardown](https://playwright.dev/docs/test-global-setup-teardown) are part of the tests.
-
-By running `yarn test` setup and teardown actions will take place.
-
-If you need to setup Admin account (if you didn't seed the DB with the admin account or have clean DB) you should run `auth.setup.js` file.
-
-If you want to clean the database (drop tables) and perform required migrations run `global.teardown.js`.
-
 # Test failures
 
 If there are failing tests in the test suite, this can be caused by a myriad of reasons, but one of the best places to start is either running the test in a headed browser, looking at the associated trace file for the failed test, or checking out the output of a failed GitHub Action.

packages/e2e-tests/fixtures/accept-invitation-page.js

@@ -1,46 +0,0 @@
-const { expect } = require('@playwright/test');
-const { BasePage } = require('./base-page');
-
-export class AcceptInvitation extends BasePage {
-  path = '/accept-invitation';
-
-  /**
-   * @param {import('@playwright/test').Page} page
-   */
-  constructor(page) {
-    super(page);
-
-    this.page = page;
-    this.passwordTextField = this.page.getByTestId('password-text-field');
-    this.passwordConfirmationTextField = this.page.getByTestId('confirm-password-text-field');
-    this.submitButton = this.page.getByTestId('submit-button');
-    this.pageTitle = this.page.getByTestId('accept-invitation-form-title');
-    this.formErrorMessage = this.page.getByTestId('accept-invitation-form-error');
-  }
-
-  async open(token) {
-    return await this.page.goto(`${this.path}?token=${token}`);
-  }
-
-  async acceptInvitation(
-    password
-  ) {
-    await this.passwordTextField.fill(password);
-    await this.passwordConfirmationTextField.fill(password);
-
-    await this.submitButton.click();
-  }
-
-  async fillPasswordField(password) {
-    await this.passwordTextField.fill(password);
-    await this.passwordConfirmationTextField.fill(password);
-  }
-
-  async excpectSubmitButtonToBeDisabled() {
-    await expect(this.submitButton).toBeDisabled();
-  }
-
-  async expectAlertToBeVisible() {
-    await expect(this.formErrorMessage).toBeVisible();
-  }
-}

packages/e2e-tests/fixtures/admin-setup-page.js

@@ -1,75 +0,0 @@
-import { BasePage } from "./base-page";
-const { faker } = require('@faker-js/faker');
-const { expect } = require('@playwright/test');
-
-export class AdminSetupPage extends BasePage {
-  path = '/installation';
-
-  /**
-  * @param {import('@playwright/test').Page} page
-  */
-  constructor(page) {
-    super(page);
-
-    this.fullNameTextField = this.page.getByTestId('fullName-text-field');
-    this.emailTextField = this.page.getByTestId('email-text-field');
-    this.passwordTextField = this.page.getByTestId('password-text-field');
-    this.repeatPasswordTextField = this.page.getByTestId('repeat-password-text-field');
-    this.createAdminButton = this.page.getByTestId('signUp-button');
-    this.invalidFields = this.page.locator('p.Mui-error');
-    this.successAlert = this.page.getByTestId('success-alert');
-  }
-
-  async open() {
-    return await this.page.goto(this.path);
-  }
-
-  async fillValidUserData() {
-    await this.fullNameTextField.fill(process.env.LOGIN_EMAIL);
-    await this.emailTextField.fill(process.env.LOGIN_EMAIL);
-    await this.passwordTextField.fill(process.env.LOGIN_PASSWORD);
-    await this.repeatPasswordTextField.fill(process.env.LOGIN_PASSWORD);
-  }
-
-  async fillInvalidUserData() {
-    await this.fullNameTextField.fill('');
-    await this.emailTextField.fill('abcde');
-    await this.passwordTextField.fill('');
-    await this.repeatPasswordTextField.fill('a');
-  }
-
-  async fillNotMatchingPasswordUserData() {
-    const testUser = this.generateUser();
-    await this.fullNameTextField.fill(testUser.fullName);
-    await this.emailTextField.fill(testUser.email);
-    await this.passwordTextField.fill(testUser.password);
-    await this.repeatPasswordTextField.fill(testUser.wronglyRepeatedPassword);
-  }
-
-  async submitAdminForm()  {
-    await this.createAdminButton.click();
-  }
-
-  async expectInvalidFields(errorCount) {
-    await expect(await this.invalidFields.all()).toHaveLength(errorCount);
-  }
-
-  async expectSuccessAlertToBeVisible() {
-    await expect(await this.successAlert).toBeVisible();
-  }
-
-  async expectSuccessMessageToContainLoginLink() {
-    await expect(await this.successAlert.locator('a')).toHaveAttribute('href', '/login');
-  }
-
-  generateUser() {
-    faker.seed(Math.ceil(Math.random() * Number.MAX_SAFE_INTEGER));
-
-    return {
-      fullName: faker.person.fullName(),
-      email: faker.internet.email(),
-      password: faker.internet.password(),
-      wronglyRepeatedPassword: faker.internet.password()
-    };
-  }
-};

packages/e2e-tests/fixtures/admin/create-user-page.js

@@ -11,11 +11,10 @@ export class AdminCreateUserPage extends AuthenticatedPage {
     super(page);
     this.fullNameInput = page.getByTestId('full-name-input');
     this.emailInput = page.getByTestId('email-input');
+    this.passwordInput = page.getByTestId('password-input');
     this.roleInput = page.getByTestId('role.id-autocomplete');
     this.createButton = page.getByTestId('create-button');
     this.pageTitle = page.getByTestId('create-user-title');
-    this.invitationEmailInfoAlert = page.getByTestId('invitation-email-info-alert');
-    this.acceptInvitationLink = page.getByTestId('invitation-email-info-alert').getByRole('link');
   }
 
   seed(seed) {
@@ -26,6 +25,7 @@ export class AdminCreateUserPage extends AuthenticatedPage {
     return {
       fullName: faker.person.fullName(),
       email: faker.internet.email().toLowerCase(),
+      password: faker.internet.password(),
     };
   }
 }

packages/e2e-tests/fixtures/admin/delete-user-modal.js

@@ -14,6 +14,6 @@ export class DeleteUserModal {
   async close () {
     await this.page.click('body', {
       position: { x: 10, y: 10 }
-    });
+    })
   }
 }

packages/e2e-tests/fixtures/admin/edit-role-page.js

@@ -1,4 +1,4 @@
-const { AdminCreateRolePage } = require('./create-role-page');
+const { AdminCreateRolePage } = require('./create-role-page')
 
 export class AdminEditRolePage extends AdminCreateRolePage {
   constructor (page) {

packages/e2e-tests/fixtures/admin/edit-user-page.js

@@ -23,7 +23,6 @@ export class AdminEditUserPage extends AuthenticatedPage {
    */
   async waitForLoad(fullName) {
     return await this.page.waitForFunction((fullName) => {
-      // eslint-disable-next-line no-undef
       const el = document.querySelector("[data-test='full-name-input']");
       return el && el.value === fullName;
     }, fullName);

packages/e2e-tests/fixtures/admin/index.js

@@ -25,5 +25,5 @@ export const adminFixtures = {
   adminCreateRolePage: async ({ page}, use) => {
     await use(new AdminCreateRolePage(page));
   },
-};
+}
 

packages/e2e-tests/fixtures/admin/users-page.js

@@ -87,7 +87,6 @@ export class AdminUsersPage extends AuthenticatedPage {
       await this.firstPageButton.click();
     }
 
-    // eslint-disable-next-line no-constant-condition
     while (true) {
       if (await this.usersLoader.isVisible()) {
         await this.usersLoader.waitFor({
@@ -109,7 +108,6 @@ export class AdminUsersPage extends AuthenticatedPage {
 
   async getTotalRows() {
     return await this.page.evaluate(() => {
-      // eslint-disable-next-line no-undef
       const node = document.querySelector('[data-total-count]');
       if (node) {
         const count = Number(node.dataset.totalCount);
@@ -123,7 +121,6 @@ export class AdminUsersPage extends AuthenticatedPage {
 
   async getRowsPerPage() {
     return await this.page.evaluate(() => {
-      // eslint-disable-next-line no-undef
       const node = document.querySelector('[data-rows-per-page]');
       if (node) {
         const count = Number(node.dataset.rowsPerPage);

packages/e2e-tests/fixtures/applications-modal.js

@@ -25,7 +25,7 @@ export class ApplicationsModal extends BasePage {
     if (this.applications[link] === undefined) {
       throw {
         message: `Unknown link "${link}" passed to ApplicationsModal.selectLink`
-      };
+      }
     }
     await this.searchInput.fill(link);
     await this.appListItem.first().click();

packages/e2e-tests/fixtures/applications-page.js

@@ -1,3 +1,4 @@
+const path = require('node:path');
 const { ApplicationsModal } = require('./applications-modal');
 const { AuthenticatedPage } = require('./authenticated-page');
 

packages/e2e-tests/fixtures/apps/github/github-page.js

@@ -1,11 +1,10 @@
 const { BasePage } = require('../../base-page');
 const { AddGithubConnectionModal } = require('./add-github-connection-modal');
-const { expect } = require('@playwright/test');
 
 export class GithubPage extends BasePage {
 
   constructor (page) {
-    super(page);
+    super(page)
     this.addConnectionButton = page.getByTestId('add-connection-button');
     this.connectionsTab = page.getByTestId('connections-tab');
     this.flowsTab = page.getByTestId('flows-tab');
@@ -39,7 +38,7 @@ export class GithubPage extends BasePage {
       await this.flowsTab.click();
       await expect(this.flowsTab).toBeVisible();
     }
-    return await this.flowRows.count() > 0;
+    return await this.flowRows.count() > 0
   }
 
   async hasConnections () {