refactor(vtiger-crm): get full url for base url

refactor(vtiger-crm): update field names and keys

.devcontainer/boot.sh

@@ -29,7 +29,6 @@ rm -rf .env
 echo "
 PORT=$WEB_PORT
 REACT_APP_GRAPHQL_URL=http://localhost:$BACKEND_PORT/graphql
-REACT_APP_NOTIFICATIONS_URL=https://notifications.automatisch.io
 " >> .env
 cd $CURRENT_DIR
 

.devcontainer/docker-compose.yml

@@ -33,7 +33,32 @@ services:
       - '6379:6379'
     expose:
       - 6379
+  keycloak:
+    image: quay.io/keycloak/keycloak:21.1
+    restart: always
+    container_name: keycloak
+    environment:
+      - KEYCLOAK_ADMIN=admin
+      - KEYCLOAK_ADMIN_PASSWORD=admin
+      - KC_DB=postgres
+      - KC_DB_URL_HOST=postgres
+      - KC_DB_URL_DATABASE=keycloak
+      - KC_DB_USERNAME=automatisch_user
+      - KC_DB_PASSWORD=automatisch_password
+      - KC_HEALTH_ENABLED=true
+    ports:
+      - "8080:8080"
+    command: start-dev
+    depends_on:
+      - postgres
+    healthcheck:
+      test: "curl -f http://localhost:8080/health/ready || exit 1"
+    volumes:
+      - keycloak:/opt/keycloak/data/
+    expose:
+      - 8080
 
 volumes:
   postgres_data:
   redis_data:
+  keycloak:

.eslintrc.js

@@ -7,4 +7,12 @@ module.exports = {
     'plugin:@typescript-eslint/recommended',
     'prettier',
   ],
+  overrides: [
+    {
+      files: ['**/*.test.ts', '**/test/**/*.ts'],
+      rules: {
+        '@typescript-eslint/ban-ts-comment': ['off'],
+      },
+    },
+  ],
 };

.github/workflows/backend.yml

@@ -0,0 +1,48 @@
+name: Automatisch Backend Tests
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on:
+      - ubuntu-latest
+    services:
+      postgres:
+        image: postgres:14.5-alpine
+        env:
+          POSTGRES_DB: automatisch_test
+          POSTGRES_USER: automatisch_test_user
+          POSTGRES_PASSWORD: automatisch_test_user_password
+        options: >-
+          --health-cmd "pg_isready -U automatisch_test_user -d automatisch_test"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+      redis:
+        image: redis:7.0.4-alpine
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Install dependencies
+        run: cd packages/backend && yarn
+      - name: Copy .env-example.test file to .env.test
+        run: cd packages/backend && cp .env-example.test .env.test
+      - name: Run tests
+        run: cd packages/backend && yarn test

.github/workflows/ci.yml

@@ -1,5 +1,11 @@
 name: Automatisch CI
-on: [push]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
 jobs:
   linter:
     runs-on: ubuntu-latest
@@ -10,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
           cache: 'yarn'
           cache-dependency-path: yarn.lock
       - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
@@ -18,7 +24,7 @@ jobs:
       - run: yarn --frozen-lockfile
       - run: yarn lint
       - run: echo "🍏 This job's status is ${{ job.status }}."
-  build-backend:
+  start-backend-server:
     runs-on: ubuntu-latest
     steps:
       - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
@@ -27,13 +33,36 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          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/backend && yarn build
+      - run: cd packages/backend && yarn start
+        env:
+          ENCRYPTION_KEY: sample_encryption_key
+          WEBHOOK_SECRET_KEY: sample_webhook_secret_key
+      - run: echo "🍏 This job's status is ${{ job.status }}."
+  start-backend-worker:
+    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/backend && yarn start:worker
+        env:
+          ENCRYPTION_KEY: sample_encryption_key
+          WEBHOOK_SECRET_KEY: sample_webhook_secret_key
       - run: echo "🍏 This job's status is ${{ job.status }}."
   build-web:
     runs-on: ubuntu-latest
@@ -44,7 +73,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
           cache: 'yarn'
           cache-dependency-path: yarn.lock
       - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
@@ -54,21 +83,3 @@ 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: '16'
-          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/backend && yarn build
-      - run: cd packages/cli && yarn build
-      - run: echo "🍏 This job's status is ${{ job.status }}."

.github/workflows/playwright.yml

@@ -0,0 +1,121 @@
+name: Automatisch UI Tests
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    paths:
+      - 'packages/backend/**'
+      - 'packages/e2e-tests/**'
+      - 'packages/web/**'
+      - '!packages/backend/src/apps/**'
+  workflow_dispatch:
+
+env:
+  ENCRYPTION_KEY: sample_encryption_key
+  WEBHOOK_SECRET_KEY: sample_webhook_secret_key
+  APP_SECRET_KEY: sample_app_secret_key
+  POSTGRES_HOST: localhost
+  POSTGRES_DATABASE: automatisch
+  POSTGRES_PORT: 5432
+  POSTGRES_USERNAME: automatisch_user
+  POSTGRES_PASSWORD: automatisch_password
+  REDIS_HOST: localhost
+  APP_ENV: production
+  LICENSE_KEY: dummy_license_key
+
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on:
+      - ubuntu-latest
+    services:
+      postgres:
+        image: postgres:14.5-alpine
+        env:
+          POSTGRES_DB: automatisch
+          POSTGRES_USER: automatisch_user
+          POSTGRES_PASSWORD: automatisch_password
+        options: >-
+          --health-cmd "pg_isready -U automatisch_user -d automatisch"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+      redis:
+        image: redis:7.0.4-alpine
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Install dependencies
+        run: yarn && yarn lerna bootstrap
+      - name: Install Playwright Browsers
+        run: yarn playwright install --with-deps
+      - name: Build Automatisch
+        run: yarn lerna run --scope=@*/{web,cli} build
+        env:
+          # Keep this until we clean up warnings in build processes
+          CI: false
+      - name: Migrate database
+        working-directory: ./packages/backend
+        run: yarn db:migrate
+      - name: Seed user
+        working-directory: ./packages/backend
+        run: yarn db:seed:user &
+      - name: Install certutils
+        run: sudo apt install -y libnss3-tools
+      - name: Install mkcert
+        run: |
+          curl -JLO "https://dl.filippo.io/mkcert/latest?for=linux/amd64" \
+          && chmod +x mkcert-v*-linux-amd64 \
+          && sudo cp mkcert-v*-linux-amd64 /usr/local/bin/mkcert
+      - name: Install root certificate via mkcert
+        run: mkcert -install
+      - name: Create certificate
+        run: mkcert automatisch.io "*.automatisch.io" localhost 127.0.0.1 ::1
+        working-directory: ./packages/e2e-tests
+      - name: Set CAROOT environment variable
+        run: echo "NODE_EXTRA_CA_CERTS=$(mkcert -CAROOT)/rootCA.pem" >> "$GITHUB_ENV"
+      - name: Override license server with local server
+        run: sudo echo "127.0.0.1 license.automatisch.io" | sudo tee -a /etc/hosts
+      - name: Run local license server
+        working-directory: ./packages/e2e-tests
+        run: sudo yarn start-mock-license-server &
+      - name: Run Automatisch
+        run: yarn start &
+        working-directory: ./packages/backend
+      - name: Run Automatisch worker
+        run: yarn start:worker &
+        working-directory: ./packages/backend
+      - name: Setup upterm session
+        if: false
+        uses: lhotari/action-upterm@v1
+        with:
+          limit-access-to-actor: true
+          limit-access-to-users: barinali
+      - name: Run Playwright tests
+        working-directory: ./packages/e2e-tests
+        env:
+          LOGIN_EMAIL: user@automatisch.io
+          LOGIN_PASSWORD: sample
+          BASE_URL: http://localhost:3000
+          GITHUB_CLIENT_ID: 1c0417daf898adfbd99a
+          GITHUB_CLIENT_SECRET: 3328fa814dd582ccd03dbe785cfd683fb8da92b3
+        run: yarn test
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: playwright-report
+          path: packages/e2e-tests/test-results
+          retention-days: 30

.node-version

@@ -0,0 +1 @@
+18.19.0

.nvmrc

@@ -0,0 +1 @@
+18.19.0

.vscode/settings.json

@@ -1,4 +1,7 @@
 {
   "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
+}

docker/Dockerfile

@@ -1,10 +1,10 @@
 # syntax=docker/dockerfile:1
-FROM node:16-alpine
+FROM node:18-alpine
 WORKDIR /automatisch
 
 RUN \
   apk --no-cache add --virtual build-dependencies python3 build-base && \
-  yarn global add @automatisch/cli@0.7.1 --network-timeout 1000000 && \
+  yarn global add @automatisch/cli@0.10.0 --network-timeout 1000000 && \
   rm -rf /usr/local/share/.cache/ && \
   apk del build-dependencies
 

docker/Dockerfile.cloud

@@ -1,17 +1,22 @@
 # syntax=docker/dockerfile:1
-FROM node:16-alpine
+FROM node:18-alpine
-WORKDIR /automatisch
 
 ENV PORT 3000
 
-RUN ls -lna
+RUN \
+  apk --no-cache add --virtual build-dependencies python3 build-base git
 
-# copy the app, note .dockerignore
+RUN git clone https://github.com/automatisch/automatisch.git
-COPY . ./
 
-RUN yarn
+WORKDIR /automatisch
-RUN yarn lerna bootstrap
+
-RUN yarn lerna run --scope=@*/{web,backend,cli} build
+RUN yarn install
+
+RUN if [ "$WORKER" != "true" ]; then cd packages/web && yarn build; fi
+
+RUN \
+  rm -rf /usr/local/share/.cache/ && \
+  apk del build-dependencies
 
 COPY ./docker/entrypoint-cloud.sh /entrypoint-cloud.sh
 

docker/Dockerfile.compose

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM automatischio/automatisch:0.7.1
+FROM automatischio/automatisch:0.10.0
 WORKDIR /automatisch
 
 RUN apk add --no-cache openssl dos2unix

docker/entrypoint-cloud.sh

@@ -2,8 +2,12 @@
 
 set -e
 
+cd packages/backend
+
 if [ -n "$WORKER" ]; then
-  yarn automatisch start-worker
+  yarn start:worker
 else
-  yarn automatisch start
+  yarn db:migrate
+  yarn db:seed:user
+  yarn start
 fi

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.7.1",
+  "version": "0.10.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

package.json

@@ -6,8 +6,7 @@
     "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,cli} lint",
+    "lint": "lerna run --no-bail --stream --parallel --scope=@*/{web,backend} 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": {
@@ -18,7 +17,6 @@
       "**/babel-loader",
       "**/webpack",
       "**/@automatisch/web",
-      "**/@automatisch/types",
       "**/ajv"
     ]
   },

packages/backend/.env-example.test

@@ -0,0 +1,15 @@
+APP_ENV=test
+HOST=localhost
+PROTOCOL=http
+PORT=3000
+LOG_LEVEL=debug
+ENCRYPTION_KEY=sample_encryption_key
+WEBHOOK_SECRET_KEY=sample_webhook_secret_key
+APP_SECRET_KEY=sample_app_secret_key
+POSTGRES_HOST=localhost
+POSTGRES_DATABASE=automatisch_test
+POSTGRES_PORT=5432
+POSTGRES_USERNAME=automatisch_test_user
+POSTGRES_PASSWORD=automatisch_test_user_password
+REDIS_HOST=localhost
+AUTOMATISCH_CLOUD=true

packages/backend/.eslintrc.json

@@ -0,0 +1,12 @@
+{
+  "root": true,
+  "env": {
+    "node": true,
+    "es6": true
+  },
+  "extends": ["eslint:recommended", "prettier"],
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  }
+}

packages/backend/bin/database/client.js

@@ -1,6 +1,6 @@
-import { Client } from 'pg';
+import pg from 'pg';
 
-const client = new Client({
+const client = new pg.Client({
   host: 'localhost',
   user: 'postgres',
   port: 5432,

packages/backend/bin/database/convert-migrations.js

@@ -0,0 +1,31 @@
+import appConfig from '../../src/config/app.js';
+import logger from '../../src/helpers/logger.js';
+import '../../src/config/orm.js';
+import { client as knex } from '../../src/config/database.js';
+
+export const renameMigrationsAsJsFiles = async () => {
+  if (!appConfig.isDev) {
+    return;
+  }
+
+  try {
+    const tableExists = await knex.schema.hasTable('knex_migrations');
+
+    if (tableExists) {
+      await knex('knex_migrations')
+        .where('name', 'like', '%.ts')
+        .update({
+          name: knex.raw("REPLACE(name, '.ts', '.js')"),
+        });
+      logger.info(
+        `Migration file names with typescript renamed as JS file names!`
+      );
+    }
+  } catch (err) {
+    logger.error(err.message);
+  }
+
+  await knex.destroy();
+};
+
+renameMigrationsAsJsFiles();

packages/backend/bin/database/create.js

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

packages/backend/bin/database/create.ts

@@ -1,3 +0,0 @@
-import { createDatabaseAndUser } from './utils';
-
-createDatabaseAndUser();

packages/backend/bin/database/drop.js

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

packages/backend/bin/database/drop.ts

@@ -1,3 +0,0 @@
-import { dropDatabase } from './utils';
-
-dropDatabase();

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

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

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

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

packages/backend/bin/database/utils.js

@@ -1,19 +1,34 @@
-import appConfig from '../../src/config/app';
+import appConfig from '../../src/config/app.js';
-import logger from '../../src/helpers/logger';
+import logger from '../../src/helpers/logger.js';
-import client from './client';
+import client from './client.js';
-import User from '../../src/models/user';
+import User from '../../src/models/user.js';
-import '../../src/config/orm';
+import Role from '../../src/models/role.js';
+import '../../src/config/orm.js';
+import process from 'process';
+
+async function fetchAdminRole() {
+  const role = await Role.query()
+    .where({
+      key: 'admin',
+    })
+    .limit(1)
+    .first();
+
+  return role;
+}
 
 export async function createUser(
   email = 'user@automatisch.io',
   password = 'sample'
 ) {
   const UNIQUE_VIOLATION_CODE = '23505';
+
+  const role = await fetchAdminRole();
   const userParams = {
     email,
     password,
     fullName: 'Initial admin',
-    role: 'admin',
+    roleId: role.id,
   };
 
   try {
@@ -26,12 +41,14 @@ export async function createUser(
       logger.info('No need to seed a user.');
     }
   } catch (err) {
-    if ((err as any).nativeError.code !== UNIQUE_VIOLATION_CODE) {
+    if (err.nativeError.code !== UNIQUE_VIOLATION_CODE) {
       throw err;
     }
 
     logger.info(`User already exists: ${email}`);
   }
+
+  process.exit(0);
 }
 
 export const createDatabaseAndUser = async (
@@ -44,6 +61,7 @@ export const createDatabaseAndUser = async (
   await grantPrivileges(database, user);
 
   await client.end();
+  process.exit(0);
 };
 
 export const createDatabase = async (database = appConfig.postgresDatabase) => {
@@ -53,7 +71,7 @@ export const createDatabase = async (database = appConfig.postgresDatabase) => {
     await client.query(`CREATE DATABASE ${database}`);
     logger.info(`Database: ${database} created!`);
   } catch (err) {
-    if ((err as any).code !== DUPLICATE_DB_CODE) {
+    if (err.code !== DUPLICATE_DB_CODE) {
       throw err;
     }
 
@@ -70,7 +88,7 @@ export const createDatabaseUser = async (user = appConfig.postgresUsername) => {
 
     return result;
   } catch (err) {
-    if ((err as any).code !== DUPLICATE_OBJECT_CODE) {
+    if (err.code !== DUPLICATE_OBJECT_CODE) {
       throw err;
     }
 

packages/backend/database-utils.d.ts

@@ -1 +0,0 @@
-export * from './dist/bin/database/utils';

packages/backend/database-utils.js

@@ -1,2 +0,0 @@
-/* eslint-disable */
-module.exports = require('./dist/bin/database/utils');

packages/backend/database.d.ts

@@ -1 +0,0 @@
-export * from './dist/src/config/database';

packages/backend/database.js

@@ -1,2 +0,0 @@
-/* eslint-disable */
-module.exports = require('./dist/src/config/database');

packages/backend/knexfile.js

@@ -1,6 +1,10 @@
-import appConfig from './src/config/app';
+import { knexSnakeCaseMappers } from 'objection';
+import appConfig from './src/config/app.js';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const fileExtension = appConfig.isDev ? 'ts' : 'js';
+const fileExtension = 'js';
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const knexConfig = {
   client: 'pg',
@@ -12,6 +16,7 @@ const knexConfig = {
     database: appConfig.postgresDatabase,
     ssl: appConfig.postgresEnableSsl,
   },
+  asyncStackTraces: appConfig.isDev,
   searchPath: [appConfig.postgresSchema],
   pool: { min: 0, max: 20 },
   migrations: {
@@ -22,6 +27,7 @@ const knexConfig = {
   seeds: {
     directory: __dirname + '/src/db/seeds',
   },
+  ...(appConfig.isTest ? knexSnakeCaseMappers() : {}),
 };
 
 export default knexConfig;

packages/backend/logger.d.ts

@@ -1 +0,0 @@
-export * from './dist/src/helpers/logger';

packages/backend/logger.js

@@ -1,2 +0,0 @@
-/* eslint-disable */
-module.exports = require('./dist/src/helpers/logger');

packages/backend/package.json

@@ -1,38 +1,36 @@
 {
   "name": "@automatisch/backend",
-  "version": "0.7.1",
+  "version": "0.10.0",
   "license": "See LICENSE file",
   "description": "The open source Zapier alternative. Build workflow automation without spending time and money.",
+  "type": "module",
   "scripts": {
-    "dev": "ts-node-dev --exit-child src/server.ts",
+    "dev": "nodemon --watch 'src/**/*.js' --exec 'node' src/server.js",
-    "worker": "nodemon --watch 'src/**/*.ts' --exec 'ts-node' src/worker.ts",
+    "worker": "nodemon --watch 'src/**/*.js' --exec 'node' src/worker.js",
-    "build": "tsc && yarn copy-statics",
+    "start": "node src/server.js",
-    "build:watch": "nodemon --watch 'src/**/*.ts' --watch 'bin/**/*.ts' --exec yarn build --ext ts",
+    "start:worker": "node src/worker.js",
-    "start": "node dist/src/server.js",
+    "pretest": "APP_ENV=test node ./test/setup/prepare-test-env.js",
-    "test": "ava",
+    "test": "APP_ENV=test vitest run",
     "lint": "eslint . --ignore-path ../../.eslintignore",
-    "db:create": "ts-node ./bin/database/create.ts",
+    "db:create": "node ./bin/database/create.js",
-    "db:seed:user": "ts-node ./bin/database/seed-user.ts",
+    "db:seed:user": "node ./bin/database/seed-user.js",
-    "db:drop": "ts-node ./bin/database/drop.ts",
+    "db:drop": "node ./bin/database/drop.js",
     "db:migration:create": "knex migrate:make",
     "db:rollback": "knex migrate:rollback",
-    "db:migrate": "knex migrate:latest",
+    "db:migrate": "node ./bin/database/convert-migrations.js && knex migrate:latest"
-    "copy-statics": "copyfiles src/**/*.{graphql,json,svg,hbs} dist",
-    "prepack": "yarn build",
-    "prebuild": "rm -rf ./dist"
   },
   "dependencies": {
-    "@automatisch/web": "^0.7.1",
     "@bull-board/express": "^3.10.1",
+    "@casl/ability": "^6.5.0",
     "@graphql-tools/graphql-file-loader": "^7.3.4",
     "@graphql-tools/load": "^7.5.2",
+    "@node-saml/passport-saml": "^4.0.4",
     "@rudderstack/rudder-sdk-node": "^1.1.2",
     "@sentry/node": "^7.42.0",
     "@sentry/tracing": "^7.42.0",
-    "@types/luxon": "^2.3.1",
+    "accounting": "^0.4.1",
-    "@types/xmlrpc": "^1.3.7",
     "ajv-formats": "^2.1.1",
-    "axios": "0.24.0",
+    "axios": "1.6.0",
     "bcrypt": "^5.0.1",
     "bullmq": "^3.0.0",
     "copyfiles": "^2.4.1",
@@ -50,18 +48,26 @@
     "graphql-type-json": "^0.3.2",
     "handlebars": "^4.7.7",
     "http-errors": "~1.6.3",
+    "http-proxy-agent": "^7.0.0",
+    "https-proxy-agent": "^7.0.1",
     "jsonwebtoken": "^9.0.0",
     "knex": "^2.4.0",
+    "libphonenumber-js": "^1.10.48",
     "lodash.get": "^4.4.2",
     "luxon": "2.5.2",
     "memory-cache": "^0.2.0",
     "morgan": "^1.10.0",
     "multer": "1.4.5-lts.1",
+    "node-html-markdown": "^1.3.0",
     "nodemailer": "6.7.0",
     "oauth-1.0a": "^2.2.6",
     "objection": "^3.0.0",
+    "passport": "^0.6.0",
     "pg": "^8.7.1",
     "php-serialize": "^4.0.2",
+    "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"
@@ -73,26 +79,15 @@
     }
   ],
   "homepage": "https://github.com/automatisch/automatisch#readme",
-  "main": "dist/src/app",
+  "main": "src/server",
   "directories": {
     "bin": "bin",
     "src": "src",
     "test": "__tests__"
   },
   "files": [
-    "dist",
     "bin",
-    "src",
+    "src"
-    "server.js",
-    "server.d.ts",
-    "worker.js",
-    "worker.d.ts",
-    "logger.js",
-    "logger.d.ts",
-    "database.js",
-    "database.d.ts",
-    "database-utils.js",
-    "database-utils.d.ts"
   ],
   "repository": {
     "type": "git",
@@ -102,38 +97,9 @@
     "url": "https://github.com/automatisch/automatisch/issues"
   },
   "devDependencies": {
-    "@automatisch/types": "^0.7.1",
-    "@types/bcrypt": "^5.0.0",
-    "@types/bull": "^3.15.8",
-    "@types/cors": "^2.8.12",
-    "@types/crypto-js": "^4.0.2",
-    "@types/express": "^4.17.15",
-    "@types/http-errors": "^1.8.1",
-    "@types/jsonwebtoken": "^8.5.8",
-    "@types/lodash.get": "^4.4.6",
-    "@types/memory-cache": "^0.2.2",
-    "@types/morgan": "^1.9.3",
-    "@types/multer": "1.4.7",
-    "@types/node": "^16.10.2",
-    "@types/nodemailer": "^6.4.4",
-    "@types/pg": "^8.6.1",
-    "@types/pino": "^7.0.5",
-    "ava": "^3.15.0",
     "nodemon": "^2.0.13",
-    "sinon": "^11.1.2",
+    "supertest": "^6.3.3",
-    "ts-node": "^10.2.1",
+    "vitest": "^1.1.3"
-    "ts-node-dev": "^1.1.8"
-  },
-  "ava": {
-    "files": [
-      "test/**/*"
-    ],
-    "extensions": [
-      "ts"
-    ],
-    "require": [
-      "ts-node/register"
-    ]
   },
   "publishConfig": {
     "access": "public"

packages/backend/server.d.ts

@@ -1 +0,0 @@
-export * from './dist/src/server';

packages/backend/server.js

@@ -1,2 +0,0 @@
-/* eslint-disable */
-module.exports = require('./dist/src/server.js');

packages/backend/src/app.js

@@ -2,21 +2,21 @@ import createError from 'http-errors';
 import express from 'express';
 import cors from 'cors';
 
-import { IRequest } from '@automatisch/types';
+import appConfig from './config/app.js';
-import appConfig from './config/app';
+import corsOptions from './config/cors-options.js';
-import corsOptions from './config/cors-options';
+import morgan from './helpers/morgan.js';
-import morgan from './helpers/morgan';
+import * as Sentry from './helpers/sentry.ee.js';
-import * as Sentry from './helpers/sentry.ee';
+import appAssetsHandler from './helpers/app-assets-handler.js';
-import appAssetsHandler from './helpers/app-assets-handler';
+import webUIHandler from './helpers/web-ui-handler.js';
-import webUIHandler from './helpers/web-ui-handler';
+import errorHandler from './helpers/error-handler.js';
-import errorHandler from './helpers/error-handler';
+import './config/orm.js';
-import './config/orm';
 import {
   createBullBoardHandler,
   serverAdapter,
-} from './helpers/create-bull-board-handler';
+} from './helpers/create-bull-board-handler.js';
-import injectBullBoardHandler from './helpers/inject-bull-board-handler';
+import injectBullBoardHandler from './helpers/inject-bull-board-handler.js';
-import router from './routes';
+import router from './routes/index.js';
+import configurePassport from './helpers/passport.js';
 
 createBullBoardHandler(serverAdapter);
 
@@ -32,11 +32,12 @@ injectBullBoardHandler(app, serverAdapter);
 appAssetsHandler(app);
 
 app.use(morgan);
+
 app.use(
   express.json({
     limit: appConfig.requestBodySizeLimit,
     verify(req, res, buf) {
-      (req as IRequest).rawBody = buf;
+      req.rawBody = buf;
     },
   })
 );
@@ -45,11 +46,14 @@ app.use(
     extended: true,
     limit: appConfig.requestBodySizeLimit,
     verify(req, res, buf) {
-      (req as IRequest).rawBody = buf;
+      req.rawBody = buf;
     },
   })
 );
 app.use(cors(corsOptions));
+
+configurePassport(app);
+
 app.use('/', router);
 
 webUIHandler(app);

packages/backend/src/apps/azure-openai/actions/index.js

@@ -0,0 +1,3 @@
+import sendPrompt from './send-prompt/index.js';
+
+export default [sendPrompt];

packages/backend/src/apps/azure-openai/actions/send-prompt/index.js

@@ -0,0 +1,97 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+const castFloatOrUndefined = (value) => {
+  return value === '' ? undefined : parseFloat(value);
+};
+
+export default defineAction({
+  name: 'Send prompt',
+  key: 'sendPrompt',
+  description: 'Creates a completion for the provided prompt and parameters.',
+  arguments: [
+    {
+      label: 'Prompt',
+      key: 'prompt',
+      type: 'string',
+      required: true,
+      variables: true,
+      description: 'The text to analyze.',
+    },
+    {
+      label: 'Temperature',
+      key: 'temperature',
+      type: 'string',
+      required: false,
+      variables: true,
+      description:
+        'What sampling temperature to use, between 0 and 2. Higher values means the model will take more risks. Try 0.9 for more creative applications, and 0 (argmax sampling) for ones with a well-defined answer. We generally recommend altering this or Top P but not both.',
+    },
+    {
+      label: 'Maximum tokens',
+      key: 'maxTokens',
+      type: 'string',
+      required: false,
+      variables: true,
+      description:
+        'The maximum number of tokens to generate in the completion.',
+    },
+    {
+      label: 'Stop Sequence',
+      key: 'stopSequence',
+      type: 'string',
+      required: false,
+      variables: true,
+      description:
+        'Single stop sequence where the API will stop generating further tokens. The returned text will not contain the stop sequence.',
+    },
+    {
+      label: 'Top P',
+      key: 'topP',
+      type: 'string',
+      required: false,
+      variables: true,
+      description:
+        'An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered. We generally recommend altering this or temperature but not both.',
+    },
+    {
+      label: 'Frequency Penalty',
+      key: 'frequencyPenalty',
+      type: 'string',
+      required: false,
+      variables: true,
+      description: `Number between -2.0 and 2.0. Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim.`,
+    },
+    {
+      label: 'Presence Penalty',
+      key: 'presencePenalty',
+      type: 'string',
+      required: false,
+      variables: true,
+      description: `Number between -2.0 and 2.0. Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics.`,
+    },
+  ],
+
+  async run($) {
+    const payload = {
+      model: $.step.parameters.model,
+      prompt: $.step.parameters.prompt,
+      temperature: castFloatOrUndefined($.step.parameters.temperature),
+      max_tokens: castFloatOrUndefined($.step.parameters.maxTokens),
+      stop: $.step.parameters.stopSequence || null,
+      top_p: castFloatOrUndefined($.step.parameters.topP),
+      frequency_penalty: castFloatOrUndefined(
+        $.step.parameters.frequencyPenalty
+      ),
+      presence_penalty: castFloatOrUndefined($.step.parameters.presencePenalty),
+    };
+
+    const { data } = await $.http.post(
+      `/deployments/${$.auth.data.deploymentId}/completions`,
+      payload
+    );
+
+    $.setActionItem({
+      raw: data,
+    });
+  },
+});

packages/backend/src/apps/azure-openai/assets/favicon.svg

@@ -0,0 +1,6 @@
+<svg width="256px" height="260px" viewBox="0 0 256 260" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <title>OpenAI</title>
+    <g>
+        <path d="M239.183914,106.202783 C245.054304,88.5242096 243.02228,69.1733805 233.607599,53.0998864 C219.451678,28.4588021 190.999703,15.7836129 163.213007,21.739505 C147.554077,4.32145883 123.794909,-3.42398554 100.87901,1.41873898 C77.9631105,6.26146349 59.3690093,22.9572536 52.0959621,45.2214219 C33.8436494,48.9644867 18.0901721,60.392749 8.86672513,76.5818033 C-5.443491,101.182962 -2.19544431,132.215255 16.8986662,153.320094 C11.0060865,170.990656 13.0197283,190.343991 22.4238231,206.422991 C36.5975553,231.072344 65.0680342,243.746566 92.8695738,237.783372 C105.235639,251.708249 123.001113,259.630942 141.623968,259.52692 C170.105359,259.552169 195.337611,241.165718 204.037777,214.045661 C222.28734,210.296356 238.038489,198.869783 247.267014,182.68528 C261.404453,158.127515 258.142494,127.262775 239.183914,106.202783 L239.183914,106.202783 Z M141.623968,242.541207 C130.255682,242.559177 119.243876,238.574642 110.519381,231.286197 L112.054146,230.416496 L163.724595,200.590881 C166.340648,199.056444 167.954321,196.256818 167.970781,193.224005 L167.970781,120.373788 L189.815614,133.010026 C190.034132,133.121423 190.186235,133.330564 190.224885,133.572774 L190.224885,193.940229 C190.168603,220.758427 168.442166,242.484864 141.623968,242.541207 Z M37.1575749,197.93062 C31.456498,188.086359 29.4094818,176.546984 31.3766237,165.342426 L32.9113895,166.263285 L84.6329973,196.088901 C87.2389349,197.618207 90.4682717,197.618207 93.0742093,196.088901 L156.255402,159.663793 L156.255402,184.885111 C156.243557,185.149771 156.111725,185.394602 155.89729,185.550176 L103.561776,215.733903 C80.3054953,229.131632 50.5924954,221.165435 37.1575749,197.93062 Z M23.5493181,85.3811273 C29.2899861,75.4733097 38.3511911,67.9162648 49.1287482,64.0478825 L49.1287482,125.438515 C49.0891492,128.459425 50.6965386,131.262556 53.3237748,132.754232 L116.198014,169.025864 L94.3531808,181.662102 C94.1132325,181.789434 93.8257461,181.789434 93.5857979,181.662102 L41.3526015,151.529534 C18.1419426,138.076098 10.1817681,108.385562 23.5493181,85.125333 L23.5493181,85.3811273 Z M203.0146,127.075598 L139.935725,90.4458545 L161.7294,77.8607748 C161.969348,77.7334434 162.256834,77.7334434 162.496783,77.8607748 L214.729979,108.044502 C231.032329,117.451747 240.437294,135.426109 238.871504,154.182739 C237.305714,172.939368 225.050719,189.105572 207.414262,195.67963 L207.414262,134.288998 C207.322521,131.276867 205.650697,128.535853 203.0146,127.075598 Z M224.757116,94.3850867 L223.22235,93.4642272 L171.60306,63.3828173 C168.981293,61.8443751 165.732456,61.8443751 163.110689,63.3828173 L99.9806554,99.8079259 L99.9806554,74.5866077 C99.9533004,74.3254088 100.071095,74.0701869 100.287609,73.9215426 L152.520805,43.7889738 C168.863098,34.3743518 189.174256,35.2529043 204.642579,46.0434841 C220.110903,56.8340638 227.949269,75.5923959 224.757116,94.1804513 L224.757116,94.3850867 Z M88.0606409,139.097931 L66.2158076,126.512851 C65.9950399,126.379091 65.8450965,126.154176 65.8065367,125.898945 L65.8065367,65.684966 C65.8314495,46.8285367 76.7500605,29.6846032 93.8270852,21.6883055 C110.90411,13.6920079 131.063833,16.2835462 145.5632,28.338998 L144.028434,29.2086986 L92.3579852,59.0343142 C89.7419327,60.5687513 88.1282597,63.3683767 88.1117998,66.4011901 L88.0606409,139.097931 Z M99.9294965,113.5185 L128.06687,97.3011417 L156.255402,113.5185 L156.255402,145.953218 L128.169187,162.170577 L99.9806554,145.953218 L99.9294965,113.5185 Z" fill="#000000"></path>
+    </g>
+</svg>

packages/backend/src/apps/azure-openai/auth/index.js

@@ -0,0 +1,58 @@
+import verifyCredentials from './verify-credentials.js';
+import isStillVerified from './is-still-verified.js';
+
+export default {
+  fields: [
+    {
+      key: 'screenName',
+      label: 'Screen Name',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description:
+        'Screen name of your connection to be used on Automatisch UI.',
+      clickToCopy: false,
+    },
+    {
+      key: 'yourResourceName',
+      label: 'Your Resource Name',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: 'The name of your Azure OpenAI Resource.',
+      docUrl: 'https://automatisch.io/docs/azure-openai#your-resource-name',
+      clickToCopy: false,
+    },
+    {
+      key: 'deploymentId',
+      label: 'Deployment ID',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: 'The deployment name you chose when you deployed the model.',
+      docUrl: 'https://automatisch.io/docs/azure-openai#deployment-id',
+      clickToCopy: false,
+    },
+    {
+      key: 'apiKey',
+      label: 'API Key',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: 'Azure OpenAI API key of your account.',
+      docUrl: 'https://automatisch.io/docs/azure-openai#api-key',
+      clickToCopy: false,
+    },
+  ],
+
+  verifyCredentials,
+  isStillVerified,
+};

packages/backend/src/apps/azure-openai/auth/is-still-verified.js

@@ -0,0 +1,6 @@
+const isStillVerified = async ($) => {
+  await $.http.get('/fine_tuning/jobs');
+  return true;
+};
+
+export default isStillVerified;

packages/backend/src/apps/azure-openai/auth/verify-credentials.js

@@ -0,0 +1,5 @@
+const verifyCredentials = async ($) => {
+  await $.http.get('/fine_tuning/jobs');
+};
+
+export default verifyCredentials;

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

@@ -0,0 +1,13 @@
+const addAuthHeader = ($, requestConfig) => {
+  if ($.auth.data?.apiKey) {
+    requestConfig.headers['api-key'] = $.auth.data.apiKey;
+  }
+
+  requestConfig.params = {
+    'api-version': '2023-10-01-preview',
+  };
+
+  return requestConfig;
+};
+
+export default addAuthHeader;

packages/backend/src/apps/azure-openai/common/set-base-url.js

@@ -0,0 +1,11 @@
+const setBaseUrl = ($, requestConfig) => {
+  const yourResourceName = $.auth.data.yourResourceName;
+
+  if (yourResourceName) {
+    requestConfig.baseURL = `https://${yourResourceName}.openai.azure.com/openai`;
+  }
+
+  return requestConfig;
+};
+
+export default setBaseUrl;

packages/backend/src/apps/azure-openai/index.js

@@ -0,0 +1,20 @@
+import defineApp from '../../helpers/define-app.js';
+import setBaseUrl from './common/set-base-url.js';
+import addAuthHeader from './common/add-auth-header.js';
+import auth from './auth/index.js';
+import actions from './actions/index.js';
+
+export default defineApp({
+  name: 'Azure OpenAI',
+  key: 'azure-openai',
+  baseUrl:
+    'https://azure.microsoft.com/en-us/products/ai-services/openai-service',
+  apiBaseUrl: '',
+  iconUrl: '{BASE_URL}/apps/azure-openai/assets/favicon.svg',
+  authDocUrl: 'https://automatisch.io/docs/apps/azure-openai/connection',
+  primaryColor: '000000',
+  supportsConnections: true,
+  beforeRequest: [setBaseUrl, addAuthHeader],
+  auth,
+  actions,
+});

packages/backend/src/apps/carbone/actions/add-template/index.js

@@ -0,0 +1,35 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Add Template',
+  key: 'addTemplate',
+  description:
+    'Creates an attachment of a specified object by given parent ID.',
+  arguments: [
+    {
+      label: 'Templete Data',
+      key: 'templateData',
+      type: 'string',
+      required: true,
+      variables: true,
+      description: 'The content of your new Template in XML/HTML format.',
+    },
+  ],
+
+  async run($) {
+    const templateData = $.step.parameters.templateData;
+
+    const base64Data = Buffer.from(templateData).toString('base64');
+    const dataURI = `data:application/xml;base64,${base64Data}`;
+
+    const body = JSON.stringify({ template: dataURI });
+
+    const response = await $.http.post('/template', body, {
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+
+    $.setActionItem({ raw: response.data });
+  },
+});

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

@@ -0,0 +1,3 @@
+import addTemplate from './add-template/index.js';
+
+export default [addTemplate];

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

@@ -0,0 +1,444 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100%" viewBox="0 0 1173 1173" enable-background="new 0 0 1173 1173" xml:space="preserve">
+<path fill="#73348B" opacity="1.000000" stroke="none" 
+	d="
+M1174.000000,208.000000 
+	C1174.000000,529.969421 1174.000000,851.938782 1174.000000,1173.954102 
+	C783.067810,1173.954102 392.135559,1173.954102 1.101677,1173.954102 
+	C1.101677,783.104980 1.101677,392.209930 1.101677,1.000000 
+	C322.697510,1.000000 644.395142,1.000000 966.516235,1.467920 
+	C966.918274,68.235474 966.895691,134.535110 966.877258,200.834747 
+	C966.875183,208.314804 966.885986,208.322311 974.623108,208.322571 
+	C1038.924072,208.324631 1103.225098,208.326889 1167.526123,208.310104 
+	C1169.684082,208.309540 1171.842041,208.107910 1174.000000,208.000000 
+M824.469116,403.972260 
+	C830.640320,396.844513 836.811584,389.716736 843.084839,382.471130 
+	C813.026611,353.649353 780.256958,329.661011 741.486328,314.979523 
+	C680.713013,291.966217 618.102173,287.454407 554.867737,301.133331 
+	C463.817413,320.829376 397.312988,373.276550 356.951416,457.320282 
+	C326.804779,520.093689 319.957764,586.465027 335.155365,654.111511 
+	C358.404633,757.597168 419.946594,829.052856 520.224731,865.190979 
+	C575.706055,885.185242 632.887451,885.395691 690.185303,873.820862 
+	C753.158081,861.099548 803.501465,826.733521 847.328979,780.124756 
+	C825.522522,758.991638 803.799194,737.939087 781.866882,716.683960 
+	C775.039185,722.581055 767.314697,729.376404 759.459290,736.016846 
+	C716.790833,772.086792 668.088501,791.050049 611.649048,788.182129 
+	C555.974548,785.353088 510.796692,761.934998 476.366638,718.347046 
+	C450.585236,685.708313 437.160706,648.031494 433.752258,606.690613 
+	C430.193268,563.523926 437.309692,522.406311 457.904602,484.052490 
+	C496.945190,411.347198 573.378845,374.580780 654.712402,388.765686 
+	C691.388062,395.162079 723.361389,411.383057 752.404175,434.001740 
+	C761.432556,441.033173 770.043213,448.601013 779.130859,456.160980 
+	C794.123657,438.910675 809.069336,421.714569 824.469116,403.972260 
+M401.126434,1003.500000 
+	C401.122375,996.333740 401.039398,989.166199 401.152191,982.001770 
+	C401.198700,979.046997 400.149170,977.760315 397.091583,977.847290 
+	C392.096008,977.989441 387.061035,978.231079 382.102264,977.778320 
+	C376.825531,977.296387 375.754608,979.441406 375.775360,984.315125 
+	C375.949005,1025.145630 375.873474,1065.977417 375.874237,1106.808716 
+	C375.874329,1113.141724 375.994049,1119.477539 375.836487,1125.806519 
+	C375.755646,1129.053101 376.993805,1130.258667 380.217560,1130.162231 
+	C385.712311,1129.997559 391.222198,1129.953491 396.712982,1130.175049 
+	C400.378265,1130.322998 401.327179,1128.650757 401.160339,1125.375610 
+	C400.987305,1121.979004 401.121826,1118.566772 401.121826,1114.051758 
+	C403.029083,1115.849609 404.038116,1116.655273 404.875366,1117.611572 
+	C423.297913,1138.649780 456.085083,1135.565308 472.987305,1118.665161 
+	C494.109619,1097.545654 495.745544,1057.582886 476.289124,1034.845947 
+	C458.642456,1014.223816 423.619873,1010.312439 404.695007,1033.663574 
+	C403.933044,1034.603882 402.896790,1035.321899 401.126709,1036.922485 
+	C401.126709,1025.377563 401.126709,1014.938782 401.126434,1003.500000 
+M1021.364685,1102.039429 
+	C1034.668091,1125.202515 1054.950562,1134.733032 1081.114746,1132.114380 
+	C1116.971191,1128.525757 1140.394165,1093.509888 1130.352783,1058.871704 
+	C1120.842163,1026.064697 1084.911865,1009.039368 1051.827393,1021.662964 
+	C1020.072083,1033.779419 1006.094421,1069.964478 1021.364685,1102.039429 
+M513.859009,1053.461792 
+	C508.981232,1065.614258 508.319275,1078.089722 511.612946,1090.667114 
+	C518.928467,1118.602539 545.601379,1135.665771 576.077942,1132.138428 
+	C615.868713,1127.533081 639.243103,1085.250000 621.290771,1049.613525 
+	C609.925598,1027.053101 590.627502,1017.015625 565.767517,1017.961548 
+	C541.582703,1018.881775 524.357849,1030.779541 513.859009,1053.461792 
+M853.945312,1105.526489 
+	C844.979370,1111.390137 835.234131,1113.082764 824.789001,1110.928833 
+	C812.187134,1108.330078 801.815186,1096.424561 801.983032,1084.128296 
+	C803.915649,1084.128296 805.872803,1084.128418 807.829956,1084.128296 
+	C827.828918,1084.128174 847.827942,1084.128174 867.826904,1084.128052 
+	C883.022278,1084.128052 883.416565,1084.089355 881.911011,1068.743774 
+	C877.873352,1027.588623 845.873840,1010.303040 812.589294,1020.461792 
+	C788.140564,1027.923828 771.315674,1053.597778 776.625183,1086.417480 
+	C782.995667,1125.795166 822.767029,1141.211426 855.517578,1128.350586 
+	C864.166870,1124.953979 871.321899,1119.494873 877.282959,1111.812744 
+	C872.197815,1107.281738 867.508911,1103.103882 862.714783,1098.832153 
+	C859.777344,1101.088501 857.158447,1103.100098 853.945312,1105.526489 
+M183.035294,1022.439941 
+	C178.726364,1024.044678 174.417435,1025.649414 169.759094,1027.384277 
+	C172.080597,1034.339355 174.168320,1040.594116 176.396927,1047.270874 
+	C178.710007,1046.498047 180.428452,1045.982422 182.104675,1045.354126 
+	C192.414581,1041.489502 203.049866,1039.981567 214.012650,1041.017212 
+	C228.197418,1042.357178 237.230057,1053.265137 234.370621,1065.622192 
+	C233.945877,1065.733521 233.456528,1066.014160 233.019272,1065.948486 
+	C231.544067,1065.726807 230.081848,1065.406616 228.624466,1065.080322 
+	C213.432663,1061.679199 198.251007,1060.834473 183.260117,1065.925537 
+	C168.246078,1071.024536 160.203674,1082.376099 160.159256,1097.991577 
+	C160.116211,1113.124634 168.617416,1125.277100 183.512024,1129.868774 
+	C201.272339,1135.343872 217.762161,1132.975952 231.922165,1119.980591 
+	C232.681229,1119.283936 233.598526,1118.759888 234.998825,1117.756470 
+	C234.998825,1120.660034 235.167923,1122.828491 234.961670,1124.960815 
+	C234.595810,1128.743408 235.836517,1130.435547 239.938004,1130.198853 
+	C245.253296,1129.892090 250.601852,1130.021362 255.931290,1130.154541 
+	C258.904449,1130.228760 260.057526,1129.146118 260.038300,1126.091797 
+	C259.899628,1104.095337 260.293976,1082.087280 259.708466,1060.104492 
+	C259.149353,1039.110596 247.823425,1025.003418 228.752792,1020.447083 
+	C213.662979,1016.841919 198.651810,1018.154236 183.035294,1022.439941 
+M652.674988,1084.500000 
+	C652.676819,1097.990356 652.774353,1111.481812 652.619568,1124.970337 
+	C652.575684,1128.797485 653.756165,1130.430420 657.763428,1130.184448 
+	C662.243225,1129.909424 666.753052,1130.130493 671.249817,1130.123413 
+	C677.988098,1130.112915 677.994995,1130.108398 677.998840,1123.280029 
+	C678.009644,1104.127197 677.813293,1084.971313 678.088196,1065.822388 
+	C678.289795,1051.782104 687.650574,1041.728882 700.475464,1040.969238 
+	C714.725037,1040.125244 723.562256,1047.280884 725.706665,1061.495361 
+	C726.002808,1063.458374 725.985596,1065.479614 725.987732,1067.474121 
+	C726.007690,1086.627075 726.075562,1105.780396 725.937012,1124.932373 
+	C725.910034,1128.659790 726.763428,1130.436401 730.909912,1130.197876 
+	C736.388123,1129.882690 741.898499,1130.048462 747.393127,1130.132080 
+	C750.111389,1130.173340 751.333618,1129.085205 751.318970,1126.315796 
+	C751.187561,1101.504028 751.651367,1076.672607 750.778564,1051.887817 
+	C750.329590,1039.136963 743.986084,1028.674927 732.321106,1022.254761 
+	C716.863159,1013.746887 695.690918,1017.041931 683.479919,1029.807129 
+	C681.911743,1031.446533 680.418274,1033.157227 677.994934,1035.817871 
+	C677.994934,1031.179810 677.847046,1027.753906 678.037964,1024.347046 
+	C678.215881,1021.172424 677.140076,1019.820496 673.800659,1019.952393 
+	C668.645813,1020.156006 663.460022,1020.260315 658.319153,1019.922363 
+	C653.942261,1019.634521 652.544373,1021.128174 652.590515,1025.542358 
+	C652.792175,1044.859741 652.675354,1064.180542 652.674988,1084.500000 
+M119.317238,1046.101074 
+	C122.268578,1048.446411 125.219917,1050.791626 127.387344,1052.514038 
+	C132.109711,1048.247925 136.374313,1044.289062 140.759842,1040.468872 
+	C144.010681,1037.637085 143.275986,1035.555298 140.351669,1032.810791 
+	C125.930077,1019.275879 108.562424,1015.442383 89.835030,1018.619995 
+	C58.671745,1023.907654 39.333969,1050.496826 43.188984,1083.193359 
+	C45.926426,1106.411377 59.195229,1122.338257 81.478561,1129.875244 
+	C103.477272,1137.315918 128.440613,1130.652588 142.387802,1114.456543 
+	C144.090958,1112.478760 144.008331,1111.254517 142.279175,1109.447876 
+	C138.256943,1105.245117 134.418365,1100.866577 130.299011,1096.332031 
+	C121.771889,1103.853394 113.867172,1109.740845 103.144859,1110.191895 
+	C92.244728,1110.650269 83.239876,1107.153076 76.138634,1098.826416 
+	C65.223991,1086.028564 65.297775,1064.157593 76.319031,1051.184937 
+	C87.046638,1038.557983 103.476791,1036.430054 119.317238,1046.101074 
+M353.950317,1043.008423 
+	C354.006683,1036.186401 353.906464,1029.358154 354.180176,1022.544922 
+	C354.335571,1018.677124 352.771240,1017.653687 349.151764,1017.919495 
+	C335.330078,1018.934265 325.588013,1026.116211 318.604279,1037.643921 
+	C317.750885,1039.052734 316.890594,1040.457275 316.033447,1041.863770 
+	C315.121674,1035.918945 314.900055,1030.423950 315.194824,1024.956665 
+	C315.413696,1020.897034 313.799438,1019.733093 309.981384,1019.938782 
+	C305.168030,1020.198242 300.312347,1020.256714 295.507935,1019.924500 
+	C291.198883,1019.626587 289.697205,1020.959900 289.777374,1025.465820 
+	C290.040833,1040.276245 289.874969,1055.094116 289.875153,1069.909180 
+	C289.875397,1088.219849 289.984222,1106.531616 289.796387,1124.840332 
+	C289.753448,1129.024658 291.144775,1130.494019 295.243988,1130.181030 
+	C298.884857,1129.903076 302.564056,1130.154053 306.225861,1130.119141 
+	C316.127838,1130.024902 314.970276,1131.203003 315.137146,1121.384644 
+	C315.383026,1106.919067 314.932556,1092.386353 316.201233,1078.007690 
+	C317.784821,1060.059814 328.779388,1048.418091 344.942749,1045.376465 
+	C347.832062,1044.832642 350.733795,1044.354858 353.950317,1043.008423 
+M970.561462,1130.149170 
+	C976.347717,1130.149170 982.133972,1130.149170 988.190430,1130.149170 
+	C988.190430,1093.234131 988.190430,1056.859741 988.190430,1020.333618 
+	C979.702515,1020.333618 971.488037,1020.333618 963.325317,1020.333618 
+	C963.325317,1057.058838 963.325317,1093.449585 963.325317,1130.149170 
+	C965.622131,1130.149170 967.600586,1130.149170 970.561462,1130.149170 
+M931.087708,1129.856323 
+	C931.087708,1120.373291 931.087708,1110.890259 931.087708,1101.511963 
+	C922.010315,1101.511963 913.093201,1101.511963 904.095581,1101.511963 
+	C904.095581,1111.126099 904.095581,1120.382812 904.095581,1130.103516 
+	C912.953064,1130.103516 921.562012,1130.103516 931.087708,1129.856323 
+M989.143494,1000.348511 
+	C989.143494,993.401855 989.143494,986.455139 989.143494,979.396606 
+	C979.834900,979.396606 970.989380,979.396606 962.400879,979.396606 
+	C962.400879,987.527710 962.400879,995.258179 962.400879,1003.146362 
+	C970.452820,1003.146362 978.106445,1003.221008 985.755371,1003.064941 
+	C986.887451,1003.041870 987.997314,1001.928955 989.143494,1000.348511 
+z"/>
+<path fill="#B497C6" opacity="1.000000" stroke="none" 
+	d="
+M1174.000000,207.750000 
+	C1171.842041,208.107910 1169.684082,208.309540 1167.526123,208.310104 
+	C1103.225098,208.326889 1038.924072,208.324631 974.623108,208.322571 
+	C966.885986,208.322311 966.875183,208.314804 966.877258,200.834747 
+	C966.895691,134.535110 966.918274,68.235474 966.969849,1.467920 
+	C967.000000,1.000000 967.500000,1.000000 967.892212,1.300326 
+	C968.620972,1.969603 968.943176,2.352815 969.295898,2.705561 
+	C1036.645020,70.060425 1103.995605,137.413895 1171.356201,204.757263 
+	C1172.170776,205.571564 1173.115845,206.255310 1174.000000,207.000000 
+	C1174.000000,207.000000 1174.000000,207.500000 1174.000000,207.750000 
+z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" 
+	d="
+M1174.000000,206.533020 
+	C1173.115845,206.255310 1172.170776,205.571564 1171.356201,204.757263 
+	C1103.995605,137.413895 1036.645020,70.060425 969.295898,2.705561 
+	C968.943176,2.352815 968.620972,1.969603 968.142212,1.300326 
+	C1036.594238,1.000000 1105.188599,1.000000 1174.000000,1.000000 
+	C1174.000000,69.355194 1174.000000,137.710617 1174.000000,206.533020 
+z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" 
+	d="
+M824.242065,404.245361 
+	C809.069336,421.714569 794.123657,438.910675 779.130859,456.160980 
+	C770.043213,448.601013 761.432556,441.033173 752.404175,434.001740 
+	C723.361389,411.383057 691.388062,395.162079 654.712402,388.765686 
+	C573.378845,374.580780 496.945190,411.347198 457.904602,484.052490 
+	C437.309692,522.406311 430.193268,563.523926 433.752258,606.690613 
+	C437.160706,648.031494 450.585236,685.708313 476.366638,718.347046 
+	C510.796692,761.934998 555.974548,785.353088 611.649048,788.182129 
+	C668.088501,791.050049 716.790833,772.086792 759.459290,736.016846 
+	C767.314697,729.376404 775.039185,722.581055 781.866882,716.683960 
+	C803.799194,737.939087 825.522522,758.991638 847.328979,780.124756 
+	C803.501465,826.733521 753.158081,861.099548 690.185303,873.820862 
+	C632.887451,885.395691 575.706055,885.185242 520.224731,865.190979 
+	C419.946594,829.052856 358.404633,757.597168 335.155365,654.111511 
+	C319.957764,586.465027 326.804779,520.093689 356.951416,457.320282 
+	C397.312988,373.276550 463.817413,320.829376 554.867737,301.133331 
+	C618.102173,287.454407 680.713013,291.966217 741.486328,314.979523 
+	C780.256958,329.661011 813.026611,353.649353 843.084839,382.471130 
+	C836.811584,389.716736 830.640320,396.844513 824.242065,404.245361 
+z"/>
+<path fill="#B496C6" opacity="1.000000" stroke="none" 
+	d="
+M401.126587,1004.000000 
+	C401.126709,1014.938782 401.126709,1025.377563 401.126709,1036.922485 
+	C402.896790,1035.321899 403.933044,1034.603882 404.695007,1033.663574 
+	C423.619873,1010.312439 458.642456,1014.223816 476.289124,1034.845947 
+	C495.745544,1057.582886 494.109619,1097.545654 472.987305,1118.665161 
+	C456.085083,1135.565308 423.297913,1138.649780 404.875366,1117.611572 
+	C404.038116,1116.655273 403.029083,1115.849609 401.121826,1114.051758 
+	C401.121826,1118.566772 400.987305,1121.979004 401.160339,1125.375610 
+	C401.327179,1128.650757 400.378265,1130.322998 396.712982,1130.175049 
+	C391.222198,1129.953491 385.712311,1129.997559 380.217560,1130.162231 
+	C376.993805,1130.258667 375.755646,1129.053101 375.836487,1125.806519 
+	C375.994049,1119.477539 375.874329,1113.141724 375.874237,1106.808716 
+	C375.873474,1065.977417 375.949005,1025.145630 375.775360,984.315125 
+	C375.754608,979.441406 376.825531,977.296387 382.102264,977.778320 
+	C387.061035,978.231079 392.096008,977.989441 397.091583,977.847290 
+	C400.149170,977.760315 401.198700,979.046997 401.152191,982.001770 
+	C401.039398,989.166199 401.122375,996.333740 401.126587,1004.000000 
+M401.102875,1069.011719 
+	C400.098053,1078.886963 401.329559,1088.256470 407.101685,1096.684570 
+	C420.591766,1116.381714 449.957458,1114.592529 459.843262,1092.900513 
+	C462.811829,1086.386719 463.929352,1078.394409 463.659058,1071.163086 
+	C462.954895,1052.325073 448.612427,1039.179199 431.024689,1039.892334 
+	C416.229248,1040.492432 405.168213,1050.977661 401.102875,1069.011719 
+z"/>
+<path fill="#FEFDFE" opacity="1.000000" stroke="none" 
+	d="
+M1021.202576,1101.701294 
+	C1006.094421,1069.964478 1020.072083,1033.779419 1051.827393,1021.662964 
+	C1084.911865,1009.039368 1120.842163,1026.064697 1130.352783,1058.871704 
+	C1140.394165,1093.509888 1116.971191,1128.525757 1081.114746,1132.114380 
+	C1054.950562,1134.733032 1034.668091,1125.202515 1021.202576,1101.701294 
+M1063.986572,1041.223145 
+	C1048.638306,1046.359863 1041.596069,1057.693604 1040.531982,1073.203491 
+	C1038.714111,1099.699341 1064.766113,1118.165283 1088.315552,1107.193970 
+	C1103.746460,1100.005005 1111.074951,1080.915771 1105.178711,1063.268677 
+	C1099.385498,1045.930298 1083.597778,1037.239746 1063.986572,1041.223145 
+z"/>
+<path fill="#B396C5" opacity="1.000000" stroke="none" 
+	d="
+M513.996948,1053.104736 
+	C524.357849,1030.779541 541.582703,1018.881775 565.767517,1017.961548 
+	C590.627502,1017.015625 609.925598,1027.053101 621.290771,1049.613525 
+	C639.243103,1085.250000 615.868713,1127.533081 576.077942,1132.138428 
+	C545.601379,1135.665771 518.928467,1118.602539 511.612946,1090.667114 
+	C508.319275,1078.089722 508.981232,1065.614258 513.996948,1053.104736 
+M562.260620,1040.444092 
+	C546.615784,1043.979858 537.547485,1054.070801 535.297913,1070.447632 
+	C533.121765,1086.289917 541.953796,1102.308838 555.941284,1107.888672 
+	C570.341492,1113.633301 586.898376,1109.268066 595.135681,1096.926514 
+	C603.733704,1084.044556 604.355286,1070.265991 596.774170,1056.799438 
+	C589.497620,1043.873901 577.771179,1038.791748 562.260620,1040.444092 
+z"/>
+<path fill="#B396C5" opacity="1.000000" stroke="none" 
+	d="
+M854.242432,1105.319092 
+	C857.158447,1103.100098 859.777344,1101.088501 862.714783,1098.832153 
+	C867.508911,1103.103882 872.197815,1107.281738 877.282959,1111.812744 
+	C871.321899,1119.494873 864.166870,1124.953979 855.517578,1128.350586 
+	C822.767029,1141.211426 782.995667,1125.795166 776.625183,1086.417480 
+	C771.315674,1053.597778 788.140564,1027.923828 812.589294,1020.461792 
+	C845.873840,1010.303040 877.873352,1027.588623 881.911011,1068.743774 
+	C883.416565,1084.089355 883.022278,1084.128052 867.826904,1084.128052 
+	C847.827942,1084.128174 827.828918,1084.128174 807.829956,1084.128296 
+	C805.872803,1084.128418 803.915649,1084.128296 801.983032,1084.128296 
+	C801.815186,1096.424561 812.187134,1108.330078 824.789001,1110.928833 
+	C835.234131,1113.082764 844.979370,1111.390137 854.242432,1105.319092 
+M807.682800,1067.153442 
+	C823.922729,1067.153442 840.162659,1067.153442 856.360352,1067.153442 
+	C857.024231,1051.490723 843.821167,1038.060181 828.868347,1038.415405 
+	C814.209839,1038.763672 800.809204,1052.746582 801.885498,1066.903320 
+	C803.478333,1066.985229 805.112427,1067.069336 807.682800,1067.153442 
+z"/>
+<path fill="#B396C6" opacity="1.000000" stroke="none" 
+	d="
+M183.418549,1022.317383 
+	C198.651810,1018.154236 213.662979,1016.841919 228.752792,1020.447083 
+	C247.823425,1025.003418 259.149353,1039.110596 259.708466,1060.104492 
+	C260.293976,1082.087280 259.899628,1104.095337 260.038300,1126.091797 
+	C260.057526,1129.146118 258.904449,1130.228760 255.931290,1130.154541 
+	C250.601852,1130.021362 245.253296,1129.892090 239.938004,1130.198853 
+	C235.836517,1130.435547 234.595810,1128.743408 234.961670,1124.960815 
+	C235.167923,1122.828491 234.998825,1120.660034 234.998825,1117.756470 
+	C233.598526,1118.759888 232.681229,1119.283936 231.922165,1119.980591 
+	C217.762161,1132.975952 201.272339,1135.343872 183.512024,1129.868774 
+	C168.617416,1125.277100 160.116211,1113.124634 160.159256,1097.991577 
+	C160.203674,1082.376099 168.246078,1071.024536 183.260117,1065.925537 
+	C198.251007,1060.834473 213.432663,1061.679199 228.624466,1065.080322 
+	C230.081848,1065.406616 231.544067,1065.726807 233.019272,1065.948486 
+	C233.456528,1066.014160 233.945877,1065.733521 234.370621,1065.622192 
+	C237.230057,1053.265137 228.197418,1042.357178 214.012650,1041.017212 
+	C203.049866,1039.981567 192.414581,1041.489502 182.104675,1045.354126 
+	C180.428452,1045.982422 178.710007,1046.498047 176.396927,1047.270874 
+	C174.168320,1040.594116 172.080597,1034.339355 169.759094,1027.384277 
+	C174.417435,1025.649414 178.726364,1024.044678 183.418549,1022.317383 
+M222.614487,1110.282959 
+	C232.280441,1105.292969 236.480362,1097.197876 235.760620,1086.535889 
+	C235.661087,1085.061401 234.448975,1082.775879 233.263031,1082.397217 
+	C220.997086,1078.481323 208.516418,1076.766968 196.064621,1081.398193 
+	C188.557663,1084.190308 184.559586,1090.745972 185.061066,1098.121948 
+	C185.541321,1105.185791 190.386749,1110.687134 198.052612,1112.792114 
+	C206.277649,1115.050659 214.217789,1113.966431 222.614487,1110.282959 
+z"/>
+<path fill="#B497C6" opacity="1.000000" stroke="none" 
+	d="
+M652.674561,1084.000000 
+	C652.675354,1064.180542 652.792175,1044.859741 652.590515,1025.542358 
+	C652.544373,1021.128174 653.942261,1019.634521 658.319153,1019.922363 
+	C663.460022,1020.260315 668.645813,1020.156006 673.800659,1019.952393 
+	C677.140076,1019.820496 678.215881,1021.172424 678.037964,1024.347046 
+	C677.847046,1027.753906 677.994934,1031.179810 677.994934,1035.817871 
+	C680.418274,1033.157227 681.911743,1031.446533 683.479919,1029.807129 
+	C695.690918,1017.041931 716.863159,1013.746887 732.321106,1022.254761 
+	C743.986084,1028.674927 750.329590,1039.136963 750.778564,1051.887817 
+	C751.651367,1076.672607 751.187561,1101.504028 751.318970,1126.315796 
+	C751.333618,1129.085205 750.111389,1130.173340 747.393127,1130.132080 
+	C741.898499,1130.048462 736.388123,1129.882690 730.909912,1130.197876 
+	C726.763428,1130.436401 725.910034,1128.659790 725.937012,1124.932373 
+	C726.075562,1105.780396 726.007690,1086.627075 725.987732,1067.474121 
+	C725.985596,1065.479614 726.002808,1063.458374 725.706665,1061.495361 
+	C723.562256,1047.280884 714.725037,1040.125244 700.475464,1040.969238 
+	C687.650574,1041.728882 678.289795,1051.782104 678.088196,1065.822388 
+	C677.813293,1084.971313 678.009644,1104.127197 677.998840,1123.280029 
+	C677.994995,1130.108398 677.988098,1130.112915 671.249817,1130.123413 
+	C666.753052,1130.130493 662.243225,1129.909424 657.763428,1130.184448 
+	C653.756165,1130.430420 652.575684,1128.797485 652.619568,1124.970337 
+	C652.774353,1111.481812 652.676819,1097.990356 652.674561,1084.000000 
+z"/>
+<path fill="#B396C5" opacity="1.000000" stroke="none" 
+	d="
+M119.017403,1045.897461 
+	C103.476791,1036.430054 87.046638,1038.557983 76.319031,1051.184937 
+	C65.297775,1064.157593 65.223991,1086.028564 76.138634,1098.826416 
+	C83.239876,1107.153076 92.244728,1110.650269 103.144859,1110.191895 
+	C113.867172,1109.740845 121.771889,1103.853394 130.299011,1096.332031 
+	C134.418365,1100.866577 138.256943,1105.245117 142.279175,1109.447876 
+	C144.008331,1111.254517 144.090958,1112.478760 142.387802,1114.456543 
+	C128.440613,1130.652588 103.477272,1137.315918 81.478561,1129.875244 
+	C59.195229,1122.338257 45.926426,1106.411377 43.188984,1083.193359 
+	C39.333969,1050.496826 58.671745,1023.907654 89.835030,1018.619995 
+	C108.562424,1015.442383 125.930077,1019.275879 140.351669,1032.810791 
+	C143.275986,1035.555298 144.010681,1037.637085 140.759842,1040.468872 
+	C136.374313,1044.289062 132.109711,1048.247925 127.387344,1052.514038 
+	C125.219917,1050.791626 122.268578,1048.446411 119.017403,1045.897461 
+z"/>
+<path fill="#B497C6" opacity="1.000000" stroke="none" 
+	d="
+M353.790070,1043.427490 
+	C350.733795,1044.354858 347.832062,1044.832642 344.942749,1045.376465 
+	C328.779388,1048.418091 317.784821,1060.059814 316.201233,1078.007690 
+	C314.932556,1092.386353 315.383026,1106.919067 315.137146,1121.384644 
+	C314.970276,1131.203003 316.127838,1130.024902 306.225861,1130.119141 
+	C302.564056,1130.154053 298.884857,1129.903076 295.243988,1130.181030 
+	C291.144775,1130.494019 289.753448,1129.024658 289.796387,1124.840332 
+	C289.984222,1106.531616 289.875397,1088.219849 289.875153,1069.909180 
+	C289.874969,1055.094116 290.040833,1040.276245 289.777374,1025.465820 
+	C289.697205,1020.959900 291.198883,1019.626587 295.507935,1019.924500 
+	C300.312347,1020.256714 305.168030,1020.198242 309.981384,1019.938782 
+	C313.799438,1019.733093 315.413696,1020.897034 315.194824,1024.956665 
+	C314.900055,1030.423950 315.121674,1035.918945 316.033447,1041.863770 
+	C316.890594,1040.457275 317.750885,1039.052734 318.604279,1037.643921 
+	C325.588013,1026.116211 335.330078,1018.934265 349.151764,1017.919495 
+	C352.771240,1017.653687 354.335571,1018.677124 354.180176,1022.544922 
+	C353.906464,1029.358154 354.006683,1036.186401 353.790070,1043.427490 
+z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" 
+	d="
+M970.070190,1130.149170 
+	C967.600586,1130.149170 965.622131,1130.149170 963.325317,1130.149170 
+	C963.325317,1093.449585 963.325317,1057.058838 963.325317,1020.333618 
+	C971.488037,1020.333618 979.702515,1020.333618 988.190430,1020.333618 
+	C988.190430,1056.859741 988.190430,1093.234131 988.190430,1130.149170 
+	C982.133972,1130.149170 976.347717,1130.149170 970.070190,1130.149170 
+z"/>
+<path fill="#FCFBFD" opacity="1.000000" stroke="none" 
+	d="
+M930.629333,1129.979980 
+	C921.562012,1130.103516 912.953064,1130.103516 904.095581,1130.103516 
+	C904.095581,1120.382812 904.095581,1111.126099 904.095581,1101.511963 
+	C913.093201,1101.511963 922.010315,1101.511963 931.087708,1101.511963 
+	C931.087708,1110.890259 931.087708,1120.373291 930.629333,1129.979980 
+z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" 
+	d="
+M989.130493,1000.834351 
+	C987.997314,1001.928955 986.887451,1003.041870 985.755371,1003.064941 
+	C978.106445,1003.221008 970.452820,1003.146362 962.400879,1003.146362 
+	C962.400879,995.258179 962.400879,987.527710 962.400879,979.396606 
+	C970.989380,979.396606 979.834900,979.396606 989.143494,979.396606 
+	C989.143494,986.455139 989.143494,993.401855 989.130493,1000.834351 
+z"/>
+<path fill="#73358B" opacity="1.000000" stroke="none" 
+	d="
+M401.167480,1068.572754 
+	C405.168213,1050.977661 416.229248,1040.492432 431.024689,1039.892334 
+	C448.612427,1039.179199 462.954895,1052.325073 463.659058,1071.163086 
+	C463.929352,1078.394409 462.811829,1086.386719 459.843262,1092.900513 
+	C449.957458,1114.592529 420.591766,1116.381714 407.101685,1096.684570 
+	C401.329559,1088.256470 400.098053,1078.886963 401.167480,1068.572754 
+z"/>
+<path fill="#74368C" opacity="1.000000" stroke="none" 
+	d="
+M1064.389893,1041.130493 
+	C1083.597778,1037.239746 1099.385498,1045.930298 1105.178711,1063.268677 
+	C1111.074951,1080.915771 1103.746460,1100.005005 1088.315552,1107.193970 
+	C1064.766113,1118.165283 1038.714111,1099.699341 1040.531982,1073.203491 
+	C1041.596069,1057.693604 1048.638306,1046.359863 1064.389893,1041.130493 
+z"/>
+<path fill="#73358B" opacity="1.000000" stroke="none" 
+	d="
+M562.688843,1040.359863 
+	C577.771179,1038.791748 589.497620,1043.873901 596.774170,1056.799438 
+	C604.355286,1070.265991 603.733704,1084.044556 595.135681,1096.926514 
+	C586.898376,1109.268066 570.341492,1113.633301 555.941284,1107.888672 
+	C541.953796,1102.308838 533.121765,1086.289917 535.297913,1070.447632 
+	C537.547485,1054.070801 546.615784,1043.979858 562.688843,1040.359863 
+z"/>
+<path fill="#74358C" opacity="1.000000" stroke="none" 
+	d="
+M807.214600,1067.153320 
+	C805.112427,1067.069336 803.478333,1066.985229 801.885498,1066.903320 
+	C800.809204,1052.746582 814.209839,1038.763672 828.868347,1038.415405 
+	C843.821167,1038.060181 857.024231,1051.490723 856.360352,1067.153442 
+	C840.162659,1067.153442 823.922729,1067.153442 807.214600,1067.153320 
+z"/>
+<path fill="#74358C" opacity="1.000000" stroke="none" 
+	d="
+M222.282150,1110.464844 
+	C214.217789,1113.966431 206.277649,1115.050659 198.052612,1112.792114 
+	C190.386749,1110.687134 185.541321,1105.185791 185.061066,1098.121948 
+	C184.559586,1090.745972 188.557663,1084.190308 196.064621,1081.398193 
+	C208.516418,1076.766968 220.997086,1078.481323 233.263031,1082.397217 
+	C234.448975,1082.775879 235.661087,1085.061401 235.760620,1086.535889 
+	C236.480362,1097.197876 232.280441,1105.292969 222.282150,1110.464844 
+z"/>
+</svg>

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

@@ -0,0 +1,33 @@
+import verifyCredentials from './verify-credentials.js';
+import isStillVerified from './is-still-verified.js';
+
+export default {
+  fields: [
+    {
+      key: 'screenName',
+      label: 'Screen Name',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description:
+        'Screen name of your connection to be used on Automatisch UI.',
+      clickToCopy: false,
+    },
+    {
+      key: 'apiKey',
+      label: 'API Key',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: 'Carbone API key of your account.',
+      clickToCopy: false,
+    },
+  ],
+
+  verifyCredentials,
+  isStillVerified,
+};

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

@@ -0,0 +1,8 @@
+import verifyCredentials from './verify-credentials.js';
+
+const isStillVerified = async ($) => {
+  await verifyCredentials($);
+  return true;
+};
+
+export default isStillVerified;

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

@@ -0,0 +1,10 @@
+const verifyCredentials = async ($) => {
+  await $.http.get('/templates');
+
+  await $.auth.set({
+    screenName: $.auth.data.screenName,
+    apiKey: $.auth.data.apiKey,
+  });
+};
+
+export default verifyCredentials;

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

@@ -1,8 +1,7 @@
-import { TBeforeRequest } from '@automatisch/types';
+const addAuthHeader = ($, requestConfig) => {
-
-const addAuthHeader: TBeforeRequest = ($, requestConfig) => {
   if ($.auth.data?.apiKey) {
     requestConfig.headers.Authorization = `Bearer ${$.auth.data.apiKey}`;
+    requestConfig.headers['carbone-version'] = '4';
   }
 
   return requestConfig;

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

@@ -0,0 +1,18 @@
+import defineApp from '../../helpers/define-app.js';
+import addAuthHeader from './common/add-auth-header.js';
+import auth from './auth/index.js';
+import actions from './actions/index.js';
+
+export default defineApp({
+  name: 'Carbone',
+  key: 'carbone',
+  iconUrl: '{BASE_URL}/apps/carbone/assets/favicon.svg',
+  authDocUrl: 'https://automatisch.io/docs/apps/carbone/connection',
+  supportsConnections: true,
+  baseUrl: 'https://carbone.io',
+  apiBaseUrl: 'https://api.carbone.io',
+  primaryColor: '6f42c1',
+  beforeRequest: [addAuthHeader],
+  auth,
+  actions,
+});

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

@@ -0,0 +1,3 @@
+import translateText from './translate-text/index.js';
+
+export default [translateText];

packages/backend/src/apps/deepl/actions/index.ts

@@ -1,3 +0,0 @@
-import translateText from './translate-text';
-
-export default [translateText];

packages/backend/src/apps/deepl/actions/translate-text/index.js

@@ -1,5 +1,5 @@
 import qs from 'qs';
-import defineAction from '../../../../helpers/define-action';
+import defineAction from '../../../../helpers/define-action.js';
 
 export default defineAction({
   name: 'Translate text',
@@ -9,7 +9,7 @@ export default defineAction({
     {
       label: 'Text',
       key: 'text',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       description: 'Text to be translated.',
       variables: true,
@@ -17,7 +17,7 @@ export default defineAction({
     {
       label: 'Target Language',
       key: 'targetLanguage',
-      type: 'dropdown' as const,
+      type: 'dropdown',
       required: true,
       description: 'Language to translate the text to.',
       variables: true,

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

@@ -1,12 +1,12 @@
-import verifyCredentials from './verify-credentials';
+import verifyCredentials from './verify-credentials.js';
-import isStillVerified from './is-still-verified';
+import isStillVerified from './is-still-verified.js';
 
 export default {
   fields: [
     {
       key: 'screenName',
       label: 'Screen Name',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       readOnly: false,
       value: null,
@@ -18,7 +18,7 @@ export default {
     {
       key: 'authenticationKey',
       label: 'Authentication Key',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       readOnly: false,
       value: null,

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

@@ -0,0 +1,8 @@
+import verifyCredentials from './verify-credentials.js';
+
+const isStillVerified = async ($) => {
+  await verifyCredentials($);
+  return true;
+};
+
+export default isStillVerified;

packages/backend/src/apps/deepl/auth/is-still-verified.ts

@@ -1,9 +0,0 @@
-import { IGlobalVariable } from '@automatisch/types';
-import verifyCredentials from './verify-credentials';
-
-const isStillVerified = async ($: IGlobalVariable) => {
-  await verifyCredentials($);
-  return true;
-};
-
-export default isStillVerified;

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

@@ -1,6 +1,4 @@
-import { IGlobalVariable } from '@automatisch/types';
+const verifyCredentials = async ($) => {
-
-const verifyCredentials = async ($: IGlobalVariable) => {
   await $.http.get('/v2/usage');
 
   await $.auth.set({

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

@@ -1,6 +1,4 @@
-import { TBeforeRequest } from '@automatisch/types';
+const addAuthHeader = ($, requestConfig) => {
-
-const addAuthHeader: TBeforeRequest = ($, requestConfig) => {
   if ($.auth.data?.authenticationKey) {
     const authorizationHeader = `DeepL-Auth-Key ${$.auth.data.authenticationKey}`;
     requestConfig.headers.Authorization = authorizationHeader;

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

@@ -1,7 +1,7 @@
-import defineApp from '../../helpers/define-app';
+import defineApp from '../../helpers/define-app.js';
-import addAuthHeader from './common/add-auth-header';
+import addAuthHeader from './common/add-auth-header.js';
-import auth from './auth';
+import auth from './auth/index.js';
-import actions from './actions';
+import actions from './actions/index.js';
 
 export default defineApp({
   name: 'DeepL',

packages/backend/src/apps/delay/actions/delay-for/index.js

@@ -1,4 +1,4 @@
-import defineAction from '../../../../helpers/define-action';
+import defineAction from '../../../../helpers/define-action.js';
 
 export default defineAction({
   name: 'Delay for',
@@ -9,7 +9,7 @@ export default defineAction({
     {
       label: 'Delay for unit',
       key: 'delayForUnit',
-      type: 'dropdown' as const,
+      type: 'dropdown',
       required: true,
       value: null,
       description: 'Delay for unit, e.g. minutes, hours, days, weeks.',
@@ -36,7 +36,7 @@ export default defineAction({
     {
       label: 'Delay for value',
       key: 'delayForValue',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       description: 'Delay for value, use a number, e.g. 1, 2, 3.',
       variables: true,

packages/backend/src/apps/delay/actions/delay-until/index.js

@@ -1,4 +1,4 @@
-import defineAction from '../../../../helpers/define-action';
+import defineAction from '../../../../helpers/define-action.js';
 
 export default defineAction({
   name: 'Delay until',
@@ -9,7 +9,7 @@ export default defineAction({
     {
       label: 'Delay until (Date)',
       key: 'delayUntil',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       description: 'Delay until the date. E.g. 2022-12-18',
       variables: true,

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

@@ -0,0 +1,4 @@
+import delayFor from './delay-for/index.js';
+import delayUntil from './delay-until/index.js';
+
+export default [delayFor, delayUntil];

packages/backend/src/apps/delay/actions/index.ts

@@ -1,4 +0,0 @@
-import delayFor from './delay-for';
-import delayUntil from './delay-until';
-
-export default [delayFor, delayUntil];

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

@@ -1,5 +1,5 @@
-import defineApp from '../../helpers/define-app';
+import defineApp from '../../helpers/define-app.js';
-import actions from './actions';
+import actions from './actions/index.js';
 
 export default defineApp({
   name: 'Delay',

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

@@ -0,0 +1,88 @@
+import defineAction from '../../../../helpers/define-action.js';
+
+export default defineAction({
+  name: 'Create a scheduled event',
+  key: 'createScheduledEvent',
+  description: 'Creates a scheduled event',
+  arguments: [
+    {
+      label: 'Type',
+      key: 'entityType',
+      type: 'dropdown',
+      required: true,
+      variables: true,
+      options: [
+        { label: 'Stage channel', value: 1 },
+        { label: 'Voice channel', value: 2 },
+        { label: 'External', value: 3 },
+      ],
+      additionalFields: {
+        type: 'query',
+        name: 'getDynamicFields',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listExternalScheduledEventFields',
+          },
+          {
+            name: 'parameters.entityType',
+            value: '{parameters.entityType}',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Name',
+      key: 'name',
+      type: 'string',
+      required: true,
+      variables: true,
+    },
+    {
+      label: 'Description',
+      key: 'description',
+      type: 'string',
+      required: false,
+      variables: true,
+    },
+    {
+      label: 'Image',
+      key: 'image',
+      type: 'string',
+      required: false,
+      description:
+        'Image as DataURI scheme [data:image/<jpeg/png/gif>;base64,BASE64_ENCODED_<JPEG/PNG/GIF>_IMAGE_DATA]',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const data = {
+      channel_id: $.step.parameters.channel_id,
+      name: $.step.parameters.name,
+      privacy_level: 2,
+      scheduled_start_time: $.step.parameters.scheduledStartTime,
+      scheduled_end_time: $.step.parameters.scheduledEndTime,
+      description: $.step.parameters.description,
+      entity_type: $.step.parameters.entityType,
+      image: $.step.parameters.image,
+    };
+
+    const isExternal = $.step.parameters.entityType === 3;
+
+    if (isExternal) {
+      data.entity_metadata = {
+        location: $.step.parameters.location,
+      };
+
+      data.channel_id = null;
+    }
+
+    const response = await $.http?.post(
+      `/guilds/${$.auth.data.guildId}/scheduled-events`,
+      data
+    );
+
+    $.setActionItem({ raw: response.data });
+  },
+});

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

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

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

@@ -1,3 +0,0 @@
-import sendMessageToChannel from './send-message-to-channel';
-
-export default [sendMessageToChannel];

packages/backend/src/apps/discord/actions/send-message-to-channel/index.js

@@ -1,4 +1,4 @@
-import defineAction from '../../../../helpers/define-action';
+import defineAction from '../../../../helpers/define-action.js';
 
 export default defineAction({
   name: 'Send a message to channel',
@@ -8,7 +8,7 @@ export default defineAction({
     {
       label: 'Channel',
       key: 'channel',
-      type: 'dropdown' as const,
+      type: 'dropdown',
       required: true,
       description: 'Pick a channel to send the message to.',
       variables: true,
@@ -26,7 +26,7 @@ export default defineAction({
     {
       label: 'Message text',
       key: 'message',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       description: 'The content of your new message.',
       variables: true,
@@ -35,8 +35,9 @@ export default defineAction({
 
   async run($) {
     const data = {
-      content: $.step.parameters.message as string,
+      content: $.step.parameters.message,
     };
+
     const response = await $.http?.post(
       `/channels/${$.step.parameters.channel}/messages`,
       data

packages/backend/src/apps/discord/auth/generate-auth-url.js

@@ -1,15 +1,15 @@
-import { IField, IGlobalVariable } from '@automatisch/types';
 import { URLSearchParams } from 'url';
-import scopes from '../common/scopes';
+import scopes from '../common/scopes.js';
 
-export default async function generateAuthUrl($: IGlobalVariable) {
+export default async function generateAuthUrl($) {
   const oauthRedirectUrlField = $.app.auth.fields.find(
-    (field: IField) => field.key == 'oAuthRedirectUrl'
+    (field) => field.key == 'oAuthRedirectUrl'
   );
-  const callbackUrl = oauthRedirectUrlField.value as string;
+
+  const callbackUrl = oauthRedirectUrlField.value;
 
   const searchParams = new URLSearchParams({
-    client_id: $.auth.data.consumerKey as string,
+    client_id: $.auth.data.consumerKey,
     redirect_uri: callbackUrl,
     response_type: 'code',
     permissions: '2146958591',

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

@@ -1,13 +1,13 @@
-import generateAuthUrl from './generate-auth-url';
+import generateAuthUrl from './generate-auth-url.js';
-import verifyCredentials from './verify-credentials';
+import verifyCredentials from './verify-credentials.js';
-import isStillVerified from './is-still-verified';
+import isStillVerified from './is-still-verified.js';
 
 export default {
   fields: [
     {
       key: 'oAuthRedirectUrl',
       label: 'OAuth Redirect URL',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       readOnly: true,
       value: '{WEB_APP_URL}/app/discord/connections/add',
@@ -20,7 +20,7 @@ export default {
     {
       key: 'consumerKey',
       label: 'Consumer Key',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       readOnly: false,
       value: null,
@@ -32,7 +32,7 @@ export default {
     {
       key: 'consumerSecret',
       label: 'Consumer Secret',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       readOnly: false,
       value: null,
@@ -44,7 +44,7 @@ export default {
     {
       key: 'botToken',
       label: 'Bot token',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       readOnly: false,
       value: null,

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

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

packages/backend/src/apps/discord/auth/is-still-verified.ts

@@ -1,10 +0,0 @@
-import { IGlobalVariable } from '@automatisch/types';
-import getCurrentUser from '../common/get-current-user';
-
-const isStillVerified = async ($: IGlobalVariable) => {
-  await getCurrentUser($);
-
-  return true;
-};
-
-export default isStillVerified;

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

@@ -1,22 +1,24 @@
-import { IGlobalVariable, IField } from '@automatisch/types';
 import { URLSearchParams } from 'url';
-import scopes from '../common/scopes';
+import scopes from '../common/scopes.js';
-import getCurrentUser from '../common/get-current-user';
+import getCurrentUser from '../common/get-current-user.js';
 
-const verifyCredentials = async ($: IGlobalVariable) => {
+const verifyCredentials = async ($) => {
   const oauthRedirectUrlField = $.app.auth.fields.find(
-    (field: IField) => field.key == 'oAuthRedirectUrl'
+    (field) => field.key == 'oAuthRedirectUrl'
   );
-  const callbackUrl = oauthRedirectUrlField.value as string;
+
+  const callbackUrl = oauthRedirectUrlField.value;
+
   const params = new URLSearchParams({
-    client_id: $.auth.data.consumerKey as string,
+    client_id: $.auth.data.consumerKey,
     redirect_uri: callbackUrl,
     response_type: 'code',
     scope: scopes.join(' '),
-    client_secret: $.auth.data.consumerSecret as string,
+    client_secret: $.auth.data.consumerSecret,
-    code: $.auth.data.code as string,
+    code: $.auth.data.code,
     grant_type: 'authorization_code',
   });
+
   const { data: verifiedCredentials } = await $.http.post(
     '/oauth2/token',
     params.toString()

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

@@ -1,6 +1,4 @@
-import { TBeforeRequest } from '@automatisch/types';
+const addAuthHeader = ($, requestConfig) => {
-
-const addAuthHeader: TBeforeRequest = ($, requestConfig) => {
   const { tokenType, botToken } = $.auth.data;
   if (tokenType && botToken) {
     requestConfig.headers.Authorization = `Bot ${botToken}`;

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

@@ -1,6 +1,4 @@
-import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+const getCurrentUser = async ($) => {
-
-const getCurrentUser = async ($: IGlobalVariable): Promise<IJSONObject> => {
   const response = await $.http.get('/users/@me');
   const currentUser = response.data;
 

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

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

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

@@ -1,3 +0,0 @@
-import listChannels from './list-channels';
-
-export default [listChannels];

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

@@ -1,14 +1,9 @@
-import { IGlobalVariable, IJSONObject } from '@automatisch/types';
-
 export default {
   name: 'List channels',
   key: 'listChannels',
 
-  async run($: IGlobalVariable) {
+  async run($) {
-    const channels: {
+    const channels = {
-      data: IJSONObject[];
-      error: IJSONObject | null;
-    } = {
       data: [],
       error: null,
     };
@@ -18,11 +13,11 @@ export default {
     );
 
     channels.data = response.data
-      .filter((channel: IJSONObject) => {
+      .filter((channel) => {
         // filter in text channels and announcement channels only
         return channel.type === 0 || channel.type === 5;
       })
-      .map((channel: IJSONObject) => {
+      .map((channel) => {
         return {
           value: channel.id,
           name: channel.name,

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

@@ -0,0 +1,29 @@
+export default {
+  name: 'List voice channels',
+  key: 'listVoiceChannels',
+
+  async run($) {
+    const channels = {
+      data: [],
+      error: null,
+    };
+
+    const response = await $.http.get(
+      `/guilds/${$.auth.data.guildId}/channels`
+    );
+
+    channels.data = response.data
+      .filter((channel) => {
+        // filter in voice and stage channels only
+        return channel.type === 2 || channel.type === 13;
+      })
+      .map((channel) => {
+        return {
+          value: channel.id,
+          name: channel.name,
+        };
+      });
+
+    return channels;
+  },
+};

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

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

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

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

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

@@ -1,9 +1,10 @@
-import defineApp from '../../helpers/define-app';
+import defineApp from '../../helpers/define-app.js';
-import addAuthHeader from './common/add-auth-header';
+import addAuthHeader from './common/add-auth-header.js';
-import auth from './auth';
+import auth from './auth/index.js';
-import dynamicData from './dynamic-data';
+import dynamicData from './dynamic-data/index.js';
-import actions from './actions';
+import actions from './actions/index.js';
-import triggers from './triggers';
+import triggers from './triggers/index.js';
+import dynamicFields from './dynamic-fields/index.js';
 
 export default defineApp({
   name: 'Discord',
@@ -17,6 +18,7 @@ export default defineApp({
   beforeRequest: [addAuthHeader],
   auth,
   dynamicData,
+  dynamicFields,
   triggers,
   actions,
 });

packages/backend/src/apps/dropbox/actions/create-folder/index.js

@@ -1,23 +1,25 @@
 import path from 'node:path';
-import defineAction from '../../../../helpers/define-action';
+import defineAction from '../../../../helpers/define-action.js';
 
 export default defineAction({
   name: 'Create folder',
   key: 'createFolder',
-  description: 'Create a new folder with the given parent folder and folder name',
+  description:
+    'Create a new folder with the given parent folder and folder name',
   arguments: [
     {
       label: 'Folder',
       key: 'parentFolder',
-      type: 'string' as const,
+      type: 'string',
       required: true,
-      description: 'Enter the parent folder path, like /TextFiles/ or /Documents/Taxes/',
+      description:
+        'Enter the parent folder path, like /TextFiles/ or /Documents/Taxes/',
       variables: true,
     },
     {
       label: 'Folder Name',
       key: 'folderName',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       description: 'Enter the name for the new folder',
       variables: true,
@@ -25,11 +27,13 @@ export default defineAction({
   ],
 
   async run($) {
-    const parentFolder = $.step.parameters.parentFolder as string;
+    const parentFolder = $.step.parameters.parentFolder;
-    const folderName = $.step.parameters.folderName as string;
+    const folderName = $.step.parameters.folderName;
     const folderPath = path.join(parentFolder, folderName);
 
-    const response = await $.http.post('/2/files/create_folder_v2', { path: folderPath });
+    const response = await $.http.post('/2/files/create_folder_v2', {
+      path: folderPath,
+    });
 
     $.setActionItem({ raw: response.data });
   },

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

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

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

@@ -1,4 +0,0 @@
-import createFolder from "./create-folder";
-import renameFile from "./rename-file";
-
-export default [createFolder, renameFile];

packages/backend/src/apps/dropbox/actions/rename-file/index.js

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import defineAction from '../../../../helpers/define-action';
+import defineAction from '../../../../helpers/define-action.js';
 
 export default defineAction({
   name: 'Rename file',
@@ -9,25 +9,25 @@ export default defineAction({
     {
       label: 'File Path',
       key: 'filePath',
-      type: 'string' as const,
+      type: 'string',
       required: true,
-      description:
+      description: 'Write the full path to the file such as /Folder1/File.pdf',
-        'Write the full path to the file such as /Folder1/File.pdf',
       variables: true,
     },
     {
       label: 'New Name',
       key: 'newName',
-      type: 'string' as const,
+      type: 'string',
       required: true,
-      description: "Enter the new name for the file (without the extension, e.g., '.pdf')",
+      description:
+        "Enter the new name for the file (without the extension, e.g., '.pdf')",
       variables: true,
     },
   ],
 
   async run($) {
-    const filePath = $.step.parameters.filePath as string;
+    const filePath = $.step.parameters.filePath;
-    const newName = $.step.parameters.newName as string;
+    const newName = $.step.parameters.newName;
     const fileObject = path.parse(filePath);
     const newPath = path.format({
       dir: fileObject.dir,

packages/backend/src/apps/dropbox/auth/generate-auth-url.js

@@ -1,15 +1,15 @@
 import { URLSearchParams } from 'url';
-import { IField, IGlobalVariable } from '@automatisch/types';
+import scopes from '../common/scopes.js';
-import scopes from '../common/scopes';
 
-export default async function generateAuthUrl($: IGlobalVariable) {
+export default async function generateAuthUrl($) {
   const oauthRedirectUrlField = $.app.auth.fields.find(
-    (field: IField) => field.key == 'oAuthRedirectUrl'
+    (field) => field.key == 'oAuthRedirectUrl'
   );
-  const callbackUrl = oauthRedirectUrlField.value as string;
+
+  const callbackUrl = oauthRedirectUrlField.value;
 
   const searchParams = new URLSearchParams({
-    client_id: $.auth.data.clientId as string,
+    client_id: $.auth.data.clientId,
     redirect_uri: callbackUrl,
     response_type: 'code',
     scope: scopes.join(' '),

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

@@ -1,14 +1,14 @@
-import generateAuthUrl from './generate-auth-url';
+import generateAuthUrl from './generate-auth-url.js';
-import verifyCredentials from './verify-credentials';
+import verifyCredentials from './verify-credentials.js';
-import isStillVerified from './is-still-verified';
+import isStillVerified from './is-still-verified.js';
-import refreshToken from './refresh-token';
+import refreshToken from './refresh-token.js';
 
 export default {
   fields: [
     {
       key: 'oAuthRedirectUrl',
       label: 'OAuth Redirect URL',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       readOnly: true,
       value: '{WEB_APP_URL}/app/dropbox/connections/add',
@@ -20,7 +20,7 @@ export default {
     {
       key: 'clientId',
       label: 'App Key',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       readOnly: false,
       value: null,
@@ -31,7 +31,7 @@ export default {
     {
       key: 'clientSecret',
       label: 'App Secret',
-      type: 'string' as const,
+      type: 'string',
       required: true,
       readOnly: false,
       value: null,

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

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

packages/backend/src/apps/dropbox/auth/is-still-verified.ts

@@ -1,9 +0,0 @@
-import { IGlobalVariable } from '@automatisch/types';
-import getCurrentAccount from '../common/get-current-account';
-
-const isStillVerified = async ($: IGlobalVariable) => {
-  const account = await getCurrentAccount($);
-  return !!account;
-};
-
-export default isStillVerified;

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

@@ -0,0 +1,36 @@
+import { Buffer } from 'node:buffer';
+
+const refreshToken = async ($) => {
+  const params = {
+    grant_type: 'refresh_token',
+    refresh_token: $.auth.data.refreshToken,
+  };
+
+  const basicAuthToken = Buffer.from(
+    `${$.auth.data.clientId}:${$.auth.data.clientSecret}`
+  ).toString('base64');
+
+  const { data } = await $.http.post('oauth2/token', null, {
+    params,
+    headers: {
+      Authorization: `Basic ${basicAuthToken}`,
+    },
+    additionalProperties: {
+      skipAddingAuthHeader: true,
+    },
+  });
+
+  const {
+    access_token: accessToken,
+    expires_in: expiresIn,
+    token_type: tokenType,
+  } = data;
+
+  await $.auth.set({
+    accessToken,
+    expiresIn,
+    tokenType,
+  });
+};
+
+export default refreshToken;