Merge branch 'master' of github.com:Budibase/budibase into dropdown-components

packages/builder/package.json

@@ -63,7 +63,7 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.46.0",
+    "@budibase/bbui": "^1.47.0",
     "@budibase/client": "^0.2.6",
     "@budibase/colorpicker": "^1.0.1",
     "@fortawesome/fontawesome-free": "^5.14.0",

packages/builder/src/builderStore/store/automation/index.js

@@ -11,12 +11,20 @@ const automationActions = store => ({
     ])
     const jsonResponses = await Promise.all(responses.map(x => x.json()))
     store.update(state => {
+      let selected = state.selectedAutomation?.automation
       state.automations = jsonResponses[0]
       state.blockDefinitions = {
         TRIGGER: jsonResponses[1].trigger,
         ACTION: jsonResponses[1].action,
         LOGIC: jsonResponses[1].logic,
       }
+      // if previously selected find the new obj and select it
+      if (selected) {
+        selected = jsonResponses[0].filter(
+          automation => automation._id === selected._id
+        )
+        state.selectedAutomation = new Automation(selected[0])
+      }
       return state
     })
   },

packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte

@@ -1,9 +1,10 @@
 <script>
   import { sortBy } from "lodash/fp"
   import { automationStore } from "builderStore"
-  import { DropdownMenu } from "@budibase/bbui"
+  import { DropdownMenu, Modal } from "@budibase/bbui"
   import { DropdownContainer, DropdownItem } from "components/common/Dropdowns"
   import analytics from "analytics"
+  import CreateWebhookModal from "../Shared/CreateWebhookModal.svelte"
 
   $: hasTrigger = $automationStore.selectedAutomation.hasTrigger()
   $: tabs = [
@@ -27,10 +28,10 @@
     },
   ]
 
-  let buttonProps = []
   let selectedIndex
   let anchors = []
   let popover
+  let webhookModal
   $: selectedTab = selectedIndex == null ? null : tabs[selectedIndex].value
   $: anchor = selectedIndex === -1 ? null : anchors[selectedIndex]
   $: blocks = sortBy(entry => entry[1].name)(
@@ -59,6 +60,9 @@
       name: blockDefinition.name,
     })
     closePopover()
+    if (stepId === "WEBHOOK") {
+      webhookModal.show()
+    }
   }
 </script>
 
@@ -91,6 +95,9 @@
     {/each}
   </DropdownContainer>
 </DropdownMenu>
+<Modal bind:this={webhookModal} width="30%">
+  <CreateWebhookModal />
+</Modal>
 
 <style>
   .tab-container {

packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte

@@ -1,12 +1,15 @@
 <script>
   import TableSelector from "./TableSelector.svelte"
   import RowSelector from "./RowSelector.svelte"
-  import { Input, TextArea, Select, Label } from "@budibase/bbui"
+  import { Button, Input, Select, Label } from "@budibase/bbui"
   import { automationStore } from "builderStore"
-  import BindableInput from "../../userInterface/BindableInput.svelte"
+  import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
+  import BindableInput from "components/userInterface/BindableInput.svelte"
 
   export let block
+  export let webhookModal
   $: inputs = Object.entries(block.schema?.inputs?.properties || {})
+  $: stepId = block.stepId
   $: bindings = getAvailableBindings(
     block,
     $automationStore.selectedAutomation?.automation?.definition
@@ -63,6 +66,8 @@
       <TableSelector bind:value={block.inputs[key]} />
     {:else if value.customType === 'row'}
       <RowSelector bind:value={block.inputs[key]} {bindings} />
+    {:else if value.customType === 'webhookUrl'}
+      <WebhookDisplay value={block.inputs[key]} />
     {:else if value.type === 'string' || value.type === 'number'}
       <BindableInput
         type="string"
@@ -72,6 +77,11 @@
     {/if}
   </div>
 {/each}
+{#if stepId === 'WEBHOOK'}
+  <Button wide secondary on:click={() => webhookModal.show()}>
+    Set Up Webhook
+  </Button>
+{/if}
 
 <style>
   .block-field {

packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte

@@ -2,10 +2,10 @@
   import { backendUiStore, automationStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import AutomationBlockSetup from "./AutomationBlockSetup.svelte"
-  import { Button } from "@budibase/bbui"
+  import { Button, Modal } from "@budibase/bbui"
+  import CreateWebookModal from "../Shared/CreateWebhookModal.svelte"
 
-  let selectedTab = "SETUP"
-  let confirmDeleteDialog
+  let webhookModal
 
   $: instanceId = $backendUiStore.selectedDatabase._id
   $: automation = $automationStore.selectedAutomation?.automation
@@ -59,9 +59,10 @@
     on:click={() => setAutomationLive(true)}
     class="ri-play-circle-fill" />
 </div>
-
 {#if $automationStore.selectedBlock}
-  <AutomationBlockSetup bind:block={$automationStore.selectedBlock} />
+  <AutomationBlockSetup
+    bind:block={$automationStore.selectedBlock}
+    {webhookModal} />
 {:else if $automationStore.selectedAutomation}
   <div class="block-label">{automation.name}</div>
   <Button secondary wide on:click={testAutomation}>Test Automation</Button>
@@ -73,6 +74,9 @@
   on:click={saveAutomation}>
   Save Automation
 </Button>
+<Modal bind:this={webhookModal} width="30%">
+  <CreateWebookModal />
+</Modal>
 
 <style>
   .title {

packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte

@@ -0,0 +1,105 @@
+<script>
+  import { store, backendUiStore, automationStore } from "builderStore"
+  import WebhookDisplay from "./WebhookDisplay.svelte"
+  import { ModalContent } from "@budibase/bbui"
+  import { onMount, onDestroy } from "svelte"
+
+  const POLL_RATE_MS = 2500
+  let interval
+  let finished = false
+  let schemaURL
+  let propCount = 0
+
+  $: instanceId = $backendUiStore.selectedDatabase._id
+  $: appId = $store.appId
+  $: automation = $automationStore.selectedAutomation?.automation
+
+  onMount(async () => {
+    // save the automation initially
+    await automationStore.actions.save({
+      instanceId,
+      automation,
+    })
+    interval = setInterval(async () => {
+      await automationStore.actions.fetch()
+      const outputs = automation?.definition?.trigger.schema.outputs?.properties
+      // always one prop for the "body"
+      if (Object.keys(outputs).length > 1) {
+        propCount = Object.keys(outputs).length - 1
+        finished = true
+      }
+    }, POLL_RATE_MS)
+    schemaURL = automation?.definition?.trigger?.inputs.schemaUrl
+  })
+
+  onDestroy(() => {
+    clearInterval(interval)
+  })
+</script>
+
+<ModalContent
+  title="Webhook Setup"
+  confirmText="Finished"
+  showConfirmButton={finished}
+  cancelText="Skip">
+  <p>
+    Webhooks are for receiving data. To make them easier please use the URL
+    shown below and send a
+    <code>POST</code>
+    request to it from your other application. If you're unable to do this now
+    then you can skip this step, however we will not be able to configure
+    bindings for your later actions!
+  </p>
+  <WebhookDisplay value={schemaURL} />
+  {#if finished}
+    <p class="finished-text">
+      Request received! We found
+      {propCount}
+      bindable value{propCount > 1 ? 's' : ''}.
+    </p>
+  {/if}
+  <div slot="footer">
+    <a target="_blank" href="https://docs.budibase.com/automate/steps/triggers">
+      <i class="ri-information-line" />
+      <span>Learn about webhooks</span>
+    </a>
+  </div>
+</ModalContent>
+
+<style>
+  a {
+    color: var(--ink);
+    font-size: 14px;
+    vertical-align: middle;
+    display: flex;
+    align-items: center;
+    text-decoration: none;
+  }
+  a span {
+    text-decoration: underline;
+  }
+  i {
+    font-size: 20px;
+    margin-right: var(--spacing-m);
+    text-decoration: none;
+  }
+  p {
+    margin: 0;
+    text-align: justify;
+  }
+  .finished-text {
+    font-weight: 500;
+    text-align: center;
+    color: var(--blue);
+  }
+  h5 {
+    margin: 0;
+  }
+  code {
+    padding: 1px 4px 1px 4px;
+    font-size: 14px;
+    color: var(--grey-7);
+    background-color: var(--grey-4);
+    border-radius: 2px;
+  }
+</style>

packages/builder/src/components/automation/Shared/WebhookDisplay.svelte

@@ -0,0 +1,64 @@
+<script>
+  import { notifier } from "builderStore/store/notifications"
+  import { Input } from "@budibase/bbui"
+  import { store } from "builderStore"
+
+  export let value
+  export let production = false
+
+  $: appId = $store.appId
+
+  function fullWebhookURL(uri) {
+    if (production) {
+      return `https://${appId}.app.budi.live/${uri}`
+    } else {
+      return `http://localhost:4001/${uri}`
+    }
+  }
+
+  function copyToClipboard() {
+    const dummy = document.createElement("textarea")
+    document.body.appendChild(dummy)
+    dummy.value = fullWebhookURL(value)
+    dummy.select()
+    document.execCommand("copy")
+    document.body.removeChild(dummy)
+    notifier.success(`URL copied to clipboard`)
+  }
+</script>
+
+<div>
+  <Input disabled="true" thin value={fullWebhookURL(value)} />
+  <span on:click={() => copyToClipboard()}>
+    <i class="ri-clipboard-line copy-icon" />
+  </span>
+</div>
+
+<style>
+  div {
+    position: relative;
+  }
+
+  div :global(input:disabled) {
+    color: var(--grey-7);
+  }
+
+  span {
+    position: absolute;
+    border: none;
+    border-radius: 50%;
+    height: 24px;
+    width: 24px;
+    background: white;
+    right: var(--spacing-s);
+    bottom: 9px;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+  }
+
+  span:hover {
+    background-color: var(--grey-3);
+  }
+</style>

packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte

@@ -0,0 +1,76 @@
+<script>
+  import { automationStore } from "builderStore"
+  import { ModalContent } from "@budibase/bbui"
+  import { onMount } from "svelte"
+  import WebhookDisplay from "../automation/Shared/WebhookDisplay.svelte"
+  import analytics from "analytics"
+
+  let webhookUrls = []
+
+  $: automations = $automationStore.automations
+
+  onMount(() => {
+    webhookUrls = automations.map(automation => {
+      const trigger = automation.definition.trigger
+      if (trigger?.stepId === "WEBHOOK" && trigger.inputs) {
+        return {
+          type: "Automation",
+          name: automation.name,
+          url: trigger.inputs.triggerUrl,
+        }
+      }
+    })
+  })
+</script>
+
+<ModalContent title="Webhook Endpoints" confirmText="Done">
+  <p>See below the list of deployed webhook URLs.</p>
+  {#each webhookUrls as webhookUrl}
+    <div>
+      <h5>{webhookUrl.type} - {webhookUrl.name}</h5>
+      <WebhookDisplay value={webhookUrl.url} production={true} />
+    </div>
+  {/each}
+  {#if webhookUrls.length === 0}
+    <h5>No webhooks found.</h5>
+  {/if}
+  <div slot="footer">
+    <a target="_blank" href="https://docs.budibase.com/automate/steps/triggers">
+      <i class="ri-information-line" />
+      <span>Learn about webhooks</span>
+    </a>
+  </div>
+</ModalContent>
+
+<style>
+  a {
+    color: var(--ink);
+    font-size: 14px;
+    vertical-align: middle;
+    display: flex;
+    align-items: center;
+    text-decoration: none;
+  }
+
+  a span {
+    text-decoration: underline;
+  }
+
+  i {
+    font-size: 20px;
+    margin-right: var(--spacing-m);
+    text-decoration: none;
+  }
+
+  p {
+    margin-top: 0;
+    margin-bottom: 0;
+    padding-top: 0;
+    text-align: justify;
+  }
+
+  h5 {
+    margin-top: 0;
+    padding-top: 0;
+  }
+</style>

packages/builder/src/components/deploy/DeploymentHistory.svelte

@@ -2,9 +2,10 @@
   import { onMount, onDestroy } from "svelte"
   import Spinner from "components/common/Spinner.svelte"
   import { slide } from "svelte/transition"
-  import { Heading, Body } from "@budibase/bbui"
+  import { Heading, Body, Button, Modal } from "@budibase/bbui"
   import api from "builderStore/api"
   import { notifier } from "builderStore/store/notifications"
+  import CreateWebhookDeploymentModal from "./CreateWebhookDeploymentModal.svelte"
 
   const DATE_OPTIONS = {
     fullDate: {
@@ -23,6 +24,7 @@
 
   export let appId
 
+  let modal
   let poll
   let deployments = []
   let deploymentUrl = `https://${appId}.app.budi.live/${appId}`
@@ -52,9 +54,12 @@
   <section class="deployment-history" in:slide>
     <header>
       <h4>Deployment History</h4>
-      <a target="_blank" href={`https://${appId}.app.budi.live/${appId}`}>
-        View Your Deployed App →
-      </a>
+      <div class="deploy-div">
+        <a target="_blank" href={`https://${appId}.app.budi.live/${appId}`}>
+          View Your Deployed App →
+        </a>
+        <Button primary on:click={() => modal.show()}>View webhooks</Button>
+      </div>
     </header>
     <div class="deployment-list">
       {#each deployments as deployment}
@@ -80,6 +85,9 @@
     </div>
   </section>
 {/if}
+<Modal bind:this={modal} width="30%">
+  <CreateWebhookDeploymentModal />
+</Modal>
 
 <style>
   .deployment:nth-child(odd) {
@@ -99,6 +107,13 @@
   header {
     margin-left: var(--spacing-l);
     margin-bottom: var(--spacing-xl);
+    margin-right: var(--spacing-l);
+  }
+
+  .deploy-div {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
   }
 
   .deployment-history {

packages/builder/src/components/userInterface/GenericBindingPopover.svelte

@@ -18,10 +18,21 @@
   export let align
   export let popover = null
 
+  let getCaretPosition
+
   $: categories = Object.entries(groupBy("category", bindings))
 
   function onClickBinding(binding) {
-    value += `{{ ${binding.path} }}`
+    const position = getCaretPosition()
+    const toAdd = `{{ ${binding.path} }}`
+    if (position.start) {
+      value =
+        value.substring(0, position.start) +
+        toAdd +
+        value.substring(position.end, value.length)
+    } else {
+      value += toAdd
+    }
   }
 </script>
 
@@ -54,6 +65,7 @@
       </Body>
       <TextArea
         thin
+        bind:getCaretPosition
         bind:value
         placeholder="Add options from the left, type text, or do both" />
       <div class="controls">

packages/builder/yarn.lock

@@ -709,10 +709,10 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@budibase/bbui@^1.46.0":
-  version "1.46.0"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.46.0.tgz#cfff5ec545a81582e16555c45987f86536b5cc99"
-  integrity sha512-seuaLSA6iDOzJ3eO0oHzSCTdS1otyNz+8eD5vTLW4bwRH9MZ/xl363acMQDdiCqZk619+WeSqb85fmFTTSJHNQ==
+"@budibase/bbui@^1.47.0":
+  version "1.47.0"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.47.0.tgz#f7c1f1efff12b2a62eb52536fcc9a037f9b25982"
+  integrity sha512-mWOglrEjKSOe7At2gA8HDv5MUvPzFrpGgiikAeMEulvE7sq/SCreXtAps/Jx+RKq/tUMEZkDoA3S5nuQhsNM/A==
   dependencies:
     sirv-cli "^0.4.6"
     svelte-flatpickr "^2.4.0"

packages/server/package.json

@@ -57,8 +57,10 @@
     "electron-updater": "^4.3.1",
     "fix-path": "^3.0.0",
     "fs-extra": "^8.1.0",
+    "handlebars": "^4.7.6",
     "jimp": "^0.16.1",
     "joi": "^17.2.1",
+    "jsonschema": "^1.4.0",
     "jsonwebtoken": "^8.5.1",
     "koa": "^2.7.0",
     "koa-body": "^4.2.0",
@@ -77,6 +79,7 @@
     "sanitize-s3-objectkey": "^0.0.1",
     "squirrelly": "^7.5.0",
     "tar-fs": "^2.1.0",
+    "to-json-schema": "^0.2.5",
     "uuid": "^3.3.2",
     "validate.js": "^0.13.1",
     "worker-farm": "^1.7.0",

packages/server/src/api/controllers/automation.js

@@ -2,8 +2,10 @@ const CouchDB = require("../../db")
 const actions = require("../../automations/actions")
 const logic = require("../../automations/logic")
 const triggers = require("../../automations/triggers")
+const webhooks = require("./webhook")
 const { getAutomationParams, generateAutomationID } = require("../../db/utils")
 
+const WH_STEP_ID = triggers.BUILTIN_DEFINITIONS.WEBHOOK.stepId
 /*************************
  *                       *
  *   BUILDER FUNCTIONS   *
@@ -30,6 +32,67 @@ function cleanAutomationInputs(automation) {
   return automation
 }
 
+/**
+ * This function handles checking if any webhooks need to be created or deleted for automations.
+ * @param {object} user The user object, including all auth info
+ * @param {object|undefined} oldAuto The old automation object if updating/deleting
+ * @param {object|undefined} newAuto The new automation object if creating/updating
+ * @returns {Promise<object|undefined>} After this is complete the new automation object may have been updated and should be
+ * written to DB (this does not write to DB as it would be wasteful to repeat).
+ */
+async function checkForWebhooks({ user, oldAuto, newAuto }) {
+  const oldTrigger = oldAuto ? oldAuto.definition.trigger : null
+  const newTrigger = newAuto ? newAuto.definition.trigger : null
+  function isWebhookTrigger(auto) {
+    return (
+      auto &&
+      auto.definition.trigger &&
+      auto.definition.trigger.stepId === WH_STEP_ID
+    )
+  }
+  // need to delete webhook
+  if (
+    isWebhookTrigger(oldAuto) &&
+    !isWebhookTrigger(newAuto) &&
+    oldTrigger.webhookId
+  ) {
+    let db = new CouchDB(user.instanceId)
+    // need to get the webhook to get the rev
+    const webhook = await db.get(oldTrigger.webhookId)
+    const ctx = {
+      user,
+      params: { id: webhook._id, rev: webhook._rev },
+    }
+    // might be updating - reset the inputs to remove the URLs
+    if (newTrigger) {
+      delete newTrigger.webhookId
+      newTrigger.inputs = {}
+    }
+    await webhooks.destroy(ctx)
+  }
+  // need to create webhook
+  else if (!isWebhookTrigger(oldAuto) && isWebhookTrigger(newAuto)) {
+    const ctx = {
+      user,
+      request: {
+        body: new webhooks.Webhook(
+          "Automation webhook",
+          webhooks.WebhookType.AUTOMATION,
+          newAuto._id
+        ),
+      },
+    }
+    await webhooks.save(ctx)
+    const id = ctx.body.webhook._id
+    newTrigger.webhookId = id
+    newTrigger.inputs = {
+      schemaUrl: `api/webhooks/schema/${user.instanceId}/${id}`,
+      triggerUrl: `api/webhooks/trigger/${user.instanceId}/${id}`,
+    }
+  }
+  return newAuto
+}
+
 exports.create = async function(ctx) {
   const db = new CouchDB(ctx.user.instanceId)
   let automation = ctx.request.body
@@ -39,7 +102,8 @@ exports.create = async function(ctx) {
 
   automation.type = "automation"
   automation = cleanAutomationInputs(automation)
-  const response = await db.post(automation)
+  automation = await checkForWebhooks({ user: ctx.user, newAuto: automation })
+  const response = await db.put(automation)
   automation._rev = response.rev
 
   ctx.status = 200
@@ -56,8 +120,13 @@ exports.update = async function(ctx) {
   const db = new CouchDB(ctx.user.instanceId)
   let automation = ctx.request.body
   automation.appId = ctx.user.appId
-
+  const oldAutomation = await db.get(automation._id)
   automation = cleanAutomationInputs(automation)
+  automation = await checkForWebhooks({
+    user: ctx.user,
+    oldAuto: oldAutomation,
+    newAuto: automation,
+  })
   const response = await db.put(automation)
   automation._rev = response.rev
 
@@ -89,6 +158,8 @@ exports.find = async function(ctx) {
 
 exports.destroy = async function(ctx) {
   const db = new CouchDB(ctx.user.instanceId)
+  const oldAutomation = await db.get(ctx.params.id)
+  await checkForWebhooks({ user: ctx.user, oldAuto: oldAutomation })
   ctx.body = await db.remove(ctx.params.id, ctx.params.rev)
 }
 

packages/server/src/api/controllers/webhook.js

@@ -0,0 +1,99 @@
+const CouchDB = require("../../db")
+const { generateWebhookID, getWebhookParams } = require("../../db/utils")
+const toJsonSchema = require("to-json-schema")
+const validate = require("jsonschema").validate
+const triggers = require("../../automations/triggers")
+
+const AUTOMATION_DESCRIPTION = "Generated from Webhook Schema"
+
+function Webhook(name, type, target) {
+  this.live = true
+  this.name = name
+  this.action = {
+    type,
+    target,
+  }
+}
+
+exports.Webhook = Webhook
+
+exports.WebhookType = {
+  AUTOMATION: "automation",
+}
+
+exports.fetch = async ctx => {
+  const db = new CouchDB(ctx.user.instanceId)
+  const response = await db.allDocs(
+    getWebhookParams(null, {
+      include_docs: true,
+    })
+  )
+  ctx.body = response.rows.map(row => row.doc)
+}
+
+exports.save = async ctx => {
+  const db = new CouchDB(ctx.user.instanceId)
+  const webhook = ctx.request.body
+  webhook.appId = ctx.user.appId
+
+  // check that the webhook exists
+  if (webhook._id) {
+    await db.get(webhook._id)
+  } else {
+    webhook._id = generateWebhookID()
+  }
+  const response = await db.put(webhook)
+  ctx.body = {
+    message: "Webhook created successfully",
+    webhook: {
+      ...webhook,
+      ...response,
+    },
+  }
+}
+
+exports.destroy = async ctx => {
+  const db = new CouchDB(ctx.user.instanceId)
+  ctx.body = await db.remove(ctx.params.id, ctx.params.rev)
+}
+
+exports.buildSchema = async ctx => {
+  const db = new CouchDB(ctx.params.instance)
+  const webhook = await db.get(ctx.params.id)
+  webhook.bodySchema = toJsonSchema(ctx.request.body)
+  // update the automation outputs
+  if (webhook.action.type === exports.WebhookType.AUTOMATION) {
+    let automation = await db.get(webhook.action.target)
+    const autoOutputs = automation.definition.trigger.schema.outputs
+    let properties = webhook.bodySchema.properties
+    for (let prop of Object.keys(properties)) {
+      autoOutputs.properties[prop] = {
+        type: properties[prop].type,
+        description: AUTOMATION_DESCRIPTION,
+      }
+    }
+    await db.put(automation)
+  }
+  ctx.body = await db.put(webhook)
+}
+
+exports.trigger = async ctx => {
+  const db = new CouchDB(ctx.params.instance)
+  const webhook = await db.get(ctx.params.id)
+  // validate against the schema
+  if (webhook.bodySchema) {
+    validate(ctx.request.body, webhook.bodySchema)
+  }
+  const target = await db.get(webhook.action.target)
+  if (webhook.action.type === exports.WebhookType.AUTOMATION) {
+    // trigger with both the pure request and then expand it
+    // incase the user has produced a schema to bind to
+    await triggers.externalTrigger(target, {
+      body: ctx.request.body,
+      ...ctx.request.body,
+      instanceId: ctx.params.instance,
+    })
+  }
+  ctx.status = 200
+  ctx.body = "Webhook trigger fired successfully"
+}

packages/server/src/api/index.js

@@ -22,6 +22,7 @@ const {
   apiKeysRoutes,
   templatesRoutes,
   analyticsRoutes,
+  webhookRoutes,
 } = require("./routes")
 
 const router = new Router()
@@ -88,6 +89,9 @@ router.use(instanceRoutes.allowedMethods())
 router.use(automationRoutes.routes())
 router.use(automationRoutes.allowedMethods())
 
+router.use(webhookRoutes.routes())
+router.use(webhookRoutes.allowedMethods())
+
 router.use(deployRoutes.routes())
 router.use(deployRoutes.allowedMethods())
 

packages/server/src/api/routes/automation.js

@@ -2,7 +2,7 @@ const Router = require("@koa/router")
 const controller = require("../controllers/automation")
 const authorized = require("../../middleware/authorized")
 const joiValidator = require("../../middleware/joi-validator")
-const { BUILDER } = require("../../utilities/accessLevels")
+const { BUILDER, EXECUTE_AUTOMATION } = require("../../utilities/accessLevels")
 const Joi = require("joi")
 
 const router = Router()
@@ -33,7 +33,7 @@ function generateValidator(existing = false) {
     type: Joi.string().valid("automation").required(),
     definition: Joi.object({
       steps: Joi.array().required().items(generateStepSchema(["ACTION", "LOGIC"])),
-      trigger: generateStepSchema(["TRIGGER"]),
+      trigger: generateStepSchema(["TRIGGER"]).allow(null),
     }).required().unknown(true),
   }).unknown(true))
 }
@@ -73,7 +73,11 @@ router
     generateValidator(false),
     controller.create
   )
-  .post("/api/automations/:id/trigger", controller.trigger)
+  .post(
+    "/api/automations/:id/trigger",
+    authorized(EXECUTE_AUTOMATION),
+    controller.trigger
+  )
   .delete("/api/automations/:id/:rev", authorized(BUILDER), controller.destroy)
 
 module.exports = router

packages/server/src/api/routes/index.js

@@ -10,6 +10,7 @@ const viewRoutes = require("./view")
 const staticRoutes = require("./static")
 const componentRoutes = require("./component")
 const automationRoutes = require("./automation")
+const webhookRoutes = require("./webhook")
 const accesslevelRoutes = require("./accesslevel")
 const deployRoutes = require("./deploy")
 const apiKeysRoutes = require("./apikeys")
@@ -34,4 +35,5 @@ module.exports = {
   apiKeysRoutes,
   templatesRoutes,
   analyticsRoutes,
+  webhookRoutes,
 }

packages/server/src/api/routes/webhook.js

@@ -0,0 +1,45 @@
+const Router = require("@koa/router")
+const controller = require("../controllers/webhook")
+const authorized = require("../../middleware/authorized")
+const joiValidator = require("../../middleware/joi-validator")
+const { BUILDER, EXECUTE_WEBHOOK } = require("../../utilities/accessLevels")
+const Joi = require("joi")
+
+const router = Router()
+
+function generateSaveValidator() {
+  // prettier-ignore
+  return joiValidator.body(Joi.object({
+    live: Joi.bool(),
+    _id: Joi.string().optional(),
+    _rev: Joi.string().optional(),
+    name: Joi.string().required(),
+    bodySchema: Joi.object().optional(),
+    action: Joi.object({
+      type: Joi.string().required().valid(controller.WebhookType.AUTOMATION),
+      target: Joi.string().required(),
+    }).required(),
+  }).unknown(true))
+}
+
+router
+  .get("/api/webhooks", authorized(BUILDER), controller.fetch)
+  .put(
+    "/api/webhooks",
+    authorized(BUILDER),
+    generateSaveValidator(),
+    controller.save
+  )
+  .delete("/api/webhooks/:id/:rev", authorized(BUILDER), controller.destroy)
+  .post(
+    "/api/webhooks/schema/:instance/:id",
+    authorized(BUILDER),
+    controller.buildSchema
+  )
+  .post(
+    "/api/webhooks/trigger/:instance/:id",
+    authorized(EXECUTE_WEBHOOK),
+    controller.trigger
+  )
+
+module.exports = router

packages/server/src/automations/actions.js

@@ -3,6 +3,7 @@ const createRow = require("./steps/createRow")
 const updateRow = require("./steps/updateRow")
 const deleteRow = require("./steps/deleteRow")
 const createUser = require("./steps/createUser")
+const outgoingWebhook = require("./steps/outgoingWebhook")
 const environment = require("../environment")
 const download = require("download")
 const fetch = require("node-fetch")
@@ -21,6 +22,7 @@ const BUILTIN_ACTIONS = {
   UPDATE_ROW: updateRow.run,
   DELETE_ROW: deleteRow.run,
   CREATE_USER: createUser.run,
+  OUTGOING_WEBHOOK: outgoingWebhook.run,
 }
 const BUILTIN_DEFINITIONS = {
   SEND_EMAIL: sendEmail.definition,
@@ -28,6 +30,7 @@ const BUILTIN_DEFINITIONS = {
   UPDATE_ROW: updateRow.definition,
   DELETE_ROW: deleteRow.definition,
   CREATE_USER: createUser.definition,
+  OUTGOING_WEBHOOK: outgoingWebhook.definition,
 }
 
 let AUTOMATION_BUCKET = environment.AUTOMATION_BUCKET

packages/server/src/automations/steps/createRow.js

@@ -6,7 +6,7 @@ const usage = require("../../utilities/usageQuota")
 module.exports.definition = {
   name: "Create Row",
   tagline: "Create a {{inputs.enriched.table.name}} row",
-  icon: "ri-save-3-fill",
+  icon: "ri-save-3-line",
   description: "Add a row to your database",
   type: "ACTION",
   stepId: "CREATE_ROW",

packages/server/src/automations/steps/createUser.js

@@ -6,7 +6,7 @@ const usage = require("../../utilities/usageQuota")
 module.exports.definition = {
   description: "Create a new user",
   tagline: "Create user {{inputs.username}}",
-  icon: "ri-user-add-fill",
+  icon: "ri-user-add-line",
   name: "Create User",
   type: "ACTION",
   stepId: "CREATE_USER",

packages/server/src/automations/steps/delay.js

@@ -2,7 +2,7 @@ let { wait } = require("../../utilities")
 
 module.exports.definition = {
   name: "Delay",
-  icon: "ri-time-fill",
+  icon: "ri-time-line",
   tagline: "Delay for {{inputs.time}} milliseconds",
   description: "Delay the automation until an amount of time has passed",
   stepId: "DELAY",

packages/server/src/automations/steps/outgoingWebhook.js

@@ -0,0 +1,95 @@
+const fetch = require("node-fetch")
+
+const RequestType = {
+  POST: "POST",
+  GET: "GET",
+  PUT: "PUT",
+  DELETE: "DELETE",
+  PATCH: "PATCH",
+}
+
+const BODY_REQUESTS = [RequestType.POST, RequestType.PUT, RequestType.PATCH]
+
+/**
+ * Note, there is some functionality in this that is not currently exposed as it
+ * is complex and maybe better to be opinionated here.
+ * GET/DELETE requests cannot handle body elements so they will not be sent if configured.
+ */
+
+module.exports.definition = {
+  name: "Outgoing webhook",
+  tagline: "Send a {{inputs.requestMethod}} request",
+  icon: "ri-send-plane-line",
+  description: "Send a request of specified method to a URL",
+  type: "ACTION",
+  stepId: "OUTGOING_WEBHOOK",
+  inputs: {
+    requestMethod: "POST",
+    url: "http://",
+    requestBody: "{}",
+  },
+  schema: {
+    inputs: {
+      properties: {
+        requestMethod: {
+          type: "string",
+          enum: Object.values(RequestType),
+          title: "Request method",
+        },
+        url: {
+          type: "string",
+          title: "URL",
+        },
+        requestBody: {
+          type: "string",
+          title: "JSON Body",
+          customType: "wide",
+        },
+      },
+      required: ["requestMethod", "url"],
+    },
+    outputs: {
+      properties: {
+        response: {
+          type: "object",
+          description: "The response from the webhook",
+        },
+        success: {
+          type: "boolean",
+          description: "Whether the action was successful",
+        },
+      },
+      required: ["response", "success"],
+    },
+  },
+}
+
+module.exports.run = async function({ inputs }) {
+  let { requestMethod, url, requestBody } = inputs
+  if (!url.startsWith("http")) {
+    url = `http://${url}`
+  }
+  const request = {
+    method: requestMethod,
+  }
+  if (
+    requestBody &&
+    requestBody.length !== 0 &&
+    BODY_REQUESTS.indexOf(requestMethod) !== -1
+  ) {
+    request.body = JSON.parse(requestBody)
+  }
+
+  try {
+    const response = await fetch(url, request)
+    return {
+      response: await response.json(),
+      success: response.status === 200,
+    }
+  } catch (err) {
+    return {
+      success: false,
+      response: err,
+    }
+  }
+}

packages/server/src/automations/steps/sendEmail.js

@@ -1,7 +1,7 @@
 module.exports.definition = {
   description: "Send an email",
   tagline: "Send email to {{inputs.to}}",
-  icon: "ri-mail-open-fill",
+  icon: "ri-mail-open-line",
   name: "Send Email",
   type: "ACTION",
   stepId: "SEND_EMAIL",

packages/server/src/automations/steps/updateRow.js

@@ -4,7 +4,7 @@ const automationUtils = require("../automationUtils")
 module.exports.definition = {
   name: "Update Row",
   tagline: "Update a {{inputs.enriched.table.name}} row",
-  icon: "ri-refresh-fill",
+  icon: "ri-refresh-line",
   description: "Update a row in your database",
   type: "ACTION",
   stepId: "UPDATE_ROW",

packages/server/src/automations/thread.js

@@ -1,8 +1,12 @@
-const mustache = require("mustache")
+const handlebars = require("handlebars")
 const actions = require("./actions")
 const logic = require("./logic")
 const automationUtils = require("./automationUtils")
 
+handlebars.registerHelper("object", value => {
+  return new handlebars.SafeString(JSON.stringify(value))
+})
+
 const FILTER_STEP_ID = logic.BUILTIN_DEFINITIONS.FILTER.stepId
 
 function recurseMustache(inputs, context) {
@@ -10,7 +14,8 @@ function recurseMustache(inputs, context) {
     let val = inputs[key]
     if (typeof val === "string") {
       val = automationUtils.cleanMustache(inputs[key])
-      inputs[key] = mustache.render(val, context)
+      const template = handlebars.compile(val)
+      inputs[key] = template(context)
     }
     // this covers objects and arrays
     else if (typeof val === "object") {

packages/server/src/automations/triggers.js

@@ -83,6 +83,42 @@ const BUILTIN_DEFINITIONS = {
     },
     type: "TRIGGER",
   },
+  WEBHOOK: {
+    name: "Webhook",
+    event: "web:trigger",
+    icon: "ri-global-line",
+    tagline: "Webhook endpoint is hit",
+    description: "Trigger an automation when a HTTP POST webhook is hit",
+    stepId: "WEBHOOK",
+    inputs: {},
+    schema: {
+      inputs: {
+        properties: {
+          schemaUrl: {
+            type: "string",
+            customType: "webhookUrl",
+            title: "Schema URL",
+          },
+          triggerUrl: {
+            type: "string",
+            customType: "webhookUrl",
+            title: "Trigger URL",
+          },
+        },
+        required: ["schemaUrl", "triggerUrl"],
+      },
+      outputs: {
+        properties: {
+          body: {
+            type: "object",
+            description: "Body of the request which hit the webhook",
+          },
+        },
+        required: ["body"],
+      },
+    },
+    type: "TRIGGER",
+  },
 }
 
 async function queueRelevantRowAutomations(event, eventType) {

packages/server/src/db/utils.js

@@ -11,6 +11,7 @@ const DocumentTypes = {
   LINK: "li",
   APP: "app",
   ACCESS_LEVEL: "ac",
+  WEBHOOK: "wh",
 }
 
 exports.DocumentTypes = DocumentTypes
@@ -164,3 +165,18 @@ exports.generateAccessLevelID = () => {
 exports.getAccessLevelParams = (accessLevelId = null, otherProps = {}) => {
   return getDocParams(DocumentTypes.ACCESS_LEVEL, accessLevelId, otherProps)
 }
+
+/**
+ * Generates a new webhook ID.
+ * @returns {string} The new webhook ID which the webhook doc can be stored under.
+ */
+exports.generateWebhookID = () => {
+  return `${DocumentTypes.WEBHOOK}${SEPARATOR}${newid()}`
+}
+
+/**
+ * Gets parameters for retrieving a webhook, this is a utility function for the getDocParams function.
+ */
+exports.getWebhookParams = (webhookId = null, otherProps = {}) => {
+  return getDocParams(DocumentTypes.WEBHOOK, webhookId, otherProps)
+}

packages/server/src/middleware/authorized.js

@@ -9,7 +9,13 @@ const environment = require("../environment")
 const { apiKeyTable } = require("../db/dynamoClient")
 const { AuthTypes } = require("../constants")
 
+const LOCAL_PASS = new RegExp(["webhooks/trigger", "webhooks/schema"].join("|"))
+
 module.exports = (permName, getItemId) => async (ctx, next) => {
+  // webhooks can pass locally
+  if (!environment.CLOUD && LOCAL_PASS.test(ctx.request.url)) {
+    return next()
+  }
   if (
     environment.CLOUD &&
     ctx.headers["x-api-key"] &&

packages/server/src/utilities/accessLevels.js

@@ -3,6 +3,7 @@ module.exports.READ_TABLE = "read-table"
 module.exports.WRITE_TABLE = "write-table"
 module.exports.READ_VIEW = "read-view"
 module.exports.EXECUTE_AUTOMATION = "execute-automation"
+module.exports.EXECUTE_WEBHOOK = "execute-webhook"
 module.exports.USER_MANAGEMENT = "user-management"
 module.exports.BUILDER = "builder"
 module.exports.LIST_USERS = "list-users"

packages/server/yarn.lock

@@ -200,15 +200,6 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@budibase/client@^0.2.6":
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.2.6.tgz#de1b4872c7956d386a3b08969eda509bd39d1a64"
-  integrity sha512-sSoGN0k2Tcc5GewBjFMN+G3h21O9JvakYI33kBKgEVGrdEQLBbry7vRKb+lALeW2Bz65gafZL2joZzL8vnH0lw==
-  dependencies:
-    deep-equal "^2.0.1"
-    mustache "^4.0.1"
-    regexparam "^1.3.0"
-
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
@@ -1236,11 +1227,6 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
-array-filter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
-  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -1313,13 +1299,6 @@ atomic-sleep@^1.0.0:
   resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
   integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
 
-available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
-  integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==
-  dependencies:
-    array-filter "^1.0.0"
-
 aws-sdk@^2.767.0:
   version "2.771.0"
   resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.771.0.tgz#ff4beb0a04d6ab1ae962c85dfb42e3e9bfe2b93b"
@@ -2185,26 +2164,6 @@ decompress@^4.2.1:
     pify "^2.3.0"
     strip-dirs "^2.0.0"
 
-deep-equal@^2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.4.tgz#6b0b407a074666033169df3acaf128e1c6f3eab6"
-  integrity sha512-BUfaXrVoCfgkOQY/b09QdO9L3XNoF2XH0A3aY9IQwQL/ZjLOe8FQgCNVl1wiolhsFo8kFdO9zdPViCPbmaJA5w==
-  dependencies:
-    es-abstract "^1.18.0-next.1"
-    es-get-iterator "^1.1.0"
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.2"
-    is-regex "^1.1.1"
-    isarray "^2.0.5"
-    object-is "^1.1.3"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    regexp.prototype.flags "^1.3.0"
-    side-channel "^1.0.3"
-    which-boxed-primitive "^1.0.1"
-    which-collection "^1.0.1"
-    which-typed-array "^1.1.2"
-
 deep-equal@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -2578,7 +2537,7 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4, es-abstract@^1.17.5:
+es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
   version "1.17.7"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
   integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
@@ -2595,7 +2554,7 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4, es-abstrac
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
-es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
+es-abstract@^1.18.0-next.0:
   version "1.18.0-next.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
   integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
@@ -2613,19 +2572,6 @@ es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
-es-get-iterator@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8"
-  integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==
-  dependencies:
-    es-abstract "^1.17.4"
-    has-symbols "^1.0.1"
-    is-arguments "^1.0.4"
-    is-map "^2.0.1"
-    is-set "^2.0.1"
-    is-string "^1.0.5"
-    isarray "^2.0.5"
-
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -3482,6 +3428,18 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
+handlebars@^4.7.6:
+  version "4.7.6"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
+  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
+  dependencies:
+    minimist "^1.2.5"
+    neo-async "^2.6.0"
+    source-map "^0.6.1"
+    wordwrap "^1.0.0"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -3810,21 +3768,11 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-arguments@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
-  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
-
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
-is-bigint@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4"
-  integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g==
-
 is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
@@ -3832,11 +3780,6 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
-  integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
-
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -3873,7 +3816,7 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-date-object@^1.0.1, is-date-object@^1.0.2:
+is-date-object@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
   integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
@@ -3953,11 +3896,6 @@ is-installed-globally@^0.3.1:
     global-dirs "^2.0.1"
     is-path-inside "^3.0.1"
 
-is-map@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
-  integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==
-
 is-natural-number@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
@@ -3973,11 +3911,6 @@ is-npm@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
   integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
 
-is-number-object@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
-  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -4029,21 +3962,11 @@ is-retry-allowed@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
   integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
 
-is-set@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43"
-  integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==
-
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-string@^1.0.4, is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
-
 is-symbol@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
@@ -4060,16 +3983,6 @@ is-type-of@^1.0.0:
     is-class-hotfix "~0.0.6"
     isstream "~0.1.2"
 
-is-typed-array@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.3.tgz#a4ff5a5e672e1a55f99c7f54e59597af5c1df04d"
-  integrity sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ==
-  dependencies:
-    available-typed-arrays "^1.0.0"
-    es-abstract "^1.17.4"
-    foreach "^2.0.5"
-    has-symbols "^1.0.1"
-
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -4080,16 +3993,6 @@ is-utf8@^0.2.0:
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
-is-weakmap@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
-  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
-
-is-weakset@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
-  integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==
-
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -4115,11 +4018,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
 isbinaryfile@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
@@ -4714,6 +4612,11 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonschema@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2"
+  integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw==
+
 jsonwebtoken@^8.5.1:
   version "8.5.1"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
@@ -5160,6 +5063,21 @@ lodash.isstring@^4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
   integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
 
+lodash.keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"
+  integrity sha1-oIYCrBLk+4P5H8H7ejYKTZujUgU=
+
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.omit@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
+  integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=
+
 lodash.once@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
@@ -5175,6 +5093,16 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
+lodash.without@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
+  integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=
+
+lodash.xor@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
+  integrity sha1-TUjtfpgJWwYyWCunFNP/iuj7HbY=
+
 lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.3:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
@@ -5469,6 +5397,11 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
+neo-async@^2.6.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -5618,14 +5551,6 @@ object-inspect@^1.8.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
   integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
 
-object-is@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"
-  integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-
 object-keys@^1.0.12, object-keys@^1.0.6, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -6495,19 +6420,6 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
-  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-
-regexparam@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f"
-  integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g==
-
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -6867,14 +6779,6 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
-side-channel@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3"
-  integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==
-  dependencies:
-    es-abstract "^1.18.0-next.0"
-    object-inspect "^1.8.0"
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -7471,6 +7375,18 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
+to-json-schema@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/to-json-schema/-/to-json-schema-0.2.5.tgz#ef3c3f11ad64460dcfbdbafd0fd525d69d62a98f"
+  integrity sha512-jP1ievOee8pec3tV9ncxLSS48Bnw7DIybgy112rhMCEhf3K4uyVNZZHr03iQQBzbV5v5Hos+dlZRRyk6YSMNDw==
+  dependencies:
+    lodash.isequal "^4.5.0"
+    lodash.keys "^4.2.0"
+    lodash.merge "^4.6.2"
+    lodash.omit "^4.5.0"
+    lodash.without "^4.4.0"
+    lodash.xor "^4.5.0"
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -7632,6 +7548,11 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+uglify-js@^3.1.4:
+  version "3.11.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.4.tgz#b47b7ae99d4bd1dca65b53aaa69caa0909e6fadf"
+  integrity sha512-FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw==
+
 unbzip2-stream@^1.0.9:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
@@ -7885,44 +7806,11 @@ whatwg-url@^7.0.0:
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
-which-boxed-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1"
-  integrity sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ==
-  dependencies:
-    is-bigint "^1.0.0"
-    is-boolean-object "^1.0.0"
-    is-number-object "^1.0.3"
-    is-string "^1.0.4"
-    is-symbol "^1.0.2"
-
-which-collection@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
-  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
-  dependencies:
-    is-map "^2.0.1"
-    is-set "^2.0.1"
-    is-weakmap "^2.0.1"
-    is-weakset "^2.0.1"
-
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which-typed-array@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2"
-  integrity sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ==
-  dependencies:
-    available-typed-arrays "^1.0.2"
-    es-abstract "^1.17.5"
-    foreach "^2.0.5"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.1"
-    is-typed-array "^1.1.3"
-
 which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -7942,6 +7830,11 @@ word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
+wordwrap@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"