Release v0.6.0

feat: Add postgres schema environment variable

---------

Co-authored-by: Faruk AYDIN <omerfaruk26@gmail.com>

.devcontainer/Dockerfile

@@ -0,0 +1 @@
+FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu-22.04

.devcontainer/boot.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+CURRENT_DIR="$(pwd)"
+BACKEND_PORT=3000
+WEB_PORT=3001
+
+echo "Configuring backend environment variables..."
+cd packages/backend
+rm -rf .env
+echo "
+PORT=$BACKEND_PORT
+WEB_APP_URL=http://localhost:$WEB_PORT
+APP_ENV=development
+POSTGRES_DATABASE=automatisch
+POSTGRES_PORT=5432
+POSTGRES_HOST=postgres
+POSTGRES_USERNAME=automatisch_user
+POSTGRES_PASSWORD=automatisch_password
+ENCRYPTION_KEY=sample_encryption_key
+WEBHOOK_SECRET_KEY=sample_webhook_secret_key
+APP_SECRET_KEY=sample_app_secret_key
+REDIS_HOST=redis
+SERVE_WEB_APP_SEPARATELY=true" >> .env
+cd $CURRENT_DIR
+
+echo "Configuring web environment variables..."
+cd packages/web
+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
+
+echo "Installing and linking dependencies..."
+yarn
+yarn lerna bootstrap
+
+echo "Migrating database..."
+cd packages/backend
+yarn db:migrate
+yarn db:seed:user
+
+echo "Done!"

.devcontainer/devcontainer.json

@@ -0,0 +1,53 @@
+{
+  "name": "Automatisch",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspace",
+  "features": {
+    "ghcr.io/devcontainers/features/git:1": {
+      "version": "latest"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": 16
+    },
+    "ghcr.io/devcontainers/features/common-utils:1": {
+      "username": "vscode",
+      "uid": 1000,
+      "gid": 1000,
+      "installZsh": true,
+      "installOhMyZsh": true,
+      "configureZshAsDefaultShell": true,
+      "upgradePackages": true
+    }
+  },
+
+  "hostRequirements": {
+    "cpus": 4,
+    "memory": "8gb",
+    "storage": "32gb"
+  },
+
+  "portsAttributes": {
+    "3000": {
+      "label": "Backend",
+      "onAutoForward": "silent",
+      "protocol": "http"
+    },
+    "3001": {
+      "label": "Frontend",
+      "onAutoForward": "silent",
+      "protocol": "http"
+    }
+  },
+
+  "forwardPorts": [3000, 3001],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": ["bash", ".devcontainer/boot.sh"]
+
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,39 @@
+version: '3.9'
+
+services:
+  app:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    volumes:
+      - ..:/workspace:cached
+    command: sleep infinity
+  postgres:
+    image: 'postgres:14.5-alpine'
+    environment:
+      - POSTGRES_DB=automatisch
+      - POSTGRES_USER=automatisch_user
+      - POSTGRES_PASSWORD=automatisch_password
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}']
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    ports:
+      - '5432:5432'
+    expose:
+      - 5432
+  redis:
+    image: 'redis:7.0.4-alpine'
+    volumes:
+      - redis_data:/data
+    ports:
+      - '6379:6379'
+    expose:
+      - 6379
+
+volumes:
+  postgres_data:
+  redis_data:

.eslintignore

@@ -3,6 +3,7 @@ dist
 build
 coverage
 packages/docs/*
+packages/e2e-tests
 
 .eslintrc.js
 husky.config.js

.gitignore

@@ -74,6 +74,15 @@ web_modules/
 .env.test
 .env.production
 
+# cypress environment variables file
+cypress.env.json
+
+# cypress screenshots
+packages/e2e-tests/cypress/screenshots
+
+# cypress videos
+packages/e2e-tests/cypress/videos/
+
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 .parcel-cache

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "editor.formatOnSave": true
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode"
 }

.yarnrc

@@ -0,0 +1 @@
+network-timeout 400000

CONTRIBUTOR_LICENSE_AGREEMENT.md

@@ -0,0 +1,5 @@
+# Automatisch Contributor License Agreement
+
+I give Automatisch permission to license my contributions on any terms they like. I am giving them this license in order to make it possible for them to accept my contributions into their project.
+
+**_As far as the law allows, my contributions come as is, without any warranty or condition, and I will not be liable to anyone for any damages related to this software or this license, under any kind of legal claim._**

LICENSE

@@ -0,0 +1,3 @@
+LICENSE.agpl (AGPL-3.0) applies to all files in this
+repository, except for files that contain ".ee." in their name
+which are covered by LICENSE.enterprise.

LICENSE.enterprise

@@ -0,0 +1,35 @@
+The Automatisch Enterprise license (the “Enterprise License”)
+Copyright (c) 2023 Ömer Faruk Aydın, Ali Barın.
+
+With regard to the Automatisch Software:
+
+This software and associated documentation files (the "Software") may only be
+used in production, if you (and any entity that you represent) have a valid
+Automatisch Enterprise license for the correct number of user seats. Subject
+to the foregoing sentence, you are free to modify this Software and publish
+patches to the Software. You agree that Automatisch and/or its licensors
+(as applicable) retain all right, title and interest in and to all such
+modifications and/or patches, and all such modifications and/or patches may
+only be used, copied, modified, displayed, distributed, or otherwise exploited
+with a valid Automatisch Enterprise license for the correct number of user seats.
+Notwithstanding the foregoing, you may copy and modify the Software for
+development and testing purposes, without requiring a subscription. You agree
+that Automatisch and/or its licensors (as applicable) retain all right, title
+and interest in and to all such modifications. You are not granted any other
+rights beyond what is expressly stated herein. Subject to the foregoing, it is
+forbidden to copy, merge, publish, distribute, sublicense, and/or sell the Software.
+
+The full text of this Enterprise License shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+For all third party components incorporated into the Automatisch Software, those
+components are licensed under the original license provided by the owner of the
+applicable component.

README.md

@@ -10,7 +10,7 @@
 
 There are other existing solutions in the market, like Zapier and Integromat, so you might be wondering why you should use Automatisch.
 
-✅ The most significant advantage of having Automatisch is keeping your data on your own servers. Not all companies want to use an automation service in the cloud, and the current open-source or self-hosted solutions mainly focus on developers rather than a user without a technical background.
+✅ One of the main benefits of using Automatisch is that it allows you to store your data on your own servers, which is essential for businesses that handle sensitive user information and cannot risk sharing it with external cloud services. This is especially relevant for industries such as healthcare and finance, as well as for European companies that must adhere to the General Data Protection Regulation (GDPR).
 
 🤓 Your contributions are vital to the development of Automatisch. As an open-source software, anyone can have an impact on how it is being developed.
 
@@ -24,33 +24,38 @@ The official documentation can be found here: [https://automatisch.io/docs](http
 
 ```bash
 # Clone the repository
-git clone git@github.com:automatisch/automatisch.git
+git clone https://github.com/automatisch/automatisch.git
 
 # Go to the repository folder
-cd automatisch/docker/compose
+cd automatisch
 
 # Start
 docker compose up
 ```
 
-You can use `user@automatisch.io` email address and `sample` password to login to Automatisch. You can also change your email and password later on from the settings page.
+You can use `user@automatisch.io` email address and `sample` password to login to Automatisch. Please do not forget to change your email and password from the settings page.
+
+For other installation types, you can check the [installation](https://automatisch.io/docs/guide/installation) guide.
 
 ## Community Links
 
-- [Github](https://github.com/automatisch/automatisch)
 - [Discord](https://discord.gg/dJSah9CVrC)
 - [Twitter](https://twitter.com/automatischio)
 
 ## Support
 
-If you have any questions or problems, please visit our GitHub discussions page, and we'll try to help you as soon as possible.
+If you have any questions or problems, please visit our GitHub issues page, and we'll try to help you as soon as possible.
 
-[https://github.com/automatisch/automatisch/discussions](https://github.com/automatisch/automatisch/discussions)
+[https://github.com/automatisch/automatisch/issues](https://github.com/automatisch/automatisch/issues)
-
-## Contribution Guide
-
-You can access to the [contribution guide](https://docs.automatisch.io) page from the documentation website.
 
 ## License
 
-Automatisch is an open-source software with an [AGPL 3.0 license](https://github.com/automatisch/automatisch/blob/main/LICENSE.md).
+Automatisch Community Edition (Automatisch CE) is an open-source software with the [AGPL-3.0 license](LICENSE.agpl).
+
+Automatisch Enterprise Edition (Automatisch EE) is a commercial offering with the [Enterprise license](LICENSE.enterprise).
+
+The Automatisch repository contains both AGPL-licensed and Enterprise-licensed files. We maintain a single repository to make development easier.
+
+All files that contain ".ee." in their name fall under the [Enterprise license](LICENSE.enterprise). All other files fall under the [AGPL-3.0 license](LICENSE.agpl).
+
+See the [LICENSE](LICENSE) file for more information.

docker-compose.yml

@@ -0,0 +1,70 @@
+version: '3.9'
+services:
+  main:
+    build:
+      context: ./docker
+      dockerfile: Dockerfile.compose
+    entrypoint: /compose-entrypoint.sh
+    ports:
+      - '3000:3000'
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_started
+    environment:
+      - HOST=localhost
+      - PROTOCOL=http
+      - PORT=3000
+      - APP_ENV=production
+      - REDIS_HOST=redis
+      - POSTGRES_HOST=postgres
+      - POSTGRES_DATABASE=automatisch
+      - POSTGRES_USERNAME=automatisch_user
+      - POSTGRES_PASSWORD=automatisch_password
+      - ENCRYPTION_KEY
+      - WEBHOOK_SECRET_KEY
+      - APP_SECRET_KEY
+    volumes:
+      - automatisch_storage:/automatisch/storage
+  worker:
+    build:
+      context: ./docker
+      dockerfile: Dockerfile.compose
+    entrypoint: /compose-entrypoint.sh
+    depends_on:
+      - main
+    environment:
+      - APP_ENV=production
+      - REDIS_HOST=redis
+      - POSTGRES_HOST=postgres
+      - POSTGRES_DATABASE=automatisch
+      - POSTGRES_USERNAME=automatisch_user
+      - POSTGRES_PASSWORD=automatisch_password
+      - ENCRYPTION_KEY
+      - WEBHOOK_SECRET_KEY
+      - APP_SECRET_KEY
+      - WORKER=true
+    volumes:
+      - automatisch_storage:/automatisch/storage
+  postgres:
+    image: 'postgres:14.5'
+    environment:
+      - POSTGRES_DB=automatisch
+      - POSTGRES_USER=automatisch_user
+      - POSTGRES_PASSWORD=automatisch_password
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}']
+      interval: 10s
+      timeout: 5s
+      retries: 5
+  redis:
+    image: 'redis:7.0.4'
+    volumes:
+      - redis_data:/data
+volumes:
+  automatisch_storage:
+  postgres_data:
+  redis_data:

docker/Dockerfile

@@ -0,0 +1,14 @@
+# syntax=docker/dockerfile:1
+FROM node:16-alpine
+WORKDIR /automatisch
+
+RUN \
+  apk --no-cache add --virtual build-dependencies python3 build-base && \
+  yarn global add @automatisch/cli@0.5.0 --network-timeout 1000000 && \
+  rm -rf /usr/local/share/.cache/ && \
+  apk del build-dependencies
+
+COPY ./entrypoint.sh /entrypoint.sh
+
+EXPOSE 3000
+ENTRYPOINT ["sh", "/entrypoint.sh"]

docker/Dockerfile.compose

@@ -0,0 +1,11 @@
+# syntax=docker/dockerfile:1
+FROM automatischio/automatisch:0.5.0
+WORKDIR /automatisch
+
+RUN apk add --no-cache openssl dos2unix
+
+COPY ./compose-entrypoint.sh /compose-entrypoint.sh
+RUN dos2unix /compose-entrypoint.sh
+
+EXPOSE 3000
+ENTRYPOINT ["sh", "/compose-entrypoint.sh"]

docker/compose-entrypoint.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -f /automatisch/storage/.env ]; then
+  >&2 echo "Saving environment variables"
+  ENCRYPTION_KEY="${ENCRYPTION_KEY:-$(openssl rand -base64 36)}"
+  WEBHOOK_SECRET_KEY="${WEBHOOK_SECRET_KEY:-$(openssl rand -base64 36)}"
+  APP_SECRET_KEY="${APP_SECRET_KEY:-$(openssl rand -base64 36)}"
+  echo "ENCRYPTION_KEY=$ENCRYPTION_KEY" >> /automatisch/storage/.env
+  echo "WEBHOOK_SECRET_KEY=$WEBHOOK_SECRET_KEY" >> /automatisch/storage/.env
+  echo "APP_SECRET_KEY=$APP_SECRET_KEY" >> /automatisch/storage/.env
+fi
+
+# initiate env. vars. from /automatisch/storage/.env file
+export $(grep -v '^#' /automatisch/storage/.env | xargs)
+
+# migration for webhook secret key, will be removed in the future.
+if [[ -z "${WEBHOOK_SECRET_KEY}" ]]; then
+  WEBHOOK_SECRET_KEY="$(openssl rand -base64 36)"
+  echo "WEBHOOK_SECRET_KEY=$WEBHOOK_SECRET_KEY" >> /automatisch/storage/.env
+fi
+
+echo "Environment variables have been set!"
+
+sh /entrypoint.sh

docker/compose/docker-compose.yml

@@ -1,47 +0,0 @@
-version: "3.9"
-services:
-  main:
-    build:
-      context: ../images/wait-for-postgres
-      network: host
-    ports:
-      - "3000:3000"
-    depends_on:
-      - postgres
-      - redis
-    environment:
-      - HOST=localhost
-      - PROTOCOL=http
-      - PORT=3000
-      - APP_ENV=production
-      - REDIS_HOST=redis
-      - POSTGRES_HOST=postgres
-      - POSTGRES_DATABASE=automatisch
-      - POSTGRES_USERNAME=automatisch_user
-    volumes:
-      - automatisch_storage:/automatisch/storage
-  worker:
-    build:
-      context: ../images/plain
-      network: host
-    depends_on:
-      - main
-    environment:
-      - APP_ENV=production
-      - REDIS_HOST=redis
-      - POSTGRES_HOST=postgres
-      - POSTGRES_DATABASE=automatisch
-      - POSTGRES_USERNAME=automatisch_user
-    command: automatisch start-worker --env-file /automatisch/storage/.env
-    volumes:
-      - automatisch_storage:/automatisch/storage
-  postgres:
-    image: "postgres:14.5"
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: trust
-      POSTGRES_DB: automatisch
-      POSTGRES_USER: automatisch_user
-  redis:
-    image: "redis:7.0.4"
-volumes:
-  automatisch_storage:

docker/entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ -n "$WORKER" ]; then
+  automatisch start-worker
+else
+  automatisch start
+fi

docker/images/plain/Dockerfile

@@ -1,5 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM node:16
-WORKDIR /automatisch
-
-RUN yarn global add @automatisch/cli@0.1.4

docker/images/wait-for-postgres/Dockerfile

@@ -1,15 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM node:16
-WORKDIR /automatisch
-
-RUN apt-get update && apt-get install -y postgresql-client
-COPY ./wait-for-postgres.sh /automatisch/wait-for-postgres.sh
-
-RUN mkdir -p /automatisch/storage
-RUN touch /automatisch/storage/.env
-RUN echo "ENCRYPTION_KEY=$(openssl rand -base64 36)" >> /automatisch/storage/.env
-RUN echo "APP_SECRET_KEY=$(openssl rand -base64 36)" >> /automatisch/storage/.env
-RUN yarn global add @automatisch/cli@0.1.4
-
-EXPOSE 3000
-CMD sh /automatisch/wait-for-postgres.sh automatisch start --env-file=/automatisch/storage/.env

docker/images/wait-for-postgres/wait-for-postgres.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-until psql -h "$POSTGRES_HOST" -U "$POSTGRES_USERNAME" -d "$POSTGRES_HOST" -c '\q'; do
-  >&2 echo "Postgres is unavailable - sleeping"
-  sleep 1
-done
-
->&2 echo "Postgres is up - executing command"
-exec "$@"

lerna.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automatisch/root",
-  "license": "AGPL-3.0",
+  "license": "See LICENSE file",
   "private": true,
   "scripts": {
     "start": "lerna run --stream --parallel --scope=@*/{web,backend} dev",

packages/backend/.env-example

@@ -1,7 +1,8 @@
 HOST=localhost
 PROTOCOL=http
 PORT=3000
-WEB_APP_URL=https://localhost:3001
+WEB_APP_URL=http://localhost:3001
+WEBHOOK_URL=http://localhost:3000
 APP_ENV=development
 POSTGRES_DATABASE=automatisch_development
 POSTGRES_PORT=5432
@@ -10,7 +11,12 @@ POSTGRES_USERNAME=automatish_development_user
 POSTGRES_PASSWORD=
 POSTGRES_ENABLE_SSL=false
 ENCRYPTION_KEY=sample-encryption-key
+WEBHOOK_SECRET_KEY=sample-webhook-key
 APP_SECRET_KEY=sample-app-secret-key
 REDIS_PORT=6379
 REDIS_HOST=127.0.0.1
+REDIS_USERNAME=redis_username
+REDIS_PASSWORD=redis_password
+REDIS_TLS=true
 ENABLE_BULLMQ_DASHBOARD=false
+SERVE_WEB_APP_SEPARATELY=true

packages/backend/bin/database/client.ts

@@ -4,6 +4,6 @@ const client = new Client({
   host: 'localhost',
   user: 'postgres',
   port: 5432,
-})
+});
 
 export default client;

packages/backend/bin/database/utils.ts

@@ -4,11 +4,16 @@ import client from './client';
 import User from '../../src/models/user';
 import '../../src/config/orm';
 
-export async function createUser(email = 'user@automatisch.io', password = 'sample') {
+export async function createUser(
+  email = 'user@automatisch.io',
+  password = 'sample'
+) {
   const UNIQUE_VIOLATION_CODE = '23505';
   const userParams = {
     email,
     password,
+    fullName: 'Initial admin',
+    role: 'admin',
   };
 
   try {
@@ -29,14 +34,17 @@ export async function createUser(email = 'user@automatisch.io', password = 'samp
   }
 }
 
-export const createDatabaseAndUser = async (database = appConfig.postgresDatabase, user = appConfig.postgresUsername) => {
+export const createDatabaseAndUser = async (
+  database = appConfig.postgresDatabase,
+  user = appConfig.postgresUsername
+) => {
   await client.connect();
   await createDatabase(database);
   await createDatabaseUser(user);
   await grantPrivileges(database, user);
 
   await client.end();
-}
+};
 
 export const createDatabase = async (database = appConfig.postgresDatabase) => {
   const DUPLICATE_DB_CODE = '42P04';
@@ -51,7 +59,7 @@ export const createDatabase = async (database = appConfig.postgresDatabase) => {
 
     logger.info(`Database: ${database} already exists!`);
   }
-}
+};
 
 export const createDatabaseUser = async (user = appConfig.postgresUsername) => {
   const DUPLICATE_OBJECT_CODE = '42710';
@@ -68,25 +76,25 @@ export const createDatabaseUser = async (user = appConfig.postgresUsername) => {
 
     logger.info(`Database User: ${user} already exists!`);
   }
-}
+};
 
 export const grantPrivileges = async (
-  database = appConfig.postgresDatabase, user = appConfig.postgresUsername
+  database = appConfig.postgresDatabase,
+  user = appConfig.postgresUsername
 ) => {
   await client.query(
     `GRANT ALL PRIVILEGES ON DATABASE ${database} TO ${user};`
   );
 
-  logger.info(
+  logger.info(`${user} has granted all privileges on ${database}!`);
-    `${user} has granted all privileges on ${database}!`
+};
-  );
-}
 
 export const dropDatabase = async () => {
   if (appConfig.appEnv != 'development' && appConfig.appEnv != 'test') {
-    const errorMessage = 'Drop database command can be used only with development or test environments!'
+    const errorMessage =
+      'Drop database command can be used only with development or test environments!';
 
-    logger.error(errorMessage)
+    logger.error(errorMessage);
     return;
   }
 
@@ -94,13 +102,15 @@ export const dropDatabase = async () => {
   await dropDatabaseAndUser();
 
   await client.end();
-}
+};
 
-export const dropDatabaseAndUser = async(database = appConfig.postgresDatabase, user = appConfig.postgresUsername) => {
+export const dropDatabaseAndUser = async (
+  database = appConfig.postgresDatabase,
+  user = appConfig.postgresUsername
+) => {
   await client.query(`DROP DATABASE IF EXISTS ${database}`);
   logger.info(`Database: ${database} removed!`);
 
   await client.query(`DROP USER IF EXISTS ${user}`);
   logger.info(`Database User: ${user} removed!`);
-}
+};
-

packages/backend/knexfile.ts

@@ -10,8 +10,9 @@ const knexConfig = {
     user: appConfig.postgresUsername,
     password: appConfig.postgresPassword,
     database: appConfig.postgresDatabase,
-    ssl: appConfig.postgresEnableSsl
+    ssl: appConfig.postgresEnableSsl,
   },
+  searchPath: [appConfig.postgresSchema],
   pool: { min: 0, max: 20 },
   migrations: {
     directory: __dirname + '/src/db/migrations',
@@ -20,7 +21,7 @@ const knexConfig = {
   },
   seeds: {
     directory: __dirname + '/src/db/seeds',
-  }
+  },
-}
+};
 
 export default knexConfig;

packages/backend/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@automatisch/backend",
-  "version": "0.1.4",
+  "version": "0.6.0",
-  "license": "AGPL-3.0",
+  "license": "See LICENSE file",
   "description": "The open source Zapier alternative. Build workflow automation without spending time and money.",
   "scripts": {
-    "dev": "ts-node-dev src/server.ts",
+    "dev": "ts-node-dev --exit-child src/server.ts",
     "worker": "nodemon --watch 'src/**/*.ts' --exec 'ts-node' src/worker.ts",
     "build": "tsc && yarn copy-statics",
     "build:watch": "nodemon --watch 'src/**/*.ts' --watch 'bin/**/*.ts' --exec yarn build --ext ts",
@@ -22,46 +22,46 @@
     "prebuild": "rm -rf ./dist"
   },
   "dependencies": {
-    "@automatisch/web": "^0.1.4",
+    "@automatisch/web": "^0.6.0",
     "@bull-board/express": "^3.10.1",
-    "@gitbeaker/node": "^35.6.0",
     "@graphql-tools/graphql-file-loader": "^7.3.4",
     "@graphql-tools/load": "^7.5.2",
     "@rudderstack/rudder-sdk-node": "^1.1.2",
-    "@slack/bolt": "3.10.0",
+    "@sentry/node": "^7.42.0",
+    "@sentry/tracing": "^7.42.0",
     "@types/luxon": "^2.3.1",
     "ajv-formats": "^2.1.1",
     "axios": "0.24.0",
     "bcrypt": "^5.0.1",
-    "bullmq": "^1.76.1",
+    "bullmq": "^3.0.0",
     "copyfiles": "^2.4.1",
     "cors": "^2.8.5",
     "crypto-js": "^4.1.1",
     "debug": "~2.6.9",
-    "discord.js": "13.2.0",
     "dotenv": "^10.0.0",
-    "express": "~4.16.1",
+    "express": "~4.18.2",
+    "express-basic-auth": "^1.2.1",
     "express-graphql": "^0.12.0",
-    "flickr-sdk": "3.10.0",
+    "fast-xml-parser": "^4.0.11",
-    "googleapis": "89.0.0",
     "graphql-middleware": "^6.1.15",
     "graphql-shield": "^7.5.0",
     "graphql-tools": "^8.2.0",
     "graphql-type-json": "^0.3.2",
+    "handlebars": "^4.7.7",
     "http-errors": "~1.6.3",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
-    "knex": "^0.95.11",
+    "knex": "^2.4.0",
     "lodash.get": "^4.4.2",
-    "luxon": "2.3.1",
+    "luxon": "2.5.2",
+    "memory-cache": "^0.2.0",
     "morgan": "^1.10.0",
+    "multer": "1.4.5-lts.1",
     "nodemailer": "6.7.0",
     "oauth-1.0a": "^2.2.6",
     "objection": "^3.0.0",
-    "octokit": "^1.7.1",
     "pg": "^8.7.1",
-    "twilio": "3.70.0",
+    "php-serialize": "^4.0.2",
-    "twitch-js": "2.0.0-beta.42",
+    "stripe": "^11.13.0",
-    "twitter-api-v2": "1.6.0",
     "winston": "^3.7.1"
   },
   "contributors": [
@@ -100,16 +100,18 @@
     "url": "https://github.com/automatisch/automatisch/issues"
   },
   "devDependencies": {
-    "@automatisch/types": "^0.1.4",
+    "@automatisch/types": "^0.6.0",
     "@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.13",
+    "@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",

packages/backend/src/app.ts

@@ -1,10 +1,12 @@
-import appConfig from './config/app';
 import createError from 'http-errors';
-import express, { Request, Response, NextFunction } from 'express';
+import express from 'express';
 import cors from 'cors';
+
+import { IRequest } from '@automatisch/types';
+import appConfig from './config/app';
 import corsOptions from './config/cors-options';
-import graphQLInstance from './helpers/graphql-instance';
 import morgan from './helpers/morgan';
+import * as Sentry from './helpers/sentry.ee';
 import appAssetsHandler from './helpers/app-assets-handler';
 import webUIHandler from './helpers/web-ui-handler';
 import errorHandler from './helpers/error-handler';
@@ -14,32 +16,51 @@ import {
   serverAdapter,
 } from './helpers/create-bull-board-handler';
 import injectBullBoardHandler from './helpers/inject-bull-board-handler';
+import router from './routes';
 
-if (appConfig.enableBullMQDashboard) {
 createBullBoardHandler(serverAdapter);
-}
 
 const app = express();
 
-if (appConfig.enableBullMQDashboard) {
+Sentry.init(app);
+
+Sentry.attachRequestHandler(app);
+Sentry.attachTracingHandler(app);
+
 injectBullBoardHandler(app, serverAdapter);
-}
 
 appAssetsHandler(app);
 
 app.use(morgan);
-app.use(express.json());
+app.use(
-app.use(express.urlencoded({ extended: false }));
+  express.json({
+    limit: appConfig.requestBodySizeLimit,
+    verify(req, res, buf) {
+      (req as IRequest).rawBody = buf;
+    },
+  })
+);
+app.use(
+  express.urlencoded({
+    extended: true,
+    limit: appConfig.requestBodySizeLimit,
+    verify(req, res, buf) {
+      (req as IRequest).rawBody = buf;
+    },
+  })
+);
 app.use(cors(corsOptions));
-app.use('/graphql', graphQLInstance);
+app.use('/', router);
 
 webUIHandler(app);
 
 // catch 404 and forward to error handler
-app.use(function (req: Request, res: Response, next: NextFunction) {
+app.use(function (req, res, next) {
   next(createError(404));
 });
 
+Sentry.attachErrorHandler(app);
+
 app.use(errorHandler);
 
 export default app;

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

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

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

@@ -0,0 +1,77 @@
+import qs from 'qs';
+import defineAction from '../../../../helpers/define-action';
+
+export default defineAction({
+  name: 'Translate Text',
+  key: 'translateText',
+  description: 'Translates text from one language to another.',
+  arguments: [
+    {
+      label: 'Text',
+      key: 'text',
+      type: 'string' as const,
+      required: true,
+      description: 'Text to be translated.',
+      variables: true,
+    },
+    {
+      label: 'Target Language',
+      key: 'targetLanguage',
+      type: 'dropdown' as const,
+      required: true,
+      description: 'Language to translate the text to.',
+      variables: false,
+      value: '',
+      options: [
+        { label: 'Bulgarian', value: 'BG' },
+        { label: 'Chinese (simplified)', value: 'ZH' },
+        { label: 'Czech', value: 'CS' },
+        { label: 'Danish', value: 'DA' },
+        { label: 'Dutch', value: 'NL' },
+        { label: 'English', value: 'EN' },
+        { label: 'English (American)', value: 'EN-US' },
+        { label: 'English (British)', value: 'EN-GB' },
+        { label: 'Estonian', value: 'ET' },
+        { label: 'Finnish', value: 'FI' },
+        { label: 'French', value: 'FR' },
+        { label: 'German', value: 'DE' },
+        { label: 'Greek', value: 'EL' },
+        { label: 'Hungarian', value: 'HU' },
+        { label: 'Indonesian', value: 'ID' },
+        { label: 'Italian', value: 'IT' },
+        { label: 'Japanese', value: 'JA' },
+        { label: 'Latvian', value: 'LV' },
+        { label: 'Lithuanian', value: 'LT' },
+        { label: 'Polish', value: 'PL' },
+        { label: 'Portuguese', value: 'PT' },
+        { label: 'Portuguese (Brazilian)', value: 'PT-BR' },
+        {
+          label:
+            'Portuguese (all Portuguese varieties excluding Brazilian Portuguese)',
+          value: 'PT-PT',
+        },
+        { label: 'Romanian', value: 'RO' },
+        { label: 'Russian', value: 'RU' },
+        { label: 'Slovak', value: 'SK' },
+        { label: 'Slovenian', value: 'SL' },
+        { label: 'Spanish', value: 'ES' },
+        { label: 'Swedish', value: 'SV' },
+        { label: 'Turkish', value: 'TR' },
+        { label: 'Ukrainian', value: 'UK' },
+      ],
+    },
+  ],
+
+  async run($) {
+    const stringifiedBody = qs.stringify({
+      text: $.step.parameters.text,
+      target_lang: $.step.parameters.targetLanguage,
+    });
+
+    const response = await $.http.post('/v2/translate', stringifiedBody);
+
+    $.setActionItem({
+      raw: response.data,
+    });
+  },
+});

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

@@ -0,0 +1,39 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg">
+ <metadata id="metadata4177">image/svg+xml</metadata>
+ <defs>
+  <clipPath id="clipPath4187" clipPathUnits="userSpaceOnUse">
+   <path id="path4189" d="m70.850157,393.069981l708.661,0l0,-425.197l-708.661,0l0,425.197z"/>
+  </clipPath>
+ </defs>
+ <g>
+  <title>background</title>
+  <rect fill="#ffffff" id="canvas_background" height="130" width="130" y="-1" x="-1"/>
+ </g>
+ <g>
+  <title>Layer 1</title>
+  <g fill="#FFF" transform="matrix(1.36265596065192,0,0,-1.3395561298863794,-403.63320244005325,311.0674198374575) " id="g4179">
+   <g fill="#FFF" id="g4183">
+    <g fill="#FFF" clip-path="url(#clipPath4187)" id="g4185">
+     <g fill="#FFF" id="g4191">
+      <path fill="#000000" fill-rule="nonzero" id="path4193" d="m411.83557,185.452083c0,-2.425 -0.463,-4.637 -1.3,-6.226c-1.009,-1.905 -2.173,-3.234 -3.366,-3.843c-1.641,-0.835 -3.707,-1.69 -6.586,-1.69l-4.044,0l0,22.753l3.221,0c4.28,0 7.213,-0.841 8.971,-2.572c2.09,-2.059 3.104,-4.814 3.104,-8.422m-1.89,15.206c-2.434,1.24 -6.053,1.24 -10.633,1.24l-7.069,0c-1.158,0 -2.097,-0.939 -2.097,-2.097l0,-29.463c0,-1.157 0.939,-2.096 2.097,-2.096l6.662,0c3.78,0 7.209,0.393 9.411,1.079c1.585,0.491 3.181,1.529 5.022,3.27c1.559,1.472 2.785,3.317 3.642,5.484c0.886,2.243 1.318,4.609 1.318,7.232c0,3.66 -0.771,6.809 -2.359,9.622c-1.441,2.558 -3.344,4.377 -5.994,5.729"/>
+     </g>
+     <g fill="#FFF" id="g4195">
+      <path fill="#000000" fill-rule="nonzero" id="path4197" d="m533.882353,173.693278l-10.436,0l0,27.36c0,0.467 -0.38,0.845 -0.845,0.845l-4.702,0c-0.466,0 -0.845,-0.378 -0.845,-0.845l0,-31.966c0,-0.467 0.379,-0.846 0.845,-0.846l15.983,0c0.465,0 0.848,0.379 0.848,0.846l0,3.759c0,0.469 -0.383,0.847 -0.848,0.847"/>
+     </g>
+     <g fill="#FFF" id="g4199">
+      <path fill="#000000" fill-rule="nonzero" id="path4201" d="m506.182158,181.465785c0,-2.225 -0.685,-4.08 -2.034,-5.516c-1.35,-1.437 -3.039,-2.167 -5.017,-2.167c-2.038,0 -3.751,0.718 -5.096,2.13c-1.34,1.415 -2.022,3.291 -2.022,5.576c0,2.242 0.682,4.081 2.024,5.471c1.343,1.391 3.056,2.096 5.094,2.096c2.026,0 3.724,-0.716 5.05,-2.132c1.326,-1.412 2.001,-3.249 2.001,-5.458m-5.813,13.324c-1.536,0 -3.091,-0.305 -4.385,-0.862c-1.508,-0.646 -2.894,-1.553 -3.903,-2.554l-0.601,-0.48l-2.708,2.543l-2.843,0c-0.465,0 -0.842,-0.377 -0.842,-0.842l0,-32.911c0,-0.467 0.378,-0.845 0.845,-0.845l4.701,0c0.467,0 0.847,0.379 0.847,0.847l0,12.166l0.598,-0.455c1.287,-1.204 2.95,-2.034 4.125,-2.52c1.249,-0.516 2.621,-0.78 4.076,-0.78c3.306,0 6.085,1.248 8.499,3.812c2.408,2.557 3.581,5.661 3.581,9.488c0,3.886 -1.176,7.13 -3.505,9.64c-2.302,2.491 -5.157,3.753 -8.485,3.753"/>
+     </g>
+     <g fill="#FFF" id="g4203">
+      <path fill="#000000" fill-rule="nonzero" id="path4205" d="m460.078642,184.036586l0.149,0.387c0.847,1.866 1.627,3.045 2.381,3.604c1.364,1.009 2.965,1.522 4.765,1.522c1.543,0 3.024,-0.499 4.396,-1.485c1.209,-0.865 2.09,-2.13 2.533,-3.616l0.101,-0.412l-14.325,0zm6.978,10.753c-3.801,0 -6.871,-1.255 -9.39,-3.836c-2.52,-2.584 -3.745,-5.741 -3.745,-9.651c0,-3.815 1.228,-6.902 3.757,-9.439c2.526,-2.535 5.709,-3.766 9.73,-3.766c2.584,0 4.824,0.454 6.656,1.348c1.543,0.752 2.915,1.843 4.079,3.243c0.167,0.203 0.233,0.472 0.172,0.728c-0.056,0.257 -0.23,0.472 -0.469,0.583l-3.782,1.739c-0.3,0.138 -0.656,0.089 -0.907,-0.128c-1.691,-1.459 -3.641,-2.2 -5.797,-2.2c-2.156,0 -3.793,0.489 -5.008,1.493c-1.29,1.072 -2.003,2.191 -2.332,3.679l19.696,0c0.466,0 0.842,0.375 0.844,0.841l0.007,0.835c0,4.359 -1.369,8.256 -3.757,10.695c-2.529,2.581 -5.718,3.836 -9.754,3.836"/>
+     </g>
+     <g fill="#FFF" id="g4207">
+      <path fill="#000000" fill-rule="nonzero" id="path4209" d="m428.942961,184.036586l0.148,0.386c0.854,1.871 1.635,3.05 2.387,3.605c1.36,1.009 2.963,1.522 4.763,1.522c1.542,0 3.022,-0.5 4.396,-1.485c1.208,-0.865 2.088,-2.13 2.533,-3.615l0.099,-0.413l-14.326,0zm6.979,10.753c-3.798,0 -6.871,-1.255 -9.39,-3.836c-2.521,-2.584 -3.745,-5.741 -3.745,-9.651c0,-3.816 1.227,-6.904 3.757,-9.439c2.526,-2.535 5.709,-3.766 9.73,-3.766c2.584,0 4.824,0.454 6.656,1.348c1.544,0.752 2.915,1.843 4.079,3.244c0.168,0.202 0.231,0.471 0.172,0.728c-0.056,0.256 -0.231,0.471 -0.469,0.582l-3.782,1.739c-0.298,0.138 -0.655,0.089 -0.907,-0.128c-1.688,-1.459 -3.639,-2.2 -5.797,-2.2c-2.156,0 -3.793,0.489 -5.005,1.494c-1.29,1.071 -2.006,2.189 -2.335,3.678l19.696,0c0.465,0 0.844,0.375 0.847,0.841l0.004,0.835c0,4.358 -1.369,8.254 -3.757,10.695c-2.526,2.581 -5.715,3.836 -9.754,3.836"/>
+     </g>
+     <g fill="#FFF" id="g4211">
+      <path fill="#000000" fill-rule="nonzero" id="path4213" d="m355.595244,180.065883c-2.797,0 -5.063,2.266 -5.063,5.063c0,0.295 0.025,0.584 0.075,0.865l-12.108,6.972c-0.881,-0.744 -2.02,-1.193 -3.263,-1.193c-2.797,0 -5.064,2.267 -5.064,5.063c0,2.796 2.267,5.063 5.064,5.063c2.797,0 5.064,-2.267 5.064,-5.063c0,-0.322 -0.033,-0.637 -0.091,-0.943l12.064,-6.946c0.889,0.775 2.051,1.245 3.322,1.245c2.795,0 5.062,-2.267 5.062,-5.063c0,-2.797 -2.267,-5.063 -5.062,-5.063m-15.357,-6.724c0,-2.796 -2.266,-5.063 -5.063,-5.063c-2.795,0 -5.062,2.267 -5.062,5.063c0,2.797 2.267,5.064 5.062,5.064c1.257,0 2.405,-0.459 3.29,-1.217l8.827,5.073c0.377,-1.089 0.963,-2.081 1.708,-2.929l-8.843,-5.083c0.052,-0.295 0.081,-0.598 0.081,-0.908m30.444,30.899l-24.042,13.738c-1.637,0.935 -3.647,0.935 -5.284,0l-24.04,-13.738c-1.66,-0.948 -2.684,-2.714 -2.684,-4.624l0,-27.946c0,-1.902 1.015,-3.661 2.663,-4.612l41.387,-23.889l0.007,16.968l12.01,6.921c1.65,0.951 2.666,2.71 2.666,4.614l0,27.944c0,1.91 -1.024,3.676 -2.683,4.624"/>
+     </g>
+    </g>
+   </g>
+  </g>
+ </g>
+</svg>

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

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

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

@@ -0,0 +1,9 @@
+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.ts

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

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

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

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

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

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

@@ -0,0 +1,56 @@
+import defineAction from '../../../../helpers/define-action';
+
+export default defineAction({
+  name: 'Delay For',
+  key: 'delayFor',
+  description:
+    'Delays the execution of the next action by a specified amount of time.',
+  arguments: [
+    {
+      label: 'Delay for unit',
+      key: 'delayForUnit',
+      type: 'dropdown' as const,
+      required: true,
+      value: null,
+      description: 'Delay for unit, e.g. minutes, hours, days, weeks.',
+      variables: false,
+      options: [
+        {
+          label: 'Minutes',
+          value: 'minutes',
+        },
+        {
+          label: 'Hours',
+          value: 'hours',
+        },
+        {
+          label: 'Days',
+          value: 'days',
+        },
+        {
+          label: 'Weeks',
+          value: 'weeks',
+        },
+      ],
+    },
+    {
+      label: 'Delay for value',
+      key: 'delayForValue',
+      type: 'string' as const,
+      required: true,
+      description: 'Delay for value, use a number, e.g. 1, 2, 3.',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const { delayForUnit, delayForValue } = $.step.parameters;
+
+    const dataItem = {
+      delayForUnit,
+      delayForValue,
+    };
+
+    $.setActionItem({ raw: dataItem });
+  },
+});

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

@@ -0,0 +1,28 @@
+import defineAction from '../../../../helpers/define-action';
+
+export default defineAction({
+  name: 'Delay Until',
+  key: 'delayUntil',
+  description:
+    'Delays the execution of the next action until a specified date.',
+  arguments: [
+    {
+      label: 'Delay until (Date)',
+      key: 'delayUntil',
+      type: 'string' as const,
+      required: true,
+      description: 'Delay until the date. E.g. 2022-12-18',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const { delayUntil } = $.step.parameters;
+
+    const dataItem = {
+      delayUntil,
+    };
+
+    $.setActionItem({ raw: dataItem });
+  },
+});

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

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

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

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 122.88 100.6" style="enable-background:new 0 0 122.88 100.6" xml:space="preserve">
+  <style type="text/css">.st0{fill:#272727;} .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#000000;}</style>
+  <g>
+    <path class="st0" d="M72.58,0c6.8,0,13.3,1.36,19.23,3.81c6.16,2.55,11.7,6.29,16.33,10.92l0,0c4.63,4.63,8.37,10.17,10.92,16.34 c2.46,5.93,3.81,12.43,3.81,19.23c0,6.8-1.36,13.3-3.81,19.23c-2.55,6.16-6.29,11.7-10.92,16.33l0,0 c-4.63,4.63-10.17,8.37-16.34,10.92c-5.93,2.46-12.43,3.81-19.23,3.81c-6.8,0-13.3-1.36-19.23-3.81 c-6.15-2.55-11.69-6.28-16.33-10.92l-0.01-0.01c-4.64-4.64-8.37-10.17-10.92-16.33c-0.79-1.91-1.47-3.87-2.02-5.89 c1.05,0.1,2.12,0.15,3.2,0.15c2.05,0,4.05-0.19,6-0.54c0.32,0.97,0.67,1.93,1.06,2.87c2.09,5.05,5.17,9.6,8.99,13.43 c3.82,3.82,8.38,6.9,13.43,8.99c4.87,2.02,10.21,3.13,15.83,3.13c5.62,0,10.96-1.11,15.83-3.13c5.05-2.09,9.6-5.17,13.43-8.99 c3.82-3.82,6.9-8.38,8.99-13.43c2.02-4.87,3.13-10.21,3.13-15.83c0-5.62-1.11-10.96-3.13-15.83c-2.09-5.05-5.17-9.6-8.99-13.43 c-3.82-3.82-8.38-6.9-13.43-8.99c-4.87-2.02-10.21-3.13-15.83-3.13c-5.62,0-10.96,1.11-15.83,3.13c-0.44,0.18-0.87,0.37-1.3,0.56 c-1.65-2.61-3.66-4.97-5.95-7.02c1.25-0.65,2.53-1.24,3.84-1.79C59.28,1.36,65.78,0,72.58,0L72.58,0z M66.8,26.39 c0-1.23,0.5-2.35,1.31-3.16c0.81-0.81,1.93-1.31,3.16-1.31c1.23,0,2.35,0.5,3.16,1.31c0.81,0.81,1.31,1.93,1.31,3.16v23.47 l17.54,10.4c1.05,0.62,1.76,1.62,2.05,2.73c0.28,1.1,0.15,2.31-0.47,3.37l0,0.01l0,0c-0.62,1.05-1.62,1.76-2.73,2.05 c-1.1,0.28-2.31,0.15-3.37-0.47l-0.01,0l0,0L69.1,56.29c-0.67-0.38-1.24-0.92-1.64-1.57c-0.42-0.68-0.66-1.48-0.66-2.32V26.39 L66.8,26.39z"/>
+    <path class="st1" d="M27.27,3.18c15.06,0,27.27,12.21,27.27,27.27c0,15.06-12.21,27.27-27.27,27.27C12.21,57.73,0,45.52,0,30.45 C0,15.39,12.21,3.18,27.27,3.18L27.27,3.18z M24.35,41.34h5.82v5.16h-5.82V41.34L24.35,41.34L24.35,41.34z M30.17,37.77h-5.82 c-0.58-7.07-1.8-11.56-1.8-18.63c0-2.61,2.12-4.72,4.72-4.72c2.61,0,4.72,2.12,4.72,4.72C32,26.2,30.76,30.7,30.17,37.77 L30.17,37.77L30.17,37.77L30.17,37.77z"/>
+  </g>
+</svg>

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

@@ -0,0 +1,14 @@
+import defineApp from '../../helpers/define-app';
+import actions from './actions';
+
+export default defineApp({
+  name: 'Delay',
+  key: 'delay',
+  iconUrl: '{BASE_URL}/apps/delay/assets/favicon.svg',
+  authDocUrl: 'https://automatisch.io/docs/apps/delay/connection',
+  supportsConnections: false,
+  baseUrl: '',
+  apiBaseUrl: '',
+  primaryColor: '001F52',
+  actions,
+});

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

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

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

@@ -0,0 +1,47 @@
+import defineAction from '../../../../helpers/define-action';
+
+export default defineAction({
+  name: 'Send a message to channel',
+  key: 'sendMessageToChannel',
+  description: 'Sends a message to a specific channel you specify.',
+  arguments: [
+    {
+      label: 'Channel',
+      key: 'channel',
+      type: 'dropdown' as const,
+      required: true,
+      description: 'Pick a channel to send the message to.',
+      variables: false,
+      source: {
+        type: 'query',
+        name: 'getDynamicData',
+        arguments: [
+          {
+            name: 'key',
+            value: 'listChannels',
+          },
+        ],
+      },
+    },
+    {
+      label: 'Message text',
+      key: 'message',
+      type: 'string' as const,
+      required: true,
+      description: 'The content of your new message.',
+      variables: true,
+    },
+  ],
+
+  async run($) {
+    const data = {
+      content: $.step.parameters.message as string,
+    };
+    const response = await $.http?.post(
+      `/channels/${$.step.parameters.channel}/messages`,
+      data
+    );
+
+    $.setActionItem({ raw: response.data });
+  },
+});

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

@@ -0,0 +1,22 @@
+import { IField, IGlobalVariable } from '@automatisch/types';
+import { URLSearchParams } from 'url';
+import scopes from '../common/scopes';
+
+export default async function generateAuthUrl($: IGlobalVariable) {
+  const oauthRedirectUrlField = $.app.auth.fields.find(
+    (field: IField) => field.key == 'oAuthRedirectUrl'
+  );
+  const callbackUrl = oauthRedirectUrlField.value as string;
+
+  const searchParams = new URLSearchParams({
+    client_id: $.auth.data.consumerKey as string,
+    redirect_uri: callbackUrl,
+    response_type: 'code',
+    permissions: '2146958591',
+    scope: scopes.join(' '),
+  });
+
+  const url = `${$.app.apiBaseUrl}/oauth2/authorize?${searchParams.toString()}`;
+
+  await $.auth.set({ url });
+}

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

@@ -0,0 +1,61 @@
+import generateAuthUrl from './generate-auth-url';
+import verifyCredentials from './verify-credentials';
+import isStillVerified from './is-still-verified';
+
+export default {
+  fields: [
+    {
+      key: 'oAuthRedirectUrl',
+      label: 'OAuth Redirect URL',
+      type: 'string' as const,
+      required: true,
+      readOnly: true,
+      value: '{WEB_APP_URL}/app/discord/connections/add',
+      placeholder: null,
+      description:
+        'When asked to input an OAuth callback or redirect URL in Discord OAuth, enter the URL above.',
+      docUrl: 'https://automatisch.io/docs/discord#oauth-redirect-url',
+      clickToCopy: true,
+    },
+    {
+      key: 'consumerKey',
+      label: 'Consumer Key',
+      type: 'string' as const,
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      docUrl: 'https://automatisch.io/docs/discord#consumer-key',
+      clickToCopy: false,
+    },
+    {
+      key: 'consumerSecret',
+      label: 'Consumer Secret',
+      type: 'string' as const,
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      docUrl: 'https://automatisch.io/docs/discord#consumer-secret',
+      clickToCopy: false,
+    },
+    {
+      key: 'botToken',
+      label: 'Bot token',
+      type: 'string' as const,
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      docUrl: 'https://automatisch.io/docs/discord#bot-token',
+      clickToCopy: false,
+    },
+  ],
+
+  generateAuthUrl,
+  verifyCredentials,
+  isStillVerified,
+};

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

@@ -0,0 +1,10 @@
+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.ts

@@ -0,0 +1,53 @@
+import { IGlobalVariable, IField } from '@automatisch/types';
+import { URLSearchParams } from 'url';
+import scopes from '../common/scopes';
+import getCurrentUser from '../common/get-current-user';
+
+const verifyCredentials = async ($: IGlobalVariable) => {
+  const oauthRedirectUrlField = $.app.auth.fields.find(
+    (field: IField) => field.key == 'oAuthRedirectUrl'
+  );
+  const callbackUrl = oauthRedirectUrlField.value as string;
+  const params = new URLSearchParams({
+    client_id: $.auth.data.consumerKey as string,
+    redirect_uri: callbackUrl,
+    response_type: 'code',
+    scope: scopes.join(' '),
+    client_secret: $.auth.data.consumerSecret as string,
+    code: $.auth.data.code as string,
+    grant_type: 'authorization_code',
+  });
+  const { data: verifiedCredentials } = await $.http.post(
+    '/oauth2/token',
+    params.toString()
+  );
+
+  const {
+    access_token: accessToken,
+    refresh_token: refreshToken,
+    expires_in: expiresIn,
+    scope: scope,
+    token_type: tokenType,
+    guild: { id: guildId, name: guildName },
+  } = verifiedCredentials;
+
+  await $.auth.set({
+    accessToken,
+    refreshToken,
+    expiresIn,
+    scope,
+    tokenType,
+  });
+
+  const user = await getCurrentUser($);
+
+  await $.auth.set({
+    userId: user.id,
+    screenName: user.username,
+    email: user.email,
+    guildId,
+    guildName,
+  });
+};
+
+export default verifyCredentials;

packages/backend/src/apps/discord/authentication.ts

@@ -1,99 +0,0 @@
-import type {
-  IAuthentication,
-  IApp,
-  IField,
-  IJSONObject,
-} from '@automatisch/types';
-import { URLSearchParams } from 'url';
-import axios, { AxiosInstance } from 'axios';
-
-export default class Authentication implements IAuthentication {
-  appData: IApp;
-  connectionData: IJSONObject;
-  client: AxiosInstance = axios.create({
-    baseURL: 'https://discord.com/api/',
-  });
-
-  scope: string[] = ['identify', 'email'];
-
-  constructor(appData: IApp, connectionData: IJSONObject) {
-    this.appData = appData;
-    this.connectionData = connectionData;
-  }
-
-  get oauthRedirectUrl() {
-    return this.appData.fields.find(
-      (field: IField) => field.key == 'oAuthRedirectUrl'
-    ).value;
-  }
-
-  async createAuthData() {
-    const searchParams = new URLSearchParams({
-      client_id: this.connectionData.consumerKey as string,
-      redirect_uri: this.oauthRedirectUrl,
-      response_type: 'code',
-      scope: this.scope.join(' '),
-    });
-
-    const url = `https://discord.com/api/oauth2/authorize?${searchParams.toString()}`;
-
-    return { url };
-  }
-
-  async verifyCredentials() {
-    const params = new URLSearchParams({
-      client_id: this.connectionData.consumerKey as string,
-      redirect_uri: this.oauthRedirectUrl,
-      response_type: 'code',
-      scope: this.scope.join(' '),
-      client_secret: this.connectionData.consumerSecret as string,
-      code: this.connectionData.oauthVerifier as string,
-      grant_type: 'authorization_code',
-    });
-    const { data: verifiedCredentials } = await this.client.post(
-      '/oauth2/token',
-      params.toString()
-    );
-
-    const {
-      access_token: accessToken,
-      refresh_token: refreshToken,
-      expires_in: expiresIn,
-      scope: scope,
-      token_type: tokenType,
-    } = verifiedCredentials;
-
-    const { data: user } = await this.client.get('/users/@me', {
-      headers: {
-        Authorization: `${tokenType} ${accessToken}`,
-      },
-    });
-
-    return {
-      consumerKey: this.connectionData.consumerKey,
-      consumerSecret: this.connectionData.consumerSecret,
-      accessToken,
-      refreshToken,
-      expiresIn,
-      scope,
-      tokenType,
-      userId: user.id,
-      screenName: user.username,
-      email: user.email,
-    };
-  }
-
-  async isStillVerified() {
-    try {
-      await this.client.get('/users/@me', {
-        headers: {
-          Authorization: `${this.connectionData.tokenType} ${this.connectionData.accessToken}`,
-        },
-      });
-
-      return true;
-    } catch {
-      return false;
-    }
-  }
-}

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

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

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

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

packages/backend/src/apps/discord/common/scopes.ts

@@ -0,0 +1,3 @@
+const scopes = ['bot', 'identify'];
+
+export default scopes;

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

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

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

@@ -0,0 +1,34 @@
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+
+export default {
+  name: 'List channels',
+  key: 'listChannels',
+
+  async run($: IGlobalVariable) {
+    const channels: {
+      data: IJSONObject[];
+      error: IJSONObject | null;
+    } = {
+      data: [],
+      error: null,
+    };
+
+    const response = await $.http.get(
+      `/guilds/${$.auth.data.guildId}/channels`
+    );
+
+    channels.data = response.data
+      .filter((channel: IJSONObject) => {
+        // filter in text channels only
+        return channel.type === 0;
+      })
+      .map((channel: IJSONObject) => {
+        return {
+          value: channel.id,
+          name: channel.name,
+        };
+      });
+
+    return channels;
+  },
+};

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

@@ -1,15 +1,22 @@
-import Authentication from './authentication';
+import defineApp from '../../helpers/define-app';
-import {
+import addAuthHeader from './common/add-auth-header';
-  IService,
+import auth from './auth';
-  IAuthentication,
+import dynamicData from './dynamic-data';
-  IApp,
+import actions from './actions';
-  IJSONObject,
+import triggers from './triggers';
-} from '@automatisch/types';
 
-export default class Discord implements IService {
+export default defineApp({
-  authenticationClient: IAuthentication;
+  name: 'Discord',
-
+  key: 'discord',
-  constructor(appData: IApp, connectionData: IJSONObject) {
+  iconUrl: '{BASE_URL}/apps/discord/assets/favicon.svg',
-    this.authenticationClient = new Authentication(appData, connectionData);
+  authDocUrl: 'https://automatisch.io/docs/apps/discord/connection',
-  }
+  supportsConnections: true,
-}
+  baseUrl: 'https://discord.com',
+  apiBaseUrl: 'https://discord.com/api',
+  primaryColor: '5865f2',
+  beforeRequest: [addAuthHeader],
+  auth,
+  dynamicData,
+  triggers,
+  actions,
+});

packages/backend/src/apps/discord/info.json

@@ -1,219 +0,0 @@
-{
-  "name": "Discord",
-  "key": "discord",
-  "iconUrl": "{BASE_URL}/apps/discord/assets/favicon.svg",
-  "docUrl": "https://automatisch.io/docs/discord",
-  "primaryColor": "5865f2",
-  "supportsConnections": true,
-  "fields": [
-    {
-      "key": "oAuthRedirectUrl",
-      "label": "OAuth Redirect URL",
-      "type": "string",
-      "required": true,
-      "readOnly": true,
-      "value": "{WEB_APP_URL}/app/discord/connections/add",
-      "placeholder": null,
-      "description": "When asked to input an OAuth callback or redirect URL in Discord OAuth, enter the URL above.",
-      "docUrl": "https://automatisch.io/docs/discord#oauth-redirect-url",
-      "clickToCopy": true
-    },
-    {
-      "key": "consumerKey",
-      "label": "Consumer Key",
-      "type": "string",
-      "required": true,
-      "readOnly": false,
-      "value": null,
-      "placeholder": null,
-      "description": null,
-      "docUrl": "https://automatisch.io/docs/discord#consumer-key",
-      "clickToCopy": false
-    },
-    {
-      "key": "consumerSecret",
-      "label": "Consumer Secret",
-      "type": "string",
-      "required": true,
-      "readOnly": false,
-      "value": null,
-      "placeholder": null,
-      "description": null,
-      "docUrl": "https://automatisch.io/docs/discord#consumer-secret",
-      "clickToCopy": false
-    }
-  ],
-  "authenticationSteps": [
-    {
-      "step": 1,
-      "type": "mutation",
-      "name": "createConnection",
-      "arguments": [
-        {
-          "name": "key",
-          "value": "{key}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "consumerKey",
-              "value": "{fields.consumerKey}"
-            },
-            {
-              "name": "consumerSecret",
-              "value": "{fields.consumerSecret}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 2,
-      "type": "mutation",
-      "name": "createAuthData",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{createConnection.id}"
-        }
-      ]
-    },
-    {
-      "step": 3,
-      "type": "openWithPopup",
-      "name": "openAuthPopup",
-      "arguments": [
-        {
-          "name": "url",
-          "value": "{createAuthData.url}"
-        }
-      ]
-    },
-    {
-      "step": 4,
-      "type": "mutation",
-      "name": "updateConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{createConnection.id}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "oauthVerifier",
-              "value": "{openAuthPopup.code}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 5,
-      "type": "mutation",
-      "name": "verifyConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{createConnection.id}"
-        }
-      ]
-    }
-  ],
-  "reconnectionSteps": [
-    {
-      "step": 1,
-      "type": "mutation",
-      "name": "resetConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        }
-      ]
-    },
-    {
-      "step": 2,
-      "type": "mutation",
-      "name": "updateConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "consumerKey",
-              "value": "{fields.consumerKey}"
-            },
-            {
-              "name": "consumerSecret",
-              "value": "{fields.consumerSecret}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 3,
-      "type": "mutation",
-      "name": "createAuthData",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        }
-      ]
-    },
-    {
-      "step": 4,
-      "type": "openWithPopup",
-      "name": "openAuthPopup",
-      "arguments": [
-        {
-          "name": "url",
-          "value": "{createAuthData.url}"
-        }
-      ]
-    },
-    {
-      "step": 5,
-      "type": "mutation",
-      "name": "updateConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "oauthVerifier",
-              "value": "{openAuthPopup.code}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 6,
-      "type": "mutation",
-      "name": "verifyConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        }
-      ]
-    }
-  ]
-}

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

@@ -0,0 +1 @@
+export default [];

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

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

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

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

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

@@ -0,0 +1,45 @@
+import path from 'node:path';
+import defineAction from '../../../../helpers/define-action';
+
+export default defineAction({
+  name: 'Rename file',
+  key: 'renameFile',
+  description: 'Rename a file with the given file path and new name',
+  arguments: [
+    {
+      label: 'File Path',
+      key: 'filePath',
+      type: 'string' as const,
+      required: true,
+      description:
+        'Write the full path to the file such as /Folder1/File.pdf',
+      variables: true,
+    },
+    {
+      label: 'New Name',
+      key: 'newName',
+      type: 'string' as const,
+      required: true,
+      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 newName = $.step.parameters.newName as string;
+    const fileObject = path.parse(filePath);
+    const newPath = path.format({
+      dir: fileObject.dir,
+      ext: fileObject.ext,
+      name: newName,
+    });
+
+    const response = await $.http.post('/2/files/move_v2', {
+      from_path: filePath,
+      to_path: newPath,
+    });
+
+    $.setActionItem({ raw: response.data.metadata });
+  },
+});

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

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-label="Dropbox" role="img" viewBox="0 0 512 512" fill="#0061ff">
+  <path d="M158 101l-99 63 295 188 99-63m-99-188l99 63-295 188-99-63m99 83l98 63 98-63-98-62z"/>
+</svg>

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

@@ -0,0 +1,22 @@
+import { URLSearchParams } from 'url';
+import { IField, IGlobalVariable } from '@automatisch/types';
+import scopes from '../common/scopes';
+
+export default async function generateAuthUrl($: IGlobalVariable) {
+  const oauthRedirectUrlField = $.app.auth.fields.find(
+    (field: IField) => field.key == 'oAuthRedirectUrl'
+  );
+  const callbackUrl = oauthRedirectUrlField.value as string;
+
+  const searchParams = new URLSearchParams({
+    client_id: $.auth.data.clientId as string,
+    redirect_uri: callbackUrl,
+    response_type: 'code',
+    scope: scopes.join(' '),
+    token_access_type: 'offline',
+  });
+
+  const url = `${$.app.baseUrl}/oauth2/authorize?${searchParams.toString()}`;
+
+  await $.auth.set({ url });
+}

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

@@ -0,0 +1,48 @@
+import generateAuthUrl from './generate-auth-url';
+import verifyCredentials from './verify-credentials';
+import isStillVerified from './is-still-verified';
+import refreshToken from './refresh-token';
+
+export default {
+  fields: [
+    {
+      key: 'oAuthRedirectUrl',
+      label: 'OAuth Redirect URL',
+      type: 'string' as const,
+      required: true,
+      readOnly: true,
+      value: '{WEB_APP_URL}/app/dropbox/connections/add',
+      placeholder: null,
+      description:
+        'When asked to input an OAuth callback or redirect URL in Dropbox OAuth, enter the URL above.',
+      clickToCopy: true,
+    },
+    {
+      key: 'clientId',
+      label: 'App Key',
+      type: 'string' as const,
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      clickToCopy: false,
+    },
+    {
+      key: 'clientSecret',
+      label: 'App Secret',
+      type: 'string' as const,
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      clickToCopy: false,
+    },
+  ],
+
+  generateAuthUrl,
+  verifyCredentials,
+  isStillVerified,
+  refreshToken,
+};

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

@@ -0,0 +1,9 @@
+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.ts

@@ -0,0 +1,41 @@
+import { Buffer } from 'node:buffer';
+import { IGlobalVariable } from '@automatisch/types';
+
+const refreshToken = async ($: IGlobalVariable) => {
+  const params = {
+    grant_type: 'refresh_token',
+    refresh_token: $.auth.data.refreshToken as string,
+  };
+
+  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;

packages/backend/src/apps/dropbox/auth/verify-credentials.ts

@@ -0,0 +1,102 @@
+import { IGlobalVariable, IField } from '@automatisch/types';
+import getCurrentAccount from '../common/get-current-account';
+
+type TAccount = {
+  account_id: string,
+  name: {
+    given_name: string,
+    surname: string,
+    familiar_name: string,
+    display_name: string,
+    abbreviated_name: string,
+  },
+  email: string,
+  email_verified: boolean,
+  disabled: boolean,
+  country: string,
+  locale: string,
+  referral_link: string,
+  is_paired: boolean,
+  account_type: {
+    ".tag": string,
+  },
+  root_info: {
+    ".tag": string,
+    root_namespace_id: string,
+    home_namespace_id: string,
+  },
+}
+
+const verifyCredentials = async ($: IGlobalVariable) => {
+  const oauthRedirectUrlField = $.app.auth.fields.find(
+    (field: IField) => field.key == 'oAuthRedirectUrl'
+  );
+  const redirectUrl = oauthRedirectUrlField.value as string;
+  const params = {
+    client_id: $.auth.data.clientId as string,
+    redirect_uri: redirectUrl,
+    client_secret: $.auth.data.clientSecret as string,
+    code: $.auth.data.code as string,
+    grant_type: 'authorization_code',
+  }
+  const { data: verifiedCredentials } = await $.http.post(
+    '/oauth2/token',
+    null,
+    { params }
+  );
+
+  const {
+    access_token: accessToken,
+    refresh_token: refreshToken,
+    expires_in: expiresIn,
+    scope: scope,
+    token_type: tokenType,
+    account_id: accountId,
+    team_id: teamId,
+    id_token: idToken,
+    uid,
+  } = verifiedCredentials;
+
+  await $.auth.set({
+    accessToken,
+    refreshToken,
+    expiresIn,
+    scope,
+    tokenType,
+    accountId,
+    teamId,
+    idToken,
+    uid
+  });
+
+  const account = await getCurrentAccount($) as TAccount;
+
+  await $.auth.set({
+    accountId: account.account_id,
+    name: {
+      givenName: account.name.given_name,
+      surname: account.name.surname,
+      familiarName: account.name.familiar_name,
+      displayName: account.name.display_name,
+      abbreviatedName: account.name.abbreviated_name,
+    },
+    email: account.email,
+    emailVerified: account.email_verified,
+    disabled: account.disabled,
+    country: account.country,
+    locale: account.locale,
+    referralLink: account.referral_link,
+    isPaired: account.is_paired,
+    accountType: {
+      ".tag": account.account_type['.tag'],
+    },
+    rootInfo: {
+      ".tag": account.root_info['.tag'],
+      rootNamespaceId: account.root_info.root_namespace_id,
+      homeNamespaceId: account.root_info.home_namespace_id,
+    },
+    screenName: `${account.name.display_name} - ${account.email}`,
+  });
+};
+
+export default verifyCredentials;

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

@@ -0,0 +1,13 @@
+import { TBeforeRequest } from '@automatisch/types';
+
+const addAuthHeader: TBeforeRequest = ($, requestConfig) => {
+  requestConfig.headers['Content-Type'] = 'application/json';
+
+  if (!requestConfig.additionalProperties?.skipAddingAuthHeader && $.auth.data?.accessToken) {
+    requestConfig.headers.Authorization = `Bearer ${$.auth.data.accessToken}`;
+  }
+
+  return requestConfig;
+};
+
+export default addAuthHeader;

packages/backend/src/apps/dropbox/common/get-current-account.ts

@@ -0,0 +1,8 @@
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+
+const getCurrentAccount = async ($: IGlobalVariable): Promise<IJSONObject> => {
+  const response = await $.http.post('/2/users/get_current_account', null);
+  return response.data;
+};
+
+export default getCurrentAccount;

packages/backend/src/apps/dropbox/common/scopes.ts

@@ -0,0 +1,8 @@
+const scopes = [
+  'account_info.read',
+  'files.metadata.read',
+  'files.content.write',
+  'files.content.read',
+];
+
+export default scopes;

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

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

packages/backend/src/apps/filter/actions/continue/index.ts

@@ -0,0 +1,79 @@
+import defineAction from '../../../../helpers/define-action';
+
+type TGroupItem = {
+  key: string;
+  operator: keyof TOperators;
+  value: string;
+  id: string;
+}
+
+type TGroup = Record<'and', TGroupItem[]>;
+
+const isEqual = (a: string, b: string) => a === b;
+const isNotEqual = (a: string, b: string) => !isEqual(a, b)
+const isGreaterThan = (a: string, b: string) => Number(a) > Number(b);
+const isLessThan = (a: string, b: string) => Number(a) < Number(b);
+const isGreaterThanOrEqual = (a: string, b: string) => Number(a) >= Number(b);
+const isLessThanOrEqual = (a: string, b: string) => Number(a) <= Number(b);
+const contains = (a: string, b: string) => a.includes(b);
+const doesNotContain = (a: string, b: string) => !contains(a, b);
+
+type TOperatorFunc = (a: string, b: string) => boolean;
+
+type TOperators = {
+  equal: TOperatorFunc;
+  not_equal: TOperatorFunc;
+  greater_than: TOperatorFunc;
+  less_than: TOperatorFunc;
+  greater_than_or_equal: TOperatorFunc;
+  less_than_or_equal: TOperatorFunc;
+  contains: TOperatorFunc;
+  not_contains: TOperatorFunc;
+};
+
+const operators: TOperators = {
+  'equal': isEqual,
+  'not_equal': isNotEqual,
+  'greater_than': isGreaterThan,
+  'less_than': isLessThan,
+  'greater_than_or_equal': isGreaterThanOrEqual,
+  'less_than_or_equal': isLessThanOrEqual,
+  'contains': contains,
+  'not_contains': doesNotContain,
+};
+
+const operate = (operation: keyof TOperators, a: string, b: string) => {
+  return operators[operation](a, b);
+};
+
+export default defineAction({
+  name: 'Continue if conditions match',
+  key: 'continueIfMatches',
+  description: 'Let the execution continue if the conditions match',
+  arguments: [],
+
+  async run($) {
+    const orGroups = $.step.parameters.or as TGroup[];
+
+    const matchingGroups = orGroups.reduce((groups, group) => {
+      const matchingConditions = group.and
+        .filter((condition) => operate(condition.operator, condition.key, condition.value));
+
+      if (matchingConditions.length) {
+        return groups.concat([{ and: matchingConditions }]);
+      }
+
+      return groups;
+    }, []);
+
+    if (matchingGroups.length === 0) {
+      $.execution.exit();
+    }
+
+    $.setActionItem({
+      raw: {
+        or: matchingGroups,
+      }
+    });
+  },
+});

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

@@ -0,0 +1,3 @@
+import continueIfMatches from './continue';
+
+export default [continueIfMatches];

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

@@ -0,0 +1,8 @@
+<svg width="800px" height="800px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Shape" fill="#000000" transform="translate(42.666667, 85.333333)">
+      <path d="M3.55271368e-14,1.42108547e-14 L191.565013,234.666667 L192,234.666667 L192,384 L234.666667,384 L234.666667,234.666667 L426.666667,1.42108547e-14 L3.55271368e-14,1.42108547e-14 Z M214.448,192 L211.81248,192 L89.9076267,42.6666667 L336.630187,42.6666667 L214.448,192 Z">
+      </path>
+    </g>
+  </g>
+</svg>

packages/backend/src/apps/filter/index.ts

@@ -0,0 +1,14 @@
+import defineApp from '../../helpers/define-app';
+import actions from './actions';
+
+export default defineApp({
+  name: 'Filter',
+  key: 'filter',
+  iconUrl: '{BASE_URL}/apps/filter/assets/favicon.svg',
+  authDocUrl: 'https://automatisch.io/docs/apps/filter/connection',
+  supportsConnections: false,
+  baseUrl: '',
+  apiBaseUrl: '',
+  primaryColor: '001F52',
+  actions,
+});

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

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="256px" height="351px" viewBox="0 0 256 351" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
-    <defs>
-        <path d="M1.25273437,280.731641 L2.85834533,277.600858 L102.211177,89.0833546 L58.0613266,5.6082033 C54.3920011,-1.28304578 45.0741245,0.473674398 43.8699203,8.18789086 L1.25273437,280.731641 Z" id="path-1"></path>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-2">
-            <feGaussianBlur stdDeviation="17.5" in="SourceAlpha" result="shadowBlurInner1"></feGaussianBlur>
-            <feOffset dx="0" dy="0" in="shadowBlurInner1" result="shadowOffsetInner1"></feOffset>
-            <feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.06 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
-        </filter>
-        <path d="M134.417103,148.974235 L166.455722,116.161738 L134.417104,55.1546874 C131.374828,49.3635911 123.983911,48.7568362 120.973828,54.5646483 L103.26875,88.6738296 L102.739423,90.4175473 L134.417103,148.974235 Z" id="path-3"></path>
-        <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
-            <feGaussianBlur stdDeviation="3.5" in="SourceAlpha" result="shadowBlurInner1"></feGaussianBlur>
-            <feOffset dx="1" dy="-9" in="shadowBlurInner1" result="shadowOffsetInner1"></feOffset>
-            <feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.09 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
-        </filter>
-    </defs>
-	<g>
-		<path d="M0,282.99762 L2.12250746,280.0256 L102.527363,89.5119284 L102.739423,87.4951323 L58.478806,4.35817711 C54.7706269,-2.60604179 44.3313035,-0.845245771 43.1143483,6.95065473 L0,282.99762 Z" fill="#FFC24A"></path>
-		<g>
-			<use fill="#FFA712" fill-rule="evenodd" xlink:href="#path-1"></use>
-			<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
-		</g>
-		<path d="M135.004975,150.380704 L167.960199,116.629461 L134.995423,53.6993114 C131.866109,47.7425353 123.128817,47.7253411 120.032618,53.6993112 L102.421015,87.2880848 L102.421015,90.1487443 L135.004975,150.380704 Z" fill="#F4BD62"></path>
-		<g>
-			<use fill="#FFA50E" fill-rule="evenodd" xlink:href="#path-3"></use>
-			<use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"></use>
-		</g>
-		<polygon fill="#F6820C" points="0 282.99762 0.962097168 282.030396 4.45771144 280.60956 132.935323 152.60956 134.563025 148.178595 102.513123 87.1048584"></polygon>
-		<path d="M139.120971,347.551268 L255.395916,282.703666 L222.191698,78.2093373 C221.153051,71.8112478 213.303658,69.2818149 208.724314,73.8694368 L0.000254726368,282.997875 L115.608454,347.545536 C122.914643,351.624979 131.812872,351.62689 139.120971,347.551268" fill="#FDE068"></path>
-		<path d="M254.354084,282.159837 L221.401937,79.2179369 C220.371175,72.8684188 213.843792,70.2409553 209.299213,74.79375 L1.28945312,282.600785 L115.627825,346.509458 C122.878548,350.557931 131.709226,350.559827 138.961846,346.515146 L254.354084,282.159837 Z" fill="#FCCA3F"></path>
-		<path d="M139.120907,345.64082 C131.812808,349.716442 122.914579,349.714531 115.60839,345.635089 L0.93134768,282.014551 L0.000191044776,282.997875 L115.60839,347.545536 C122.914579,351.624979 131.812808,351.62689 139.120907,347.551268 L255.395853,282.703666 L255.111196,280.951785 L139.120907,345.64082 Z" fill="#EEAB37"></path>
-	</g>
-</svg>

packages/backend/src/apps/firebase/authentication.ts

@@ -1,89 +0,0 @@
-import type {
-  IAuthentication,
-  IApp,
-  IField,
-  IJSONObject,
-} from '@automatisch/types';
-import { google as GoogleApi } from 'googleapis';
-import { OAuth2Client } from 'google-auth-library';
-
-export default class Authentication implements IAuthentication {
-  appData: IApp;
-  connectionData: IJSONObject;
-  client: OAuth2Client;
-
-  scopes: string[] = [
-    'https://www.googleapis.com/auth/datastore',
-    'https://www.googleapis.com/auth/firebase',
-    'https://www.googleapis.com/auth/user.emails.read',
-    'profile',
-  ];
-
-  constructor(appData: IApp, connectionData: IJSONObject) {
-    this.appData = appData;
-    this.connectionData = connectionData;
-
-    this.client = new GoogleApi.auth.OAuth2(
-      connectionData.consumerKey as string,
-      connectionData.consumerSecret as string,
-      this.oauthRedirectUrl
-    );
-
-    GoogleApi.options({ auth: this.client });
-  }
-
-  get oauthRedirectUrl() {
-    return this.appData.fields.find(
-      (field: IField) => field.key == 'oAuthRedirectUrl'
-    ).value;
-  }
-
-  async createAuthData() {
-    const url = this.client.generateAuthUrl({
-      access_type: 'offline',
-      scope: this.scopes,
-    });
-
-    return { url };
-  }
-
-  async verifyCredentials() {
-    const { tokens } = await this.client.getToken(
-      this.connectionData.oauthVerifier as string
-    );
-    this.client.setCredentials(tokens);
-
-    const people = GoogleApi.people('v1');
-
-    const { data } = await people.people.get({
-      resourceName: 'people/me',
-      personFields: 'emailAddresses',
-    });
-
-    const { emailAddresses, resourceName: userId } = data;
-    const primaryEmailAddress = emailAddresses.find(
-      (emailAddress) => emailAddress.metadata.primary
-    );
-
-    return {
-      consumerKey: this.connectionData.consumerKey,
-      consumerSecret: this.connectionData.consumerSecret,
-      accessToken: tokens.access_token,
-      refreshToken: tokens.refresh_token,
-      tokenType: tokens.token_type,
-      expiryDate: tokens.expiry_date,
-      scope: tokens.scope,
-      screenName: primaryEmailAddress.value,
-      userId,
-    };
-  }
-
-  async isStillVerified() {
-    try {
-      await this.client.getTokenInfo(this.connectionData.accessToken as string);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-}

packages/backend/src/apps/firebase/index.ts

@@ -1,15 +0,0 @@
-import Authentication from './authentication';
-import {
-  IService,
-  IAuthentication,
-  IApp,
-  IJSONObject,
-} from '@automatisch/types';
-
-export default class Firebase implements IService {
-  authenticationClient: IAuthentication;
-
-  constructor(appData: IApp, connectionData: IJSONObject) {
-    this.authenticationClient = new Authentication(appData, connectionData);
-  }
-}

packages/backend/src/apps/firebase/info.json

@@ -1,219 +0,0 @@
-{
-  "name": "Firebase",
-  "key": "firebase",
-  "iconUrl": "{BASE_URL}/apps/firebase/assets/favicon.svg",
-  "docUrl": "https://automatisch.io/docs/firebase",
-  "primaryColor": "ffca28",
-  "supportsConnections": true,
-  "fields": [
-    {
-      "key": "oAuthRedirectUrl",
-      "label": "OAuth Redirect URL",
-      "type": "string",
-      "required": true,
-      "readOnly": true,
-      "value": "{WEB_APP_URL}/app/firebase/connections/add",
-      "placeholder": null,
-      "description": "When asked to input an OAuth callback or redirect URL in Firebase OAuth, enter the URL above.",
-      "docUrl": "https://automatisch.io/docs/firebase#oauth-redirect-url",
-      "clickToCopy": true
-    },
-    {
-      "key": "consumerKey",
-      "label": "Consumer Key",
-      "type": "string",
-      "required": true,
-      "readOnly": false,
-      "value": null,
-      "placeholder": null,
-      "description": null,
-      "docUrl": "https://automatisch.io/docs/firebase#consumer-key",
-      "clickToCopy": false
-    },
-    {
-      "key": "consumerSecret",
-      "label": "Consumer Secret",
-      "type": "string",
-      "required": true,
-      "readOnly": false,
-      "value": null,
-      "placeholder": null,
-      "description": null,
-      "docUrl": "https://automatisch.io/docs/firebase#consumer-secret",
-      "clickToCopy": false
-    }
-  ],
-  "authenticationSteps": [
-    {
-      "step": 1,
-      "type": "mutation",
-      "name": "createConnection",
-      "arguments": [
-        {
-          "name": "key",
-          "value": "{key}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "consumerKey",
-              "value": "{fields.consumerKey}"
-            },
-            {
-              "name": "consumerSecret",
-              "value": "{fields.consumerSecret}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 2,
-      "type": "mutation",
-      "name": "createAuthData",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{createConnection.id}"
-        }
-      ]
-    },
-    {
-      "step": 3,
-      "type": "openWithPopup",
-      "name": "openAuthPopup",
-      "arguments": [
-        {
-          "name": "url",
-          "value": "{createAuthData.url}"
-        }
-      ]
-    },
-    {
-      "step": 4,
-      "type": "mutation",
-      "name": "updateConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{createConnection.id}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "oauthVerifier",
-              "value": "{openAuthPopup.code}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 5,
-      "type": "mutation",
-      "name": "verifyConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{createConnection.id}"
-        }
-      ]
-    }
-  ],
-  "reconnectionSteps": [
-    {
-      "step": 1,
-      "type": "mutation",
-      "name": "resetConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        }
-      ]
-    },
-    {
-      "step": 2,
-      "type": "mutation",
-      "name": "updateConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "consumerKey",
-              "value": "{fields.consumerKey}"
-            },
-            {
-              "name": "consumerSecret",
-              "value": "{fields.consumerSecret}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 3,
-      "type": "mutation",
-      "name": "createAuthData",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        }
-      ]
-    },
-    {
-      "step": 4,
-      "type": "openWithPopup",
-      "name": "openAuthPopup",
-      "arguments": [
-        {
-          "name": "url",
-          "value": "{createAuthData.url}"
-        }
-      ]
-    },
-    {
-      "step": 5,
-      "type": "mutation",
-      "name": "updateConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "oauthVerifier",
-              "value": "{openAuthPopup.code}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 6,
-      "type": "mutation",
-      "name": "verifyConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        }
-      ]
-    }
-  ]
-}

packages/backend/src/apps/flickr/auth/generate-auth-url.ts

@@ -0,0 +1,21 @@
+import { IField, IGlobalVariable } from '@automatisch/types';
+import { URLSearchParams } from 'url';
+
+export default async function generateAuthUrl($: IGlobalVariable) {
+  const oauthRedirectUrlField = $.app.auth.fields.find(
+    (field: IField) => field.key == 'oAuthRedirectUrl'
+  );
+
+  const callbackUrl = oauthRedirectUrlField.value;
+  const requestPath = '/oauth/request_token';
+  const data = { oauth_callback: callbackUrl };
+
+  const response = await $.http.post(requestPath, data);
+  const responseData = Object.fromEntries(new URLSearchParams(response.data));
+
+  await $.auth.set({
+    url: `${$.app.apiBaseUrl}/oauth/authorize?oauth_token=${responseData.oauth_token}&perms=delete`,
+    accessToken: responseData.oauth_token,
+    accessSecret: responseData.oauth_token_secret,
+  });
+}

packages/backend/src/apps/flickr/auth/index.ts

@@ -0,0 +1,48 @@
+import generateAuthUrl from './generate-auth-url';
+import verifyCredentials from './verify-credentials';
+import isStillVerified from './is-still-verified';
+
+export default {
+  fields: [
+    {
+      key: 'oAuthRedirectUrl',
+      label: 'OAuth Redirect URL',
+      type: 'string' as const,
+      required: true,
+      readOnly: true,
+      value: '{WEB_APP_URL}/app/flickr/connections/add',
+      placeholder: null,
+      description:
+        'When asked to input an OAuth callback or redirect URL in Flickr OAuth, enter the URL above.',
+      docUrl: 'https://automatisch.io/docs/flickr#oauth-redirect-url',
+      clickToCopy: true,
+    },
+    {
+      key: 'consumerKey',
+      label: 'Consumer Key',
+      type: 'string' as const,
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      docUrl: 'https://automatisch.io/docs/flickr#consumer-key',
+      clickToCopy: false,
+    },
+    {
+      key: 'consumerSecret',
+      label: 'Consumer Secret',
+      type: 'string' as const,
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      docUrl: 'https://automatisch.io/docs/flickr#consumer-secret',
+      clickToCopy: false,
+    },
+  ],
+  generateAuthUrl,
+  verifyCredentials,
+  isStillVerified,
+};

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

@@ -0,0 +1,13 @@
+import { IGlobalVariable } from '@automatisch/types';
+
+const isStillVerified = async ($: IGlobalVariable) => {
+  const params = {
+    method: 'flickr.test.login',
+    format: 'json',
+    nojsoncallback: 1,
+  };
+  const response = await $.http.get('/rest', { params });
+  return !!response.data.user.id;
+};
+
+export default isStillVerified;

packages/backend/src/apps/flickr/auth/verify-credentials.ts

@@ -0,0 +1,22 @@
+import { IGlobalVariable } from '@automatisch/types';
+import { URLSearchParams } from 'url';
+
+const verifyCredentials = async ($: IGlobalVariable) => {
+  const response = await $.http.post(
+    `/oauth/access_token?oauth_verifier=${$.auth.data.oauth_verifier}&oauth_token=${$.auth.data.accessToken}`,
+    null
+  );
+
+  const responseData = Object.fromEntries(new URLSearchParams(response.data));
+
+  await $.auth.set({
+    consumerKey: $.auth.data.consumerKey,
+    consumerSecret: $.auth.data.consumerSecret,
+    accessToken: responseData.oauth_token,
+    accessSecret: responseData.oauth_token_secret,
+    userId: responseData.user_nsid,
+    screenName: responseData.fullname,
+  });
+};
+
+export default verifyCredentials;

packages/backend/src/apps/flickr/authentication.ts

@@ -1,82 +0,0 @@
-import type {
-  IAuthentication,
-  IApp,
-  IField,
-  IJSONObject,
-} from '@automatisch/types';
-import FlickrApi from 'flickr-sdk';
-
-export default class Authentication implements IAuthentication {
-  appData: IApp;
-  connectionData: IJSONObject;
-  client: typeof FlickrApi;
-  oauthClient: typeof FlickrApi;
-
-  constructor(appData: IApp, connectionData: IJSONObject) {
-    this.oauthClient = new FlickrApi.OAuth(
-      connectionData.consumerKey,
-      connectionData.consumerSecret
-    );
-
-    if (connectionData.accessToken && connectionData.accessSecret) {
-      this.client = new FlickrApi(
-        FlickrApi.OAuth.createPlugin(
-          connectionData.consumerKey,
-          connectionData.consumerSecret,
-          connectionData.accessToken,
-          connectionData.accessSecret
-        )
-      );
-    }
-
-    this.connectionData = connectionData;
-    this.appData = appData;
-  }
-
-  async createAuthData() {
-    const appFields = this.appData.fields.find(
-      (field: IField) => field.key == 'oAuthRedirectUrl'
-    );
-    const callbackUrl = appFields.value;
-
-    const oauthData = (await this.oauthClient.request(callbackUrl)).body;
-    const url = await this.oauthClient.authorizeUrl(
-      oauthData.oauth_token,
-      'delete'
-    );
-
-    return {
-      accessToken: oauthData.oauth_token,
-      accessSecret: oauthData.oauth_token_secret,
-      url: url,
-    };
-  }
-
-  async verifyCredentials() {
-    const verifiedCredentials = (
-      await this.oauthClient.verify(
-        this.connectionData.accessToken,
-        this.connectionData.oauthVerifier,
-        this.connectionData.accessSecret
-      )
-    ).body;
-
-    return {
-      consumerKey: this.connectionData.consumerKey,
-      consumerSecret: this.connectionData.consumerSecret,
-      accessToken: verifiedCredentials.oauth_token,
-      accessSecret: verifiedCredentials.oauth_token_secret,
-      userId: verifiedCredentials.user_nsid,
-      screenName: verifiedCredentials.fullname,
-    };
-  }
-
-  async isStillVerified() {
-    try {
-      await this.client.test.login();
-      return true;
-    } catch {
-      return false;
-    }
-  }
-}

packages/backend/src/apps/flickr/common/add-auth-header.ts

@@ -0,0 +1,41 @@
+import { Token } from 'oauth-1.0a';
+import { IJSONObject, TBeforeRequest } from '@automatisch/types';
+import oauthClient from './oauth-client';
+
+type RequestDataType = {
+  url: string;
+  method: string;
+  data?: IJSONObject;
+};
+
+const addAuthHeader: TBeforeRequest = ($, requestConfig) => {
+  const { url, method, data, params } = requestConfig;
+
+  const token: Token = {
+    key: $.auth.data?.accessToken as string,
+    secret: $.auth.data?.accessSecret as string,
+  };
+
+  const requestData: RequestDataType = {
+    url: `${requestConfig.baseURL}${url}`,
+    method,
+  };
+
+  if (url === '/oauth/request_token') {
+    requestData.data = data;
+  }
+
+  if (method === 'get') {
+    requestData.data = params;
+  }
+
+  const authHeader = oauthClient($).toHeader(
+    oauthClient($).authorize(requestData, token)
+  );
+
+  requestConfig.headers.Authorization = authHeader.Authorization;
+
+  return requestConfig;
+};
+
+export default addAuthHeader;

packages/backend/src/apps/flickr/common/oauth-client.ts

@@ -0,0 +1,23 @@
+import { IGlobalVariable } from '@automatisch/types';
+import crypto from 'crypto';
+import OAuth from 'oauth-1.0a';
+
+const oauthClient = ($: IGlobalVariable) => {
+  const consumerData = {
+    key: $.auth.data.consumerKey as string,
+    secret: $.auth.data.consumerSecret as string,
+  };
+
+  return new OAuth({
+    consumer: consumerData,
+    signature_method: 'HMAC-SHA1',
+    hash_function(base_string, key) {
+      return crypto
+        .createHmac('sha1', key)
+        .update(base_string)
+        .digest('base64');
+    },
+  });
+};
+
+export default oauthClient;

packages/backend/src/apps/flickr/data.ts

@@ -1,10 +0,0 @@
-import { IJSONObject } from '@automatisch/types';
-import ListAlbums from './data/list-albums';
-
-export default class Data {
-  listAlbums: ListAlbums;
-
-  constructor(connectionData: IJSONObject) {
-    this.listAlbums = new ListAlbums(connectionData);
-  }
-}

packages/backend/src/apps/flickr/data/list-albums.ts

@@ -1,39 +0,0 @@
-import FlickrApi from 'flickr-sdk';
-import type { IJSONObject } from '@automatisch/types';
-
-export default class ListAlbums {
-  client?: typeof FlickrApi;
-
-  constructor(connectionData: IJSONObject) {
-    if (
-      connectionData.consumerKey &&
-      connectionData.consumerSecret &&
-      connectionData.accessToken &&
-      connectionData.accessSecret
-    ) {
-      this.client = new FlickrApi(
-        FlickrApi.OAuth.createPlugin(
-          connectionData.consumerKey,
-          connectionData.consumerSecret,
-          connectionData.accessToken,
-          connectionData.accessSecret
-        )
-      );
-    }
-  }
-
-  async run() {
-    const { photosets } = (await this.client.photosets.getList()).body;
-    const allPhotosets = [...photosets.photoset];
-
-    for (let page = photosets.page + 1; page <= photosets.pages; page++) {
-      const { photosets } = (await this.client.photosets.getList({ page, })).body;
-      allPhotosets.push(...photosets.photoset);
-    }
-
-    return allPhotosets.map((photoset) => ({
-      value: photoset.id,
-      name: photoset.title._content,
-    }));
-  }
-}

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

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

packages/backend/src/apps/flickr/dynamic-data/list-albums/index.ts

@@ -0,0 +1,56 @@
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+
+type TResponse = {
+  data: IJSONObject[];
+  error?: IJSONObject;
+};
+
+type TPhotoset = {
+  id: string;
+  title: {
+    _content: string;
+  };
+};
+
+export default {
+  name: 'List albums',
+  key: 'listAlbums',
+
+  async run($: IGlobalVariable) {
+    const params = {
+      page: 1,
+      per_page: 500,
+      user_id: $.auth.data.userId,
+      method: 'flickr.photosets.getList',
+      format: 'json',
+      nojsoncallback: 1,
+    };
+    let response = await $.http.get('/rest', { params });
+
+    const aggregatedResponse: TResponse = {
+      data: [...response.data.photosets.photoset],
+    };
+
+    while (response.data.photosets.page < response.data.photosets.pages) {
+      response = await $.http.get('/rest', {
+        params: {
+          ...params,
+          page: response.data.photosets.page,
+        },
+      });
+
+      aggregatedResponse.data.push(...response.data.photosets.photoset);
+    }
+
+    aggregatedResponse.data = aggregatedResponse.data.map(
+      (photoset: TPhotoset) => {
+        return {
+          value: photoset.id,
+          name: photoset.title._content,
+        } as IJSONObject;
+      }
+    );
+
+    return aggregatedResponse;
+  },
+};

packages/backend/src/apps/flickr/index.d.ts

@@ -1 +0,0 @@
-declare module 'flickr-sdk';

packages/backend/src/apps/flickr/index.ts

@@ -1,25 +1,21 @@
-import {
+import defineApp from '../../helpers/define-app';
-  IService,
+import addAuthHeader from './common/add-auth-header';
-  IAuthentication,
+import auth from './auth';
-  IApp,
+import triggers from './triggers';
-  IJSONObject,
+import dynamicData from './dynamic-data';
-} from '@automatisch/types';
-import Authentication from './authentication';
-import Triggers from './triggers';
-import Data from './data';
 
-export default class Flickr implements IService {
+export default defineApp({
-  authenticationClient: IAuthentication;
+  name: 'Flickr',
-  triggers: Triggers;
+  key: 'flickr',
-  data: Data;
+  iconUrl: '{BASE_URL}/apps/flickr/assets/favicon.svg',
-
+  authDocUrl: 'https://automatisch.io/docs/apps/flickr/connection',
-  constructor(
+  docUrl: 'https://automatisch.io/docs/flickr',
-    appData: IApp,
+  primaryColor: '000000',
-    connectionData: IJSONObject,
+  supportsConnections: true,
-    parameters: IJSONObject
+  baseUrl: 'https://www.flickr.com/',
-  ) {
+  apiBaseUrl: 'https://www.flickr.com/services',
-    this.authenticationClient = new Authentication(appData, connectionData);
+  beforeRequest: [addAuthHeader],
-    this.data = new Data(connectionData);
+  auth,
-    this.triggers = new Triggers(connectionData, parameters);
+  triggers,
-  }
+  dynamicData,
-}
+});

packages/backend/src/apps/flickr/info.json

@@ -1,304 +0,0 @@
-{
-  "name": "Flickr",
-  "key": "flickr",
-  "iconUrl": "{BASE_URL}/apps/flickr/assets/favicon.svg",
-  "docUrl": "https://automatisch.io/docs/flickr",
-  "primaryColor": "000000",
-  "supportsConnections": true,
-  "fields": [
-    {
-      "key": "oAuthRedirectUrl",
-      "label": "OAuth Redirect URL",
-      "type": "string",
-      "required": true,
-      "readOnly": true,
-      "value": "{WEB_APP_URL}/app/flickr/connections/add",
-      "placeholder": null,
-      "description": "When asked to input an OAuth callback or redirect URL in Flickr OAuth, enter the URL above.",
-      "docUrl": "https://automatisch.io/docs/flickr#oauth-redirect-url",
-      "clickToCopy": true
-    },
-    {
-      "key": "consumerKey",
-      "label": "Consumer Key",
-      "type": "string",
-      "required": true,
-      "readOnly": false,
-      "value": null,
-      "placeholder": null,
-      "description": null,
-      "docUrl": "https://automatisch.io/docs/flickr#consumer-key",
-      "clickToCopy": false
-    },
-    {
-      "key": "consumerSecret",
-      "label": "Consumer Secret",
-      "type": "string",
-      "required": true,
-      "readOnly": false,
-      "value": null,
-      "placeholder": null,
-      "description": null,
-      "docUrl": "https://automatisch.io/docs/flickr#consumer-secret",
-      "clickToCopy": false
-    }
-  ],
-  "authenticationSteps": [
-    {
-      "step": 1,
-      "type": "mutation",
-      "name": "createConnection",
-      "arguments": [
-        {
-          "name": "key",
-          "value": "{key}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "consumerKey",
-              "value": "{fields.consumerKey}"
-            },
-            {
-              "name": "consumerSecret",
-              "value": "{fields.consumerSecret}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 2,
-      "type": "mutation",
-      "name": "createAuthData",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{createConnection.id}"
-        }
-      ]
-    },
-    {
-      "step": 3,
-      "type": "openWithPopup",
-      "name": "openAuthPopup",
-      "arguments": [
-        {
-          "name": "url",
-          "value": "{createAuthData.url}"
-        }
-      ]
-    },
-    {
-      "step": 4,
-      "type": "mutation",
-      "name": "updateConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{createConnection.id}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "oauthVerifier",
-              "value": "{openAuthPopup.oauth_verifier}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 5,
-      "type": "mutation",
-      "name": "verifyConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{createConnection.id}"
-        }
-      ]
-    }
-  ],
-  "reconnectionSteps": [
-    {
-      "step": 1,
-      "type": "mutation",
-      "name": "resetConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        }
-      ]
-    },
-    {
-      "step": 2,
-      "type": "mutation",
-      "name": "updateConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "consumerKey",
-              "value": "{fields.consumerKey}"
-            },
-            {
-              "name": "consumerSecret",
-              "value": "{fields.consumerSecret}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 3,
-      "type": "mutation",
-      "name": "createAuthData",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        }
-      ]
-    },
-    {
-      "step": 4,
-      "type": "openWithPopup",
-      "name": "openAuthPopup",
-      "arguments": [
-        {
-          "name": "url",
-          "value": "{createAuthData.url}"
-        }
-      ]
-    },
-    {
-      "step": 5,
-      "type": "mutation",
-      "name": "updateConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "oauthVerifier",
-              "value": "{openAuthPopup.oauth_verifier}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 6,
-      "type": "mutation",
-      "name": "verifyConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        }
-      ]
-    }
-  ],
-  "triggers": [
-    {
-      "name": "New favorite photo",
-      "key": "newFavoritePhoto",
-      "description": "Triggers when you favorite a photo.",
-      "substeps": [
-        {
-          "key": "chooseConnection",
-          "name": "Choose connection"
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    },
-    {
-      "name": "New photo in album",
-      "key": "newPhotoInAlbum",
-      "description": "Triggers when you add a new photo in an album.",
-      "substeps": [
-        {
-          "key": "chooseConnection",
-          "name": "Choose connection"
-        },
-        {
-          "key": "chooseTrigger",
-          "name": "Set up a trigger",
-          "arguments": [
-            {
-              "label": "Album",
-              "key": "album",
-              "type": "dropdown",
-              "required": true,
-              "variables": false,
-              "source": {
-                "type": "query",
-                "name": "getData",
-                "arguments": [
-                  {
-                    "name": "key",
-                    "value": "listAlbums"
-                  }
-                ]
-              }
-            }
-          ]
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    },
-    {
-      "name": "New photo",
-      "key": "newPhoto",
-      "description": "Triggers when you add a new photo.",
-      "substeps": [
-        {
-          "key": "chooseConnection",
-          "name": "Choose connection"
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    },
-    {
-      "name": "New album",
-      "key": "newAlbum",
-      "description": "Triggers when you create a new album.",
-      "substeps": [
-        {
-          "key": "chooseConnection",
-          "name": "Choose connection"
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    }
-  ]
-}

packages/backend/src/apps/flickr/triggers.ts

@@ -1,19 +0,0 @@
-import { IJSONObject } from '@automatisch/types';
-import NewFavoritePhoto from './triggers/new-favorite-photo';
-import NewPhotoInAlbum from './triggers/new-photo-in-album';
-import NewPhoto from './triggers/new-photo';
-import NewAlbum from './triggers/new-album';
-
-export default class Triggers {
-  newFavoritePhoto: NewFavoritePhoto;
-  newPhotoInAlbum: NewPhotoInAlbum;
-  newPhoto: NewPhoto;
-  newAlbum: NewAlbum;
-
-  constructor(connectionData: IJSONObject, parameters: IJSONObject) {
-    this.newFavoritePhoto = new NewFavoritePhoto(connectionData);
-    this.newPhotoInAlbum = new NewPhotoInAlbum(connectionData, parameters);
-    this.newPhoto = new NewPhoto(connectionData);
-    this.newAlbum = new NewAlbum(connectionData);
-  }
-}

packages/backend/src/apps/flickr/triggers/index.ts

@@ -0,0 +1,6 @@
+import newAlbums from './new-albums';
+import newFavoritePhotos from './new-favorite-photos';
+import newPhotos from './new-photos';
+import newPhotosInAlbums from './new-photos-in-album';
+
+export default [newAlbums, newFavoritePhotos, newPhotos, newPhotosInAlbums];

packages/backend/src/apps/flickr/triggers/new-album.ts

@@ -1,103 +0,0 @@
-import { DateTime } from 'luxon';
-import FlickrApi from 'flickr-sdk';
-import { IJSONObject } from '@automatisch/types';
-
-export default class NewAlbum {
-  client?: typeof FlickrApi;
-  connectionData?: IJSONObject;
-  primaryPhotoExtraFields = [
-    'description',
-    'license',
-    'date_upload',
-    'date_taken',
-    'owner_name',
-    'icon_server',
-    'original_format',
-    'last_update',
-    'geo',
-    'tags',
-    'machine_tags',
-    'o_dims',
-    'views',
-    'media',
-    'path_alias',
-    'url_sq',
-    'url_t',
-    'url_s',
-    'url_q',
-    'url_m',
-    'url_n',
-    'url_z',
-    'url_c',
-    'url_l',
-    'url_o',
-  ].join(',');
-
-  constructor(connectionData: IJSONObject) {
-    if (
-      connectionData.consumerKey &&
-      connectionData.consumerSecret &&
-      connectionData.accessToken &&
-      connectionData.accessSecret
-    ) {
-      this.client = new FlickrApi(
-        FlickrApi.OAuth.createPlugin(
-          connectionData.consumerKey,
-          connectionData.consumerSecret,
-          connectionData.accessToken,
-          connectionData.accessSecret
-        )
-      );
-
-      this.connectionData = connectionData;
-    }
-  }
-
-  async getAlbums(options: { perPage?: number, page?: number } = {}) {
-    const { perPage, page } = options;
-    const payload = {
-      page,
-      per_page: perPage,
-      primary_photo_extras: this.primaryPhotoExtraFields,
-    };
-    const { photosets } = (await this.client.photosets.getList(payload)).body;
-
-    return photosets;
-  }
-
-  async run(startTime: Date) {
-    const albums = await this.getAlbums({ page: 1 });
-    const allAlbums = [...albums.photoset];
-    const newAlbums = [];
-
-    let page = 1;
-    for (const album of allAlbums) {
-      const createdAtInSeconds = DateTime.fromSeconds(parseInt(album.date_create, 10));
-      const createdAt = createdAtInSeconds.toMillis();
-
-      if (createdAt <= startTime.getTime()) {
-        break;
-      }
-
-      newAlbums.push(album);
-
-      const currentIndex = allAlbums.indexOf(album);
-      const totalAlbums = allAlbums.length;
-      const isLastItem = currentIndex + 1 === totalAlbums;
-
-      if (isLastItem && page < albums.pages) {
-        page = page + 1;
-        const { photoset } = await this.getAlbums({ page, });
-        allAlbums.push(...photoset.photoset);
-      }
-    }
-
-    return newAlbums;
-  }
-
-  async testRun() {
-    const { photoset } = await this.getAlbums({ perPage: 1 });
-
-    return photoset;
-  }
-}