Release v0.1.5

docs: Fix broken links

.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

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+Demonstrating empathy and kindness toward other people
+Being respectful of differing opinions, viewpoints, and experiences
+Giving and gracefully accepting constructive feedback
+Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+Focusing on what is best not just for us as individuals, but for the overall community
+Examples of unacceptable behavior include:
+
+The use of sexualized language or imagery, and sexual attention or advances of any kind
+Trolling, insulting or derogatory comments, and personal or political attacks
+Public or private harassment
+Publishing others’ private information, such as a physical or email address, without their explicit permission
+Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at ali@automatisch.io. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+Community Impact: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+Consequence: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+Community Impact: A violation through a single incident or series of actions.
+
+Consequence: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+Community Impact: A serious violation of community standards, including sustained inappropriate behavior.
+
+Consequence: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+Community Impact: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+Consequence: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version 2.1, available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by Mozilla’s code of conduct enforcement ladder.
+
+For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

README.md

@@ -0,0 +1,52 @@
+# Automatisch - Open Source Zapier Alternative
+
+![Automatisch - Screenshot](https://user-images.githubusercontent.com/2501931/191562539-e42f6c34-03c7-4dc4-bcf9-7f9473a9c64f.png)
+
+🧐 Automatisch is a business automation tool that lets you connect different services like Twitter, Slack, and more to automate your business processes.
+
+💸 Automating your workflows doesn't have to be a difficult or expensive process. You also don't need any programming knowledge to use Automatisch.
+
+## Advantages
+
+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.
+
+🤓 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.
+
+💙 No vendor lock-in. If you ever decide that Automatisch is no longer helpful for your business, you can switch to any other provider, which will be easier than switching from the one cloud provider to another since you have all data and flexibility.
+
+## Documentation
+
+The official documentation can be found here: [https://automatisch.io/docs](https://automatisch.io/docs)
+
+## Installation
+
+```bash
+# Clone the repository
+git clone git@github.com:automatisch/automatisch.git
+
+# Go to the repository folder
+cd automatisch/docker/compose
+
+# 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.
+
+## 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.
+
+[https://github.com/automatisch/automatisch/discussions](https://github.com/automatisch/automatisch/discussions)
+
+## License
+
+Automatisch is an open-source software with an [AGPL 3.0 license](https://github.com/automatisch/automatisch/blob/main/LICENSE.md).

docker/compose/docker-compose.yml

@@ -0,0 +1,47 @@
+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/images/plain/Dockerfile

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

docker/images/wait-for-postgres/Dockerfile

@@ -0,0 +1,15 @@
+# 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.5
+
+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

@@ -0,0 +1,11 @@
+#!/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,16 +2,12 @@
   "packages": [
     "packages/*"
   ],
-  "private": true,
-  "version": "independent",
+  "version": "0.1.5",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {
-    "publish": {
-      "registry": "http://localhost:5000"
-    },
     "add": {
       "exact": true
     }
   }
-}
+}

package.json

@@ -1,5 +1,6 @@
 {
   "name": "@automatisch/root",
+  "license": "AGPL-3.0",
   "private": true,
   "scripts": {
     "start": "lerna run --stream --parallel --scope=@*/{web,backend} dev",
@@ -31,6 +32,6 @@
     "prettier": "^2.5.1"
   },
   "publishConfig": {
-    "registry": "http://localhost:5000"
+    "access": "public"
   }
-}
+}

packages/backend/.env-example

@@ -13,3 +13,4 @@ ENCRYPTION_KEY=sample-encryption-key
 APP_SECRET_KEY=sample-app-secret-key
 REDIS_PORT=6379
 REDIS_HOST=127.0.0.1
+ENABLE_BULLMQ_DASHBOARD=false

packages/backend/README.md

@@ -1,11 +1,4 @@
 # `backend`
 
-> TODO: description
-
-## Usage
-
-```
-const backend = require('backend');
-
-// TODO: DEMONSTRATE API
-```
+The open source Zapier alternative. Build workflow automation without spending
+time and money.

packages/backend/bin/database/utils.ts

@@ -12,8 +12,14 @@ export async function createUser(email = 'user@automatisch.io', password = 'samp
   };
 
   try {
-    const user = await User.query().insertAndFetch(userParams);
-    logger.info(`User has been saved: ${user.email}`);
+    const userCount = await User.query().resultSize();
+
+    if (userCount === 0) {
+      const user = await User.query().insertAndFetch(userParams);
+      logger.info(`User has been saved: ${user.email}`);
+    } else {
+      logger.info('No need to seed a user.');
+    }
   } catch (err) {
     if ((err as any).nativeError.code !== UNIQUE_VIOLATION_CODE) {
       throw err;

packages/backend/database-utils.d.ts

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

packages/backend/database-utils.js

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

packages/backend/database.d.ts

@@ -1,2 +1 @@
-export * as utils from './dist/bin/database/utils';
-export * as database from './dist/src/config/database';
+export * from './dist/src/config/database';

packages/backend/database.js

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

packages/backend/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@automatisch/backend",
-  "version": "0.1.0",
-  "description": "> TODO: description",
+  "version": "0.1.5",
+  "license": "AGPL-3.0",
+  "description": "The open source Zapier alternative. Build workflow automation without spending time and money.",
   "scripts": {
-    "dev": "nodemon --watch 'src/**/*.ts' --watch 'bin/**/*.ts' --exec 'ts-node' src/server.ts --ext ts,json",
+    "dev": "ts-node-dev 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",
@@ -16,15 +17,16 @@
     "db:migration:create": "knex migrate:make",
     "db:rollback": "knex migrate:rollback",
     "db:migrate": "knex migrate:latest",
-    "copy-statics": "copyfiles src/**/*.{graphql,json,svg} dist"
+    "copy-statics": "copyfiles src/**/*.{graphql,json,svg} dist",
+    "prepack": "yarn build",
+    "prebuild": "rm -rf ./dist"
   },
   "dependencies": {
-    "@automatisch/web": "0.1.0",
+    "@automatisch/web": "^0.1.5",
     "@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",
-    "@octokit/oauth-methods": "^1.2.6",
     "@rudderstack/rudder-sdk-node": "^1.1.2",
     "@slack/bolt": "3.10.0",
     "@types/luxon": "^2.3.1",
@@ -53,6 +55,7 @@
     "luxon": "2.3.1",
     "morgan": "^1.10.0",
     "nodemailer": "6.7.0",
+    "oauth-1.0a": "^2.2.6",
     "objection": "^3.0.0",
     "octokit": "^1.7.1",
     "pg": "^8.7.1",
@@ -75,14 +78,19 @@
     "test": "__tests__"
   },
   "files": [
+    "dist",
     "bin",
     "src",
     "server.js",
     "server.d.ts",
+    "worker.js",
+    "worker.d.ts",
     "logger.js",
     "logger.d.ts",
     "database.js",
-    "database.d.ts"
+    "database.d.ts",
+    "database-utils.js",
+    "database-utils.d.ts"
   ],
   "repository": {
     "type": "git",
@@ -92,7 +100,7 @@
     "url": "https://github.com/automatisch/automatisch/issues"
   },
   "devDependencies": {
-    "@automatisch/types": "0.1.0",
+    "@automatisch/types": "^0.1.5",
     "@types/bcrypt": "^5.0.0",
     "@types/bull": "^3.15.8",
     "@types/cors": "^2.8.12",
@@ -109,7 +117,8 @@
     "ava": "^3.15.0",
     "nodemon": "^2.0.13",
     "sinon": "^11.1.2",
-    "ts-node": "^10.2.1"
+    "ts-node": "^10.2.1",
+    "ts-node-dev": "^1.1.8"
   },
   "ava": {
     "files": [
@@ -121,5 +130,8 @@
     "require": [
       "ts-node/register"
     ]
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }

packages/backend/src/app.ts

@@ -15,13 +15,13 @@ import {
 } from './helpers/create-bull-board-handler';
 import injectBullBoardHandler from './helpers/inject-bull-board-handler';
 
-if (appConfig.appEnv === 'development') {
+if (appConfig.enableBullMQDashboard) {
   createBullBoardHandler(serverAdapter);
 }
 
 const app = express();
 
-if (appConfig.appEnv === 'development') {
+if (appConfig.enableBullMQDashboard) {
   injectBullBoardHandler(app, serverAdapter);
 }
 

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

@@ -4,6 +4,7 @@
   "iconUrl": "{BASE_URL}/apps/discord/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/discord",
   "primaryColor": "5865f2",
+  "supportsConnections": true,
   "fields": [
     {
       "key": "oAuthRedirectUrl",

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

@@ -4,6 +4,7 @@
   "iconUrl": "{BASE_URL}/apps/firebase/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/firebase",
   "primaryColor": "ffca28",
+  "supportsConnections": true,
   "fields": [
     {
       "key": "oAuthRedirectUrl",

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

@@ -4,6 +4,7 @@
   "iconUrl": "{BASE_URL}/apps/flickr/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/flickr",
   "primaryColor": "000000",
+  "supportsConnections": true,
   "fields": [
     {
       "key": "oAuthRedirectUrl",
@@ -222,8 +223,8 @@
       "description": "Triggers when you favorite a photo.",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "testStep",
@@ -237,8 +238,8 @@
       "description": "Triggers when you add a new photo in an album.",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -275,8 +276,8 @@
       "description": "Triggers when you add a new photo.",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "testStep",
@@ -290,8 +291,8 @@
       "description": "Triggers when you create a new album.",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "testStep",

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

@@ -4,35 +4,19 @@ import type {
   IField,
   IJSONObject,
 } from '@automatisch/types';
-import {
-  getWebFlowAuthorizationUrl,
-  exchangeWebFlowCode,
-  checkToken,
-} from '@octokit/oauth-methods';
+import createHttpClient, { IHttpClient } from '../../helpers/http-client';
+import { URLSearchParams } from 'url';
 
 export default class Authentication implements IAuthentication {
   appData: IApp;
   connectionData: IJSONObject;
-  scopes: string[] = [
-    'read:org',
-    'repo',
-    'user',
-  ];
-  client: {
-    getWebFlowAuthorizationUrl: typeof getWebFlowAuthorizationUrl;
-    exchangeWebFlowCode: typeof exchangeWebFlowCode;
-    checkToken: typeof checkToken;
-  };
+  scopes: string[] = ['read:org', 'repo', 'user'];
+  client: IHttpClient;
 
   constructor(appData: IApp, connectionData: IJSONObject) {
     this.connectionData = connectionData;
     this.appData = appData;
-
-    this.client = {
-      getWebFlowAuthorizationUrl,
-      exchangeWebFlowCode,
-      checkToken,
-    };
+    this.client = createHttpClient({ baseURL: 'https://github.com' });
   }
 
   get oauthRedirectUrl(): string {
@@ -42,26 +26,28 @@ export default class Authentication implements IAuthentication {
   }
 
   async createAuthData(): Promise<{ url: string }> {
-    const { url } = await this.client.getWebFlowAuthorizationUrl({
-      clientType: 'oauth-app',
-      clientId: this.connectionData.consumerKey as string,
-      redirectUrl: this.oauthRedirectUrl,
-      scopes: this.scopes,
+    const searchParams = new URLSearchParams({
+      client_id: this.connectionData.consumerKey as string,
+      redirect_uri: this.oauthRedirectUrl,
+      scope: this.scopes.join(','),
     });
 
+    const url = `https://github.com/login/oauth/authorize?${searchParams.toString()}`;
+
     return {
-      url: url,
+      url,
     };
   }
 
   async verifyCredentials() {
-    const { data } = await this.client.exchangeWebFlowCode({
-      clientType: 'oauth-app',
-      clientId: this.connectionData.consumerKey as string,
-      clientSecret: this.connectionData.consumerSecret as string,
-      code: this.connectionData.oauthVerifier as string,
+    const response = await this.client.post('/login/oauth/access_token', {
+      client_id: this.connectionData.consumerKey,
+      client_secret: this.connectionData.consumerSecret,
+      code: this.connectionData.oauthVerifier,
     });
 
+    const data = Object.fromEntries(new URLSearchParams(response.data));
+
     this.connectionData.accessToken = data.access_token;
 
     const tokenInfo = await this.getTokenInfo();
@@ -78,12 +64,23 @@ export default class Authentication implements IAuthentication {
   }
 
   async getTokenInfo() {
-    return this.client.checkToken({
-      clientType: 'oauth-app',
-      clientId: this.connectionData.consumerKey as string,
-      clientSecret: this.connectionData.consumerSecret as string,
-      token: this.connectionData.accessToken as string,
-    });
+    const basicAuthToken = Buffer.from(
+      this.connectionData.consumerKey + ':' + this.connectionData.consumerSecret
+    ).toString('base64');
+
+    const headers = {
+      Authorization: `Basic ${basicAuthToken}`,
+    };
+
+    const body = {
+      access_token: this.connectionData.accessToken,
+    };
+
+    return await this.client.post(
+      `https://api.github.com/applications/${this.connectionData.consumerKey}/token`,
+      body,
+      { headers }
+    );
   }
 
   async isStillVerified() {

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

@@ -4,6 +4,7 @@
   "iconUrl": "{BASE_URL}/apps/github/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/github",
   "primaryColor": "000000",
+  "supportsConnections": true,
   "fields": [
     {
       "key": "oAuthRedirectUrl",
@@ -19,26 +20,26 @@
     },
     {
       "key": "consumerKey",
-      "label": "Consumer Key",
+      "label": "Client ID",
       "type": "string",
       "required": true,
       "readOnly": false,
       "value": null,
       "placeholder": null,
       "description": null,
-      "docUrl": "https://automatisch.io/docs/github#consumer-key",
+      "docUrl": "https://automatisch.io/docs/github#client-id",
       "clickToCopy": false
     },
     {
       "key": "consumerSecret",
-      "label": "Consumer Secret",
+      "label": "Client Secret",
       "type": "string",
       "required": true,
       "readOnly": false,
       "value": null,
       "placeholder": null,
       "description": null,
-      "docUrl": "https://automatisch.io/docs/github#consumer-secret",
+      "docUrl": "https://automatisch.io/docs/github#client-secret",
       "clickToCopy": false
     }
   ],
@@ -222,8 +223,8 @@
       "description": "Triggers when a new repository is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "testStep",
@@ -237,8 +238,8 @@
       "description": "Triggers when a new organization is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "testStep",
@@ -252,8 +253,8 @@
       "description": "Triggers when a new branch is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -290,8 +291,8 @@
       "description": "Triggers when a new notification is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -329,8 +330,8 @@
       "description": "Triggers when a new pull request is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -367,8 +368,8 @@
       "description": "Triggers when a new watcher is added to a repo",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -405,8 +406,8 @@
       "description": "Triggers when a new milestone is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -443,8 +444,8 @@
       "description": "Triggers when a new commit comment is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -481,8 +482,8 @@
       "description": "Triggers when a new label is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -519,8 +520,8 @@
       "description": "Triggers when a new collaborator is added to a repo",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -557,8 +558,8 @@
       "description": "Triggers when a new release is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -595,8 +596,8 @@
       "description": "Triggers when a new commit is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",
@@ -656,8 +657,8 @@
       "description": "Triggers when a new issue is created",
       "substeps": [
         {
-          "key": "chooseAccount",
-          "name": "Choose account"
+          "key": "chooseConnection",
+          "name": "Choose connection"
         },
         {
           "key": "chooseTrigger",

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

@@ -4,6 +4,7 @@
   "iconUrl": "{BASE_URL}/apps/gitlab/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/gitlab",
   "primaryColor": "2DAAE1",
+  "supportsConnections": true,
   "fields": [
     {
       "key": "oAuthRedirectUrl",

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

@@ -4,6 +4,7 @@
   "iconUrl": "{BASE_URL}/apps/postgresql/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/postgresql",
   "primaryColor": "2DAAE1",
+  "supportsConnections": true,
   "fields": [
     {
       "key": "host",

packages/backend/src/apps/scheduler/common/cron-times.ts

@@ -0,0 +1,10 @@
+const cronTimes = {
+  everyHour: '0 * * * *',
+  everyHourExcludingWeekends: '0 * * * 1-5',
+  everyDayAt: (hour: number) => `0 ${hour} * * *`,
+  everyDayExcludingWeekendsAt: (hour: number) => `0 ${hour} * * 1-5`,
+  everyWeekOnAndAt: (weekday: number, hour: number) => `0 ${hour} * * ${weekday}`,
+  everyMonthOnAndAt: (day: number, hour: number) => `0 ${hour} ${day} * *`,
+};
+
+export default cronTimes;

packages/backend/src/apps/scheduler/common/get-date-time-object.ts

@@ -0,0 +1,14 @@
+import { DateTime } from 'luxon';
+
+export default function getDateTimeObjectRepresentation(dateTime: DateTime) {
+  const defaults = dateTime.toObject();
+
+  return {
+    ...defaults,
+    ISO_date_time: dateTime.toISO(),
+    pretty_date: dateTime.toLocaleString(DateTime.DATE_MED),
+    pretty_time: dateTime.toLocaleString(DateTime.TIME_WITH_SECONDS),
+    pretty_day_of_week: dateTime.toFormat('cccc'),
+    day_of_week: dateTime.weekday,
+  };
+}

packages/backend/src/apps/scheduler/common/get-next-cron-date-time.ts

@@ -0,0 +1,10 @@
+import { DateTime } from 'luxon';
+import cronParser from 'cron-parser';
+
+export default function getNextCronDateTime(cronString: string) {
+  const cronDate = cronParser.parseExpression(cronString);
+  const matchingNextCronDateTime = cronDate.next();
+  const matchingNextDateTime = DateTime.fromJSDate(matchingNextCronDateTime.toDate());
+
+  return matchingNextDateTime;
+};

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

@@ -1,18 +1,10 @@
-import Triggers from './triggers';
-import {
-  IService,
-  IApp,
-  IJSONObject,
-} from '@automatisch/types';
-
-export default class Scheduler implements IService {
-  triggers: Triggers;
-
-  constructor(
-    appData: IApp,
-    connectionData: IJSONObject,
-    parameters: IJSONObject
-  ) {
-    this.triggers = new Triggers(connectionData, parameters);
-  }
-}
+export default {
+  name: "Scheduler",
+  key: "scheduler",
+  iconUrl: "{BASE_URL}/apps/scheduler/assets/favicon.svg",
+  docUrl: "https://automatisch.io/docs/scheduler",
+  authDocUrl: "https://automatisch.io/docs/connections/scheduler",
+  primaryColor: "0059F7",
+  supportsConnections: false,
+  requiresAuthentication: false,
+};

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

@@ -1,606 +0,0 @@
-{
-  "name": "Scheduler",
-  "key": "scheduler",
-  "iconUrl": "{BASE_URL}/apps/scheduler/assets/favicon.svg",
-  "docUrl": "https://automatisch.io/docs/scheduler",
-  "primaryColor": "0059F7",
-  "requiresAuthentication": false,
-  "triggers": [
-    {
-      "name": "Every hour",
-      "key": "everyHour",
-      "description": "Triggers every hour.",
-      "substeps": [
-        {
-          "key": "chooseTrigger",
-          "name": "Set up a trigger",
-          "arguments": [
-            {
-              "label": "Trigger on weekends?",
-              "key": "triggersOnWeekend",
-              "type": "dropdown",
-              "description": "Should this flow trigger on Saturday and Sunday?",
-              "required": true,
-              "value": true,
-              "variables": false,
-              "options": [
-                {
-                  "label": "Yes",
-                  "value": true
-                },
-                {
-                  "label": "No",
-                  "value": false
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    },
-    {
-      "name": "Every day",
-      "key": "everyDay",
-      "description": "Triggers every day.",
-      "substeps": [
-        {
-          "key": "chooseTrigger",
-          "name": "Set up a trigger",
-          "arguments": [
-            {
-              "label": "Trigger on weekends?",
-              "key": "triggersOnWeekend",
-              "type": "dropdown",
-              "description": "Should this flow trigger on Saturday and Sunday?",
-              "required": true,
-              "value": true,
-              "variables": false,
-              "options": [
-                {
-                  "label": "Yes",
-                  "value": true
-                },
-                {
-                  "label": "No",
-                  "value": false
-                }
-              ]
-            },
-            {
-              "label": "Time of day",
-              "key": "hour",
-              "type": "dropdown",
-              "required": true,
-              "value": null,
-              "variables": false,
-              "options": [
-                {
-                  "label": "00:00",
-                  "value": 0
-                },
-                {
-                  "label": "01:00",
-                  "value": 1
-                },
-                {
-                  "label": "02:00",
-                  "value": 2
-                },
-                {
-                  "label": "03:00",
-                  "value": 3
-                },
-                {
-                  "label": "04:00",
-                  "value": 4
-                },
-                {
-                  "label": "05:00",
-                  "value": 5
-                },
-                {
-                  "label": "06:00",
-                  "value": 6
-                },
-                {
-                  "label": "07:00",
-                  "value": 7
-                },
-                {
-                  "label": "08:00",
-                  "value": 8
-                },
-                {
-                  "label": "09:00",
-                  "value": 9
-                },
-                {
-                  "label": "10:00",
-                  "value": 10
-                },
-                {
-                  "label": "11:00",
-                  "value": 11
-                },
-                {
-                  "label": "12:00",
-                  "value": 12
-                },
-                {
-                  "label": "13:00",
-                  "value": 13
-                },
-                {
-                  "label": "14:00",
-                  "value": 14
-                },
-                {
-                  "label": "15:00",
-                  "value": 15
-                },
-                {
-                  "label": "16:00",
-                  "value": 16
-                },
-                {
-                  "label": "17:00",
-                  "value": 17
-                },
-                {
-                  "label": "18:00",
-                  "value": 18
-                },
-                {
-                  "label": "19:00",
-                  "value": 19
-                },
-                {
-                  "label": "20:00",
-                  "value": 20
-                },
-                {
-                  "label": "21:00",
-                  "value": 21
-                },
-                {
-                  "label": "22:00",
-                  "value": 22
-                },
-                {
-                  "label": "23:00",
-                  "value": 23
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    },
-    {
-      "name": "Every week",
-      "key": "everyWeek",
-      "description": "Triggers every week.",
-      "substeps": [
-        {
-          "key": "chooseTrigger",
-          "name": "Set up a trigger",
-          "arguments": [
-            {
-              "label": "Day of the week",
-              "key": "weekday",
-              "type": "dropdown",
-              "required": true,
-              "value": null,
-              "variables": false,
-              "options": [
-                {
-                  "label": "Monday",
-                  "value": 1
-                },
-                {
-                  "label": "Tuesday",
-                  "value": 2
-                },
-                {
-                  "label": "Wednesday",
-                  "value": 3
-                },
-                {
-                  "label": "Thursday",
-                  "value": 4
-                },
-                {
-                  "label": "Friday",
-                  "value": 5
-                },
-                {
-                  "label": "Saturday",
-                  "value": 6
-                },
-                {
-                  "label": "Sunday",
-                  "value": 0
-                }
-              ]
-            },
-            {
-              "label": "Time of day",
-              "key": "hour",
-              "type": "dropdown",
-              "required": true,
-              "value": null,
-              "variables": false,
-              "options": [
-                {
-                  "label": "00:00",
-                  "value": 0
-                },
-                {
-                  "label": "01:00",
-                  "value": 1
-                },
-                {
-                  "label": "02:00",
-                  "value": 2
-                },
-                {
-                  "label": "03:00",
-                  "value": 3
-                },
-                {
-                  "label": "04:00",
-                  "value": 4
-                },
-                {
-                  "label": "05:00",
-                  "value": 5
-                },
-                {
-                  "label": "06:00",
-                  "value": 6
-                },
-                {
-                  "label": "07:00",
-                  "value": 7
-                },
-                {
-                  "label": "08:00",
-                  "value": 8
-                },
-                {
-                  "label": "09:00",
-                  "value": 9
-                },
-                {
-                  "label": "10:00",
-                  "value": 10
-                },
-                {
-                  "label": "11:00",
-                  "value": 11
-                },
-                {
-                  "label": "12:00",
-                  "value": 12
-                },
-                {
-                  "label": "13:00",
-                  "value": 13
-                },
-                {
-                  "label": "14:00",
-                  "value": 14
-                },
-                {
-                  "label": "15:00",
-                  "value": 15
-                },
-                {
-                  "label": "16:00",
-                  "value": 16
-                },
-                {
-                  "label": "17:00",
-                  "value": 17
-                },
-                {
-                  "label": "18:00",
-                  "value": 18
-                },
-                {
-                  "label": "19:00",
-                  "value": 19
-                },
-                {
-                  "label": "20:00",
-                  "value": 20
-                },
-                {
-                  "label": "21:00",
-                  "value": 21
-                },
-                {
-                  "label": "22:00",
-                  "value": 22
-                },
-                {
-                  "label": "23:00",
-                  "value": 23
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    },
-    {
-      "name": "Every month",
-      "key": "everyMonth",
-      "description": "Triggers every month.",
-      "substeps": [
-        {
-          "key": "chooseTrigger",
-          "name": "Set up a trigger",
-          "arguments": [
-            {
-              "label": "Day of the month",
-              "key": "day",
-              "type": "dropdown",
-              "required": true,
-              "value": null,
-              "variables": false,
-              "options": [
-                {
-                  "label": 1,
-                  "value": 1
-                },
-                {
-                  "label": 2,
-                  "value": 2
-                },
-                {
-                  "label": 3,
-                  "value": 3
-                },
-                {
-                  "label": 4,
-                  "value": 4
-                },
-                {
-                  "label": 5,
-                  "value": 5
-                },
-                {
-                  "label": 6,
-                  "value": 6
-                },
-                {
-                  "label": 7,
-                  "value": 7
-                },
-                {
-                  "label": 8,
-                  "value": 8
-                },
-                {
-                  "label": 9,
-                  "value": 9
-                },
-                {
-                  "label": 10,
-                  "value": 10
-                },
-                {
-                  "label": 11,
-                  "value": 11
-                },
-                {
-                  "label": 12,
-                  "value": 12
-                },
-                {
-                  "label": 13,
-                  "value": 13
-                },
-                {
-                  "label": 14,
-                  "value": 14
-                },
-                {
-                  "label": 15,
-                  "value": 15
-                },
-                {
-                  "label": 16,
-                  "value": 16
-                },
-                {
-                  "label": 17,
-                  "value": 17
-                },
-                {
-                  "label": 18,
-                  "value": 18
-                },
-                {
-                  "label": 19,
-                  "value": 19
-                },
-                {
-                  "label": 20,
-                  "value": 20
-                },
-                {
-                  "label": 21,
-                  "value": 21
-                },
-                {
-                  "label": 22,
-                  "value": 22
-                },
-                {
-                  "label": 23,
-                  "value": 23
-                },
-                {
-                  "label": 24,
-                  "value": 24
-                },
-                {
-                  "label": 25,
-                  "value": 25
-                },
-                {
-                  "label": 26,
-                  "value": 26
-                },
-                {
-                  "label": 27,
-                  "value": 27
-                },
-                {
-                  "label": 28,
-                  "value": 28
-                },
-                {
-                  "label": 29,
-                  "value": 29
-                },
-                {
-                  "label": 30,
-                  "value": 30
-                },
-                {
-                  "label": 31,
-                  "value": 31
-                }
-              ]
-            },
-            {
-              "label": "Time of day",
-              "key": "hour",
-              "type": "dropdown",
-              "required": true,
-              "value": null,
-              "variables": false,
-              "options": [
-                {
-                  "label": "00:00",
-                  "value": 0
-                },
-                {
-                  "label": "01:00",
-                  "value": 1
-                },
-                {
-                  "label": "02:00",
-                  "value": 2
-                },
-                {
-                  "label": "03:00",
-                  "value": 3
-                },
-                {
-                  "label": "04:00",
-                  "value": 4
-                },
-                {
-                  "label": "05:00",
-                  "value": 5
-                },
-                {
-                  "label": "06:00",
-                  "value": 6
-                },
-                {
-                  "label": "07:00",
-                  "value": 7
-                },
-                {
-                  "label": "08:00",
-                  "value": 8
-                },
-                {
-                  "label": "09:00",
-                  "value": 9
-                },
-                {
-                  "label": "10:00",
-                  "value": 10
-                },
-                {
-                  "label": "11:00",
-                  "value": 11
-                },
-                {
-                  "label": "12:00",
-                  "value": 12
-                },
-                {
-                  "label": "13:00",
-                  "value": 13
-                },
-                {
-                  "label": "14:00",
-                  "value": 14
-                },
-                {
-                  "label": "15:00",
-                  "value": 15
-                },
-                {
-                  "label": "16:00",
-                  "value": 16
-                },
-                {
-                  "label": "17:00",
-                  "value": 17
-                },
-                {
-                  "label": "18:00",
-                  "value": 18
-                },
-                {
-                  "label": "19:00",
-                  "value": 19
-                },
-                {
-                  "label": "20:00",
-                  "value": 20
-                },
-                {
-                  "label": "21:00",
-                  "value": 21
-                },
-                {
-                  "label": "22:00",
-                  "value": 22
-                },
-                {
-                  "label": "23:00",
-                  "value": 23
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    }
-  ]
-}

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

@@ -1,19 +0,0 @@
-import { IJSONObject } from '@automatisch/types';
-import EveryHour from './triggers/every-hour';
-import EveryDay from './triggers/every-day';
-import EveryWeek from './triggers/every-week';
-import EveryMonth from './triggers/every-month';
-
-export default class Triggers {
-  everyHour: EveryHour;
-  everyDay: EveryDay;
-  everyWeek: EveryWeek;
-  everyMonth: EveryMonth;
-
-  constructor(connectionData: IJSONObject, parameters: IJSONObject) {
-    this.everyHour = new EveryHour(parameters);
-    this.everyDay = new EveryDay(parameters);
-    this.everyWeek = new EveryWeek(parameters);
-    this.everyMonth = new EveryMonth(parameters);
-  }
-}

packages/backend/src/apps/scheduler/triggers/every-day.ts

@@ -1,40 +0,0 @@
-import { DateTime } from 'luxon';
-import type { IJSONObject, IJSONValue, ITrigger } from '@automatisch/types';
-import { cronTimes, getNextCronDateTime, getDateTimeObjectRepresentation } from '../utils';
-
-export default class EveryDay implements ITrigger {
-  triggersOnWeekend?: boolean;
-  hour?: number;
-
-  constructor(parameters: IJSONObject) {
-    if (parameters.triggersOnWeekend) {
-      this.triggersOnWeekend = parameters.triggersOnWeekend as boolean;
-    }
-
-    if (parameters.hour) {
-      this.hour = parameters.hour as number;
-    }
-  }
-
-  get interval() {
-    if (this.triggersOnWeekend) {
-      return cronTimes.everyDayAt(this.hour);
-    }
-
-    return cronTimes.everyDayExcludingWeekendsAt(this.hour);
-  }
-
-  async run(startDateTime: Date) {
-    const dateTime = DateTime.fromJSDate(startDateTime);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(dateTime) as IJSONValue;
-
-    return [dateTimeObjectRepresentation] as IJSONValue;
-  }
-
-  async testRun() {
-    const nextCronDateTime = getNextCronDateTime(this.interval);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(nextCronDateTime) as IJSONValue;
-
-    return [dateTimeObjectRepresentation] as IJSONValue;
-  }
-}

packages/backend/src/apps/scheduler/triggers/every-day/index.ts

@@ -0,0 +1,170 @@
+import { DateTime } from 'luxon';
+import { IGlobalVariable, IJSONValue } from '@automatisch/types';
+import cronTimes from '../../common/cron-times';
+import getNextCronDateTime from '../../common/get-next-cron-date-time';
+import getDateTimeObjectRepresentation from '../../common/get-date-time-object';
+
+export default {
+  name: 'Every day',
+  key: 'everyDay',
+  description: 'Triggers every day.',
+  substeps: [
+    {
+      key: 'chooseTrigger',
+      name: 'Set up a trigger',
+      arguments: [
+        {
+          label: 'Trigger on weekends?',
+          key: 'triggersOnWeekend',
+          type: 'dropdown',
+          description: 'Should this flow trigger on Saturday and Sunday?',
+          required: true,
+          value: true,
+          variables: false,
+          options: [
+            {
+              label: 'Yes',
+              value: true
+            },
+            {
+              label: 'No',
+              value: false
+            }
+          ]
+        },
+        {
+          label: 'Time of day',
+          key: 'hour',
+          type: 'dropdown',
+          required: true,
+          value: null,
+          variables: false,
+          options: [
+            {
+              label: '00:00',
+              value: 0
+            },
+            {
+              label: '01:00',
+              value: 1
+            },
+            {
+              label: '02:00',
+              value: 2
+            },
+            {
+              label: '03:00',
+              value: 3
+            },
+            {
+              label: '04:00',
+              value: 4
+            },
+            {
+              label: '05:00',
+              value: 5
+            },
+            {
+              label: '06:00',
+              value: 6
+            },
+            {
+              label: '07:00',
+              value: 7
+            },
+            {
+              label: '08:00',
+              value: 8
+            },
+            {
+              label: '09:00',
+              value: 9
+            },
+            {
+              label: '10:00',
+              value: 10
+            },
+            {
+              label: '11:00',
+              value: 11
+            },
+            {
+              label: '12:00',
+              value: 12
+            },
+            {
+              label: '13:00',
+              value: 13
+            },
+            {
+              label: '14:00',
+              value: 14
+            },
+            {
+              label: '15:00',
+              value: 15
+            },
+            {
+              label: '16:00',
+              value: 16
+            },
+            {
+              label: '17:00',
+              value: 17
+            },
+            {
+              label: '18:00',
+              value: 18
+            },
+            {
+              label: '19:00',
+              value: 19
+            },
+            {
+              label: '20:00',
+              value: 20
+            },
+            {
+              label: '21:00',
+              value: 21
+            },
+            {
+              label: '22:00',
+              value: 22
+            },
+            {
+              label: '23:00',
+              value: 23
+            }
+          ]
+        }
+      ]
+    },
+    {
+      key: 'testStep',
+      name: 'Test trigger'
+    }
+  ],
+
+  getInterval(parameters: IGlobalVariable["db"]["step"]["parameters"]) {
+    if (parameters.triggersOnWeekend as boolean) {
+      return cronTimes.everyDayAt(parameters.hour as number);
+    }
+
+    return cronTimes.everyDayExcludingWeekendsAt(parameters.hour as number);
+  },
+
+  async run($: IGlobalVariable, startDateTime: Date) {
+    const dateTime = DateTime.fromJSDate(startDateTime);
+    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(dateTime) as IJSONValue;
+
+    return { data: [dateTimeObjectRepresentation] };
+  },
+
+  async testRun($: IGlobalVariable) {
+    const nextCronDateTime = getNextCronDateTime(this.getInterval($.db.step.parameters));
+    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(nextCronDateTime) as IJSONValue;
+
+    return { data: [dateTimeObjectRepresentation] };
+  },
+};

packages/backend/src/apps/scheduler/triggers/every-hour.ts

@@ -1,35 +0,0 @@
-import { DateTime } from 'luxon';
-import type { IJSONObject, IJSONValue, ITrigger } from '@automatisch/types';
-import { cronTimes, getNextCronDateTime, getDateTimeObjectRepresentation } from '../utils';
-
-export default class EveryHour implements ITrigger {
-  triggersOnWeekend?: boolean | string;
-
-  constructor(parameters: IJSONObject) {
-    if (parameters.triggersOnWeekend) {
-      this.triggersOnWeekend = parameters.triggersOnWeekend as string;
-    }
-  }
-
-  get interval() {
-    if (this.triggersOnWeekend) {
-      return cronTimes.everyHour;
-    }
-
-    return cronTimes.everyHourExcludingWeekends;
-  }
-
-  async run(startDateTime: Date) {
-    const dateTime = DateTime.fromJSDate(startDateTime);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(dateTime) as IJSONValue;
-
-    return [dateTimeObjectRepresentation] as IJSONValue;
-  }
-
-  async testRun() {
-    const nextCronDateTime = getNextCronDateTime(this.interval);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(nextCronDateTime) as IJSONValue;
-
-    return [dateTimeObjectRepresentation] as IJSONValue;
-  }
-}

packages/backend/src/apps/scheduler/triggers/every-hour/index.ts

@@ -0,0 +1,64 @@
+import { DateTime } from 'luxon';
+import { IGlobalVariable, IJSONValue } from '@automatisch/types';
+import cronTimes from '../../common/cron-times';
+import getNextCronDateTime from '../../common/get-next-cron-date-time';
+import getDateTimeObjectRepresentation from '../../common/get-date-time-object';
+
+export default {
+  name: 'Every hour',
+  key: 'everyHour',
+  description: 'Triggers every hour.',
+  substeps: [
+    {
+      key: 'chooseTrigger',
+      name: 'Set up a trigger',
+      arguments: [
+        {
+          label: 'Trigger on weekends?',
+          key: 'triggersOnWeekend',
+          type: 'dropdown',
+          description: 'Should this flow trigger on Saturday and Sunday?',
+          required: true,
+          value: true,
+          variables: false,
+          options: [
+            {
+              label: 'Yes',
+              value: true
+            },
+            {
+              label: 'No',
+              value: false
+            }
+          ]
+        }
+      ]
+    },
+    {
+      key: 'testStep',
+      name: 'Test trigger'
+    }
+  ],
+
+  getInterval(parameters: IGlobalVariable["db"]["step"]["parameters"]) {
+    if (parameters.triggersOnWeekend) {
+      return cronTimes.everyHour
+    }
+
+    return cronTimes.everyHourExcludingWeekends;
+  },
+
+  async run($: IGlobalVariable, startDateTime: Date) {
+    const dateTime = DateTime.fromJSDate(startDateTime);
+    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(dateTime) as IJSONValue;
+
+    return { data: [dateTimeObjectRepresentation] };
+  },
+
+  async testRun($: IGlobalVariable) {
+    const nextCronDateTime = getNextCronDateTime(this.getInterval($.db.step.parameters));
+    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(nextCronDateTime) as IJSONValue;
+
+    return { data: [dateTimeObjectRepresentation] };
+  },
+};

packages/backend/src/apps/scheduler/triggers/every-month.ts

@@ -1,36 +0,0 @@
-import { DateTime } from 'luxon';
-import type { IJSONObject, IJSONValue, ITrigger } from '@automatisch/types';
-import { cronTimes, getNextCronDateTime, getDateTimeObjectRepresentation } from '../utils';
-
-export default class EveryMonth implements ITrigger {
-  day?: number;
-  hour?: number;
-
-  constructor(parameters: IJSONObject) {
-    if (parameters.day) {
-      this.day = parameters.day as number;
-    }
-
-    if (parameters.hour) {
-      this.hour = parameters.hour as number;
-    }
-  }
-
-  get interval() {
-    return cronTimes.everyMonthOnAndAt(this.day, this.hour);
-  }
-
-  async run(startDateTime: Date) {
-    const dateTime = DateTime.fromJSDate(startDateTime);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(dateTime) as IJSONValue;
-
-    return [dateTimeObjectRepresentation] as IJSONValue;
-  }
-
-  async testRun() {
-    const nextCronDateTime = getNextCronDateTime(this.interval);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(nextCronDateTime) as IJSONValue;
-
-    return [dateTimeObjectRepresentation] as IJSONValue;
-  }
-}

packages/backend/src/apps/scheduler/triggers/every-month/index.ts

@@ -0,0 +1,283 @@
+import { DateTime } from 'luxon';
+import { IGlobalVariable, IJSONValue } from '@automatisch/types';
+import cronTimes from '../../common/cron-times';
+import getNextCronDateTime from '../../common/get-next-cron-date-time';
+import getDateTimeObjectRepresentation from '../../common/get-date-time-object';
+
+export default {
+  name: 'Every month',
+  key: 'everyMonth',
+  description: 'Triggers every month.',
+  substeps: [
+    {
+      key: 'chooseTrigger',
+      name: 'Set up a trigger',
+      arguments: [
+        {
+          label: 'Day of the month',
+          key: 'day',
+          type: 'dropdown',
+          required: true,
+          value: null,
+          variables: false,
+          options: [
+            {
+              label: 1,
+              value: 1
+            },
+            {
+              label: 2,
+              value: 2
+            },
+            {
+              label: 3,
+              value: 3
+            },
+            {
+              label: 4,
+              value: 4
+            },
+            {
+              label: 5,
+              value: 5
+            },
+            {
+              label: 6,
+              value: 6
+            },
+            {
+              label: 7,
+              value: 7
+            },
+            {
+              label: 8,
+              value: 8
+            },
+            {
+              label: 9,
+              value: 9
+            },
+            {
+              label: 10,
+              value: 10
+            },
+            {
+              label: 11,
+              value: 11
+            },
+            {
+              label: 12,
+              value: 12
+            },
+            {
+              label: 13,
+              value: 13
+            },
+            {
+              label: 14,
+              value: 14
+            },
+            {
+              label: 15,
+              value: 15
+            },
+            {
+              label: 16,
+              value: 16
+            },
+            {
+              label: 17,
+              value: 17
+            },
+            {
+              label: 18,
+              value: 18
+            },
+            {
+              label: 19,
+              value: 19
+            },
+            {
+              label: 20,
+              value: 20
+            },
+            {
+              label: 21,
+              value: 21
+            },
+            {
+              label: 22,
+              value: 22
+            },
+            {
+              label: 23,
+              value: 23
+            },
+            {
+              label: 24,
+              value: 24
+            },
+            {
+              label: 25,
+              value: 25
+            },
+            {
+              label: 26,
+              value: 26
+            },
+            {
+              label: 27,
+              value: 27
+            },
+            {
+              label: 28,
+              value: 28
+            },
+            {
+              label: 29,
+              value: 29
+            },
+            {
+              label: 30,
+              value: 30
+            },
+            {
+              label: 31,
+              value: 31
+            }
+          ]
+        },
+        {
+          label: 'Time of day',
+          key: 'hour',
+          type: 'dropdown',
+          required: true,
+          value: null,
+          variables: false,
+          options: [
+            {
+              label: '00:00',
+              value: 0
+            },
+            {
+              label: '01:00',
+              value: 1
+            },
+            {
+              label: '02:00',
+              value: 2
+            },
+            {
+              label: '03:00',
+              value: 3
+            },
+            {
+              label: '04:00',
+              value: 4
+            },
+            {
+              label: '05:00',
+              value: 5
+            },
+            {
+              label: '06:00',
+              value: 6
+            },
+            {
+              label: '07:00',
+              value: 7
+            },
+            {
+              label: '08:00',
+              value: 8
+            },
+            {
+              label: '09:00',
+              value: 9
+            },
+            {
+              label: '10:00',
+              value: 10
+            },
+            {
+              label: '11:00',
+              value: 11
+            },
+            {
+              label: '12:00',
+              value: 12
+            },
+            {
+              label: '13:00',
+              value: 13
+            },
+            {
+              label: '14:00',
+              value: 14
+            },
+            {
+              label: '15:00',
+              value: 15
+            },
+            {
+              label: '16:00',
+              value: 16
+            },
+            {
+              label: '17:00',
+              value: 17
+            },
+            {
+              label: '18:00',
+              value: 18
+            },
+            {
+              label: '19:00',
+              value: 19
+            },
+            {
+              label: '20:00',
+              value: 20
+            },
+            {
+              label: '21:00',
+              value: 21
+            },
+            {
+              label: '22:00',
+              value: 22
+            },
+            {
+              label: '23:00',
+              value: 23
+            }
+          ]
+        }
+      ]
+    },
+    {
+      key: 'testStep',
+      name: 'Test trigger'
+    }
+  ],
+
+  getInterval(parameters: IGlobalVariable["db"]["step"]["parameters"]) {
+    const interval = cronTimes.everyMonthOnAndAt(parameters.day as number, parameters.hour as number);
+
+    return interval;
+  },
+
+  async run($: IGlobalVariable, startDateTime: Date) {
+    const dateTime = DateTime.fromJSDate(startDateTime);
+    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(dateTime) as IJSONValue;
+
+    return { data: [dateTimeObjectRepresentation] };
+  },
+
+  async testRun($: IGlobalVariable) {
+    const nextCronDateTime = getNextCronDateTime(this.getInterval($.db.step.parameters));
+    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(nextCronDateTime) as IJSONValue;
+
+    return { data: [dateTimeObjectRepresentation] };
+  },
+};

packages/backend/src/apps/scheduler/triggers/every-week.ts

@@ -1,36 +0,0 @@
-import { DateTime } from 'luxon';
-import type { IJSONObject, IJSONValue, ITrigger } from '@automatisch/types';
-import { cronTimes, getNextCronDateTime, getDateTimeObjectRepresentation } from '../utils';
-
-export default class EveryWeek implements ITrigger {
-  weekday?: number;
-  hour?: number;
-
-  constructor(parameters: IJSONObject) {
-    if (parameters.weekday) {
-      this.weekday = parameters.weekday as number;
-    }
-
-    if (parameters.hour) {
-      this.hour = parameters.hour as number;
-    }
-  }
-
-  get interval() {
-    return cronTimes.everyWeekOnAndAt(this.weekday, this.hour);
-  }
-
-  async run(startDateTime: Date) {
-    const dateTime = DateTime.fromJSDate(startDateTime);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(dateTime) as IJSONValue;
-
-    return [dateTimeObjectRepresentation] as IJSONValue;
-  }
-
-  async testRun() {
-    const nextCronDateTime = getNextCronDateTime(this.interval);
-    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(nextCronDateTime) as IJSONValue;
-
-    return [dateTimeObjectRepresentation] as IJSONValue;
-  }
-}

packages/backend/src/apps/scheduler/triggers/every-week/index.ts

@@ -0,0 +1,187 @@
+import { DateTime } from 'luxon';
+import { IGlobalVariable, IJSONValue } from '@automatisch/types';
+import cronTimes from '../../common/cron-times';
+import getNextCronDateTime from '../../common/get-next-cron-date-time';
+import getDateTimeObjectRepresentation from '../../common/get-date-time-object';
+
+export default {
+  name: 'Every week',
+  key: 'everyWeek',
+  description: 'Triggers every week.',
+  substeps: [
+    {
+      key: 'chooseTrigger',
+      name: 'Set up a trigger',
+      arguments: [
+        {
+          label: 'Day of the week',
+          key: 'weekday',
+          type: 'dropdown',
+          required: true,
+          value: null,
+          variables: false,
+          options: [
+            {
+              label: 'Monday',
+              value: 1
+            },
+            {
+              label: 'Tuesday',
+              value: 2
+            },
+            {
+              label: 'Wednesday',
+              value: 3
+            },
+            {
+              label: 'Thursday',
+              value: 4
+            },
+            {
+              label: 'Friday',
+              value: 5
+            },
+            {
+              label: 'Saturday',
+              value: 6
+            },
+            {
+              label: 'Sunday',
+              value: 0
+            }
+          ]
+        },
+        {
+          label: 'Time of day',
+          key: 'hour',
+          type: 'dropdown',
+          required: true,
+          value: null,
+          variables: false,
+          options: [
+            {
+              label: '00:00',
+              value: 0
+            },
+            {
+              label: '01:00',
+              value: 1
+            },
+            {
+              label: '02:00',
+              value: 2
+            },
+            {
+              label: '03:00',
+              value: 3
+            },
+            {
+              label: '04:00',
+              value: 4
+            },
+            {
+              label: '05:00',
+              value: 5
+            },
+            {
+              label: '06:00',
+              value: 6
+            },
+            {
+              label: '07:00',
+              value: 7
+            },
+            {
+              label: '08:00',
+              value: 8
+            },
+            {
+              label: '09:00',
+              value: 9
+            },
+            {
+              label: '10:00',
+              value: 10
+            },
+            {
+              label: '11:00',
+              value: 11
+            },
+            {
+              label: '12:00',
+              value: 12
+            },
+            {
+              label: '13:00',
+              value: 13
+            },
+            {
+              label: '14:00',
+              value: 14
+            },
+            {
+              label: '15:00',
+              value: 15
+            },
+            {
+              label: '16:00',
+              value: 16
+            },
+            {
+              label: '17:00',
+              value: 17
+            },
+            {
+              label: '18:00',
+              value: 18
+            },
+            {
+              label: '19:00',
+              value: 19
+            },
+            {
+              label: '20:00',
+              value: 20
+            },
+            {
+              label: '21:00',
+              value: 21
+            },
+            {
+              label: '22:00',
+              value: 22
+            },
+            {
+              label: '23:00',
+              value: 23
+            }
+          ]
+        }
+      ]
+    },
+    {
+      key: 'testStep',
+      name: 'Test trigger'
+    }
+  ],
+
+  getInterval(parameters: IGlobalVariable["db"]["step"]["parameters"]) {
+    const interval = cronTimes.everyWeekOnAndAt(parameters.weekday as number, parameters.hour as number);
+
+    return interval;
+  },
+
+  async run($: IGlobalVariable, startDateTime: Date) {
+    const dateTime = DateTime.fromJSDate(startDateTime);
+    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(dateTime) as IJSONValue;
+
+    return { data: [dateTimeObjectRepresentation] };
+  },
+
+  async testRun($: IGlobalVariable) {
+    const nextCronDateTime = getNextCronDateTime(this.getInterval($.db.step.parameters));
+    const dateTimeObjectRepresentation = getDateTimeObjectRepresentation(nextCronDateTime) as IJSONValue;
+
+    return { data: [dateTimeObjectRepresentation] };
+  },
+};

packages/backend/src/apps/scheduler/utils.ts

@@ -1,32 +0,0 @@
-import { DateTime } from 'luxon';
-import cronParser from 'cron-parser';
-
-export const cronTimes = {
-  everyHour: '0 * * * *',
-  everyHourExcludingWeekends: '0 * * * 1-5',
-  everyDayAt: (hour: number) => `0 ${hour} * * *`,
-  everyDayExcludingWeekendsAt: (hour: number) => `0 ${hour} * * 1-5`,
-  everyWeekOnAndAt: (weekday: number, hour: number) => `0 ${hour} * * ${weekday}`,
-  everyMonthOnAndAt: (day: number, hour: number) => `0 ${hour} ${day} * *`,
-};
-
-export function getNextCronDateTime(cronString: string) {
-  const cronDate = cronParser.parseExpression(cronString);
-  const matchingNextCronDateTime = cronDate.next();
-  const matchingNextDateTime = DateTime.fromJSDate(matchingNextCronDateTime.toDate());
-
-  return matchingNextDateTime;
-};
-
-export function getDateTimeObjectRepresentation(dateTime: DateTime) {
-  const defaults = dateTime.toObject();
-
-  return {
-    ...defaults,
-    ISO_date_time: dateTime.toISO(),
-    pretty_date: dateTime.toLocaleString(DateTime.DATE_MED),
-    pretty_time: dateTime.toLocaleString(DateTime.TIME_WITH_SECONDS),
-    pretty_day_of_week: dateTime.toFormat('cccc'),
-    day_of_week: dateTime.weekday,
-  };
-}

packages/backend/src/apps/slack/actions.ts

@@ -1,13 +0,0 @@
-import SendMessageToChannel from './actions/send-message-to-channel';
-import { IJSONObject } from '@automatisch/types';
-
-export default class Actions {
-  sendMessageToChannel: SendMessageToChannel;
-
-  constructor(connectionData: IJSONObject, parameters: IJSONObject) {
-    this.sendMessageToChannel = new SendMessageToChannel(
-      connectionData,
-      parameters
-    );
-  }
-}

packages/backend/src/apps/slack/actions/find-message/find-message.ts

@@ -0,0 +1,50 @@
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+
+type FindMessageOptions = {
+  query: string;
+  sortBy: string;
+  sortDirection: string;
+  count: number;
+};
+
+const findMessage = async ($: IGlobalVariable, options: FindMessageOptions) => {
+  const message: {
+    data?: IJSONObject;
+    error?: IJSONObject;
+  } = {};
+
+  const headers = {
+    Authorization: `Bearer ${$.auth.data.accessToken}`,
+  };
+
+  const params = {
+    query: options.query,
+    sort: options.sortBy,
+    sort_dir: options.sortDirection,
+    count: options.count || 1,
+  };
+
+  const response = await $.http.get('/search.messages', {
+    headers,
+    params,
+  });
+
+  if (response.integrationError) {
+    message.error = response.integrationError;
+    return message;
+  }
+
+  const data = response.data;
+
+  if (!data.ok) {
+    message.error = data;
+    return message;
+  }
+
+  const messages = data.messages.matches;
+  message.data = messages?.[0];
+
+  return message;
+};
+
+export default findMessage;

packages/backend/src/apps/slack/actions/find-message/index.ts

@@ -0,0 +1,90 @@
+import { IGlobalVariable } from '@automatisch/types';
+import findMessage from './find-message';
+
+export default {
+  name: 'Find message',
+  key: 'findMessage',
+  description: 'Find a Slack message using the Slack Search feature.',
+  substeps: [
+    {
+      key: 'chooseConnection',
+      name: 'Choose connection',
+    },
+    {
+      key: 'setupAction',
+      name: 'Set up action',
+      arguments: [
+        {
+          label: 'Search Query',
+          key: 'query',
+          type: 'string',
+          required: true,
+          description:
+            'Search query to use for finding matching messages. See the Slack Search Documentation for more information on constructing a query.',
+          variables: true,
+        },
+        {
+          label: 'Sort by',
+          key: 'sortBy',
+          type: 'dropdown',
+          description:
+            'Sort messages by their match strength or by their date. Default is score.',
+          required: true,
+          value: 'score',
+          variables: false,
+          options: [
+            {
+              label: 'Match strength',
+              value: 'score',
+            },
+            {
+              label: 'Message date time',
+              value: 'timestamp',
+            },
+          ],
+        },
+        {
+          label: 'Sort direction',
+          key: 'sortDirection',
+          type: 'dropdown',
+          description:
+            'Sort matching messages in ascending or descending order. Default is descending.',
+          required: true,
+          value: 'desc',
+          variables: false,
+          options: [
+            {
+              label: 'Descending (newest or best match first)',
+              value: 'desc',
+            },
+            {
+              label: 'Ascending (oldest or worst match first)',
+              value: 'asc',
+            },
+          ],
+        },
+      ],
+    },
+    {
+      key: 'testStep',
+      name: 'Test action',
+    },
+  ],
+
+  async run($: IGlobalVariable) {
+    const parameters = $.db.step.parameters;
+    const query = parameters.query as string;
+    const sortBy = parameters.sortBy as string;
+    const sortDirection = parameters.sortDirection as string;
+    const count = 1;
+
+    const messages = await findMessage($, {
+      query,
+      sortBy,
+      sortDirection,
+      count,
+    });
+
+    return messages;
+  },
+};

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

@@ -0,0 +1,59 @@
+import { IGlobalVariable } from '@automatisch/types';
+import postMessage from './post-message';
+
+export default {
+  name: 'Send a message to channel',
+  key: 'sendMessageToChannel',
+  description: 'Send a message to a specific channel you specify.',
+  substeps: [
+    {
+      key: 'chooseConnection',
+      name: 'Choose connection',
+    },
+    {
+      key: 'setupAction',
+      name: 'Set up action',
+      arguments: [
+        {
+          label: 'Channel',
+          key: 'channel',
+          type: 'dropdown',
+          required: true,
+          description: 'Pick a channel to send the message to.',
+          variables: false,
+          source: {
+            type: 'query',
+            name: 'getData',
+            arguments: [
+              {
+                name: 'key',
+                value: 'listChannels',
+              },
+            ],
+          },
+        },
+        {
+          label: 'Message text',
+          key: 'message',
+          type: 'string',
+          required: true,
+          description: 'The content of your new message.',
+          variables: true,
+        },
+      ],
+    },
+    {
+      key: 'testStep',
+      name: 'Test action',
+    },
+  ],
+
+  async run($: IGlobalVariable) {
+    const channelId = $.db.step.parameters.channel as string;
+    const text = $.db.step.parameters.message as string;
+
+    const message = await postMessage($, channelId, text);
+
+    return message;
+  },
+};

packages/backend/src/apps/slack/actions/send-a-message-to-channel/post-message.ts

@@ -0,0 +1,37 @@
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+
+const postMessage = async (
+  $: IGlobalVariable,
+  channelId: string,
+  text: string
+) => {
+  const message: {
+    data: IJSONObject | null | undefined;
+    error: IJSONObject | null | undefined;
+  } = {
+    data: null,
+    error: null,
+  };
+
+  const headers = {
+    Authorization: `Bearer ${$.auth.data.accessToken}`,
+  };
+
+  const params = {
+    channel: channelId,
+    text,
+  };
+
+  const response = await $.http.post('/chat.postMessage', params, { headers });
+
+  message.error = response?.integrationError;
+  message.data = response?.data?.message;
+
+  if (response.data.ok === false) {
+    message.error = response.data;
+  }
+
+  return message;
+};
+
+export default postMessage;

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

@@ -1,21 +0,0 @@
-import { WebClient } from '@slack/web-api';
-import { IJSONObject } from '@automatisch/types';
-
-export default class SendMessageToChannel {
-  client: WebClient;
-  parameters: IJSONObject;
-
-  constructor(connectionData: IJSONObject, parameters: IJSONObject) {
-    this.client = new WebClient(connectionData.accessToken as string);
-    this.parameters = parameters;
-  }
-
-  async run() {
-    const result = await this.client.chat.postMessage({
-      channel: this.parameters.channel as string,
-      text: this.parameters.message as string,
-    });
-
-    return result;
-  }
-}

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

@@ -1,7 +1,6 @@
-
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 aria-label="Slack" role="img"
 viewBox="0 0 512 512"><rect
 width="512" height="512"
 rx="15%"
-fill="#fff"/><g fill="#e01e5a"><path id="a" d="M149 305a39 39 0 01-78 0c0-22 17 -39 39 -39h39zM168 305a39 39 0 0178 0v97a39 39 0 01-78 0z"/></g><use xlink:href="#a" fill="#36c5f0" transform="rotate(90,256,256)"/><use xlink:href="#a" fill="#2eb67d" transform="rotate(180,256,256)"/><use xlink:href="#a" fill="#ecb22e" transform="rotate(270,256,256)"/></svg>
+fill="#fff"/><g fill="#e01e5a"><path id="a" d="M149 305a39 39 0 01-78 0c0-22 17 -39 39 -39h39zM168 305a39 39 0 0178 0v97a39 39 0 01-78 0z"/></g><use xlink:href="#a" fill="#36c5f0" transform="rotate(90,256,256)"/><use xlink:href="#a" fill="#2eb67d" transform="rotate(180,256,256)"/><use xlink:href="#a" fill="#ecb22e" transform="rotate(270,256,256)"/></svg>

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

@@ -0,0 +1,100 @@
+import verifyCredentials from './verify-credentials';
+import isStillVerified from './is-still-verified';
+
+export default {
+  fields: [
+    {
+      key: 'accessToken',
+      label: 'Access Token',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: 'Access token of slack that Automatisch will connect to.',
+      clickToCopy: false,
+    },
+  ],
+  authenticationSteps: [
+    {
+      step: 1,
+      type: 'mutation',
+      name: 'createConnection',
+      arguments: [
+        {
+          name: 'key',
+          value: '{key}',
+        },
+        {
+          name: 'formattedData',
+          value: null,
+          properties: [
+            {
+              name: 'accessToken',
+              value: '{fields.accessToken}',
+            },
+          ],
+        },
+      ],
+    },
+    {
+      step: 2,
+      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: 'accessToken',
+              value: '{fields.accessToken}',
+            },
+          ],
+        },
+      ],
+    },
+    {
+      step: 3,
+      type: 'mutation',
+      name: 'verifyConnection',
+      arguments: [
+        {
+          name: 'id',
+          value: '{connection.id}',
+        },
+      ],
+    },
+  ],
+
+  verifyCredentials,
+  isStillVerified,
+};

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

@@ -0,0 +1,12 @@
+import verifyCredentials from './verify-credentials';
+
+const isStillVerified = async ($: any) => {
+  try {
+    await verifyCredentials($);
+    return true;
+  } catch (error) {
+    return false;
+  }
+};
+
+export default isStillVerified;

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

@@ -0,0 +1,34 @@
+import qs from 'qs';
+import { IGlobalVariable } from '@automatisch/types';
+
+const verifyCredentials = async ($: IGlobalVariable) => {
+  const headers = {
+    'Content-Type': 'application/x-www-form-urlencoded',
+  };
+
+  const stringifiedBody = qs.stringify({
+    token: $.auth.data.accessToken,
+  });
+
+  const response = await $.http.post('/auth.test', stringifiedBody, {
+    headers,
+  });
+
+  if (response.data.ok === false) {
+    throw new Error(
+      `Error occured while verifying credentials: ${response.data.error}.(More info: https://api.slack.com/methods/auth.test#errors)`
+    );
+  }
+
+  const { bot_id: botId, user: screenName } = response.data;
+
+  $.auth.set({
+    botId,
+    screenName,
+    token: $.auth.data.accessToken,
+  });
+
+  return response.data;
+};
+
+export default verifyCredentials;

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

@@ -1,39 +0,0 @@
-import type { IAuthentication, IApp, IJSONObject } from '@automatisch/types';
-import { WebClient } from '@slack/web-api';
-
-export default class Authentication implements IAuthentication {
-  appData: IApp;
-  connectionData: IJSONObject;
-  client: WebClient;
-
-  constructor(appData: IApp, connectionData: IJSONObject) {
-    this.client = new WebClient();
-
-    this.connectionData = connectionData;
-    this.appData = appData;
-  }
-
-  async verifyCredentials() {
-    const { bot_id: botId, user: screenName } = await this.client.auth.test({
-      token: this.connectionData.accessToken as string,
-    });
-
-    return {
-      botId,
-      screenName,
-      token: this.connectionData.accessToken,
-    };
-  }
-
-  async isStillVerified() {
-    try {
-      await this.client.auth.test({
-        token: this.connectionData.accessToken as string,
-      });
-
-      return true;
-    } catch (error) {
-      return false;
-    }
-  }
-}

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

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

packages/backend/src/apps/slack/data/list-channels.ts

@@ -1,21 +0,0 @@
-import type { IJSONObject } from '@automatisch/types';
-import { WebClient } from '@slack/web-api';
-
-export default class ListChannels {
-  client: WebClient;
-
-  constructor(connectionData: IJSONObject) {
-    this.client = new WebClient(connectionData.accessToken as string);
-  }
-
-  async run() {
-    const { channels } = await this.client.conversations.list();
-
-    return channels.map((channel) => {
-      return {
-        value: channel.id,
-        name: channel.name,
-      };
-    });
-  }
-}

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

@@ -0,0 +1,41 @@
+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('/conversations.list', {
+      headers: {
+        Authorization: `Bearer ${$.auth.data.accessToken}`,
+      },
+    });
+
+    if (response.integrationError) {
+      channels.error = response.integrationError;
+      return channels;
+    }
+
+    if (response.data.ok === 'false') {
+      channels.error = response.data.error;
+      return channels;
+    }
+
+    channels.data = response.data.channels.map((channel: IJSONObject) => {
+      return {
+        value: channel.id,
+        name: channel.name,
+      };
+    });
+
+    return channels;
+  },
+};

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

@@ -1,28 +1,8 @@
-import {
-  IService,
-  IAuthentication,
-  IApp,
-  IJSONObject,
-} from '@automatisch/types';
-import Authentication from './authentication';
-import Triggers from './triggers';
-import Actions from './actions';
-import Data from './data';
-
-export default class Slack implements IService {
-  authenticationClient: IAuthentication;
-  triggers: Triggers;
-  actions: Actions;
-  data: Data;
-
-  constructor(
-    appData: IApp,
-    connectionData: IJSONObject,
-    parameters: IJSONObject
-  ) {
-    this.authenticationClient = new Authentication(appData, connectionData);
-    this.data = new Data(connectionData);
-    this.triggers = new Triggers(connectionData, parameters);
-    this.actions = new Actions(connectionData, parameters);
-  }
-}
+export default {
+  name: 'Slack',
+  key: 'slack',
+  iconUrl: '{BASE_URL}/apps/slack/assets/favicon.svg',
+  authDocUrl: 'https://automatisch.io/docs/connections/slack',
+  supportsConnections: true,
+  baseUrl: 'https://slack.com/api',
+};

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

@@ -1,208 +0,0 @@
-{
-  "name": "Slack",
-  "key": "slack",
-  "iconUrl": "{BASE_URL}/apps/slack/assets/favicon.svg",
-  "docUrl": "https://automatisch.io/docs/slack",
-  "primaryColor": "2DAAE1",
-  "fields": [
-    {
-      "key": "accessToken",
-      "label": "Access Token",
-      "type": "string",
-      "required": true,
-      "readOnly": false,
-      "value": null,
-      "placeholder": null,
-      "description": "Access token of slack that Automatisch will connect to.",
-      "docUrl": "https://automatisch.io/docs/slack#access-token",
-      "clickToCopy": false
-    }
-  ],
-  "authenticationSteps": [
-    {
-      "step": 1,
-      "type": "mutation",
-      "name": "createConnection",
-      "arguments": [
-        {
-          "name": "key",
-          "value": "{key}"
-        },
-        {
-          "name": "formattedData",
-          "value": null,
-          "properties": [
-            {
-              "name": "accessToken",
-              "value": "{fields.accessToken}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 2,
-      "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": "accessToken",
-              "value": "{fields.accessToken}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "step": 3,
-      "type": "mutation",
-      "name": "verifyConnection",
-      "arguments": [
-        {
-          "name": "id",
-          "value": "{connection.id}"
-        }
-      ]
-    }
-  ],
-  "triggers": [
-    {
-      "name": "New message posted to a channel",
-      "key": "newMessageToChannel",
-      "description": "Triggers when a new message is posted to a channel",
-      "substeps": [
-        {
-          "key": "chooseAccount",
-          "name": "Choose account"
-        },
-        {
-          "key": "chooseTrigger",
-          "name": "Set up a trigger",
-          "arguments": [
-            {
-              "label": "Channel",
-              "key": "channel",
-              "type": "dropdown",
-              "required": true,
-              "variables": false,
-              "source": {
-                "type": "query",
-                "name": "getData",
-                "arguments": [
-                  {
-                    "name": "key",
-                    "value": "listChannels"
-                  }
-                ]
-              }
-            },
-            {
-              "label": "Trigger for Bot Messages?",
-              "key": "triggerForBotMessages",
-              "type": "dropdown",
-              "description": "Should this flow trigger for bot messages?",
-              "required": true,
-              "value": true,
-              "variables": false,
-              "options": [
-                {
-                  "label": "Yes",
-                  "value": true
-                },
-                {
-                  "label": "No",
-                  "value": false
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    }
-  ],
-  "actions": [
-    {
-      "name": "Send a message to channel",
-      "key": "sendMessageToChannel",
-      "description": "Send a message to a specific channel you specify.",
-      "substeps": [
-        {
-          "key": "chooseAccount",
-          "name": "Choose account"
-        },
-        {
-          "key": "setupAction",
-          "name": "Set up action",
-          "arguments": [
-            {
-              "label": "Channel",
-              "key": "channel",
-              "type": "dropdown",
-              "required": true,
-              "description": "Pick a channel to send the message to.",
-              "variables": false,
-              "source": {
-                "type": "query",
-                "name": "getData",
-                "arguments": [
-                  {
-                    "name": "key",
-                    "value": "listChannels"
-                  }
-                ]
-              }
-            },
-            {
-              "label": "Message text",
-              "key": "message",
-              "type": "string",
-              "required": true,
-              "description": "The content of your new message.",
-              "variables": true
-            }
-          ]
-        },
-        {
-          "key": "testStep",
-          "name": "Test action"
-        }
-      ]
-    }
-  ]
-}

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

@@ -1,13 +0,0 @@
-import { IJSONObject } from '@automatisch/types';
-import NewMessageToChannel from './triggers/new-message-to-channel';
-
-export default class Triggers {
-  newMessageToChannel: NewMessageToChannel;
-
-  constructor(connectionData: IJSONObject, parameters: IJSONObject) {
-    this.newMessageToChannel = new NewMessageToChannel(
-      connectionData,
-      parameters
-    );
-  }
-}

packages/backend/src/apps/slack/triggers/new-message-to-channel.ts

@@ -1,47 +0,0 @@
-import { IJSONObject } from '@automatisch/types';
-import axios, { AxiosInstance } from 'axios';
-
-export default class NewMessageToChannel {
-  httpClient: AxiosInstance;
-  parameters: IJSONObject;
-  connectionData: IJSONObject;
-  BASE_URL = 'https://slack.com/api';
-
-  constructor(connectionData: IJSONObject, parameters: IJSONObject) {
-    this.httpClient = axios.create({ baseURL: this.BASE_URL });
-    this.connectionData = connectionData;
-    this.parameters = parameters;
-  }
-
-  async run() {
-    // TODO: Fix after webhook implementation.
-  }
-
-  async testRun() {
-    const headers = {
-      Authorization: `Bearer ${this.connectionData.accessToken}`,
-    };
-
-    const params = {
-      channel: this.parameters.channel,
-    };
-
-    const response = await this.httpClient.get('/conversations.history', {
-      headers,
-      params,
-    });
-
-    let lastMessage;
-
-    if (this.parameters.triggerForBotMessages) {
-      lastMessage = response.data.messages[0];
-    } else {
-      lastMessage = response.data.messages.find(
-        (message: IJSONObject) =>
-          !Object.prototype.hasOwnProperty.call(message, 'bot_id')
-      );
-    }
-
-    return [lastMessage];
-  }
-}

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

@@ -4,6 +4,7 @@
   "iconUrl": "{BASE_URL}/apps/smtp/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/smtp",
   "primaryColor": "2DAAE1",
+  "supportsConnections": true,
   "fields": [
     {
       "key": "host",

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

@@ -4,6 +4,7 @@
   "iconUrl": "{BASE_URL}/apps/twilio/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/twilio",
   "primaryColor": "f22f46",
+  "supportsConnections": true,
   "fields": [
     {
       "key": "accountSid",

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

@@ -4,6 +4,7 @@
   "iconUrl": "{BASE_URL}/apps/twitch/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/twitch",
   "primaryColor": "2DAAE1",
+  "supportsConnections": true,
   "fields": [
     {
       "key": "oAuthRedirectUrl",

packages/backend/src/apps/twitter/actions.ts

@@ -1,10 +0,0 @@
-import CreateTweet from './actions/create-tweet';
-import { IJSONObject } from '@automatisch/types';
-
-export default class Actions {
-  createTweet: CreateTweet;
-
-  constructor(connectionData: IJSONObject, parameters: IJSONObject) {
-    this.createTweet = new CreateTweet(connectionData, parameters);
-  }
-}

packages/backend/src/apps/twitter/actions/create-tweet.ts

@@ -1,23 +0,0 @@
-import TwitterApi, { TwitterApiTokens } from 'twitter-api-v2';
-import { IJSONObject } from '@automatisch/types';
-
-export default class CreateTweet {
-  client: TwitterApi;
-  parameters: IJSONObject;
-
-  constructor(connectionData: IJSONObject, parameters: IJSONObject) {
-    this.client = new TwitterApi({
-      appKey: connectionData.consumerKey,
-      appSecret: connectionData.consumerSecret,
-      accessToken: connectionData.accessToken,
-      accessSecret: connectionData.accessSecret,
-    } as TwitterApiTokens);
-
-    this.parameters = parameters;
-  }
-
-  async run() {
-    const tweet = await this.client.v1.tweet(this.parameters.tweet as string);
-    return tweet;
-  }
-}

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

@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" aria-label="Twitter" role="img" viewBox="0 0 512 512">
   <rect width="512" height="512" rx="15%" fill="#1da1f2"/>
   <path fill="#fff" d="M437 152a72 72 0 01-40 12a72 72 0 0032-40a72 72 0 01-45 17a72 72 0 00-122 65a200 200 0 01-145-74a72 72 0 0022 94a72 72 0 01-32-7a72 72 0 0056 69a72 72 0 01-32 1a72 72 0 0067 50a200 200 0 01-105 29a200 200 0 00309-179a200 200 0 0035-37"/>
-</svg>
+</svg>

packages/backend/src/apps/twitter/auth/create-auth-data.ts

@@ -0,0 +1,35 @@
+import generateRequest from '../common/generate-request';
+import { IJSONObject, IField, IGlobalVariable } from '@automatisch/types';
+import { URLSearchParams } from 'url';
+
+export default async function createAuthData($: IGlobalVariable) {
+  try {
+    const oauthRedirectUrlField = $.app.auth.fields.find(
+      (field: IField) => field.key == 'oAuthRedirectUrl'
+    );
+
+    const callbackUrl = oauthRedirectUrlField.value;
+
+    const response = await generateRequest($, {
+      requestPath: '/oauth/request_token',
+      method: 'POST',
+      data: { oauth_callback: callbackUrl },
+    });
+
+    const responseData = Object.fromEntries(new URLSearchParams(response.data));
+
+    await $.auth.set({
+      url: `${$.app.baseUrl}/oauth/authorize?oauth_token=${responseData.oauth_token}`,
+      accessToken: responseData.oauth_token,
+      accessSecret: responseData.oauth_token_secret,
+    });
+  } catch (error) {
+    const errorMessages = error.response.data.errors
+      .map((error: IJSONObject) => error.message)
+      .join(' ');
+
+    throw new Error(
+      `Error occured while verifying credentials: ${errorMessages}`
+    );
+  }
+}

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

@@ -0,0 +1,219 @@
+import createAuthData from './create-auth-data';
+import verifyCredentials from './verify-credentials';
+import isStillVerified from './is-still-verified';
+
+export default {
+  fields: [
+    {
+      key: 'oAuthRedirectUrl',
+      label: 'OAuth Redirect URL',
+      type: 'string',
+      required: true,
+      readOnly: true,
+      value: '{WEB_APP_URL}/app/twitter/connections/add',
+      placeholder: null,
+      description:
+        'When asked to input an OAuth callback or redirect URL in Twitter OAuth, enter the URL above.',
+      clickToCopy: true,
+    },
+    {
+      key: 'consumerKey',
+      label: 'API Key',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      clickToCopy: false,
+    },
+    {
+      key: 'consumerSecret',
+      label: 'API Secret',
+      type: 'string',
+      required: true,
+      readOnly: false,
+      value: null,
+      placeholder: null,
+      description: null,
+      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}',
+        },
+      ],
+    },
+  ],
+
+  createAuthData,
+  verifyCredentials,
+  isStillVerified,
+};

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

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

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

@@ -0,0 +1,24 @@
+import { IGlobalVariable } from '@automatisch/types';
+import { URLSearchParams } from 'url';
+
+const verifyCredentials = async ($: IGlobalVariable) => {
+  try {
+    const response = await $.http.post(
+      `/oauth/access_token?oauth_verifier=${$.auth.data.oauthVerifier}&oauth_token=${$.auth.data.accessToken}`,
+      null
+    );
+
+    const responseData = Object.fromEntries(new URLSearchParams(response.data));
+
+    await $.auth.set({
+      accessToken: responseData.oauth_token,
+      accessSecret: responseData.oauth_token_secret,
+      userId: responseData.user_id,
+      screenName: responseData.screen_name,
+    });
+  } catch (error) {
+    throw new Error(error.response.data);
+  }
+};
+
+export default verifyCredentials;

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

@@ -1,66 +0,0 @@
-import type {
-  IAuthentication,
-  IApp,
-  IField,
-  IJSONObject,
-} from '@automatisch/types';
-import TwitterApi, { TwitterApiTokens } from 'twitter-api-v2';
-
-export default class Authentication implements IAuthentication {
-  appData: IApp;
-  connectionData: IJSONObject;
-  client: TwitterApi;
-
-  constructor(appData: IApp, connectionData: IJSONObject) {
-    this.appData = appData;
-    this.connectionData = connectionData;
-
-    const clientParams = {
-      appKey: connectionData.consumerKey,
-      appSecret: connectionData.consumerSecret,
-      accessToken: connectionData.accessToken,
-      accessSecret: connectionData.accessSecret,
-    } as TwitterApiTokens;
-
-    this.client = new TwitterApi(clientParams);
-  }
-
-  async createAuthData() {
-    const appFields = this.appData.fields.find(
-      (field: IField) => field.key == 'oAuthRedirectUrl'
-    );
-    const callbackUrl = appFields.value;
-
-    const authLink = await this.client.generateAuthLink(callbackUrl);
-
-    return {
-      url: authLink.url,
-      accessToken: authLink.oauth_token,
-      accessSecret: authLink.oauth_token_secret,
-    };
-  }
-
-  async verifyCredentials() {
-    const verifiedCredentials = await this.client.login(
-      this.connectionData.oauthVerifier as string
-    );
-
-    return {
-      consumerKey: this.connectionData.consumerKey,
-      consumerSecret: this.connectionData.consumerSecret,
-      accessToken: verifiedCredentials.accessToken,
-      accessSecret: verifiedCredentials.accessSecret,
-      userId: verifiedCredentials.userId,
-      screenName: verifiedCredentials.screenName,
-    };
-  }
-
-  async isStillVerified() {
-    try {
-      await this.client.currentUser();
-      return true;
-    } catch {
-      return false;
-    }
-  }
-}

packages/backend/src/apps/twitter/common/generate-request.ts

@@ -0,0 +1,44 @@
+import { Token } from 'oauth-1.0a';
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+import oauthClient from './oauth-client';
+import { Method } from 'axios';
+
+type IGenereateRequestOptons = {
+  requestPath: string;
+  method: string;
+  data?: IJSONObject;
+};
+
+const generateRequest = async (
+  $: IGlobalVariable,
+  options: IGenereateRequestOptons
+) => {
+  const { requestPath, method, data } = options;
+
+  const token: Token = {
+    key: $.auth.data.accessToken as string,
+    secret: $.auth.data.accessSecret as string,
+  };
+
+  const requestData = {
+    url: `${$.app.baseUrl}${requestPath}`,
+    method,
+    data,
+  };
+
+  const authHeader = oauthClient($).toHeader(
+    oauthClient($).authorize(requestData, token)
+  );
+
+  const response = await $.http.request({
+    url: requestData.url,
+    method: requestData.method as Method,
+    headers: {
+      ...authHeader,
+    },
+  });
+
+  return response;
+};
+
+export default generateRequest;

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

@@ -0,0 +1,14 @@
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+import generateRequest from './generate-request';
+
+const getCurrentUser = async ($: IGlobalVariable): Promise<IJSONObject> => {
+  const response = await generateRequest($, {
+    requestPath: '/2/users/me',
+    method: 'GET',
+  });
+
+  const currentUser = response.data.data;
+  return currentUser;
+};
+
+export default getCurrentUser;

packages/backend/src/apps/twitter/common/get-user-by-username.ts

@@ -0,0 +1,22 @@
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+import generateRequest from './generate-request';
+
+const getUserByUsername = async ($: IGlobalVariable, username: string) => {
+  const response = await generateRequest($, {
+    requestPath: `/2/users/by/username/${username}`,
+    method: 'GET',
+  });
+
+  if (response.data.errors) {
+    const errorMessages = response.data.errors
+      .map((error: IJSONObject) => error.detail)
+      .join(' ');
+
+    throw new Error(`Error occured while fetching user data: ${errorMessages}`);
+  }
+
+  const user = response.data.data;
+  return user;
+};
+
+export default getUserByUsername;

packages/backend/src/apps/twitter/common/get-user-followers.ts

@@ -0,0 +1,68 @@
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+import { URLSearchParams } from 'url';
+import { omitBy, isEmpty } from 'lodash';
+import generateRequest from './generate-request';
+
+type GetUserFollowersOptions = {
+  userId: string;
+  lastInternalId?: string;
+};
+
+const getUserFollowers = async (
+  $: IGlobalVariable,
+  options: GetUserFollowersOptions
+) => {
+  let response;
+
+  const followers: {
+    data: IJSONObject[];
+    error: IJSONObject | null;
+  } = {
+    data: [],
+    error: null,
+  };
+
+  do {
+    const params: IJSONObject = {
+      pagination_token: response?.data?.meta?.next_token,
+    };
+
+    const queryParams = new URLSearchParams(omitBy(params, isEmpty));
+
+    const requestPath = `/2/users/${options.userId}/followers${
+      queryParams.toString() ? `?${queryParams.toString()}` : ''
+    }`;
+
+    response = await generateRequest($, {
+      requestPath,
+      method: 'GET',
+    });
+
+    if (response.integrationError) {
+      followers.error = response.integrationError;
+      return followers;
+    }
+
+    if (response.data?.errors) {
+      followers.error = response.data.errors;
+      return followers;
+    }
+
+    if (response.data.meta.result_count > 0) {
+      response.data.data.forEach((tweet: IJSONObject) => {
+        if (
+          !options.lastInternalId ||
+          Number(tweet.id) > Number(options.lastInternalId)
+        ) {
+          followers.data.push(tweet);
+        } else {
+          return;
+        }
+      });
+    }
+  } while (response.data.meta.next_token && options.lastInternalId);
+
+  return followers;
+};
+
+export default getUserFollowers;

packages/backend/src/apps/twitter/common/get-user-tweets.ts

@@ -0,0 +1,79 @@
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+import { URLSearchParams } from 'url';
+import omitBy from 'lodash/omitBy';
+import isEmpty from 'lodash/isEmpty';
+import generateRequest from './generate-request';
+import getCurrentUser from './get-current-user';
+import getUserByUsername from './get-user-by-username';
+
+type IGetUserTweetsOptions = {
+  currentUser: boolean;
+  userId?: string;
+  lastInternalId?: string;
+};
+
+const getUserTweets = async (
+  $: IGlobalVariable,
+  options: IGetUserTweetsOptions
+) => {
+  let username: string;
+
+  if (options.currentUser) {
+    const currentUser = await getCurrentUser($);
+    username = currentUser.username as string;
+  } else {
+    username = $.db.step.parameters.username as string;
+  }
+
+  const user = await getUserByUsername($, username);
+
+  let response;
+
+  const tweets: {
+    data: IJSONObject[];
+    error: IJSONObject | null;
+  } = {
+    data: [],
+    error: null,
+  };
+
+  do {
+    const params: IJSONObject = {
+      since_id: options.lastInternalId,
+      pagination_token: response?.data?.meta?.next_token,
+    };
+
+    const queryParams = new URLSearchParams(omitBy(params, isEmpty));
+
+    const requestPath = `/2/users/${user.id}/tweets${
+      queryParams.toString() ? `?${queryParams.toString()}` : ''
+    }`;
+
+    response = await generateRequest($, {
+      requestPath,
+      method: 'GET',
+    });
+
+    if (response.integrationError) {
+      tweets.error = response.integrationError;
+      return tweets;
+    }
+
+    if (response.data.meta.result_count > 0) {
+      response.data.data.forEach((tweet: IJSONObject) => {
+        if (
+          !options.lastInternalId ||
+          Number(tweet.id) > Number(options.lastInternalId)
+        ) {
+          tweets.data.push(tweet);
+        } else {
+          return;
+        }
+      });
+    }
+  } while (response.data.meta.next_token && options.lastInternalId);
+
+  return tweets;
+};
+
+export default getUserTweets;

packages/backend/src/apps/twitter/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/twitter/index.ts

@@ -1,25 +1,8 @@
-import {
-  IService,
-  IAuthentication,
-  IApp,
-  IJSONObject,
-} from '@automatisch/types';
-import Authentication from './authentication';
-import Triggers from './triggers';
-import Actions from './actions';
-
-export default class Twitter implements IService {
-  authenticationClient: IAuthentication;
-  triggers: Triggers;
-  actions: Actions;
-
-  constructor(
-    appData: IApp,
-    connectionData: IJSONObject,
-    parameters: IJSONObject
-  ) {
-    this.authenticationClient = new Authentication(appData, connectionData);
-    this.triggers = new Triggers(connectionData, parameters);
-    this.actions = new Actions(connectionData, parameters);
-  }
-}
+export default {
+  name: 'Twitter',
+  key: 'twitter',
+  iconUrl: '{BASE_URL}/apps/twitter/assets/favicon.svg',
+  authDocUrl: 'https://automatisch.io/docs/connections/twitter',
+  supportsConnections: true,
+  baseUrl: 'https://api.twitter.com',
+};

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

@@ -1,320 +0,0 @@
-{
-  "name": "Twitter",
-  "key": "twitter",
-  "iconUrl": "{BASE_URL}/apps/twitter/assets/favicon.svg",
-  "docUrl": "https://automatisch.io/docs/twitter",
-  "primaryColor": "2DAAE1",
-  "fields": [
-    {
-      "key": "oAuthRedirectUrl",
-      "label": "OAuth Redirect URL",
-      "type": "string",
-      "required": true,
-      "readOnly": true,
-      "value": "{WEB_APP_URL}/app/twitter/connections/add",
-      "placeholder": null,
-      "description": "When asked to input an OAuth callback or redirect URL in Twitter OAuth, enter the URL above.",
-      "docUrl": "https://automatisch.io/docs/twitter#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/twitter#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/twitter#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": "My Tweet",
-      "key": "myTweet",
-      "description": "Will be triggered when you tweet something new.",
-      "substeps": [
-        {
-          "key": "chooseAccount",
-          "name": "Choose account"
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    },
-    {
-      "name": "User Tweet",
-      "key": "userTweet",
-      "description": "Will be triggered when a specific user tweet something new.",
-      "substeps": [
-        {
-          "key": "chooseAccount",
-          "name": "Choose account"
-        },
-        {
-          "key": "chooseTrigger",
-          "name": "Set up a trigger",
-          "arguments": [
-            {
-              "label": "Username",
-              "key": "username",
-              "type": "string",
-              "required": true
-            }
-          ]
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    },
-    {
-      "name": "Search Tweet",
-      "key": "searchTweet",
-      "description": "Will be triggered when any user tweet something containing a specific keyword, phrase, username or hashtag.",
-      "substeps": [
-        {
-          "key": "chooseAccount",
-          "name": "Choose account"
-        },
-        {
-          "key": "chooseTrigger",
-          "name": "Set up a trigger",
-          "arguments": [
-            {
-              "label": "Search Term",
-              "key": "searchTerm",
-              "type": "string",
-              "required": true
-            }
-          ]
-        },
-        {
-          "key": "testStep",
-          "name": "Test trigger"
-        }
-      ]
-    }
-  ],
-  "actions": [
-    {
-      "name": "Create Tweet",
-      "key": "createTweet",
-      "description": "Will create a tweet.",
-      "substeps": [
-        {
-          "key": "chooseAccount",
-          "name": "Choose account"
-        },
-        {
-          "key": "chooseAction",
-          "name": "Set up action",
-          "arguments": [
-            {
-              "label": "Tweet body",
-              "key": "tweet",
-              "type": "string",
-              "required": true,
-              "description": "The content of your new tweet.",
-              "variables": true
-            }
-          ]
-        },
-        {
-          "key": "testStep",
-          "name": "Test action"
-        }
-      ]
-    }
-  ]
-}

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

@@ -1,13 +0,0 @@
-import { IJSONObject } from '@automatisch/types';
-import MyTweet from './triggers/my-tweet';
-import SearchTweet from './triggers/search-tweet';
-
-export default class Triggers {
-  myTweet: MyTweet;
-  searchTweet: SearchTweet;
-
-  constructor(connectionData: IJSONObject, parameters: IJSONObject) {
-    this.myTweet = new MyTweet(connectionData);
-    this.searchTweet = new SearchTweet(connectionData, parameters);
-  }
-}

packages/backend/src/apps/twitter/triggers/my-tweet.ts

@@ -1,25 +0,0 @@
-import TwitterApi, { TwitterApiTokens } from 'twitter-api-v2';
-import { IJSONObject } from '@automatisch/types';
-
-export default class MyTweet {
-  client: TwitterApi;
-
-  constructor(connectionData: IJSONObject) {
-    this.client = new TwitterApi({
-      appKey: connectionData.consumerKey,
-      appSecret: connectionData.consumerSecret,
-      accessToken: connectionData.accessToken,
-      accessSecret: connectionData.accessSecret,
-    } as TwitterApiTokens);
-  }
-
-  async run() {
-    const response = await this.client.currentUser();
-    const username = response.screen_name;
-
-    const userTimeline = await this.client.v1.userTimelineByUsername(username);
-    const fetchedTweets = userTimeline.tweets;
-
-    return fetchedTweets;
-  }
-}

packages/backend/src/apps/twitter/triggers/my-tweets/index.ts

@@ -0,0 +1,30 @@
+import { IGlobalVariable } from '@automatisch/types';
+import getUserTweets from '../../common/get-user-tweets';
+
+export default {
+  name: 'My Tweets',
+  key: 'myTweets',
+  pollInterval: 15,
+  description: 'Will be triggered when you tweet something new.',
+  substeps: [
+    {
+      key: 'chooseConnection',
+      name: 'Choose connection',
+    },
+    {
+      key: 'testStep',
+      name: 'Test trigger',
+    },
+  ],
+
+  async run($: IGlobalVariable) {
+    return await getUserTweets($, {
+      currentUser: true,
+      lastInternalId: $.db.flow.lastInternalId,
+    });
+  },
+
+  async testRun($: IGlobalVariable) {
+    return await getUserTweets($, { currentUser: true });
+  },
+};

packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts

@@ -0,0 +1,27 @@
+import { IGlobalVariable } from '@automatisch/types';
+import myFollowers from './my-followers';
+
+export default {
+  name: 'New follower of me',
+  key: 'myFollowers',
+  pollInterval: 15,
+  description: 'Will be triggered when you have a new follower.',
+  substeps: [
+    {
+      key: 'chooseConnection',
+      name: 'Choose connection',
+    },
+    {
+      key: 'testStep',
+      name: 'Test trigger',
+    },
+  ],
+
+  async run($: IGlobalVariable) {
+    return await myFollowers($, $.db.flow.lastInternalId);
+  },
+
+  async testRun($: IGlobalVariable) {
+    return await myFollowers($);
+  },
+};

packages/backend/src/apps/twitter/triggers/new-follower-of-me/my-followers.ts

@@ -0,0 +1,17 @@
+import { IGlobalVariable } from '@automatisch/types';
+import getCurrentUser from '../../common/get-current-user';
+import getUserByUsername from '../../common/get-user-by-username';
+import getUserFollowers from '../../common/get-user-followers';
+
+const myFollowers = async ($: IGlobalVariable, lastInternalId?: string) => {
+  const { username } = await getCurrentUser($);
+  const user = await getUserByUsername($, username as string);
+
+  const tweets = await getUserFollowers($, {
+    userId: user.id,
+    lastInternalId,
+  });
+  return tweets;
+};
+
+export default myFollowers;

packages/backend/src/apps/twitter/triggers/search-tweet.ts

@@ -1,58 +0,0 @@
-import TwitterApi, { TwitterApiTokens } from 'twitter-api-v2';
-import { IJSONObject } from '@automatisch/types';
-
-export default class SearchTweet {
-  client: TwitterApi;
-  parameters: IJSONObject;
-
-  constructor(connectionData: IJSONObject, parameters: IJSONObject) {
-    this.client = new TwitterApi({
-      appKey: connectionData.consumerKey,
-      appSecret: connectionData.consumerSecret,
-      accessToken: connectionData.accessToken,
-      accessSecret: connectionData.accessSecret,
-    } as TwitterApiTokens);
-
-    this.parameters = parameters;
-  }
-
-  async run(startTime: Date) {
-    const tweets = [];
-
-    const response = await this.client.v2.search(
-      this.parameters.searchTerm as string,
-      {
-        max_results: 50,
-        'tweet.fields': 'created_at',
-      }
-    );
-
-    for await (const tweet of response.data.data) {
-      if (new Date(tweet.created_at).getTime() <= startTime.getTime()) {
-        break;
-      }
-
-      tweets.push(tweet);
-
-      if (response.data.meta.next_token) {
-        await response.fetchNext();
-      }
-    }
-
-    return tweets;
-  }
-
-  async testRun() {
-    const response = await this.client.v2.search(
-      this.parameters.searchTerm as string,
-      {
-        max_results: 10,
-        'tweet.fields': 'created_at',
-      }
-    );
-
-    const mostRecentTweet = response.data.data[0];
-
-    return [mostRecentTweet];
-  }
-}

packages/backend/src/apps/twitter/triggers/search-tweets/index.ts

@@ -0,0 +1,45 @@
+import { IGlobalVariable } from '@automatisch/types';
+import searchTweets from './search-tweets';
+
+export default {
+  name: 'Search Tweets',
+  key: 'searchTweets',
+  pollInterval: 15,
+  description:
+    'Will be triggered when any user tweet something containing a specific keyword, phrase, username or hashtag.',
+  substeps: [
+    {
+      key: 'chooseConnection',
+      name: 'Choose connection',
+    },
+    {
+      key: 'chooseTrigger',
+      name: 'Set up a trigger',
+      arguments: [
+        {
+          label: 'Search Term',
+          key: 'searchTerm',
+          type: 'string',
+          required: true,
+        },
+      ],
+    },
+    {
+      key: 'testStep',
+      name: 'Test trigger',
+    },
+  ],
+
+  async run($: IGlobalVariable) {
+    return await searchTweets($, {
+      searchTerm: $.db.step.parameters.searchTerm as string,
+      lastInternalId: $.db.flow.lastInternalId,
+    });
+  },
+
+  async testRun($: IGlobalVariable) {
+    return await searchTweets($, {
+      searchTerm: $.db.step.parameters.searchTerm as string,
+    });
+  },
+};

packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts

@@ -0,0 +1,70 @@
+import { IGlobalVariable, IJSONObject } from '@automatisch/types';
+import qs from 'qs';
+import generateRequest from '../../common/generate-request';
+import { omitBy, isEmpty } from 'lodash';
+
+type ISearchTweetsOptions = {
+  searchTerm: string;
+  lastInternalId?: string;
+};
+
+const searchTweets = async (
+  $: IGlobalVariable,
+  options: ISearchTweetsOptions
+) => {
+  let response;
+
+  const tweets: {
+    data: IJSONObject[];
+    error: IJSONObject | null;
+  } = {
+    data: [],
+    error: null,
+  };
+
+  do {
+    const params: IJSONObject = {
+      query: options.searchTerm,
+      since_id: options.lastInternalId,
+      pagination_token: response?.data?.meta?.next_token,
+    };
+
+    const queryParams = qs.stringify(omitBy(params, isEmpty));
+
+    const requestPath = `/2/tweets/search/recent${
+      queryParams.toString() ? `?${queryParams.toString()}` : ''
+    }`;
+
+    response = await generateRequest($, {
+      requestPath,
+      method: 'GET',
+    });
+
+    if (response.integrationError) {
+      tweets.error = response.integrationError;
+      return tweets;
+    }
+
+    if (response.data.errors) {
+      tweets.error = response.data.errors;
+      return tweets;
+    }
+
+    if (response.data.meta.result_count > 0) {
+      response.data.data.forEach((tweet: IJSONObject) => {
+        if (
+          !options.lastInternalId ||
+          Number(tweet.id) > Number(options.lastInternalId)
+        ) {
+          tweets.data.push(tweet);
+        } else {
+          return;
+        }
+      });
+    }
+  } while (response.data.meta.next_token && options.lastInternalId);
+
+  return tweets;
+};
+
+export default searchTweets;

packages/backend/src/apps/twitter/triggers/user-tweets/index.ts

@@ -0,0 +1,46 @@
+import { IGlobalVariable } from '@automatisch/types';
+import getUserTweets from '../../common/get-user-tweets';
+
+export default {
+  name: 'User Tweets',
+  key: 'userTweets',
+  pollInterval: 15,
+  description: 'Will be triggered when a specific user tweet something new.',
+  substeps: [
+    {
+      key: 'chooseConnection',
+      name: 'Choose connection',
+    },
+    {
+      key: 'chooseTrigger',
+      name: 'Set up a trigger',
+      arguments: [
+        {
+          label: 'Username',
+          key: 'username',
+          type: 'string',
+          required: true,
+        },
+      ],
+    },
+    {
+      key: 'testStep',
+      name: 'Test trigger',
+    },
+  ],
+
+  async run($: IGlobalVariable) {
+    return await getUserTweets($, {
+      currentUser: false,
+      userId: $.db.step.parameters.username as string,
+      lastInternalId: $.db.flow.lastInternalId,
+    });
+  },
+
+  async testRun($: IGlobalVariable) {
+    return await getUserTweets($, {
+      currentUser: false,
+      userId: $.db.step.parameters.username as string,
+    });
+  },
+};

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

@@ -5,14 +5,12 @@ import type {
   IJSONObject,
 } from '@automatisch/types';
 import { URLSearchParams } from 'url';
-import axios, { AxiosInstance } from 'axios';
+import createHttpClient, { IHttpClient } from '../../helpers/http-client';
 
 export default class Authentication implements IAuthentication {
   appData: IApp;
   connectionData: IJSONObject;
-  client: AxiosInstance = axios.create({
-    baseURL: 'https://api.typeform.com',
-  });
+  client: IHttpClient;
 
   scope: string[] = [
     'forms:read',
@@ -27,6 +25,7 @@ export default class Authentication implements IAuthentication {
   constructor(appData: IApp, connectionData: IJSONObject) {
     this.connectionData = connectionData;
     this.appData = appData;
+    this.client = createHttpClient({ baseURL: 'https://api.typeform.com' });
   }
 
   get oauthRedirectUrl() {

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

@@ -4,6 +4,7 @@
   "iconUrl": "{BASE_URL}/apps/typeform/assets/favicon.svg",
   "docUrl": "https://automatisch.io/docs/typeform",
   "primaryColor": "5865f2",
+  "supportsConnections": true,
   "fields": [
     {
       "key": "oAuthRedirectUrl",

packages/backend/src/config/app.ts

@@ -13,6 +13,7 @@ type AppConfig = {
   postgresHost: string;
   postgresUsername: string;
   postgresPassword?: string;
+  version: string;
   postgresEnableSsl: boolean;
   baseUrl: string;
   encryptionKey: string;
@@ -20,12 +21,15 @@ type AppConfig = {
   serveWebAppSeparately: boolean;
   redisHost: string;
   redisPort: number;
+  enableBullMQDashboard: boolean;
+  telemetryEnabled: boolean;
 };
 
 const host = process.env.HOST || 'localhost';
 const protocol = process.env.PROTOCOL || 'http';
 const port = process.env.PORT || '3000';
-const serveWebAppSeparately = process.env.SERVE_WEB_APP_SEPARATELY === 'true' ? true : false;
+const serveWebAppSeparately =
+  process.env.SERVE_WEB_APP_SEPARATELY === 'true' ? true : false;
 
 let webAppUrl = `${protocol}://${host}:${port}`;
 if (serveWebAppSeparately) {
@@ -42,8 +46,9 @@ const appConfig: AppConfig = {
   port,
   appEnv: appEnv,
   isDev: appEnv === 'development',
+  version: process.env.npm_package_version,
   postgresDatabase: process.env.POSTGRES_DATABASE || 'automatisch_development',
-  postgresPort: parseInt(process.env.POSTGRES_PORT|| '5432'),
+  postgresPort: parseInt(process.env.POSTGRES_PORT || '5432'),
   postgresHost: process.env.POSTGRES_HOST || 'localhost',
   postgresUsername:
     process.env.POSTGRES_USERNAME || 'automatisch_development_user',
@@ -54,8 +59,11 @@ const appConfig: AppConfig = {
   serveWebAppSeparately,
   redisHost: process.env.REDIS_HOST || '127.0.0.1',
   redisPort: parseInt(process.env.REDIS_PORT || '6379'),
+  enableBullMQDashboard:
+    process.env.ENABLE_BULLMQ_DASHBOARD === 'true' ? true : false,
   baseUrl,
   webAppUrl,
+  telemetryEnabled: process.env.TELEMETRY_ENABLED === 'false' ? false : true,
 };
 
 if (!appConfig.encryptionKey) {

packages/backend/src/config/database.ts

@@ -1,4 +1,8 @@
 import process from 'process';
+// The following two lines are required to get count values as number.
+// More info: https://github.com/knex/knex/issues/387#issuecomment-51554522
+import pg from 'pg';
+pg.types.setTypeParser(20, 'text', parseInt);
 import knex from 'knex';
 import type { Knex } from 'knex';
 import knexConfig from '../../knexfile';
@@ -8,10 +12,12 @@ export const client: Knex = knex(knexConfig);
 
 const CONNECTION_REFUSED = 'ECONNREFUSED';
 
-client.raw('SELECT 1')
-  .catch((err) => {
-    if (err.code === CONNECTION_REFUSED) {
-      logger.error('Make sure you have installed PostgreSQL and it is running.', err);
-      process.exit();
-    }
-  });
+client.raw('SELECT 1').catch((err) => {
+  if (err.code === CONNECTION_REFUSED) {
+    logger.error(
+      'Make sure you have installed PostgreSQL and it is running.',
+      err
+    );
+    process.exit();
+  }
+});

packages/backend/src/db/migrations/20220727104324_add_draft_column_to_connections.ts

@@ -0,0 +1,13 @@
+import { Knex } from 'knex';
+
+export async function up(knex: Knex): Promise<void> {
+  return knex.schema.table('connections', (table) => {
+    table.boolean('draft').defaultTo(true);
+  });
+}
+
+export async function down(knex: Knex): Promise<void> {
+  return knex.schema.table('connections', (table) => {
+    table.dropColumn('draft');
+  });
+}

packages/backend/src/db/migrations/20220817121241_add_published_at_column_to_flows.ts

@@ -0,0 +1,13 @@
+import { Knex } from 'knex';
+
+export async function up(knex: Knex): Promise<void> {
+  return knex.schema.table('flows', (table) => {
+    table.timestamp('published_at').nullable();
+  });
+}
+
+export async function down(knex: Knex): Promise<void> {
+  return knex.schema.table('flows', (table) => {
+    table.dropColumn('published_at');
+  });
+}

packages/backend/src/db/migrations/20220823171017_add_internal_id_to_executions.ts

@@ -0,0 +1,13 @@
+import { Knex } from 'knex';
+
+export async function up(knex: Knex): Promise<void> {
+  return knex.schema.table('executions', (table) => {
+    table.string('internal_id');
+  });
+}
+
+export async function down(knex: Knex): Promise<void> {
+  return knex.schema.table('executions', (table) => {
+    table.dropColumn('internal_id');
+  });
+}

packages/backend/src/db/migrations/20220904160521_add_raw_error_to_execution_steps.ts

@@ -0,0 +1,13 @@
+import { Knex } from 'knex';
+
+export async function up(knex: Knex): Promise<void> {
+  return knex.schema.table('execution_steps', (table) => {
+    table.jsonb('error_details');
+  });
+}
+
+export async function down(knex: Knex): Promise<void> {
+  return knex.schema.table('execution_steps', (table) => {
+    table.dropColumn('error_details');
+  });
+}

packages/backend/src/graphql/mutations/create-auth-data.ts

@@ -1,4 +1,6 @@
 import Context from '../../types/express/context';
+import axios from 'axios';
+import globalVariable from '../../helpers/global-variable';
 import App from '../../models/app';
 
 type Params = {
@@ -19,22 +21,24 @@ const createAuthData = async (
     })
     .throwIfNotFound();
 
-  const appClass = (await import(`../../apps/${connection.key}`)).default;
-  const appData = App.findOneByKey(connection.key);
+  if (!connection.formattedData) {
+    return null;
+  }
 
-  if (!connection.formattedData) { return null; }
+  const authInstance = (await import(`../../apps/${connection.key}/auth`))
+    .default;
+  const app = await App.findOneByKey(connection.key);
 
-  const appInstance = new appClass(appData, connection.formattedData);
-  const authLink = await appInstance.authenticationClient.createAuthData();
+  const $ = await globalVariable(connection, app);
+  await authInstance.createAuthData($);
 
-  await connection.$query().patch({
-    formattedData: {
-      ...connection.formattedData,
-      ...authLink,
-    },
-  });
+  try {
+    await axios.get(connection.formattedData.url as string);
+  } catch (error) {
+    throw new Error('Error occured while creating authorization URL!');
+  }
 
-  return authLink;
+  return connection.formattedData;
 };
 
 export default createAuthData;

packages/backend/src/graphql/mutations/create-connection.ts

@@ -13,19 +13,12 @@ const createConnection = async (
   params: Params,
   context: Context
 ) => {
-  const app = App.findOneByKey(params.input.key);
+  await App.findOneByKey(params.input.key);
 
-  const connection = await context.currentUser
-    .$relatedQuery('connections')
-    .insert({
-      key: params.input.key,
-      formattedData: params.input.formattedData,
-    });
-
-  return {
-    ...connection,
-    app,
-  };
+  return await context.currentUser.$relatedQuery('connections').insert({
+    key: params.input.key,
+    formattedData: params.input.formattedData,
+  });
 };
 
 export default createConnection;

packages/backend/src/graphql/mutations/create-flow.ts

@@ -4,6 +4,7 @@ import Context from '../../types/express/context';
 type Params = {
   input: {
     triggerAppKey: string;
+    connectionId: string;
   };
 };
 
@@ -12,17 +13,32 @@ const createFlow = async (
   params: Params,
   context: Context
 ) => {
+  const connectionId = params?.input?.connectionId;
   const appKey = params?.input?.triggerAppKey;
 
   const flow = await context.currentUser.$relatedQuery('flows').insert({
     name: 'Name your flow',
   });
 
+  if (connectionId) {
+    await context.currentUser
+      .$relatedQuery('connections')
+      .findById(connectionId)
+      .throwIfNotFound();
+  }
+
   await Step.query().insert({
     flowId: flow.id,
     type: 'trigger',
     position: 1,
     appKey,
+    connectionId
+  });
+
+  await Step.query().insert({
+    flowId: flow.id,
+    type: 'action',
+    position: 2
   });
 
   return flow;

packages/backend/src/graphql/mutations/delete-flow.ts

@@ -1,4 +1,6 @@
 import Context from '../../types/express/context';
+import Execution from '../../models/execution';
+import ExecutionStep from '../../models/execution-step';
 
 type Params = {
   input: {
@@ -11,14 +13,23 @@ const deleteFlow = async (
   params: Params,
   context: Context
 ) => {
-  await context.currentUser
+  const flow = await context.currentUser
     .$relatedQuery('flows')
-    .delete()
     .findOne({
       id: params.input.id,
     })
     .throwIfNotFound();
 
+  const executionIds = (
+    await flow.$relatedQuery('executions').select('executions.id')
+  ).map((execution: Execution) => execution.id);
+
+  await ExecutionStep.query().delete().whereIn('execution_id', executionIds);
+
+  await flow.$relatedQuery('executions').delete();
+  await flow.$relatedQuery('steps').delete();
+  await flow.$query().delete();
+
   return;
 };
 

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

@@ -19,8 +19,7 @@ const deleteStep = async (
     })
     .throwIfNotFound();
 
-  if (!step) return;
-
+  await step.$relatedQuery('executionSteps').delete();
   await step.$query().delete();
 
   const nextSteps = await step.flow