fix: Use await for seed user creation function

.devcontainer/devcontainer.json

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

.github/workflows/ci.yml

@@ -83,3 +83,20 @@ jobs:
         env:
           CI: false
       - run: echo "🍏 This job's status is ${{ job.status }}."
+  build-cli:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
+      - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '18'
+          cache: 'yarn'
+          cache-dependency-path: yarn.lock
+      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - run: yarn --frozen-lockfile && yarn lerna bootstrap
+      - run: cd packages/cli && yarn build
+      - run: echo "🍏 This job's status is ${{ job.status }}."

package.json

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

packages/backend/bin/database/seed-user.js

@@ -1,3 +1,3 @@
 import { createUser } from './utils.js';
 
-createUser();
+await createUser();

packages/backend/package.json

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

packages/backend/src/apps/bigin-by-zoho-crm/assets/favicon.svg

@@ -1,32 +0,0 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" id="b" data-name="Layer 2" width="327.714" height="120" viewBox="0 0 327.714 120">
-  <defs>
-    <style>
-      .d {
-        fill: #039649;
-      }
-    </style>
-  </defs>
-  <g id="c" data-name="Layer 1">
-    <g>
-      <path class="d" d="m52.39,120c-1.801,0-3.6-.6-5.101-1.5-2.1-1.5-3.6-4.2-3.6-6.9v-24.6L1.09,12.901C-.41,9.9-.41,6.601,1.391,4.2,2.891,1.5,5.89,0,8.89,0h78c2.999,0,5.698,1.5,7.199,4.2,1.801,2.702,1.801,6.3.301,9.002l-5.101,9h10.201c2.999,0,5.698,1.5,7.199,4.2,1.801,2.7,1.801,6.3.301,9l-29.701,51.3v18.599c0,3.899-2.399,6.9-5.999,8.099l-16.2,6.3c-.6.301-1.799.301-2.7.301M8.89,8.4q-.301.301-.301.602l42.301,73.798c1.199,2.1,1.199,3.299,1.199,4.501v23.998s.301.301.6,0l16.2-6.3h.6v-17.999c0-1.199,0-3.299,1.201-4.8l29.4-50.999c0-.301,0-.6-.301-.6l-53.699-.301,14.399,24.901,10.201-17.7c1.199-2.1,3.6-2.7,5.7-1.5,2.1,1.199,2.7,3.6,1.498,5.7l-11.998,20.699c-2.702,4.2-8.701,3.901-11.102.301l-17.4-30.9c-1.199-1.799-1.199-4.2,0-6.3,1.201-2.1,3.301-3.6,5.7-3.6h36.6l7.499-12.899s0-.301-.299-.602H8.89Z"/>
-      <g>
-        <path d="m181.725,48.737c0,3.089-.54,5.684-1.618,7.788-1.081,2.104-2.548,3.79-4.407,5.062-1.858,1.27-4.016,2.179-6.476,2.726-2.459.547-5.069.819-7.828.819h-24.591V6.521h23.034c2.676,0,5.198.24,7.561.718,2.364.479,4.427,1.311,6.189,2.5,1.762,1.189,3.149,2.787,4.16,4.795,1.011,2.008,1.517,4.53,1.517,7.562,0,3.17-.786,5.813-2.357,7.93-1.57,2.119-3.913,3.628-7.028,4.53,4.017.819,6.995,2.371,8.935,4.652s2.91,5.458,2.91,9.529Zm-33.813-17.624h10.533c1.612,0,3.033-.136,4.263-.41,1.23-.272,2.268-.738,3.115-1.393.846-.656,1.489-1.55,1.927-2.684.436-1.134.655-2.562.655-4.284,0-1.612-.267-2.923-.799-3.934-.532-1.01-1.25-1.809-2.152-2.398-.902-.587-1.967-.99-3.197-1.209s-2.542-.328-3.934-.328h-10.411v16.64Zm0,26.067h12.09c1.64,0,3.115-.169,4.427-.512,1.311-.342,2.424-.894,3.341-1.66.915-.764,1.612-1.748,2.091-2.951.478-1.202.716-2.663.716-4.385,0-1.802-.294-3.285-.881-4.447-.588-1.161-1.394-2.083-2.419-2.766s-2.227-1.154-3.606-1.414c-1.381-.26-2.863-.39-4.447-.39h-11.312v18.525Z"/>
-        <path d="m202.257,9.555c0,.847-.151,1.633-.451,2.356-.3.724-.716,1.34-1.25,1.844-.532.507-1.167.902-1.905,1.189s-1.53.431-2.377.431c-.819,0-1.598-.144-2.336-.431s-1.388-.69-1.947-1.209c-.56-.519-.998-1.133-1.311-1.844-.315-.711-.471-1.489-.471-2.336s.156-1.626.471-2.336c.314-.711.744-1.325,1.291-1.845.546-.519,1.187-.922,1.925-1.209s1.53-.431,2.377-.431c.821,0,1.598.144,2.336.431s1.373.69,1.907,1.209c.532.52.955,1.134,1.27,1.845.314.71.471,1.489.471,2.336Zm-.778,12.705v42.871h-10.246V22.261h10.246Z"/>
-        <path d="m254.186,61.935c0,3.361-.587,6.236-1.762,8.627-1.174,2.391-2.78,4.352-4.815,5.882-2.036,1.529-4.407,2.65-7.111,3.361-2.706.71-5.589,1.065-8.648,1.065-2.023,0-4.037-.157-6.045-.471-2.009-.314-3.908-.861-5.697-1.64-1.79-.778-3.395-1.837-4.816-3.175-1.421-1.34-2.555-3.021-3.402-5.042l8.074-3.525c.519,1.202,1.202,2.193,2.049,2.971.847.779,1.797,1.408,2.848,1.885,1.051.479,2.172.814,3.361,1.005s2.398.287,3.628.287c1.885,0,3.572-.232,5.062-.696,1.489-.466,2.752-1.169,3.79-2.111,1.039-.943,1.838-2.132,2.399-3.566.559-1.434.839-3.107.839-5.02v-6.393c-.71,1.229-1.592,2.336-2.643,3.319-1.053.983-2.207,1.824-3.464,2.52s-2.582,1.237-3.976,1.62c-1.393.383-2.814.574-4.263.574-3.033,0-5.737-.56-8.114-1.681-2.377-1.119-4.379-2.636-6.005-4.55-1.625-1.912-2.862-4.139-3.709-6.68-.847-2.542-1.27-5.233-1.27-8.074,0-2.814.451-5.491,1.353-8.033.901-2.542,2.192-4.775,3.873-6.702,1.68-1.927,3.709-3.464,6.086-4.611,2.376-1.147,5.054-1.721,8.033-1.721,2.923,0,5.621.594,8.094,1.782,2.472,1.189,4.473,3.082,6.004,5.677v-6.557h10.246v39.674Zm-33.198-19.017c0,1.666.252,3.265.758,4.795s1.237,2.876,2.193,4.037c.957,1.162,2.137,2.084,3.545,2.767s3.013,1.025,4.816,1.025c2.021,0,3.784-.355,5.287-1.066,1.502-.711,2.746-1.673,3.729-2.89.985-1.215,1.722-2.643,2.213-4.283.492-1.64.738-3.374.738-5.206,0-1.802-.239-3.49-.716-5.062-.479-1.57-1.203-2.93-2.173-4.077s-2.179-2.056-3.626-2.726c-1.449-.67-3.157-1.005-5.123-1.005-2.049,0-3.812.363-5.287,1.086-1.476.724-2.684,1.709-3.628,2.951-.943,1.243-1.633,2.699-2.069,4.365-.438,1.666-.656,3.429-.656,5.287Z"/>
-        <path d="m277.096,9.555c0,.847-.151,1.633-.451,2.356-.3.724-.716,1.34-1.25,1.844-.532.507-1.167.902-1.905,1.189s-1.53.431-2.377.431c-.819,0-1.598-.144-2.336-.431s-1.388-.69-1.947-1.209c-.56-.519-.998-1.133-1.311-1.844-.315-.711-.471-1.489-.471-2.336s.156-1.626.471-2.336c.314-.711.744-1.325,1.291-1.845.546-.519,1.187-.922,1.925-1.209s1.53-.431,2.377-.431c.821,0,1.598.144,2.336.431s1.373.69,1.907,1.209c.532.52.955,1.134,1.27,1.845.314.71.471,1.489.471,2.336Zm-.778,12.705v42.871h-10.246V22.261h10.246Z"/>
-        <path d="m308.451,29.801c-1.585,0-2.999.24-4.243.718-1.243.479-2.288,1.162-3.135,2.049-.847.889-1.496,1.961-1.947,3.217-.451,1.258-.676,2.651-.676,4.181v25.165h-10.246V22.261h10.246v6.803c.683-1.338,1.537-2.492,2.562-3.462,1.025-.97,2.165-1.769,3.422-2.399,1.257-.627,2.59-1.091,3.997-1.393,1.406-.3,2.82-.451,4.241-.451,2.623,0,4.884.431,6.783,1.291s3.464,2.049,4.694,3.565c1.229,1.517,2.131,3.307,2.704,5.37s.861,4.311.861,6.742v26.805h-10.328v-25.822c0-3.005-.711-5.341-2.132-7.008-1.421-1.666-3.688-2.5-6.803-2.5Z"/>
-      </g>
-      <g>
-        <path d="m152.871,102.12c0,1.138-.168,2.221-.507,3.25-.337,1.028-.828,1.935-1.471,2.72s-1.436,1.41-2.379,1.874-2.021.696-3.234.696c-.579,0-1.155-.061-1.723-.183-.569-.121-1.107-.306-1.613-.553-.505-.247-.974-.561-1.407-.941s-.801-.822-1.107-1.328v2.72h-2.625v-24.446h2.625v10.689c.273-.464.632-.882,1.076-1.257.442-.374.93-.696,1.463-.964.531-.27,1.082-.477,1.652-.626.569-.146,1.122-.22,1.66-.22,1.244,0,2.34.227,3.289.679.95.454,1.743,1.068,2.38,1.843s1.117,1.685,1.44,2.728c.321,1.044.482,2.151.482,3.321Zm-13.536.126c0,.917.123,1.756.371,2.515.249.759.614,1.415,1.1,1.968.485.553,1.079.984,1.787,1.289.706.306,1.517.459,2.435.459.991,0,1.813-.178,2.467-.53.653-.354,1.178-.828,1.573-1.424.395-.595.674-1.283.838-2.063.163-.78.245-1.603.245-2.467,0-.801-.104-1.576-.308-2.325-.206-.748-.52-1.415-.941-1.999-.422-.586-.958-1.055-1.605-1.407-.648-.354-1.415-.53-2.3-.53-.981,0-1.827.174-2.538.521-.711.349-1.3.818-1.764,1.409-.464.59-.806,1.28-1.028,2.071s-.332,1.629-.332,2.514Z"/>
-        <path d="m169.949,93.834l-9.141,22.297h-2.656l3.131-7.464-6.388-14.833h2.814l4.965,11.86,4.586-11.86h2.689Z"/>
-        <path d="m194.11,108.034v2.34h-16.414v-1.139l13.189-19.228h-12.05v-2.246h15.465v1.139l-12.84,19.134h12.65Z"/>
-        <path d="m213.229,102.215c0,1.202-.206,2.319-.617,3.352-.411,1.034-.986,1.927-1.723,2.681-.739.753-1.611,1.344-2.618,1.77-1.007.428-2.106.641-3.296.641-1.256,0-2.388-.222-3.4-.665s-1.874-1.053-2.585-1.834-1.257-1.697-1.637-2.752c-.38-1.053-.57-2.192-.57-3.416,0-1.191.201-2.3.601-3.329.4-1.028.964-1.92,1.692-2.68.727-.759,1.594-1.354,2.601-1.787s2.116-.648,3.329-.648c1.254,0,2.391.22,3.408.663s1.881,1.055,2.593,1.835,1.26,1.697,1.644,2.751c.385,1.055.578,2.192.578,3.416Zm-13.726.031c0,.886.117,1.708.349,2.467s.579,1.418,1.043,1.977c.464.558,1.038.995,1.723,1.311.685.317,1.481.476,2.388.476.938,0,1.753-.175,2.443-.522.691-.349,1.263-.816,1.717-1.407.452-.591.79-1.275,1.012-2.056.22-.78.332-1.602.332-2.466,0-.844-.117-1.646-.349-2.404-.232-.759-.579-1.429-1.043-2.008s-1.038-1.038-1.723-1.376c-.685-.337-1.481-.505-2.388-.505-.971,0-1.802.174-2.498.521-.696.349-1.265.82-1.708,1.416-.443.595-.77,1.288-.981,2.078-.21.792-.316,1.624-.316,2.498Z"/>
-        <path d="m224.423,95.827c-.696,0-1.323.105-1.881.316s-1.034.512-1.423.902c-.391.39-.691.864-.902,1.423s-.316,1.186-.316,1.881v10.026h-2.625v-24.446h2.625v10.531c.253-.516.564-.956.933-1.32s.777-.663,1.226-.902c.447-.237.933-.411,1.454-.521.522-.111,1.057-.166,1.605-.166,1.033,0,1.937.171,2.712.513.775.343,1.423.818,1.945,1.424.522.605.915,1.326,1.178,2.157.263.833.395,1.745.395,2.735v9.994h-2.625v-10.184c0-1.423-.36-2.506-1.083-3.25-.722-.742-1.795-1.114-3.217-1.114Z"/>
-        <path d="m251.685,102.215c0,1.202-.206,2.319-.617,3.352-.411,1.034-.986,1.927-1.723,2.681-.739.753-1.611,1.344-2.618,1.77-1.007.428-2.106.641-3.296.641-1.256,0-2.388-.222-3.4-.665s-1.874-1.053-2.585-1.834-1.257-1.697-1.637-2.752c-.38-1.053-.57-2.192-.57-3.416,0-1.191.201-2.3.601-3.329.4-1.028.964-1.92,1.692-2.68.727-.759,1.594-1.354,2.601-1.787s2.116-.648,3.329-.648c1.254,0,2.391.22,3.408.663s1.881,1.055,2.593,1.835,1.26,1.697,1.644,2.751c.385,1.055.578,2.192.578,3.416Zm-13.726.031c0,.886.117,1.708.349,2.467s.579,1.418,1.043,1.977c.464.558,1.038.995,1.723,1.311.685.317,1.481.476,2.388.476.938,0,1.753-.175,2.443-.522.691-.349,1.263-.816,1.717-1.407.452-.591.79-1.275,1.012-2.056.22-.78.332-1.602.332-2.466,0-.844-.117-1.646-.349-2.404-.232-.759-.579-1.429-1.043-2.008s-1.038-1.038-1.723-1.376c-.685-.337-1.481-.505-2.388-.505-.971,0-1.802.174-2.498.521-.696.349-1.265.82-1.708,1.416-.443.595-.77,1.288-.981,2.078-.21.792-.316,1.624-.316,2.498Z"/>
-        <path d="m281.097,103.923c-.38.959-.884,1.85-1.511,2.672-.627.823-1.346,1.534-2.157,2.135-.812.601-1.703,1.073-2.673,1.415-.969.342-1.976.514-3.02.514-1.76,0-3.312-.295-4.656-.886-1.345-.59-2.472-1.407-3.385-2.45-.912-1.044-1.603-2.279-2.072-3.709-.469-1.428-.704-2.98-.704-4.657,0-1.033.114-2.037.341-3.013.227-.974.553-1.889.98-2.743.428-.854.95-1.637,1.565-2.348.617-.711,1.318-1.32,2.104-1.827.785-.505,1.652-.901,2.601-1.186.949-.284,1.961-.426,3.036-.426,1.012,0,2.003.148,2.973.442.971.295,1.866.718,2.689,1.266.822.548,1.55,1.209,2.182,1.984s1.127,1.642,1.486,2.602l-2.246.98c-.295-.768-.673-1.468-1.13-2.095-.459-.627-.989-1.162-1.59-1.604-.601-.443-1.265-.785-1.992-1.029-.728-.242-1.508-.363-2.341-.363-1.359,0-2.532.268-3.518.806s-1.797,1.254-2.435,2.151c-.638.895-1.107,1.919-1.407,3.067-.301,1.149-.451,2.335-.451,3.558,0,1.244.166,2.424.498,3.543.333,1.117.833,2.098,1.503,2.94.669.844,1.507,1.513,2.514,2.008,1.007.496,2.18.744,3.518.744.801,0,1.576-.143,2.325-.428.749-.284,1.44-.671,2.072-1.162.632-.49,1.191-1.064,1.675-1.723.485-.658.864-1.357,1.139-2.095l2.088.917Z"/>
-        <path d="m287.991,100.539v9.835h-2.751v-22.613h7.431c1.044,0,2.042.111,2.997.332.954.222,1.795.586,2.522,1.092.728.505,1.307,1.168,1.74,1.984.431.818.648,1.822.648,3.013,0,.885-.137,1.673-.411,2.364-.275.691-.66,1.289-1.155,1.795-.496.507-1.086.925-1.771,1.257-.685.333-1.44.583-2.261.752l6.926,10.026h-3.068l-6.736-9.835h-4.112Zm0-2.183h4.871c.727,0,1.393-.075,1.999-.228s1.131-.402,1.574-.744c.442-.342.785-.785,1.028-1.328s.363-1.21.363-2.001c0-.801-.126-1.466-.378-1.992-.254-.527-.601-.943-1.044-1.25-.443-.305-.967-.521-1.573-.648s-1.262-.189-1.968-.189h-4.871v8.38Z"/>
-        <path d="m308.231,91.335v19.039h-2.529v-22.613h3.826l7.242,17.932,7.148-17.932h3.795v22.613h-2.752v-19.039l-7.653,19.039h-1.17l-7.907-19.039Z"/>
-      </g>
-    </g>
-  </g>
-</svg>

packages/backend/src/apps/bigin-by-zoho-crm/auth/generate-auth-url.js

@@ -1,25 +0,0 @@
-import { URLSearchParams } from 'url';
-import authScope from '../common/auth-scope.js';
-
-export default async function generateAuthUrl($) {
-  const oauthRedirectUrlField = $.app.auth.fields.find(
-    (field) => field.key == 'oAuthRedirectUrl'
-  );
-  const redirectUri = oauthRedirectUrlField.value;
-  const searchParams = new URLSearchParams({
-    scope: authScope.join(','),
-    client_id: $.auth.data.clientId,
-    response_type: 'code',
-    access_type: 'offline',
-    redirect_uri: redirectUri,
-  });
-
-  const domain =
-    $.auth.data.region !== 'cn' ? 'account.zoho.com' : 'accounts.zoho.com.cn';
-
-  const url = `https://${domain}/oauth/v2/auth?${searchParams.toString()}`;
-
-  await $.auth.set({
-    url,
-  });
-}

packages/backend/src/apps/bigin-by-zoho-crm/auth/index.js

@@ -1,66 +0,0 @@
-import generateAuthUrl from './generate-auth-url.js';
-import verifyCredentials from './verify-credentials.js';
-import refreshToken from './refresh-token.js';
-import isStillVerified from './is-still-verified.js';
-
-export default {
-  fields: [
-    {
-      key: 'oAuthRedirectUrl',
-      label: 'OAuth Redirect URL',
-      type: 'string',
-      required: true,
-      readOnly: true,
-      value: '{WEB_APP_URL}/app/bigin-by-zoho-crm/connections/add',
-      placeholder: null,
-      description:
-        'When asked to input a redirect URL in Bigin By Zoho CRM, enter the URL above.',
-      clickToCopy: true,
-    },
-    {
-      key: 'region',
-      label: 'Region',
-      type: 'dropdown',
-      required: true,
-      readOnly: false,
-      value: null,
-      placeholder: null,
-      description: '',
-      options: [
-        { label: 'United States', value: 'us' },
-        { label: 'European Union', value: 'eu' },
-        { label: 'Australia', value: 'au' },
-        { label: 'India', value: 'in' },
-        { label: 'China', value: 'cn' },
-      ],
-      clickToCopy: false,
-    },
-    {
-      key: 'clientId',
-      label: 'Client ID',
-      type: 'string',
-      required: true,
-      readOnly: false,
-      value: null,
-      placeholder: null,
-      description: null,
-      clickToCopy: false,
-    },
-    {
-      key: 'clientSecret',
-      label: 'Client Secret',
-      type: 'string',
-      required: true,
-      readOnly: false,
-      value: null,
-      placeholder: null,
-      description: null,
-      clickToCopy: false,
-    },
-  ],
-
-  generateAuthUrl,
-  verifyCredentials,
-  isStillVerified,
-  refreshToken,
-};

packages/backend/src/apps/bigin-by-zoho-crm/auth/is-still-verified.js

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

packages/backend/src/apps/bigin-by-zoho-crm/auth/refresh-token.js

@@ -1,34 +0,0 @@
-import { URLSearchParams } from 'node:url';
-
-import authScope from '../common/auth-scope.js';
-import { regionUrlMap } from '../common/region-url-map.js';
-
-const refreshToken = async ($) => {
-  const location = $.auth.data.location;
-  const params = new URLSearchParams({
-    client_id: $.auth.data.clientId,
-    client_secret: $.auth.data.clientSecret,
-    refresh_token: $.auth.data.refreshToken,
-    grant_type: 'refresh_token',
-  });
-
-  const { data } = await $.http.post(
-    `${regionUrlMap[location]}/oauth/v2/token`,
-    params.toString(),
-    {
-      additionalProperties: {
-        skipAddingBaseUrl: true,
-      },
-    }
-  );
-
-  await $.auth.set({
-    accessToken: data.access_token,
-    apiDomain: data.api_domain,
-    scope: authScope.join(','),
-    tokenType: data.token_type,
-    expiresIn: data.expires_in,
-  });
-};
-
-export default refreshToken;

packages/backend/src/apps/bigin-by-zoho-crm/auth/verify-credentials.js

@@ -1,46 +0,0 @@
-import { URLSearchParams } from 'node:url';
-import { regionUrlMap } from '../common/region-url-map.js';
-import getCurrentOrganization from '../common/get-current-organization.js';
-
-const verifyCredentials = async ($) => {
-  const oauthRedirectUrlField = $.app.auth.fields.find(
-    (field) => field.key == 'oAuthRedirectUrl'
-  );
-  const redirectUri = oauthRedirectUrlField.value;
-  const location = $.auth.data.location;
-  const params = new URLSearchParams({
-    client_id: $.auth.data.clientId,
-    client_secret: $.auth.data.clientSecret,
-    code: $.auth.data.code,
-    redirect_uri: redirectUri,
-    grant_type: 'authorization_code',
-  });
-
-  const { data } = await $.http.post(
-    `${regionUrlMap[location]}/oauth/v2/token`,
-    params.toString()
-  );
-
-  await $.auth.set({
-    accessToken: data.access_token,
-    tokenType: data.token_type,
-    apiDomain: data.api_domain,
-  });
-
-  const organization = await getCurrentOrganization($);
-
-  const screenName = [organization.company_name, organization.primary_email]
-    .filter(Boolean)
-    .join(' @ ');
-
-  await $.auth.set({
-    clientId: $.auth.data.clientId,
-    clientSecret: $.auth.data.clientSecret,
-    scope: $.auth.data.scope,
-    expiresIn: data.expires_in,
-    refreshToken: data.refresh_token,
-    screenName,
-  });
-};
-
-export default verifyCredentials;

packages/backend/src/apps/bigin-by-zoho-crm/common/add-auth-header.js

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

packages/backend/src/apps/bigin-by-zoho-crm/common/auth-scope.js

@@ -1,10 +0,0 @@
-const authScope = [
-  'ZohoBigin.notifications.ALL',
-  'ZohoBigin.users.ALL',
-  'ZohoBigin.modules.ALL',
-  'ZohoBigin.org.READ',
-  'ZohoBigin.settings.ALL',
-  'ZohoBigin.modules.ALL',
-];
-
-export default authScope;

packages/backend/src/apps/bigin-by-zoho-crm/common/get-current-organization.js

@@ -1,6 +0,0 @@
-const getCurrentOrganization = async ($) => {
-  const response = await $.http.get('/bigin/v2/org');
-  return response.data.org[0];
-};
-
-export default getCurrentOrganization;

packages/backend/src/apps/bigin-by-zoho-crm/common/region-url-map.js

@@ -1,8 +0,0 @@
-export const regionUrlMap = {
-  us: 'https://accounts.zoho.com',
-  au: 'https://accounts.zoho.com.au',
-  eu: 'https://accounts.zoho.eu',
-  in: 'https://accounts.zoho.in',
-  cn: 'https://accounts.zoho.com.cn',
-  jp: 'https://accounts.zoho.jp',
-};

packages/backend/src/apps/bigin-by-zoho-crm/common/set-base-url.js

@@ -1,14 +0,0 @@
-const setBaseUrl = ($, requestConfig) => {
-  if (requestConfig.additionalProperties?.skipAddingBaseUrl)
-    return requestConfig;
-
-  const apiDomain = $.auth.data.apiDomain;
-
-  if (apiDomain) {
-    requestConfig.baseURL = apiDomain;
-  }
-
-  return requestConfig;
-};
-
-export default setBaseUrl;

packages/backend/src/apps/bigin-by-zoho-crm/dynamic-data/index.js

@@ -1,3 +0,0 @@
-import listOrganizations from './list-organizations/index.js';
-
-export default [listOrganizations];

packages/backend/src/apps/bigin-by-zoho-crm/dynamic-data/list-organizations/index.js

@@ -1,23 +0,0 @@
-export default {
-  name: 'List organizations',
-  key: 'listOrganizations',
-
-  async run($) {
-    const organizations = {
-      data: [],
-    };
-
-    const { data } = await $.http.get('/bigin/v2/org');
-
-    if (data.org) {
-      for (const org of data.org) {
-        organizations.data.push({
-          value: org.id,
-          name: org.company_name,
-        });
-      }
-    }
-
-    return organizations;
-  },
-};

packages/backend/src/apps/bigin-by-zoho-crm/index.js

@@ -1,21 +0,0 @@
-import defineApp from '../../helpers/define-app.js';
-import addAuthHeader from './common/add-auth-header.js';
-import auth from './auth/index.js';
-import setBaseUrl from './common/set-base-url.js';
-import triggers from './triggers/index.js';
-import dynamicData from './dynamic-data/index.js';
-
-export default defineApp({
-  name: 'Bigin By Zoho CRM',
-  key: 'bigin-by-zoho-crm',
-  baseUrl: 'https://www.bigin.com',
-  apiBaseUrl: '',
-  iconUrl: '{BASE_URL}/apps/bigin-by-zoho-crm/assets/favicon.svg',
-  authDocUrl: 'https://automatisch.io/docs/apps/bigin-by-zoho-crm/connection',
-  primaryColor: '039649',
-  supportsConnections: true,
-  beforeRequest: [setBaseUrl, addAuthHeader],
-  auth,
-  triggers,
-  dynamicData,
-});

packages/backend/src/apps/bigin-by-zoho-crm/triggers/index.js

@@ -1,5 +0,0 @@
-import newCalls from './new-calls/index.js';
-import newCompanies from './new-companies/index.js';
-import newContacts from './new-contacts/index.js';
-
-export default [newCalls, newCompanies, newContacts];

packages/backend/src/apps/bigin-by-zoho-crm/triggers/new-calls/index.js

@@ -1,89 +0,0 @@
-import Crypto from 'crypto';
-import defineTrigger from '../../../../helpers/define-trigger.js';
-
-export default defineTrigger({
-  name: 'New calls',
-  key: 'newCalls',
-  type: 'webhook',
-  description: 'Triggers when a new call is added.',
-  arguments: [
-    {
-      label: 'Organization',
-      key: 'organizationId',
-      type: 'dropdown',
-      required: true,
-      description: '',
-      variables: false,
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listOrganizations',
-          },
-        ],
-      },
-    },
-  ],
-
-  async run($) {
-    const dataItem = {
-      raw: $.request.body,
-      meta: {
-        internalId: Crypto.randomUUID(),
-      },
-    };
-
-    $.pushTriggerItem(dataItem);
-  },
-
-  async testRun($) {
-    const organizationId = $.step.parameters.organizationId;
-
-    const sampleEventData = {
-      ids: ['111111111111111111'],
-      token: null,
-      module: 'Calls',
-      operation: 'insert',
-      channel_id: organizationId,
-      server_time: 1708426963120,
-      query_params: {},
-      resource_uri: `${$.auth.data.apiDomain}/bigin/v1/Calls`,
-      affected_fields: [],
-    };
-
-    const dataItem = {
-      raw: sampleEventData,
-      meta: {
-        internalId: sampleEventData.channel_id,
-      },
-    };
-
-    $.pushTriggerItem(dataItem);
-  },
-
-  async registerHook($) {
-    const organizationId = $.step.parameters.organizationId;
-
-    const payload = {
-      watch: [
-        {
-          channel_id: organizationId,
-          notify_url: $.webhookUrl,
-          events: ['Calls.create'],
-        },
-      ],
-    };
-
-    await $.http.post('/bigin/v2/actions/watch', payload);
-
-    await $.flow.setRemoteWebhookId(organizationId);
-  },
-
-  async unregisterHook($) {
-    await $.http.delete(
-      `/bigin/v2/actions/watch?channel_ids=${$.flow.remoteWebhookId}`
-    );
-  },
-});

packages/backend/src/apps/bigin-by-zoho-crm/triggers/new-companies/index.js

@@ -1,89 +0,0 @@
-import Crypto from 'crypto';
-import defineTrigger from '../../../../helpers/define-trigger.js';
-
-export default defineTrigger({
-  name: 'New companies',
-  key: 'newCompanies',
-  type: 'webhook',
-  description: 'Triggers when a new company is created.',
-  arguments: [
-    {
-      label: 'Organization',
-      key: 'organizationId',
-      type: 'dropdown',
-      required: true,
-      description: '',
-      variables: false,
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listOrganizations',
-          },
-        ],
-      },
-    },
-  ],
-
-  async run($) {
-    const dataItem = {
-      raw: $.request.body,
-      meta: {
-        internalId: Crypto.randomUUID(),
-      },
-    };
-
-    $.pushTriggerItem(dataItem);
-  },
-
-  async testRun($) {
-    const organizationId = $.step.parameters.organizationId;
-
-    const sampleEventData = {
-      ids: ['111111111111111111'],
-      token: null,
-      module: 'Accounts',
-      operation: 'insert',
-      channel_id: organizationId,
-      server_time: 1708426963120,
-      query_params: {},
-      resource_uri: `${$.auth.data.apiDomain}/bigin/v1/Accounts`,
-      affected_fields: [],
-    };
-
-    const dataItem = {
-      raw: sampleEventData,
-      meta: {
-        internalId: sampleEventData.channel_id,
-      },
-    };
-
-    $.pushTriggerItem(dataItem);
-  },
-
-  async registerHook($) {
-    const organizationId = $.step.parameters.organizationId;
-
-    const payload = {
-      watch: [
-        {
-          channel_id: organizationId,
-          notify_url: $.webhookUrl,
-          events: ['Accounts.create'],
-        },
-      ],
-    };
-
-    await $.http.post('/bigin/v2/actions/watch', payload);
-
-    await $.flow.setRemoteWebhookId(organizationId);
-  },
-
-  async unregisterHook($) {
-    await $.http.delete(
-      `/bigin/v2/actions/watch?channel_ids=${$.flow.remoteWebhookId}`
-    );
-  },
-});

packages/backend/src/apps/bigin-by-zoho-crm/triggers/new-contacts/index.js

@@ -1,89 +0,0 @@
-import Crypto from 'crypto';
-import defineTrigger from '../../../../helpers/define-trigger.js';
-
-export default defineTrigger({
-  name: 'New contacts',
-  key: 'newContacts',
-  type: 'webhook',
-  description: 'Triggers when a new contact is created.',
-  arguments: [
-    {
-      label: 'Organization',
-      key: 'organizationId',
-      type: 'dropdown',
-      required: true,
-      description: '',
-      variables: false,
-      source: {
-        type: 'query',
-        name: 'getDynamicData',
-        arguments: [
-          {
-            name: 'key',
-            value: 'listOrganizations',
-          },
-        ],
-      },
-    },
-  ],
-
-  async run($) {
-    const dataItem = {
-      raw: $.request.body,
-      meta: {
-        internalId: Crypto.randomUUID(),
-      },
-    };
-
-    $.pushTriggerItem(dataItem);
-  },
-
-  async testRun($) {
-    const organizationId = $.step.parameters.organizationId;
-
-    const sampleEventData = {
-      ids: ['111111111111111111'],
-      token: null,
-      module: 'Contacts',
-      operation: 'insert',
-      channel_id: organizationId,
-      server_time: 1708426963120,
-      query_params: {},
-      resource_uri: `${$.auth.data.apiDomain}/bigin/v1/Contacts`,
-      affected_fields: [],
-    };
-
-    const dataItem = {
-      raw: sampleEventData,
-      meta: {
-        internalId: sampleEventData.channel_id,
-      },
-    };
-
-    $.pushTriggerItem(dataItem);
-  },
-
-  async registerHook($) {
-    const organizationId = $.step.parameters.organizationId;
-
-    const payload = {
-      watch: [
-        {
-          channel_id: organizationId,
-          notify_url: $.webhookUrl,
-          events: ['Contacts.create'],
-        },
-      ],
-    };
-
-    await $.http.post('/bigin/v2/actions/watch', payload);
-
-    await $.flow.setRemoteWebhookId(organizationId);
-  },
-
-  async unregisterHook($) {
-    await $.http.delete(
-      `/bigin/v2/actions/watch?channel_ids=${$.flow.remoteWebhookId}`
-    );
-  },
-});

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

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

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

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

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

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

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

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

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

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

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

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

packages/backend/src/config/app.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -6,74 +6,100 @@ import { createRole } from '../../../test/factories/role';
 import { createUser } from '../../../test/factories/user';
 
 describe('graphQL getCurrentUser query', () => {
-  let role, currentUser, token, requestObject;
+  describe('with unauthenticated user', () => {
+    it('should throw not authorized error', async () => {
+      const invalidUserToken = 'invalid-token';
 
-  beforeEach(async () => {
+      const query = `
-    role = await createRole({
+        query {
-      key: 'sample',
+          getCurrentUser {
-      name: 'sample',
-    });
-
-    currentUser = await createUser({
-      roleId: role.id,
-    });
-
-    token = createAuthTokenByUserId(currentUser.id);
-    requestObject = request(app).post('/graphql').set('Authorization', token);
-  });
-
-  it('should return user data', async () => {
-    const query = `
-      query {
-        getCurrentUser {
-          id
-          email
-          fullName
-          email
-          createdAt
-          updatedAt
-          role {
             id
-            name
+            email
           }
         }
-      }
+      `;
-    `;
 
-    const response = await requestObject.send({ query }).expect(200);
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', invalidUserToken)
+        .send({ query })
+        .expect(200);
 
-    const expectedResponsePayload = {
+      expect(response.body.errors).toBeDefined();
-      data: {
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
-        getCurrentUser: {
+    });
-          createdAt: currentUser.createdAt.getTime().toString(),
-          email: currentUser.email,
-          fullName: currentUser.fullName,
-          id: currentUser.id,
-          role: { id: role.id, name: role.name },
-          updatedAt: currentUser.updatedAt.getTime().toString(),
-        },
-      },
-    };
-
-    expect(response.body).toEqual(expectedResponsePayload);
   });
 
-  it('should not return user password', async () => {
+  describe('with authenticated user', () => {
-    const query = `
+    let role, currentUser, token, requestObject;
-      query {
+
-        getCurrentUser {
+    beforeEach(async () => {
-          id
+      role = await createRole({
-          email
+        key: 'sample',
-          password
+        name: 'sample',
+      });
+
+      currentUser = await createUser({
+        roleId: role.id,
+      });
+
+      token = createAuthTokenByUserId(currentUser.id);
+      requestObject = request(app).post('/graphql').set('Authorization', token);
+    });
+
+    it('should return user data', async () => {
+      const query = `
+        query {
+          getCurrentUser {
+            id
+            email
+            fullName
+            email
+            createdAt
+            updatedAt
+            role {
+              id
+              name
+            }
+          }
         }
-      }
+      `;
-    `;
 
-    const response = await requestObject.send({ query }).expect(400);
+      const response = await requestObject.send({ query }).expect(200);
 
-    expect(response.body.errors).toBeDefined();
+      const expectedResponsePayload = {
-    expect(response.body.errors[0].message).toEqual(
+        data: {
-      'Cannot query field "password" on type "User".'
+          getCurrentUser: {
-    );
+            createdAt: currentUser.createdAt.getTime().toString(),
+            email: currentUser.email,
+            fullName: currentUser.fullName,
+            id: currentUser.id,
+            role: { id: role.id, name: role.name },
+            updatedAt: currentUser.updatedAt.getTime().toString(),
+          },
+        },
+      };
+
+      expect(response.body).toEqual(expectedResponsePayload);
+    });
+
+    it('should not return user password', async () => {
+      const query = `
+        query {
+          getCurrentUser {
+            id
+            email
+            password
+          }
+        }
+      `;
+
+      const response = await requestObject.send({ query }).expect(400);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual(
+        'Cannot query field "password" on type "User".'
+      );
+    });
   });
 });

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

@@ -40,291 +40,307 @@ describe('graphQL getExecutions query', () => {
     }
   `;
 
-  describe('and without correct permissions', () => {
+  const invalidToken = 'invalid-token';
-    it('should throw not authorized error', async () => {
-      const userWithoutPermissions = await createUser();
-      const token = createAuthTokenByUserId(userWithoutPermissions.id);
 
+  describe('with unauthenticated user', () => {
+    it('should throw not authorized error', async () => {
       const response = await request(app)
         .post('/graphql')
-        .set('Authorization', token)
+        .set('Authorization', invalidToken)
         .send({ query })
         .expect(200);
 
       expect(response.body.errors).toBeDefined();
-      expect(response.body.errors[0].message).toEqual('Not authorized!');
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
     });
   });
 
-  describe('and with correct permission', () => {
+  describe('with authenticated user', () => {
-    let role,
+    describe('and without permissions', () => {
-      currentUser,
+      it('should throw not authorized error', async () => {
-      anotherUser,
+        const userWithoutPermissions = await createUser();
-      token,
+        const token = createAuthTokenByUserId(userWithoutPermissions.id);
-      flowOne,
-      stepOneForFlowOne,
-      stepTwoForFlowOne,
-      executionOne,
-      flowTwo,
-      stepOneForFlowTwo,
-      stepTwoForFlowTwo,
-      executionTwo,
-      flowThree,
-      stepOneForFlowThree,
-      stepTwoForFlowThree,
-      executionThree,
-      expectedResponseForExecutionOne,
-      expectedResponseForExecutionTwo,
-      expectedResponseForExecutionThree;
 
-    beforeEach(async () => {
+        const response = await request(app)
-      role = await createRole({
+          .post('/graphql')
-        key: 'sample',
+          .set('Authorization', token)
-        name: 'sample',
+          .send({ query })
+          .expect(200);
+
+        expect(response.body.errors).toBeDefined();
+        expect(response.body.errors[0].message).toEqual('Not authorized!');
       });
+    });
 
-      currentUser = await createUser({
+    describe('and with correct permission', () => {
-        roleId: role.id,
+      let role,
-        fullName: 'Current User',
+        currentUser,
-      });
+        anotherUser,
+        token,
+        flowOne,
+        stepOneForFlowOne,
+        stepTwoForFlowOne,
+        executionOne,
+        flowTwo,
+        stepOneForFlowTwo,
+        stepTwoForFlowTwo,
+        executionTwo,
+        flowThree,
+        stepOneForFlowThree,
+        stepTwoForFlowThree,
+        executionThree,
+        expectedResponseForExecutionOne,
+        expectedResponseForExecutionTwo,
+        expectedResponseForExecutionThree;
 
-      anotherUser = await createUser();
+      beforeEach(async () => {
+        role = await createRole({
+          key: 'sample',
+          name: 'sample',
+        });
 
-      token = createAuthTokenByUserId(currentUser.id);
+        currentUser = await createUser({
+          roleId: role.id,
+          fullName: 'Current User',
+        });
 
-      flowOne = await createFlow({
+        anotherUser = await createUser();
-        userId: currentUser.id,
-      });
 
-      stepOneForFlowOne = await createStep({
+        token = createAuthTokenByUserId(currentUser.id);
-        flowId: flowOne.id,
-      });
 
-      stepTwoForFlowOne = await createStep({
+        flowOne = await createFlow({
-        flowId: flowOne.id,
+          userId: currentUser.id,
-      });
+        });
 
-      executionOne = await createExecution({
+        stepOneForFlowOne = await createStep({
-        flowId: flowOne.id,
+          flowId: flowOne.id,
-      });
+        });
 
-      await createExecutionStep({
+        stepTwoForFlowOne = await createStep({
-        executionId: executionOne.id,
+          flowId: flowOne.id,
-        stepId: stepOneForFlowOne.id,
+        });
-        status: 'success',
-      });
 
-      await createExecutionStep({
+        executionOne = await createExecution({
-        executionId: executionOne.id,
+          flowId: flowOne.id,
-        stepId: stepTwoForFlowOne.id,
+        });
-        status: 'success',
-      });
 
-      flowTwo = await createFlow({
+        await createExecutionStep({
-        userId: currentUser.id,
+          executionId: executionOne.id,
-      });
+          stepId: stepOneForFlowOne.id,
-
-      stepOneForFlowTwo = await createStep({
-        flowId: flowTwo.id,
-      });
-
-      stepTwoForFlowTwo = await createStep({
-        flowId: flowTwo.id,
-      });
-
-      executionTwo = await createExecution({
-        flowId: flowTwo.id,
-      });
-
-      await createExecutionStep({
-        executionId: executionTwo.id,
-        stepId: stepOneForFlowTwo.id,
-        status: 'success',
-      });
-
-      await createExecutionStep({
-        executionId: executionTwo.id,
-        stepId: stepTwoForFlowTwo.id,
-        status: 'failure',
-      });
-
-      flowThree = await createFlow({
-        userId: anotherUser.id,
-      });
-
-      stepOneForFlowThree = await createStep({
-        flowId: flowThree.id,
-      });
-
-      stepTwoForFlowThree = await createStep({
-        flowId: flowThree.id,
-      });
-
-      executionThree = await createExecution({
-        flowId: flowThree.id,
-      });
-
-      await createExecutionStep({
-        executionId: executionThree.id,
-        stepId: stepOneForFlowThree.id,
-        status: 'success',
-      });
-
-      await createExecutionStep({
-        executionId: executionThree.id,
-        stepId: stepTwoForFlowThree.id,
-        status: 'failure',
-      });
-
-      expectedResponseForExecutionOne = {
-        node: {
-          createdAt: executionOne.createdAt.getTime().toString(),
-          flow: {
-            active: flowOne.active,
-            id: flowOne.id,
-            name: flowOne.name,
-            steps: [
-              {
-                iconUrl: `${appConfig.baseUrl}/apps/${stepOneForFlowOne.appKey}/assets/favicon.svg`,
-              },
-              {
-                iconUrl: `${appConfig.baseUrl}/apps/${stepTwoForFlowOne.appKey}/assets/favicon.svg`,
-              },
-            ],
-          },
-          id: executionOne.id,
           status: 'success',
-          testRun: executionOne.testRun,
-          updatedAt: executionOne.updatedAt.getTime().toString(),
-        },
-      };
-
-      expectedResponseForExecutionTwo = {
-        node: {
-          createdAt: executionTwo.createdAt.getTime().toString(),
-          flow: {
-            active: flowTwo.active,
-            id: flowTwo.id,
-            name: flowTwo.name,
-            steps: [
-              {
-                iconUrl: `${appConfig.baseUrl}/apps/${stepTwoForFlowTwo.appKey}/assets/favicon.svg`,
-              },
-              {
-                iconUrl: `${appConfig.baseUrl}/apps/${stepTwoForFlowTwo.appKey}/assets/favicon.svg`,
-              },
-            ],
-          },
-          id: executionTwo.id,
-          status: 'failure',
-          testRun: executionTwo.testRun,
-          updatedAt: executionTwo.updatedAt.getTime().toString(),
-        },
-      };
-
-      expectedResponseForExecutionThree = {
-        node: {
-          createdAt: executionThree.createdAt.getTime().toString(),
-          flow: {
-            active: flowThree.active,
-            id: flowThree.id,
-            name: flowThree.name,
-            steps: [
-              {
-                iconUrl: `${appConfig.baseUrl}/apps/${stepOneForFlowThree.appKey}/assets/favicon.svg`,
-              },
-              {
-                iconUrl: `${appConfig.baseUrl}/apps/${stepTwoForFlowThree.appKey}/assets/favicon.svg`,
-              },
-            ],
-          },
-          id: executionThree.id,
-          status: 'failure',
-          testRun: executionThree.testRun,
-          updatedAt: executionThree.updatedAt.getTime().toString(),
-        },
-      };
-    });
-
-    describe('and with isCreator condition', () => {
-      beforeEach(async () => {
-        await createPermission({
-          action: 'read',
-          subject: 'Execution',
-          roleId: role.id,
-          conditions: ['isCreator'],
         });
-      });
 
-      it('should return executions data of the current user', async () => {
+        await createExecutionStep({
-        const response = await request(app)
+          executionId: executionOne.id,
-          .post('/graphql')
+          stepId: stepTwoForFlowOne.id,
-          .set('Authorization', token)
+          status: 'success',
-          .send({ query })
+        });
-          .expect(200);
 
-        const expectedResponsePayload = {
+        flowTwo = await createFlow({
-          data: {
+          userId: currentUser.id,
-            getExecutions: {
+        });
-              edges: [
+
-                expectedResponseForExecutionTwo,
+        stepOneForFlowTwo = await createStep({
-                expectedResponseForExecutionOne,
+          flowId: flowTwo.id,
+        });
+
+        stepTwoForFlowTwo = await createStep({
+          flowId: flowTwo.id,
+        });
+
+        executionTwo = await createExecution({
+          flowId: flowTwo.id,
+        });
+
+        await createExecutionStep({
+          executionId: executionTwo.id,
+          stepId: stepOneForFlowTwo.id,
+          status: 'success',
+        });
+
+        await createExecutionStep({
+          executionId: executionTwo.id,
+          stepId: stepTwoForFlowTwo.id,
+          status: 'failure',
+        });
+
+        flowThree = await createFlow({
+          userId: anotherUser.id,
+        });
+
+        stepOneForFlowThree = await createStep({
+          flowId: flowThree.id,
+        });
+
+        stepTwoForFlowThree = await createStep({
+          flowId: flowThree.id,
+        });
+
+        executionThree = await createExecution({
+          flowId: flowThree.id,
+        });
+
+        await createExecutionStep({
+          executionId: executionThree.id,
+          stepId: stepOneForFlowThree.id,
+          status: 'success',
+        });
+
+        await createExecutionStep({
+          executionId: executionThree.id,
+          stepId: stepTwoForFlowThree.id,
+          status: 'failure',
+        });
+
+        expectedResponseForExecutionOne = {
+          node: {
+            createdAt: executionOne.createdAt.getTime().toString(),
+            flow: {
+              active: flowOne.active,
+              id: flowOne.id,
+              name: flowOne.name,
+              steps: [
+                {
+                  iconUrl: `${appConfig.baseUrl}/apps/${stepOneForFlowOne.appKey}/assets/favicon.svg`,
+                },
+                {
+                  iconUrl: `${appConfig.baseUrl}/apps/${stepTwoForFlowOne.appKey}/assets/favicon.svg`,
+                },
               ],
-              pageInfo: { currentPage: 1, totalPages: 1 },
             },
+            id: executionOne.id,
+            status: 'success',
+            testRun: executionOne.testRun,
+            updatedAt: executionOne.updatedAt.getTime().toString(),
           },
         };
 
-        expect(response.body).toEqual(expectedResponsePayload);
+        expectedResponseForExecutionTwo = {
-      });
+          node: {
-    });
+            createdAt: executionTwo.createdAt.getTime().toString(),
-
+            flow: {
-    describe('and without isCreator condition', () => {
+              active: flowTwo.active,
-      beforeEach(async () => {
+              id: flowTwo.id,
-        await createPermission({
+              name: flowTwo.name,
-          action: 'read',
+              steps: [
-          subject: 'Execution',
+                {
-          roleId: role.id,
+                  iconUrl: `${appConfig.baseUrl}/apps/${stepTwoForFlowTwo.appKey}/assets/favicon.svg`,
-          conditions: [],
+                },
-        });
+                {
-      });
+                  iconUrl: `${appConfig.baseUrl}/apps/${stepTwoForFlowTwo.appKey}/assets/favicon.svg`,
-
+                },
-      it('should return executions data of all users', async () => {
-        const response = await request(app)
-          .post('/graphql')
-          .set('Authorization', token)
-          .send({ query })
-          .expect(200);
-
-        const expectedResponsePayload = {
-          data: {
-            getExecutions: {
-              edges: [
-                expectedResponseForExecutionThree,
-                expectedResponseForExecutionTwo,
-                expectedResponseForExecutionOne,
               ],
-              pageInfo: { currentPage: 1, totalPages: 1 },
             },
+            id: executionTwo.id,
+            status: 'failure',
+            testRun: executionTwo.testRun,
+            updatedAt: executionTwo.updatedAt.getTime().toString(),
           },
         };
 
-        expect(response.body).toEqual(expectedResponsePayload);
+        expectedResponseForExecutionThree = {
+          node: {
+            createdAt: executionThree.createdAt.getTime().toString(),
+            flow: {
+              active: flowThree.active,
+              id: flowThree.id,
+              name: flowThree.name,
+              steps: [
+                {
+                  iconUrl: `${appConfig.baseUrl}/apps/${stepOneForFlowThree.appKey}/assets/favicon.svg`,
+                },
+                {
+                  iconUrl: `${appConfig.baseUrl}/apps/${stepTwoForFlowThree.appKey}/assets/favicon.svg`,
+                },
+              ],
+            },
+            id: executionThree.id,
+            status: 'failure',
+            testRun: executionThree.testRun,
+            updatedAt: executionThree.updatedAt.getTime().toString(),
+          },
+        };
       });
-    });
 
-    describe('and with filters', () => {
+      describe('and with isCreator condition', () => {
-      beforeEach(async () => {
+        beforeEach(async () => {
-        await createPermission({
+          await createPermission({
-          action: 'read',
+            action: 'read',
-          subject: 'Execution',
+            subject: 'Execution',
-          roleId: role.id,
+            roleId: role.id,
-          conditions: [],
+            conditions: ['isCreator'],
+          });
+        });
+
+        it('should return executions data of the current user', async () => {
+          const response = await request(app)
+            .post('/graphql')
+            .set('Authorization', token)
+            .send({ query })
+            .expect(200);
+
+          const expectedResponsePayload = {
+            data: {
+              getExecutions: {
+                edges: [
+                  expectedResponseForExecutionTwo,
+                  expectedResponseForExecutionOne,
+                ],
+                pageInfo: { currentPage: 1, totalPages: 1 },
+              },
+            },
+          };
+
+          expect(response.body).toEqual(expectedResponsePayload);
         });
       });
 
-      it('should return executions data for the specified flow', async () => {
+      describe('and without isCreator condition', () => {
-        const query = `
+        beforeEach(async () => {
+          await createPermission({
+            action: 'read',
+            subject: 'Execution',
+            roleId: role.id,
+            conditions: [],
+          });
+        });
+
+        it('should return executions data of all users', async () => {
+          const response = await request(app)
+            .post('/graphql')
+            .set('Authorization', token)
+            .send({ query })
+            .expect(200);
+
+          const expectedResponsePayload = {
+            data: {
+              getExecutions: {
+                edges: [
+                  expectedResponseForExecutionThree,
+                  expectedResponseForExecutionTwo,
+                  expectedResponseForExecutionOne,
+                ],
+                pageInfo: { currentPage: 1, totalPages: 1 },
+              },
+            },
+          };
+
+          expect(response.body).toEqual(expectedResponsePayload);
+        });
+      });
+
+      describe('and with filters', () => {
+        beforeEach(async () => {
+          await createPermission({
+            action: 'read',
+            subject: 'Execution',
+            roleId: role.id,
+            conditions: [],
+          });
+        });
+
+        it('should return executions data for the specified flow', async () => {
+          const query = `
             query {
               getExecutions(limit: 10, offset: 0, filters: { flowId: "${flowOne.id}" }) {
                 pageInfo {
@@ -352,26 +368,26 @@ describe('graphQL getExecutions query', () => {
             }
           `;
 
-        const response = await request(app)
+          const response = await request(app)
-          .post('/graphql')
+            .post('/graphql')
-          .set('Authorization', token)
+            .set('Authorization', token)
-          .send({ query })
+            .send({ query })
-          .expect(200);
+            .expect(200);
 
-        const expectedResponsePayload = {
+          const expectedResponsePayload = {
-          data: {
+            data: {
-            getExecutions: {
+              getExecutions: {
-              edges: [expectedResponseForExecutionOne],
+                edges: [expectedResponseForExecutionOne],
-              pageInfo: { currentPage: 1, totalPages: 1 },
+                pageInfo: { currentPage: 1, totalPages: 1 },
+              },
             },
-          },
+          };
-        };
 
-        expect(response.body).toEqual(expectedResponsePayload);
+          expect(response.body).toEqual(expectedResponsePayload);
-      });
+        });
 
-      it('should return only executions data with success status', async () => {
+        it('should return only executions data with success status', async () => {
-        const query = `
+          const query = `
             query {
               getExecutions(limit: 10, offset: 0, filters: { status: "success" }) {
                 pageInfo {
@@ -399,30 +415,30 @@ describe('graphQL getExecutions query', () => {
             }
           `;
 
-        const response = await request(app)
+          const response = await request(app)
-          .post('/graphql')
+            .post('/graphql')
-          .set('Authorization', token)
+            .set('Authorization', token)
-          .send({ query })
+            .send({ query })
-          .expect(200);
+            .expect(200);
 
-        const expectedResponsePayload = {
+          const expectedResponsePayload = {
-          data: {
+            data: {
-            getExecutions: {
+              getExecutions: {
-              edges: [expectedResponseForExecutionOne],
+                edges: [expectedResponseForExecutionOne],
-              pageInfo: { currentPage: 1, totalPages: 1 },
+                pageInfo: { currentPage: 1, totalPages: 1 },
+              },
             },
-          },
+          };
-        };
 
-        expect(response.body).toEqual(expectedResponsePayload);
+          expect(response.body).toEqual(expectedResponsePayload);
-      });
+        });
 
-      it('should return only executions data within date range', async () => {
+        it('should return only executions data within date range', async () => {
-        const createdAtFrom = executionOne.createdAt.getTime().toString();
+          const createdAtFrom = executionOne.createdAt.getTime().toString();
 
-        const createdAtTo = executionOne.createdAt.getTime().toString();
+          const createdAtTo = executionOne.createdAt.getTime().toString();
 
-        const query = `
+          const query = `
             query {
               getExecutions(limit: 10, offset: 0, filters: { createdAt: { from: "${createdAtFrom}", to: "${createdAtTo}" }}) {
                 pageInfo {
@@ -450,22 +466,23 @@ describe('graphQL getExecutions query', () => {
             }
           `;
 
-        const response = await request(app)
+          const response = await request(app)
-          .post('/graphql')
+            .post('/graphql')
-          .set('Authorization', token)
+            .set('Authorization', token)
-          .send({ query })
+            .send({ query })
-          .expect(200);
+            .expect(200);
 
-        const expectedResponsePayload = {
+          const expectedResponsePayload = {
-          data: {
+            data: {
-            getExecutions: {
+              getExecutions: {
-              edges: [expectedResponseForExecutionOne],
+                edges: [expectedResponseForExecutionOne],
-              pageInfo: { currentPage: 1, totalPages: 1 },
+                pageInfo: { currentPage: 1, totalPages: 1 },
+              },
             },
-          },
+          };
-        };
 
-        expect(response.body).toEqual(expectedResponsePayload);
+          expect(response.body).toEqual(expectedResponsePayload);
+        });
       });
     });
   });

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

@@ -40,200 +40,222 @@ describe('graphQL getFlow query', () => {
     `;
   };
 
-  describe('and without permissions', () => {
+  describe('with unauthenticated user', () => {
     it('should throw not authorized error', async () => {
-      const userWithoutPermissions = await createUser();
+      const invalidToken = 'invalid-token';
-      const token = createAuthTokenByUserId(userWithoutPermissions.id);
       const flow = await createFlow();
 
       const response = await request(app)
         .post('/graphql')
-        .set('Authorization', token)
+        .set('Authorization', invalidToken)
         .send({ query: query(flow.id) })
         .expect(200);
 
       expect(response.body.errors).toBeDefined();
-      expect(response.body.errors[0].message).toEqual('Not authorized!');
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
     });
   });
 
-  describe('and with correct permission', () => {
+  describe('with authenticated user', () => {
-    let currentUser, currentUserRole, currentUserFlow;
+    describe('and without permissions', () => {
-
+      it('should throw not authorized error', async () => {
-    beforeEach(async () => {
+        const userWithoutPermissions = await createUser();
-      currentUserRole = await createRole();
+        const token = createAuthTokenByUserId(userWithoutPermissions.id);
-      currentUser = await createUser({ roleId: currentUserRole.id });
+        const flow = await createFlow();
-      currentUserFlow = await createFlow({ userId: currentUser.id });
-    });
-
-    describe('and with isCreator condition', () => {
-      it('should return executions data of the current user', async () => {
-        await createPermission({
-          action: 'read',
-          subject: 'Flow',
-          roleId: currentUserRole.id,
-          conditions: ['isCreator'],
-        });
-
-        const triggerStep = await createStep({
-          flowId: currentUserFlow.id,
-          type: 'trigger',
-          key: 'catchRawWebhook',
-          webhookPath: `/webhooks/flows/${currentUserFlow.id}`,
-        });
-
-        const actionConnection = await createConnection({
-          userId: currentUser.id,
-          formattedData: {
-            screenName: 'Test',
-            authenticationKey: 'test key',
-          },
-        });
-
-        const actionStep = await createStep({
-          flowId: currentUserFlow.id,
-          type: 'action',
-          connectionId: actionConnection.id,
-          key: 'translateText',
-        });
-
-        const token = createAuthTokenByUserId(currentUser.id);
 
         const response = await request(app)
           .post('/graphql')
           .set('Authorization', token)
-          .send({ query: query(currentUserFlow.id) })
+          .send({ query: query(flow.id) })
           .expect(200);
 
-        const expectedResponsePayload = {
+        expect(response.body.errors).toBeDefined();
-          data: {
+        expect(response.body.errors[0].message).toEqual('Not authorized!');
-            getFlow: {
-              active: currentUserFlow.active,
-              id: currentUserFlow.id,
-              name: currentUserFlow.name,
-              status: 'draft',
-              steps: [
-                {
-                  appKey: triggerStep.appKey,
-                  connection: null,
-                  iconUrl: `${appConfig.baseUrl}/apps/${triggerStep.appKey}/assets/favicon.svg`,
-                  id: triggerStep.id,
-                  key: 'catchRawWebhook',
-                  parameters: {},
-                  position: 1,
-                  status: triggerStep.status,
-                  type: 'trigger',
-                  webhookUrl: `${appConfig.baseUrl}/webhooks/flows/${currentUserFlow.id}`,
-                },
-                {
-                  appKey: actionStep.appKey,
-                  connection: {
-                    createdAt: actionConnection.createdAt.getTime().toString(),
-                    id: actionConnection.id,
-                    verified: actionConnection.verified,
-                  },
-                  iconUrl: `${appConfig.baseUrl}/apps/${actionStep.appKey}/assets/favicon.svg`,
-                  id: actionStep.id,
-                  key: 'translateText',
-                  parameters: {},
-                  position: 1,
-                  status: actionStep.status,
-                  type: 'action',
-                  webhookUrl: 'http://localhost:3000/null',
-                },
-              ],
-            },
-          },
-        };
-
-        expect(response.body).toEqual(expectedResponsePayload);
       });
     });
 
-    describe('and without isCreator condition', () => {
+    describe('and with correct permission', () => {
-      it('should return executions data of all users', async () => {
+      let currentUser, currentUserRole, currentUserFlow;
-        await createPermission({
-          action: 'read',
-          subject: 'Flow',
-          roleId: currentUserRole.id,
-          conditions: [],
-        });
 
-        const anotherUser = await createUser();
+      beforeEach(async () => {
-        const anotherUserFlow = await createFlow({ userId: anotherUser.id });
+        currentUserRole = await createRole();
+        currentUser = await createUser({ roleId: currentUserRole.id });
+        currentUserFlow = await createFlow({ userId: currentUser.id });
+      });
 
-        const triggerStep = await createStep({
+      describe('and with isCreator condition', () => {
-          flowId: anotherUserFlow.id,
+        it('should return executions data of the current user', async () => {
-          type: 'trigger',
+          await createPermission({
-          key: 'catchRawWebhook',
+            action: 'read',
-          webhookPath: `/webhooks/flows/${anotherUserFlow.id}`,
+            subject: 'Flow',
-        });
+            roleId: currentUserRole.id,
+            conditions: ['isCreator'],
+          });
 
-        const actionConnection = await createConnection({
+          const triggerStep = await createStep({
-          userId: anotherUser.id,
+            flowId: currentUserFlow.id,
-          formattedData: {
+            type: 'trigger',
-            screenName: 'Test',
+            key: 'catchRawWebhook',
-            authenticationKey: 'test key',
+            webhookPath: `/webhooks/flows/${currentUserFlow.id}`,
-          },
+          });
-        });
 
-        const actionStep = await createStep({
+          const actionConnection = await createConnection({
-          flowId: anotherUserFlow.id,
+            userId: currentUser.id,
-          type: 'action',
+            formattedData: {
-          connectionId: actionConnection.id,
+              screenName: 'Test',
-          key: 'translateText',
+              authenticationKey: 'test key',
-        });
-
-        const token = createAuthTokenByUserId(currentUser.id);
-
-        const response = await request(app)
-          .post('/graphql')
-          .set('Authorization', token)
-          .send({ query: query(anotherUserFlow.id) })
-          .expect(200);
-
-        const expectedResponsePayload = {
-          data: {
-            getFlow: {
-              active: anotherUserFlow.active,
-              id: anotherUserFlow.id,
-              name: anotherUserFlow.name,
-              status: 'draft',
-              steps: [
-                {
-                  appKey: triggerStep.appKey,
-                  connection: null,
-                  iconUrl: `${appConfig.baseUrl}/apps/${triggerStep.appKey}/assets/favicon.svg`,
-                  id: triggerStep.id,
-                  key: 'catchRawWebhook',
-                  parameters: {},
-                  position: 1,
-                  status: triggerStep.status,
-                  type: 'trigger',
-                  webhookUrl: `${appConfig.baseUrl}/webhooks/flows/${anotherUserFlow.id}`,
-                },
-                {
-                  appKey: actionStep.appKey,
-                  connection: {
-                    createdAt: actionConnection.createdAt.getTime().toString(),
-                    id: actionConnection.id,
-                    verified: actionConnection.verified,
-                  },
-                  iconUrl: `${appConfig.baseUrl}/apps/${actionStep.appKey}/assets/favicon.svg`,
-                  id: actionStep.id,
-                  key: 'translateText',
-                  parameters: {},
-                  position: 1,
-                  status: actionStep.status,
-                  type: 'action',
-                  webhookUrl: 'http://localhost:3000/null',
-                },
-              ],
             },
-          },
+          });
-        };
 
-        expect(response.body).toEqual(expectedResponsePayload);
+          const actionStep = await createStep({
+            flowId: currentUserFlow.id,
+            type: 'action',
+            connectionId: actionConnection.id,
+            key: 'translateText',
+          });
+
+          const token = createAuthTokenByUserId(currentUser.id);
+
+          const response = await request(app)
+            .post('/graphql')
+            .set('Authorization', token)
+            .send({ query: query(currentUserFlow.id) })
+            .expect(200);
+
+          const expectedResponsePayload = {
+            data: {
+              getFlow: {
+                active: currentUserFlow.active,
+                id: currentUserFlow.id,
+                name: currentUserFlow.name,
+                status: 'draft',
+                steps: [
+                  {
+                    appKey: triggerStep.appKey,
+                    connection: null,
+                    iconUrl: `${appConfig.baseUrl}/apps/${triggerStep.appKey}/assets/favicon.svg`,
+                    id: triggerStep.id,
+                    key: 'catchRawWebhook',
+                    parameters: {},
+                    position: 1,
+                    status: triggerStep.status,
+                    type: 'trigger',
+                    webhookUrl: `${appConfig.baseUrl}/webhooks/flows/${currentUserFlow.id}`,
+                  },
+                  {
+                    appKey: actionStep.appKey,
+                    connection: {
+                      createdAt: actionConnection.createdAt
+                        .getTime()
+                        .toString(),
+                      id: actionConnection.id,
+                      verified: actionConnection.verified,
+                    },
+                    iconUrl: `${appConfig.baseUrl}/apps/${actionStep.appKey}/assets/favicon.svg`,
+                    id: actionStep.id,
+                    key: 'translateText',
+                    parameters: {},
+                    position: 1,
+                    status: actionStep.status,
+                    type: 'action',
+                    webhookUrl: 'http://localhost:3000/null',
+                  },
+                ],
+              },
+            },
+          };
+
+          expect(response.body).toEqual(expectedResponsePayload);
+        });
+      });
+
+      describe('and without isCreator condition', () => {
+        it('should return executions data of all users', async () => {
+          await createPermission({
+            action: 'read',
+            subject: 'Flow',
+            roleId: currentUserRole.id,
+            conditions: [],
+          });
+
+          const anotherUser = await createUser();
+          const anotherUserFlow = await createFlow({ userId: anotherUser.id });
+
+          const triggerStep = await createStep({
+            flowId: anotherUserFlow.id,
+            type: 'trigger',
+            key: 'catchRawWebhook',
+            webhookPath: `/webhooks/flows/${anotherUserFlow.id}`,
+          });
+
+          const actionConnection = await createConnection({
+            userId: anotherUser.id,
+            formattedData: {
+              screenName: 'Test',
+              authenticationKey: 'test key',
+            },
+          });
+
+          const actionStep = await createStep({
+            flowId: anotherUserFlow.id,
+            type: 'action',
+            connectionId: actionConnection.id,
+            key: 'translateText',
+          });
+
+          const token = createAuthTokenByUserId(currentUser.id);
+
+          const response = await request(app)
+            .post('/graphql')
+            .set('Authorization', token)
+            .send({ query: query(anotherUserFlow.id) })
+            .expect(200);
+
+          const expectedResponsePayload = {
+            data: {
+              getFlow: {
+                active: anotherUserFlow.active,
+                id: anotherUserFlow.id,
+                name: anotherUserFlow.name,
+                status: 'draft',
+                steps: [
+                  {
+                    appKey: triggerStep.appKey,
+                    connection: null,
+                    iconUrl: `${appConfig.baseUrl}/apps/${triggerStep.appKey}/assets/favicon.svg`,
+                    id: triggerStep.id,
+                    key: 'catchRawWebhook',
+                    parameters: {},
+                    position: 1,
+                    status: triggerStep.status,
+                    type: 'trigger',
+                    webhookUrl: `${appConfig.baseUrl}/webhooks/flows/${anotherUserFlow.id}`,
+                  },
+                  {
+                    appKey: actionStep.appKey,
+                    connection: {
+                      createdAt: actionConnection.createdAt
+                        .getTime()
+                        .toString(),
+                      id: actionConnection.id,
+                      verified: actionConnection.verified,
+                    },
+                    iconUrl: `${appConfig.baseUrl}/apps/${actionStep.appKey}/assets/favicon.svg`,
+                    id: actionStep.id,
+                    key: 'translateText',
+                    parameters: {},
+                    position: 1,
+                    status: actionStep.status,
+                    type: 'action',
+                    webhookUrl: 'http://localhost:3000/null',
+                  },
+                ],
+              },
+            },
+          };
+
+          expect(response.body).toEqual(expectedResponsePayload);
+        });
       });
     });
   });

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

@@ -17,6 +17,7 @@ describe('graphQL getRole query', () => {
     userWithoutPermissions,
     tokenWithPermissions,
     tokenWithoutPermissions,
+    invalidToken,
     permissionOne,
     permissionTwo;
 
@@ -73,91 +74,108 @@ describe('graphQL getRole query', () => {
     tokenWithoutPermissions = createAuthTokenByUserId(
       userWithoutPermissions.id
     );
+
+    invalidToken = 'invalid-token';
   });
 
-  describe('and with valid license', () => {
+  describe('with unauthenticated user', () => {
-    beforeEach(async () => {
+    it('should throw not authorized error', async () => {
-      vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', invalidToken)
+        .send({ query: queryWithValidRole })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
     });
+  });
 
-    describe('and without permissions', () => {
+  describe('with authenticated user', () => {
-      it('should throw not authorized error', async () => {
+    describe('and with valid license', () => {
-        const response = await request(app)
+      beforeEach(async () => {
-          .post('/graphql')
+        vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-          .set('Authorization', tokenWithoutPermissions)
-          .send({ query: queryWithValidRole })
-          .expect(200);
-
-        expect(response.body.errors).toBeDefined();
-        expect(response.body.errors[0].message).toEqual('Not authorized!');
       });
-    });
 
-    describe('and correct permissions', () => {
+      describe('and without permissions', () => {
-      it('should return role data for a valid role id', async () => {
+        it('should throw not authorized error', async () => {
-        const response = await request(app)
+          const response = await request(app)
-          .post('/graphql')
+            .post('/graphql')
-          .set('Authorization', tokenWithPermissions)
+            .set('Authorization', tokenWithoutPermissions)
-          .send({ query: queryWithValidRole })
+            .send({ query: queryWithValidRole })
-          .expect(200);
+            .expect(200);
 
-        const expectedResponsePayload = {
+          expect(response.body.errors).toBeDefined();
-          data: {
+          expect(response.body.errors[0].message).toEqual('Not authorized!');
-            getRole: {
+        });
-              description: validRole.description,
+      });
-              id: validRole.id,
+
-              isAdmin: validRole.key === 'admin',
+      describe('and correct permissions', () => {
-              key: validRole.key,
+        it('should return role data for a valid role id', async () => {
-              name: validRole.name,
+          const response = await request(app)
-              permissions: [
+            .post('/graphql')
-                {
+            .set('Authorization', tokenWithPermissions)
-                  action: permissionOne.action,
+            .send({ query: queryWithValidRole })
-                  conditions: permissionOne.conditions,
+            .expect(200);
-                  id: permissionOne.id,
+
-                  subject: permissionOne.subject,
+          const expectedResponsePayload = {
-                },
+            data: {
-                {
+              getRole: {
-                  action: permissionTwo.action,
+                description: validRole.description,
-                  conditions: permissionTwo.conditions,
+                id: validRole.id,
-                  id: permissionTwo.id,
+                isAdmin: validRole.key === 'admin',
-                  subject: permissionTwo.subject,
+                key: validRole.key,
-                },
+                name: validRole.name,
-              ],
+                permissions: [
+                  {
+                    action: permissionOne.action,
+                    conditions: permissionOne.conditions,
+                    id: permissionOne.id,
+                    subject: permissionOne.subject,
+                  },
+                  {
+                    action: permissionTwo.action,
+                    conditions: permissionTwo.conditions,
+                    id: permissionTwo.id,
+                    subject: permissionTwo.subject,
+                  },
+                ],
+              },
             },
-          },
+          };
-        };
 
-        expect(response.body).toEqual(expectedResponsePayload);
+          expect(response.body).toEqual(expectedResponsePayload);
-      });
+        });
 
-      it('should return not found for invalid role id', async () => {
+        it('should return not found for invalid role id', async () => {
-        const response = await request(app)
+          const response = await request(app)
-          .post('/graphql')
+            .post('/graphql')
-          .set('Authorization', tokenWithPermissions)
+            .set('Authorization', tokenWithPermissions)
-          .send({ query: queryWithInvalidRole })
+            .send({ query: queryWithInvalidRole })
-          .expect(200);
+            .expect(200);
 
-        expect(response.body.errors).toBeDefined();
+          expect(response.body.errors).toBeDefined();
-        expect(response.body.errors[0].message).toEqual('NotFoundError');
+          expect(response.body.errors[0].message).toEqual('NotFoundError');
+        });
       });
     });
-  });
 
-  describe('and without valid license', () => {
+    describe('and without valid license', () => {
-    beforeEach(async () => {
+      beforeEach(async () => {
-      vi.spyOn(license, 'hasValidLicense').mockResolvedValue(false);
+        vi.spyOn(license, 'hasValidLicense').mockResolvedValue(false);
-    });
+      });
 
-    describe('and correct permissions', () => {
+      describe('and correct permissions', () => {
-      it('should throw not authorized error', async () => {
+        it('should throw not authorized error', async () => {
-        const response = await request(app)
+          const response = await request(app)
-          .post('/graphql')
+            .post('/graphql')
-          .set('Authorization', tokenWithPermissions)
+            .set('Authorization', tokenWithPermissions)
-          .send({ query: queryWithInvalidRole })
+            .send({ query: queryWithInvalidRole })
-          .expect(200);
+            .expect(200);
 
-        expect(response.body.errors).toBeDefined();
+          expect(response.body.errors).toBeDefined();
-        expect(response.body.errors[0].message).toEqual('Not authorized!');
+          expect(response.body.errors[0].message).toEqual('Not authorized!');
+        });
       });
     });
   });

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

@@ -15,7 +15,8 @@ describe('graphQL getRoles query', () => {
     userWithPermissions,
     userWithoutPermissions,
     tokenWithPermissions,
-    tokenWithoutPermissions;
+    tokenWithoutPermissions,
+    invalidToken;
 
   beforeEach(async () => {
     currentUserRole = await createRole({ name: 'Current user role' });
@@ -52,82 +53,99 @@ describe('graphQL getRoles query', () => {
     tokenWithoutPermissions = createAuthTokenByUserId(
       userWithoutPermissions.id
     );
+
+    invalidToken = 'invalid-token';
   });
 
-  describe('and with valid license', () => {
+  describe('with unauthenticated user', () => {
-    beforeEach(async () => {
+    it('should throw not authorized error', async () => {
-      vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
+      const response = await request(app)
-    });
+        .post('/graphql')
+        .set('Authorization', invalidToken)
+        .send({ query })
+        .expect(200);
 
-    describe('and without permissions', () => {
+      expect(response.body.errors).toBeDefined();
-      it('should throw not authorized error', async () => {
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
-        const response = await request(app)
-          .post('/graphql')
-          .set('Authorization', tokenWithoutPermissions)
-          .send({ query })
-          .expect(200);
-
-        expect(response.body.errors).toBeDefined();
-        expect(response.body.errors[0].message).toEqual('Not authorized!');
-      });
-    });
-
-    describe('and correct permissions', () => {
-      it('should return roles data', async () => {
-        const response = await request(app)
-          .post('/graphql')
-          .set('Authorization', tokenWithPermissions)
-          .send({ query })
-          .expect(200);
-
-        const expectedResponsePayload = {
-          data: {
-            getRoles: [
-              {
-                description: currentUserRole.description,
-                id: currentUserRole.id,
-                isAdmin: currentUserRole.key === 'admin',
-                key: currentUserRole.key,
-                name: currentUserRole.name,
-              },
-              {
-                description: roleOne.description,
-                id: roleOne.id,
-                isAdmin: roleOne.key === 'admin',
-                key: roleOne.key,
-                name: roleOne.name,
-              },
-              {
-                description: roleSecond.description,
-                id: roleSecond.id,
-                isAdmin: roleSecond.key === 'admin',
-                key: roleSecond.key,
-                name: roleSecond.name,
-              },
-            ],
-          },
-        };
-
-        expect(response.body).toEqual(expectedResponsePayload);
-      });
     });
   });
 
-  describe('and without valid license', () => {
+  describe('with authenticated user', () => {
-    beforeEach(async () => {
+    describe('and with valid license', () => {
-      vi.spyOn(license, 'hasValidLicense').mockResolvedValue(false);
+      beforeEach(async () => {
+        vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
+      });
+
+      describe('and without permissions', () => {
+        it('should throw not authorized error', async () => {
+          const response = await request(app)
+            .post('/graphql')
+            .set('Authorization', tokenWithoutPermissions)
+            .send({ query })
+            .expect(200);
+
+          expect(response.body.errors).toBeDefined();
+          expect(response.body.errors[0].message).toEqual('Not authorized!');
+        });
+      });
+
+      describe('and correct permissions', () => {
+        it('should return roles data', async () => {
+          const response = await request(app)
+            .post('/graphql')
+            .set('Authorization', tokenWithPermissions)
+            .send({ query })
+            .expect(200);
+
+          const expectedResponsePayload = {
+            data: {
+              getRoles: [
+                {
+                  description: currentUserRole.description,
+                  id: currentUserRole.id,
+                  isAdmin: currentUserRole.key === 'admin',
+                  key: currentUserRole.key,
+                  name: currentUserRole.name,
+                },
+                {
+                  description: roleOne.description,
+                  id: roleOne.id,
+                  isAdmin: roleOne.key === 'admin',
+                  key: roleOne.key,
+                  name: roleOne.name,
+                },
+                {
+                  description: roleSecond.description,
+                  id: roleSecond.id,
+                  isAdmin: roleSecond.key === 'admin',
+                  key: roleSecond.key,
+                  name: roleSecond.name,
+                },
+              ],
+            },
+          };
+
+          expect(response.body).toEqual(expectedResponsePayload);
+        });
+      });
     });
 
-    describe('and correct permissions', () => {
+    describe('and without valid license', () => {
-      it('should throw not authorized error', async () => {
+      beforeEach(async () => {
-        const response = await request(app)
+        vi.spyOn(license, 'hasValidLicense').mockResolvedValue(false);
-          .post('/graphql')
+      });
-          .set('Authorization', tokenWithPermissions)
-          .send({ query })
-          .expect(200);
 
-        expect(response.body.errors).toBeDefined();
+      describe('and correct permissions', () => {
-        expect(response.body.errors[0].message).toEqual('Not authorized!');
+        it('should throw not authorized error', async () => {
+          const response = await request(app)
+            .post('/graphql')
+            .set('Authorization', tokenWithPermissions)
+            .send({ query })
+            .expect(200);
+
+          expect(response.body.errors).toBeDefined();
+          expect(response.body.errors[0].message).toEqual('Not authorized!');
+        });
       });
     });
   });

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

@@ -16,46 +16,34 @@ describe('graphQL getTrialStatus query', () => {
     }
   `;
 
-  let user, userToken;
+  const invalidToken = 'invalid-token';
 
-  beforeEach(async () => {
+  describe('with unauthenticated user', () => {
-    const trialExpiryDate = DateTime.now().plus({ days: 30 }).toISODate();
+    it('should throw not authorized error', async () => {
-
-    user = await createUser({ trialExpiryDate });
-    userToken = createAuthTokenByUserId(user.id);
-  });
-
-  describe('and with cloud flag disabled', () => {
-    beforeEach(async () => {
-      vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
-    });
-
-    it('should return null', async () => {
       const response = await request(app)
         .post('/graphql')
-        .set('Authorization', userToken)
+        .set('Authorization', invalidToken)
         .send({ query })
         .expect(200);
 
-      const expectedResponsePayload = {
+      expect(response.body.errors).toBeDefined();
-        data: { getTrialStatus: null },
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
-      };
-
-      expect(response.body).toEqual(expectedResponsePayload);
     });
   });
 
-  describe('and with cloud flag enabled', () => {
+  describe('with authenticated user', () => {
+    let user, userToken;
+
     beforeEach(async () => {
-      vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
+      const trialExpiryDate = DateTime.now().plus({ days: 30 }).toISODate();
+
+      user = await createUser({ trialExpiryDate });
+      userToken = createAuthTokenByUserId(user.id);
     });
 
-    describe('and not in trial and has active subscription', () => {
+    describe('and with cloud flag disabled', () => {
       beforeEach(async () => {
-        vi.spyOn(User.prototype, 'inTrial').mockResolvedValue(false);
+        vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(false);
-        vi.spyOn(User.prototype, 'hasActiveSubscription').mockResolvedValue(
-          true
-        );
       });
 
       it('should return null', async () => {
@@ -73,27 +61,56 @@ describe('graphQL getTrialStatus query', () => {
       });
     });
 
-    describe('and in trial period', () => {
+    describe('and with cloud flag enabled', () => {
       beforeEach(async () => {
-        vi.spyOn(User.prototype, 'inTrial').mockResolvedValue(true);
+        vi.spyOn(appConfig, 'isCloud', 'get').mockReturnValue(true);
       });
 
-      it('should return null', async () => {
+      describe('and not in trial and has active subscription', () => {
-        const response = await request(app)
+        beforeEach(async () => {
-          .post('/graphql')
+          vi.spyOn(User.prototype, 'inTrial').mockResolvedValue(false);
-          .set('Authorization', userToken)
+          vi.spyOn(User.prototype, 'hasActiveSubscription').mockResolvedValue(
-          .send({ query })
+            true
-          .expect(200);
+          );
+        });
 
-        const expectedResponsePayload = {
+        it('should return null', async () => {
-          data: {
+          const response = await request(app)
-            getTrialStatus: {
+            .post('/graphql')
-              expireAt: new Date(user.trialExpiryDate).getTime().toString(),
+            .set('Authorization', userToken)
+            .send({ query })
+            .expect(200);
+
+          const expectedResponsePayload = {
+            data: { getTrialStatus: null },
+          };
+
+          expect(response.body).toEqual(expectedResponsePayload);
+        });
+      });
+
+      describe('and in trial period', () => {
+        beforeEach(async () => {
+          vi.spyOn(User.prototype, 'inTrial').mockResolvedValue(true);
+        });
+
+        it('should return null', async () => {
+          const response = await request(app)
+            .post('/graphql')
+            .set('Authorization', userToken)
+            .send({ query })
+            .expect(200);
+
+          const expectedResponsePayload = {
+            data: {
+              getTrialStatus: {
+                expireAt: new Date(user.trialExpiryDate).getTime().toString(),
+              },
             },
-          },
+          };
-        };
 
-        expect(response.body).toEqual(expectedResponsePayload);
+          expect(response.body).toEqual(expectedResponsePayload);
+        });
       });
     });
   });

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

@@ -8,12 +8,37 @@ import { createPermission } from '../../../test/factories/permission';
 import { createUser } from '../../../test/factories/user';
 
 describe('graphQL getUser query', () => {
-  describe('and without permissions', () => {
+  describe('with unauthenticated user', () => {
     it('should throw not authorized error', async () => {
-      const userWithoutPermissions = await createUser();
+      const invalidUserId = '123123123';
-      const anotherUser = await createUser();
 
       const query = `
+        query {
+          getUser(id: "${invalidUserId}") {
+            id
+            email
+          }
+        }
+      `;
+
+      const response = await request(app)
+        .post('/graphql')
+        .set('Authorization', 'invalid-token')
+        .send({ query })
+        .expect(200);
+
+      expect(response.body.errors).toBeDefined();
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
+    });
+  });
+
+  describe('with authenticated user', () => {
+    describe('and without permissions', () => {
+      it('should throw not authorized error', async () => {
+        const userWithoutPermissions = await createUser();
+        const anotherUser = await createUser();
+
+        const query = `
           query {
             getUser(id: "${anotherUser.id}") {
               id
@@ -22,48 +47,50 @@ describe('graphQL getUser query', () => {
           }
         `;
 
-      const token = createAuthTokenByUserId(userWithoutPermissions.id);
+        const token = createAuthTokenByUserId(userWithoutPermissions.id);
 
-      const response = await request(app)
+        const response = await request(app)
-        .post('/graphql')
+          .post('/graphql')
-        .set('Authorization', token)
+          .set('Authorization', token)
-        .send({ query })
+          .send({ query })
-        .expect(200);
+          .expect(200);
 
-      expect(response.body.errors).toBeDefined();
+        expect(response.body.errors).toBeDefined();
-      expect(response.body.errors[0].message).toEqual('Not authorized!');
+        expect(response.body.errors[0].message).toEqual('Not authorized!');
-    });
-  });
-
-  describe('and correct permissions', () => {
-    let role, currentUser, anotherUser, token, requestObject;
-
-    beforeEach(async () => {
-      role = await createRole({
-        key: 'sample',
-        name: 'sample',
       });
-
-      await createPermission({
-        action: 'read',
-        subject: 'User',
-        roleId: role.id,
-      });
-
-      currentUser = await createUser({
-        roleId: role.id,
-      });
-
-      anotherUser = await createUser({
-        roleId: role.id,
-      });
-
-      token = createAuthTokenByUserId(currentUser.id);
-      requestObject = request(app).post('/graphql').set('Authorization', token);
     });
 
-    it('should return user data for a valid user id', async () => {
+    describe('and correct permissions', () => {
-      const query = `
+      let role, currentUser, anotherUser, token, requestObject;
+
+      beforeEach(async () => {
+        role = await createRole({
+          key: 'sample',
+          name: 'sample',
+        });
+
+        await createPermission({
+          action: 'read',
+          subject: 'User',
+          roleId: role.id,
+        });
+
+        currentUser = await createUser({
+          roleId: role.id,
+        });
+
+        anotherUser = await createUser({
+          roleId: role.id,
+        });
+
+        token = createAuthTokenByUserId(currentUser.id);
+        requestObject = request(app)
+          .post('/graphql')
+          .set('Authorization', token);
+      });
+
+      it('should return user data for a valid user id', async () => {
+        const query = `
           query {
             getUser(id: "${anotherUser.id}") {
               id
@@ -80,26 +107,26 @@ describe('graphQL getUser query', () => {
           }
         `;
 
-      const response = await requestObject.send({ query }).expect(200);
+        const response = await requestObject.send({ query }).expect(200);
 
-      const expectedResponsePayload = {
+        const expectedResponsePayload = {
-        data: {
+          data: {
-          getUser: {
+            getUser: {
-            createdAt: anotherUser.createdAt.getTime().toString(),
+              createdAt: anotherUser.createdAt.getTime().toString(),
-            email: anotherUser.email,
+              email: anotherUser.email,
-            fullName: anotherUser.fullName,
+              fullName: anotherUser.fullName,
-            id: anotherUser.id,
+              id: anotherUser.id,
-            role: { id: role.id, name: role.name },
+              role: { id: role.id, name: role.name },
-            updatedAt: anotherUser.updatedAt.getTime().toString(),
+              updatedAt: anotherUser.updatedAt.getTime().toString(),
+            },
           },
-        },
+        };
-      };
 
-      expect(response.body).toEqual(expectedResponsePayload);
+        expect(response.body).toEqual(expectedResponsePayload);
-    });
+      });
 
-    it('should not return user password for a valid user id', async () => {
+      it('should not return user password for a valid user id', async () => {
-      const query = `
+        const query = `
           query {
             getUser(id: "${anotherUser.id}") {
               id
@@ -109,18 +136,18 @@ describe('graphQL getUser query', () => {
           }
         `;
 
-      const response = await requestObject.send({ query }).expect(400);
+        const response = await requestObject.send({ query }).expect(400);
 
-      expect(response.body.errors).toBeDefined();
+        expect(response.body.errors).toBeDefined();
-      expect(response.body.errors[0].message).toEqual(
+        expect(response.body.errors[0].message).toEqual(
-        'Cannot query field "password" on type "User".'
+          'Cannot query field "password" on type "User".'
-      );
+        );
-    });
+      });
 
-    it('should return not found for invalid user id', async () => {
+      it('should return not found for invalid user id', async () => {
-      const invalidUserId = Crypto.randomUUID();
+        const invalidUserId = Crypto.randomUUID();
 
-      const query = `
+        const query = `
           query {
             getUser(id: "${invalidUserId}") {
               id
@@ -137,10 +164,11 @@ describe('graphQL getUser query', () => {
           }
         `;
 
-      const response = await requestObject.send({ query }).expect(200);
+        const response = await requestObject.send({ query }).expect(200);
 
-      expect(response.body.errors).toBeDefined();
+        expect(response.body.errors).toBeDefined();
-      expect(response.body.errors[0].message).toEqual('NotFoundError');
+        expect(response.body.errors[0].message).toEqual('NotFoundError');
+      });
     });
   });
 });

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

@@ -30,95 +30,111 @@ describe('graphQL getUsers query', () => {
     }
   `;
 
-  describe('and without permissions', () => {
+  describe('with unauthenticated user', () => {
     it('should throw not authorized error', async () => {
-      const userWithoutPermissions = await createUser();
-      const token = createAuthTokenByUserId(userWithoutPermissions.id);
-
       const response = await request(app)
         .post('/graphql')
-        .set('Authorization', token)
+        .set('Authorization', 'invalid-token')
         .send({ query })
         .expect(200);
 
       expect(response.body.errors).toBeDefined();
-      expect(response.body.errors[0].message).toEqual('Not authorized!');
+      expect(response.body.errors[0].message).toEqual('Not Authorised!');
     });
   });
 
-  describe('and with correct permissions', () => {
+  describe('with authenticated user', () => {
-    let role, currentUser, anotherUser, token, requestObject;
+    describe('and without permissions', () => {
+      it('should throw not authorized error', async () => {
+        const userWithoutPermissions = await createUser();
+        const token = createAuthTokenByUserId(userWithoutPermissions.id);
 
-    beforeEach(async () => {
+        const response = await request(app)
-      role = await createRole({
+          .post('/graphql')
-        key: 'sample',
+          .set('Authorization', token)
-        name: 'sample',
+          .send({ query })
+          .expect(200);
+
+        expect(response.body.errors).toBeDefined();
+        expect(response.body.errors[0].message).toEqual('Not authorized!');
       });
-
-      await createPermission({
-        action: 'read',
-        subject: 'User',
-        roleId: role.id,
-      });
-
-      currentUser = await createUser({
-        roleId: role.id,
-        fullName: 'Current User',
-      });
-
-      anotherUser = await createUser({
-        roleId: role.id,
-        fullName: 'Another User',
-      });
-
-      token = createAuthTokenByUserId(currentUser.id);
-      requestObject = request(app).post('/graphql').set('Authorization', token);
     });
 
-    it('should return users data', async () => {
+    describe('and with correct permissions', () => {
-      const response = await requestObject.send({ query }).expect(200);
+      let role, currentUser, anotherUser, token, requestObject;
 
-      const expectedResponsePayload = {
+      beforeEach(async () => {
-        data: {
+        role = await createRole({
-          getUsers: {
+          key: 'sample',
-            edges: [
+          name: 'sample',
-              {
+        });
-                node: {
+
-                  email: anotherUser.email,
+        await createPermission({
-                  fullName: anotherUser.fullName,
+          action: 'read',
-                  id: anotherUser.id,
+          subject: 'User',
-                  role: {
+          roleId: role.id,
-                    id: role.id,
+        });
-                    name: role.name,
+
+        currentUser = await createUser({
+          roleId: role.id,
+          fullName: 'Current User',
+        });
+
+        anotherUser = await createUser({
+          roleId: role.id,
+          fullName: 'Another User',
+        });
+
+        token = createAuthTokenByUserId(currentUser.id);
+        requestObject = request(app)
+          .post('/graphql')
+          .set('Authorization', token);
+      });
+
+      it('should return users data', async () => {
+        const response = await requestObject.send({ query }).expect(200);
+
+        const expectedResponsePayload = {
+          data: {
+            getUsers: {
+              edges: [
+                {
+                  node: {
+                    email: anotherUser.email,
+                    fullName: anotherUser.fullName,
+                    id: anotherUser.id,
+                    role: {
+                      id: role.id,
+                      name: role.name,
+                    },
                   },
                 },
-              },
+                {
-              {
+                  node: {
-                node: {
+                    email: currentUser.email,
-                  email: currentUser.email,
+                    fullName: currentUser.fullName,
-                  fullName: currentUser.fullName,
+                    id: currentUser.id,
-                  id: currentUser.id,
+                    role: {
-                  role: {
+                      id: role.id,
-                    id: role.id,
+                      name: role.name,
-                    name: role.name,
+                    },
                   },
                 },
+              ],
+              pageInfo: {
+                currentPage: 1,
+                totalPages: 1,
               },
-            ],
+              totalCount: 2,
-            pageInfo: {
-              currentPage: 1,
-              totalPages: 1,
             },
-            totalCount: 2,
           },
-        },
+        };
-      };
 
-      expect(response.body).toEqual(expectedResponsePayload);
+        expect(response.body).toEqual(expectedResponsePayload);
-    });
+      });
 
-    it('should not return users data with password', async () => {
+      it('should not return users data with password', async () => {
-      const query = `
+        const query = `
           query {
             getUsers(limit: 10, offset: 0) {
               pageInfo {
@@ -137,12 +153,13 @@ describe('graphQL getUsers query', () => {
           }
         `;
 
-      const response = await requestObject.send({ query }).expect(400);
+        const response = await requestObject.send({ query }).expect(400);
 
-      expect(response.body.errors).toBeDefined();
+        expect(response.body.errors).toBeDefined();
-      expect(response.body.errors[0].message).toEqual(
+        expect(response.body.errors[0].message).toEqual(
-        'Cannot query field "password" on type "User".'
+          'Cannot query field "password" on type "User".'
-      );
+        );
+      });
     });
   });
 });

packages/backend/src/helpers/authentication.js

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

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

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

packages/backend/src/helpers/authorization.js

@@ -1,22 +0,0 @@
-const authorizationList = {
-  '/api/v1/users/:userId': {
-    action: 'read',
-    subject: 'User',
-  },
-  '/api/v1/users/': {
-    action: 'read',
-    subject: 'User',
-  },
-};
-
-export const authorizeUser = async (request, response, next) => {
-  const currentRoute = request.baseUrl + request.route.path;
-  const currentRouteRule = authorizationList[currentRoute];
-
-  try {
-    request.currentUser.can(currentRouteRule.action, currentRouteRule.subject);
-    next();
-  } catch (error) {
-    return response.status(403).end();
-  }
-};

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

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

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

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

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

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

packages/backend/src/helpers/renderer.js

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

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

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

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

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

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

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

packages/backend/src/routes/healthcheck.js

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

packages/backend/src/routes/index.js

@@ -2,17 +2,11 @@ import { Router } from 'express';
 import graphQLInstance from '../helpers/graphql-instance.js';
 import webhooksRouter from './webhooks.js';
 import paddleRouter from './paddle.ee.js';
-import healthcheckRouter from './healthcheck.js';
-import automatischRouter from './api/v1/automatisch.js';
-import usersRouter from './api/v1/users.js';
 
 const router = Router();
 
 router.use('/graphql', graphQLInstance);
 router.use('/webhooks', webhooksRouter);
 router.use('/paddle', paddleRouter);
-router.use('/healthcheck', healthcheckRouter);
-router.use('/api/v1/automatisch', automatischRouter);
-router.use('/api/v1/users', usersRouter);
 
 export default router;

packages/backend/src/serializers/index.js

@@ -1,11 +0,0 @@
-import userSerializer from './user.js';
-import roleSerializer from './role.js';
-import permissionSerializer from './permission.js';
-
-const serializers = {
-  User: userSerializer,
-  Role: roleSerializer,
-  Permission: permissionSerializer,
-};
-
-export default serializers;

packages/backend/src/serializers/permission.js

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

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

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

packages/backend/src/serializers/role.js

@@ -1,13 +0,0 @@
-const roleSerializer = (role) => {
-  return {
-    id: role.id,
-    name: role.name,
-    key: role.key,
-    description: role.description,
-    createdAt: role.createdAt,
-    updatedAt: role.updatedAt,
-    isAdmin: role.isAdmin,
-  };
-};
-
-export default roleSerializer;

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

@@ -1,25 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createRole } from '../../test/factories/role';
-import roleSerializer from './role';
-
-describe('roleSerializer', () => {
-  let role;
-
-  beforeEach(async () => {
-    role = await createRole();
-  });
-
-  it('should return role data', async () => {
-    const expectedPayload = {
-      id: role.id,
-      name: role.name,
-      key: role.key,
-      description: role.description,
-      createdAt: role.createdAt,
-      updatedAt: role.updatedAt,
-      isAdmin: role.isAdmin,
-    };
-
-    expect(roleSerializer(role)).toEqual(expectedPayload);
-  });
-});

packages/backend/src/serializers/user.js

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

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

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

packages/backend/test/factories/config.js

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

packages/backend/test/factories/connection.js

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

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

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

packages/backend/test/factories/execution.js

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

packages/backend/test/factories/flow.js

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

packages/backend/test/factories/permission.js

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

packages/backend/test/factories/role.js

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

packages/backend/test/factories/step.js

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

packages/backend/test/factories/user.js

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

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

@@ -1,32 +0,0 @@
-const getCurrentUserMock = (currentUser, role) => {
-  return {
-    data: {
-      createdAt: currentUser.createdAt.toISOString(),
-      email: currentUser.email,
-      fullName: currentUser.fullName,
-      id: currentUser.id,
-      permissions: [],
-      role: {
-        createdAt: role.createdAt.toISOString(),
-        description: null,
-        id: role.id,
-        isAdmin: role.isAdmin,
-        key: role.key,
-        name: role.name,
-        updatedAt: role.updatedAt.toISOString(),
-      },
-      roleId: role.id,
-      trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
-      updatedAt: currentUser.updatedAt.toISOString(),
-    },
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'User',
-    },
-  };
-};
-
-export default getCurrentUserMock;

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

@@ -1,17 +0,0 @@
-const getUserTrialMock = async (currentUser) => {
-  return {
-    data: {
-      inTrial: await currentUser.inTrial(),
-      expireAt: currentUser.trialExpiryDate.toISOString(),
-    },
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'Object',
-    },
-  };
-};
-
-export default getUserTrialMock;

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

@@ -1,31 +0,0 @@
-const getUserMock = (currentUser, role) => {
-  return {
-    data: {
-      createdAt: currentUser.createdAt.toISOString(),
-      email: currentUser.email,
-      fullName: currentUser.fullName,
-      id: currentUser.id,
-      role: {
-        createdAt: role.createdAt.toISOString(),
-        description: null,
-        id: role.id,
-        isAdmin: role.isAdmin,
-        key: role.key,
-        name: role.name,
-        updatedAt: role.updatedAt.toISOString(),
-      },
-      roleId: role.id,
-      trialExpiryDate: currentUser.trialExpiryDate.toISOString(),
-      updatedAt: currentUser.updatedAt.toISOString(),
-    },
-    meta: {
-      count: 1,
-      currentPage: null,
-      isArray: false,
-      totalPages: null,
-      type: 'User',
-    },
-  };
-};
-
-export default getUserMock;

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

@@ -1,38 +0,0 @@
-const getUsersMock = async (users, roles) => {
-  const data = users.map((user) => {
-    const role = roles.find((r) => r.id === user.roleId);
-    return {
-      createdAt: user.createdAt.toISOString(),
-      email: user.email,
-      fullName: user.fullName,
-      id: user.id,
-      role: role
-        ? {
-            createdAt: role.createdAt.toISOString(),
-            description: role.description,
-            id: role.id,
-            isAdmin: role.isAdmin,
-            key: role.key,
-            name: role.name,
-            updatedAt: role.updatedAt.toISOString(),
-          }
-        : null, // Fallback to null if role not found
-      roleId: user.roleId,
-      trialExpiryDate: user.trialExpiryDate.toISOString(),
-      updatedAt: user.updatedAt.toISOString(),
-    };
-  });
-
-  return {
-    data: data,
-    meta: {
-      count: data.length,
-      currentPage: 1,
-      isArray: true,
-      totalPages: 1,
-      type: 'User',
-    },
-  };
-};
-
-export default getUsersMock;

packages/cli/.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

packages/cli/.eslintignore

@@ -0,0 +1 @@
+/dist

packages/cli/.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: 'npm'
+    versioning-strategy: increase
+    directory: '/'
+    schedule:
+      interval: 'monthly'
+    labels:
+      - 'dependencies'
+    open-pull-requests-limit: 100
+    pull-request-branch-name:
+      separator: '-'
+    ignore:
+      - dependency-name: 'fs-extra'
+      - dependency-name: '*'
+        update-types: ['version-update:semver-major']

packages/cli/.gitignore

@@ -0,0 +1,9 @@
+*-debug.log
+*-error.log
+/.nyc_output
+/dist
+/lib
+/package-lock.json
+/tmp
+node_modules
+oclif.manifest.json

packages/cli/README.md

@@ -0,0 +1,4 @@
+# `@automatisch/cli`
+
+The open source Zapier alternative. Build workflow automation without spending
+time and money.

packages/cli/bin/automatisch

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+const oclif = require('@oclif/core')
+
+oclif.run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle'))

packages/cli/bin/automatisch.cmd

@@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\automatisch" %*

packages/cli/package.json

@@ -0,0 +1,73 @@
+{
+  "name": "@automatisch/cli",
+  "version": "0.10.0",
+  "license": "See LICENSE file",
+  "description": "The open source Zapier alternative. Build workflow automation without spending time and money.",
+  "contributors": [
+    {
+      "name": "automatisch contributors",
+      "url": "https://github.com/automatisch/automatisch/graphs/contributors"
+    }
+  ],
+  "homepage": "https://github.com/automatisch/automatisch#readme",
+  "main": "dist/index.js",
+  "bin": {
+    "automatisch": "./bin/automatisch"
+  },
+  "files": [
+    "/bin",
+    "/dist",
+    "oclif.manifest.json"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/automatisch/automatisch.git"
+  },
+  "scripts": {
+    "build": "shx rm -rf dist && tsc -b",
+    "build:watch": "nodemon --watch 'src/**/*.ts' --exec 'shx rm -rf dist && tsc -b' --ext 'ts'",
+    "lint": "eslint . --ext .js --ignore-path ../../.eslintignore",
+    "postpack": "shx rm -f oclif.manifest.json",
+    "posttest": "yarn lint",
+    "prepack": "yarn build && oclif manifest && oclif readme",
+    "version": "oclif readme && git add README.md"
+  },
+  "dependencies": {
+    "@automatisch/backend": "^0.10.0",
+    "@oclif/core": "^1",
+    "@oclif/plugin-help": "^5",
+    "@oclif/plugin-plugins": "^2.0.1",
+    "dotenv": "^10.0.0"
+  },
+  "devDependencies": {
+    "@oclif/test": "^2",
+    "@types/node": "^16.9.4",
+    "eslint-config-oclif": "^4",
+    "eslint-config-oclif-typescript": "^1.0.2",
+    "globby": "^11",
+    "oclif": "^2",
+    "shx": "^0.3.3",
+    "ts-node": "^10.2.1",
+    "tslib": "^2.3.1",
+    "typescript": "^4.6.3"
+  },
+  "oclif": {
+    "bin": "automatisch",
+    "dirname": "automatisch",
+    "commands": "./dist/commands",
+    "plugins": [
+      "@oclif/plugin-help",
+      "@oclif/plugin-plugins"
+    ]
+  },
+  "engines": {
+    "node": ">=12.0.0"
+  },
+  "bugs": {
+    "url": "https://github.com/automatisch/automatisch/issues"
+  },
+  "types": "dist/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  }
+}

packages/cli/src/commands/start-worker.js

@@ -0,0 +1,50 @@
+import { readFileSync } from 'fs';
+import { Command, Flags } from '@oclif/core';
+import * as dotenv from 'dotenv';
+import process from 'process';
+
+export default class StartWorker extends Command {
+  static description = 'Run automatisch worker';
+
+  static flags = {
+    env: Flags.string({
+      multiple: true,
+      char: 'e',
+    }),
+    'env-file': Flags.string(),
+  };
+
+  async prepareEnvVars() {
+    const { flags } = await this.parse(StartWorker);
+
+    if (flags['env-file']) {
+      const envFile = readFileSync(flags['env-file'], 'utf8');
+      const envConfig = dotenv.parse(envFile);
+
+      for (const key in envConfig) {
+        const value = envConfig[key];
+        process.env[key] = value;
+      }
+    }
+
+    if (flags.env) {
+      for (const env of flags.env) {
+        const [key, value] = env.split('=');
+        process.env[key] = value;
+      }
+    }
+
+    // must serve until more customization is introduced
+    delete process.env.SERVE_WEB_APP_SEPARATELY;
+  }
+
+  async runWorker() {
+    await import('@automatisch/backend/worker');
+  }
+
+  async run() {
+    await this.prepareEnvVars();
+
+    await this.runWorker();
+  }
+}

packages/cli/src/commands/start.js

@@ -0,0 +1,96 @@
+import { readFileSync } from 'fs';
+import { Command, Flags } from '@oclif/core';
+import * as dotenv from 'dotenv';
+import process from 'process';
+
+export default class Start extends Command {
+  static description = 'Run automatisch';
+
+  static flags = {
+    env: Flags.string({
+      multiple: true,
+      char: 'e',
+    }),
+    'env-file': Flags.string(),
+  };
+
+  get isProduction() {
+    return process.env.APP_ENV === 'production';
+  }
+
+  async prepareEnvVars() {
+    const { flags } = await this.parse(Start);
+
+    if (flags['env-file']) {
+      const envFile = readFileSync(flags['env-file'], 'utf8');
+      const envConfig = dotenv.parse(envFile);
+
+      for (const key in envConfig) {
+        const value = envConfig[key];
+        process.env[key] = value;
+      }
+    }
+
+    if (flags.env) {
+      for (const env of flags.env) {
+        const [key, value] = env.split('=');
+        process.env[key] = value;
+      }
+    }
+
+    // must serve until more customization is introduced
+    delete process.env.SERVE_WEB_APP_SEPARATELY;
+  }
+
+  async createDatabaseAndUser() {
+    const utils = await import('@automatisch/backend/database-utils');
+
+    await utils.createDatabaseAndUser(
+      process.env.POSTGRES_DATABASE,
+      process.env.POSTGRES_USERNAME
+    );
+  }
+
+  async runMigrationsIfNeeded() {
+    const { logger } = await import('@automatisch/backend/logger');
+    const database = await import('@automatisch/backend/database');
+    const migrator = database.client.migrate;
+
+    const [, pendingMigrations] = await migrator.list();
+    const pendingMigrationsCount = pendingMigrations.length;
+    const needsToMigrate = pendingMigrationsCount > 0;
+
+    if (needsToMigrate) {
+      logger.info(`Processing ${pendingMigrationsCount} migrations.`);
+
+      await migrator.latest();
+      logger.info(`Completed ${pendingMigrationsCount} migrations.`);
+    } else {
+      logger.info('No migrations needed.');
+    }
+  }
+
+  async seedUser() {
+    const utils = await import('@automatisch/backend/database-utils');
+
+    await utils.createUser();
+  }
+
+  async runApp() {
+    await import('@automatisch/backend/server');
+  }
+
+  async run() {
+    await this.prepareEnvVars();
+
+    if (!this.isProduction) {
+      await this.createDatabaseAndUser();
+    }
+
+    await this.runMigrationsIfNeeded();
+
+    await this.seedUser();
+
+    await this.runApp();
+  }
+}

packages/cli/src/index.js

@@ -0,0 +1 @@
+export { run } from '@oclif/core';

packages/cli/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "declaration": true,
+    "allowJs": true,
+    "esModuleInterop": true,
+    "importHelpers": true,
+    "lib": ["es2021"],
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noImplicitAny": false,
+    "outDir": "dist",
+    "rootDir": "src",
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "es2021",
+    "typeRoots": ["node_modules/@types", "./src/types"]
+  },
+  "include": ["src/**/*"]
+}

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

@@ -32,15 +32,6 @@ export default defineConfig({
     ],
     sidebar: {
       '/apps/': [
-        {
-          text: 'Bigin By Zoho CRM',
-          collapsible: true,
-          collapsed: true,
-          items: [
-            { text: 'Triggers', link: '/apps/bigin-by-zoho-crm/triggers' },
-            { text: 'Connection', link: '/apps/bigin-by-zoho-crm/connection' },
-          ],
-        },
         {
           text: 'Carbone',
           collapsible: true,
@@ -314,7 +305,7 @@ export default defineConfig({
           collapsed: true,
           items: [
             { text: 'Actions', link: '/apps/removebg/actions' },
-            { text: 'Connection', link: '/apps/removebg/connection' },
+            { text: 'Connection', link: '/apps/removebg/connection' }
           ],
         },
         {

packages/docs/pages/advanced/configuration.md

@@ -14,33 +14,31 @@ The default values for some environment variables might be different in our deve
 Please be careful with the `ENCRYPTION_KEY` and `WEBHOOK_SECRET_KEY` environment variables. They are used to encrypt your credentials from third-party services and verify webhook requests. If you change them, your existing connections and flows will not continue to work.
 :::
 
-| Variable Name                | Type    | Default Value      | Description                                                                         |
+| Variable Name               | Type    | Default Value      | Description                                                                                          |
-| ---------------------------- | ------- | ------------------ | ----------------------------------------------------------------------------------- |
+| --------------------------- | ------- | ------------------ | ---------------------------------------------------------------------------------------------------- |
-| `HOST`                       | string  | `localhost`        | HTTP Host                                                                           |
+| `HOST`                      | string  | `localhost`        | HTTP Host                                                                                            |
-| `PROTOCOL`                   | string  | `http`             | HTTP Protocol                                                                       |
+| `PROTOCOL`                  | string  | `http`             | HTTP Protocol                                                                                        |
-| `PORT`                       | string  | `3000`             | HTTP Port                                                                           |
+| `PORT`                      | string  | `3000`             | HTTP Port                                                                                            |
-| `APP_ENV`                    | string  | `production`       | Automatisch Environment                                                             |
+| `APP_ENV`                   | string  | `production`       | Automatisch Environment                                                                              |
-| `WEB_APP_URL`                | string  |                    | Can be used to override connection URLs and CORS URL                                |
+| `WEB_APP_URL`               | string  |                    | Can be used to override connection URLs and CORS URL                                                 |
-| `WEBHOOK_URL`                | string  |                    | Can be used to override webhook URL                                                 |
+| `WEBHOOK_URL`               | string  |                    | Can be used to override webhook URL                                                                  |
-| `LOG_LEVEL`                  | string  | `info`             | Can be used to configure log level such as `error`, `warn`, `info`, `http`, `debug` |
+| `LOG_LEVEL`                 | string  | `info`             | Can be used to configure log level such as `error`, `warn`, `info`, `http`, `debug`                  |
-| `POSTGRES_DATABASE`          | string  | `automatisch`      | Database Name                                                                       |
+| `POSTGRES_DATABASE`         | string  | `automatisch`      | Database Name                                                                                        |
-| `POSTGRES_SCHEMA`            | string  | `public`           | Database Schema                                                                     |
+| `POSTGRES_SCHEMA`           | string  | `public`           | Database Schema                                                                                      |
-| `POSTGRES_PORT`              | number  | `5432`             | Database Port                                                                       |
+| `POSTGRES_PORT`             | number  | `5432`             | Database Port                                                                                        |
-| `POSTGRES_ENABLE_SSL`        | boolean | `false`            | Enable/Disable SSL for the database                                                 |
+| `POSTGRES_ENABLE_SSL`       | boolean | `false`            | Enable/Disable SSL for the database                                                                  |
-| `POSTGRES_HOST`              | string  | `postgres`         | Database Host                                                                       |
+| `POSTGRES_HOST`             | string  | `postgres`         | Database Host                                                                                        |
-| `POSTGRES_USERNAME`          | string  | `automatisch_user` | Database User                                                                       |
+| `POSTGRES_USERNAME`         | string  | `automatisch_user` | Database User                                                                                        |
-| `POSTGRES_PASSWORD`          | string  |                    | Password of Database User                                                           |
+| `POSTGRES_PASSWORD`         | string  |                    | Password of Database User                                                                            |
-| `ENCRYPTION_KEY`             | string  |                    | Encryption Key to store credentials                                                 |
+| `ENCRYPTION_KEY`            | string  |                    | Encryption Key to store credentials                                                                  |
-| `WEBHOOK_SECRET_KEY`         | string  |                    | Webhook Secret Key to verify webhook requests                                       |
+| `WEBHOOK_SECRET_KEY`        | string  |                    | Webhook Secret Key to verify webhook requests                                                        |
-| `APP_SECRET_KEY`             | string  |                    | Secret Key to authenticate the user                                                 |
+| `APP_SECRET_KEY`            | string  |                    | Secret Key to authenticate the user                                                                  |
-| `REDIS_HOST`                 | string  | `redis`            | Redis Host                                                                          |
+| `REDIS_HOST`                | string  | `redis`            | Redis Host                                                                                           |
-| `REDIS_PORT`                 | number  | `6379`             | Redis Port                                                                          |
+| `REDIS_PORT`                | number  | `6379`             | Redis Port                                                                                           |
-| `REDIS_USERNAME`             | string  |                    | Redis Username                                                                      |
+| `REDIS_USERNAME`            | string  |                    | Redis Username                                                                                       |
-| `REDIS_PASSWORD`             | string  |                    | Redis Password                                                                      |
+| `REDIS_PASSWORD`            | string  |                    | Redis Password                                                                                       |
-| `REDIS_TLS`                  | boolean | `false`            | Redis TLS                                                                           |
+| `REDIS_TLS`                 | boolean | `false`            | Redis TLS                                                                                            |
-| `TELEMETRY_ENABLED`          | boolean | `true`             | Enable/Disable Telemetry                                                            |
+| `TELEMETRY_ENABLED`         | boolean | `true`             | Enable/Disable Telemetry                                                                             |
-| `ENABLE_BULLMQ_DASHBOARD`    | boolean | `false`            | Enable BullMQ Dashboard                                                             |
+| `ENABLE_BULLMQ_DASHBOARD`   | boolean | `false`            | Enable BullMQ Dashboard                                                                              |
-| `BULLMQ_DASHBOARD_USERNAME`  | string  |                    | Username to login BullMQ Dashboard                                                  |
+| `BULLMQ_DASHBOARD_USERNAME` | string  |                    | Username to login BullMQ Dashboard                                                                   |
-| `BULLMQ_DASHBOARD_PASSWORD`  | string  |                    | Password to login BullMQ Dashboard                                                  |
+| `BULLMQ_DASHBOARD_PASSWORD` | string  |                    | Password to login BullMQ Dashboard                                                                   |
-| `DISABLE_NOTIFICATIONS_PAGE` | boolean | `false`            | Enable/Disable notifications page                                                   |
-| `DISABLE_FAVICON`            | boolean | `false`            | Enable/Disable favicon                                                              |