From 758803078093eff4a65f1ef3c70253f4de4ac635 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 6 May 2021 18:02:44 +0100
Subject: [PATCH 01/15] SMTP and template management E2E

---
 .../builder/src/pages/builder/_layout.svelte  |  84 ++++----
 .../builder/src/pages/portal/_layout.svelte   |  77 ++++---
 .../src/pages/portal/email/index.svelte       | 193 ++++++++++++++++++
 .../src/api/controllers/admin/templates.js    |   2 +-
 .../worker/src/api/routes/admin/configs.js    |   2 +-
 5 files changed, 277 insertions(+), 81 deletions(-)
 create mode 100644 packages/builder/src/pages/portal/email/index.svelte

diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index 77f8b655f5..8dcf58abb1 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -12,55 +12,47 @@
   let modal
 </script>
 
-{#if $auth}
-  {#if $auth.user}
-    <div class="root">
-      <div class="ui-nav">
-        <div class="home-logo">
-          <img src={Logo} alt="Budibase icon" />
-        </div>
-        <div class="nav-section">
-          <div class="nav-top">
-            <Navigation>
-              <Item href="/builder/" icon="Apps" selected>Apps</Item>
-              <Item external href="https://portal.budi.live/" icon="Servers">
-                Hosting
-              </Item>
-              <Item external href="https://docs.budibase.com/" icon="Book">
-                Documentation
-              </Item>
-              <Item
-                external
-                href="https://github.com/Budibase/budibase/discussions"
-                icon="PeopleGroup"
-              >
-                Community
-              </Item>
-              <Item
-                external
-                href="https://github.com/Budibase/budibase/issues/new/choose"
-                icon="Bug"
-              >
-                Raise an issue
-              </Item>
-            </Navigation>
-          </div>
-          <div class="nav-bottom">
-            <BuilderSettingsButton />
-            <LogoutButton />
-          </div>
-        </div>
+<div class="root">
+  <div class="ui-nav">
+    <div class="home-logo">
+      <img src={Logo} alt="Budibase icon" />
+    </div>
+    <div class="nav-section">
+      <div class="nav-top">
+        <Navigation>
+          <Item href="/builder/" icon="Apps" selected>Apps</Item>
+          <Item external href="https://portal.budi.live/" icon="Servers">
+            Hosting
+          </Item>
+          <Item external href="https://docs.budibase.com/" icon="Book">
+            Documentation
+          </Item>
+          <Item
+            external
+            href="https://github.com/Budibase/budibase/discussions"
+            icon="PeopleGroup"
+          >
+            Community
+          </Item>
+          <Item
+            external
+            href="https://github.com/Budibase/budibase/issues/new/choose"
+            icon="Bug"
+          >
+            Raise an issue
+          </Item>
+        </Navigation>
       </div>
-      <div class="main">
-        <slot />
+      <div class="nav-bottom">
+        <BuilderSettingsButton />
+        <LogoutButton />
       </div>
     </div>
-  {:else}
-    <section class="login">
-      <LoginForm />
-    </section>
-  {/if}
-{/if}
+  </div>
+  <div class="main">
+    <slot />
+  </div>
+</div>
 
 <style>
   .root {
diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte
index 92c2b82ff4..9eccaf639a 100644
--- a/packages/builder/src/pages/portal/_layout.svelte
+++ b/packages/builder/src/pages/portal/_layout.svelte
@@ -14,8 +14,10 @@
     SideNavigation as Navigation,
     SideNavigationItem as Item,
   } from "@budibase/bbui"
+  import LoginForm from "components/login/LoginForm.svelte"
   import api from "builderStore/api"
   import ConfigChecklist from "components/common/ConfigChecklist.svelte"
+  import { auth } from "stores/backend"
   import { organisation, admin } from "stores/portal"
 
   organisation.init()
@@ -47,43 +49,52 @@
   ]
 </script>
 
-<div class="container">
-  <div class="nav">
-    <Layout paddingX="L" paddingY="L">
-      <div class="branding">
-        <div class="name">
-          <img
-            src={$organisation?.logoUrl || "https://i.imgur.com/ZKyklgF.png"}
-            alt="Logotype"
-          />
-          <span>{$organisation?.company || "Budibase"}</span>
+{#if $auth}
+  {#if $auth.user}
+    <div class="container">
+      <div class="nav">
+        <Layout paddingX="L" paddingY="L">
+          <div class="branding">
+            <div class="name">
+              <img
+                src={$organisation?.logoUrl ||
+                  "https://i.imgur.com/ZKyklgF.png"}
+                alt="Logotype"
+              />
+              <span>{$organisation?.company || "Budibase"}</span>
+            </div>
+            <div class="onboarding">
+              <ConfigChecklist />
+            </div>
+          </div>
+          <div class="menu">
+            <Navigation>
+              {#each menu as { title, href, heading }}
+                <Item selected={$isActive(href)} {href} {heading}>{title}</Item>
+              {/each}
+            </Navigation>
+          </div>
+        </Layout>
+      </div>
+      <div class="main">
+        <div class="toolbar">
+          <Search placeholder="Global search" />
+          <div class="avatar">
+            <Avatar size="M" name="John Doe" />
+            <Icon size="XL" name="ChevronDown" />
+          </div>
         </div>
-        <div class="onboarding">
-          <ConfigChecklist />
+        <div class="content">
+          <slot />
         </div>
       </div>
-      <div class="menu">
-        <Navigation>
-          {#each menu as { title, href, heading }}
-            <Item selected={$isActive(href)} {href} {heading}>{title}</Item>
-          {/each}
-        </Navigation>
-      </div>
-    </Layout>
-  </div>
-  <div class="main">
-    <div class="toolbar">
-      <Search placeholder="Global search" />
-      <div class="avatar">
-        <Avatar size="M" name="John Doe" />
-        <Icon size="XL" name="ChevronDown" />
-      </div>
     </div>
-    <div>
-      <slot />
-    </div>
-  </div>
-</div>
+  {:else}
+    <section class="login">
+      <LoginForm />
+    </section>
+  {/if}
+{/if}
 
 <style>
   .container {
diff --git a/packages/builder/src/pages/portal/email/index.svelte b/packages/builder/src/pages/portal/email/index.svelte
new file mode 100644
index 0000000000..5ec74a159c
--- /dev/null
+++ b/packages/builder/src/pages/portal/email/index.svelte
@@ -0,0 +1,193 @@
+<script>
+  import {
+    Button,
+    Heading,
+    Divider,
+    Label,
+    notifications,
+    Layout,
+    Input,
+    TextArea,
+    Body,
+    Page,
+    Select,
+  } from "@budibase/bbui"
+  import { onMount } from "svelte"
+  import api from "builderStore/api"
+
+  const ConfigTypes = {
+    SMTP: "smtp",
+  }
+
+  let smtpConfig
+  let templateIdx = 0
+  let templateDefinition
+  let templates = []
+
+  $: templateTypes = templates.map((template, idx) => ({
+    label: template.purpose,
+    value: idx,
+  }))
+
+  $: selectedTemplate = templates[templateIdx]
+
+  async function saveSmtp() {
+    try {
+      // Save your SMTP config
+      const response = await api.post(`/api/admin/configs`, smtpConfig)
+      const json = await response.json()
+      if (response.status !== 200) throw new Error(json.message)
+      smtpConfig._rev = json._rev
+      smtpConfig._id = json._id
+
+      notifications.success(`Settings saved.`)
+    } catch (err) {
+      notifications.error(`Failed to save email settings. ${err}`)
+    }
+  }
+
+  async function saveTemplate() {
+    try {
+      // Save your SMTP config
+      const response = await api.post(`/api/admin/template`, selectedTemplate)
+      const json = await response.json()
+      if (response.status !== 200) throw new Error(json.message)
+      selectedTemplate._rev = json._rev
+      selectedTemplate._id = json._id
+
+      notifications.success(`Template saved.`)
+    } catch (err) {
+      notifications.error(`Failed to update template settings. ${err}`)
+    }
+  }
+
+  async function fetchSmtp() {
+    // fetch the configs for smtp
+    const smtpResponse = await api.get(`/api/admin/configs/${ConfigTypes.SMTP}`)
+    const smtpDoc = await smtpResponse.json()
+
+    if (!smtpDoc._id) {
+      smtpConfig = {
+        type: ConfigTypes.SMTP,
+        config: {
+          auth: {
+            type: "login",
+          },
+        },
+      }
+    } else {
+      smtpConfig = smtpDoc
+    }
+  }
+
+  async function fetchTemplates() {
+    // fetch the email template definitions
+    const templatesResponse = await api.get(`/api/admin/template/definitions`)
+    const templateDefDoc = await templatesResponse.json()
+
+    // fetch the email templates themselves
+    const emailTemplatesResponse = await api.get(`/api/admin/template/email`)
+    const emailTemplates = await emailTemplatesResponse.json()
+
+    templateDefinition = templateDefDoc
+    templates = emailTemplates
+  }
+
+  onMount(async () => {
+    await fetchSmtp()
+    await fetchTemplates()
+  })
+</script>
+
+<Page>
+  <header>
+    <Heading size="M">Email</Heading>
+    <Body size="S">
+      Sending email is not required, but highly recommended for processes such
+      as password recovery. To setup automated auth emails, simply add the
+      values below and click activate.
+    </Body>
+  </header>
+  <Divider />
+  {#if smtpConfig}
+    <div class="config-form">
+      <Heading size="S">SMTP</Heading>
+      <Body size="S">
+        To allow your app to benefit from automated auth emails, add your SMTP
+        details below.
+      </Body>
+      <Layout gap="S">
+        <Heading size="S">
+          <span />
+        </Heading>
+        <div class="form-row">
+          <Label>Host</Label>
+          <Input bind:value={smtpConfig.config.host} />
+        </div>
+        <div class="form-row">
+          <Label>Port</Label>
+          <Input type="number" bind:value={smtpConfig.config.port} />
+        </div>
+        <div class="form-row">
+          <Label>User</Label>
+          <Input bind:value={smtpConfig.config.auth.user} />
+        </div>
+        <div class="form-row">
+          <Label>Password</Label>
+          <Input type="password" bind:value={smtpConfig.config.auth.pass} />
+        </div>
+        <div class="form-row">
+          <Label>From email address</Label>
+          <Input type="email" bind:value={smtpConfig.config.from} />
+        </div>
+        <Button cta on:click={saveSmtp}>Save</Button>
+      </Layout>
+    </div>
+    <Divider />
+
+    <div class="config-form">
+      <Heading size="S">Templates</Heading>
+      <Body size="S">
+        Budibase comes out of the box with ready-made email templates to help
+        with user onboarding. Please refrain from changing the links.
+      </Body>
+      <div class="template-controls">
+        <Select bind:value={templateIdx} options={templateTypes} />
+        <Button cta on:click={saveTemplate}>Save</Button>
+      </div>
+      {#if selectedTemplate}
+        <TextArea bind:value={selectedTemplate.contents} />
+      {/if}
+    </div>
+  {/if}
+</Page>
+
+<style>
+  .config-form {
+    margin-top: 42px;
+    margin-bottom: 42px;
+  }
+
+  .form-row {
+    display: grid;
+    grid-template-columns: 20% 1fr;
+    grid-gap: var(--spacing-l);
+  }
+
+  span {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-s);
+  }
+
+  header {
+    margin-bottom: 42px;
+  }
+
+  .template-controls {
+    display: grid;
+    grid-template-columns: 80% 1fr;
+    grid-gap: var(--spacing-xl);
+    margin-bottom: var(--spacing-xl);
+  }
+</style>
diff --git a/packages/worker/src/api/controllers/admin/templates.js b/packages/worker/src/api/controllers/admin/templates.js
index 30c90d50bf..c65aaeea75 100644
--- a/packages/worker/src/api/controllers/admin/templates.js
+++ b/packages/worker/src/api/controllers/admin/templates.js
@@ -1,5 +1,5 @@
 const { generateTemplateID, StaticDatabases } = require("@budibase/auth").db
-const { CouchDB } = require("../../../db")
+const CouchDB = require("../../../db")
 const {
   TemplateMetadata,
   TemplateBindings,
diff --git a/packages/worker/src/api/routes/admin/configs.js b/packages/worker/src/api/routes/admin/configs.js
index 9437aec588..38212ea17f 100644
--- a/packages/worker/src/api/routes/admin/configs.js
+++ b/packages/worker/src/api/routes/admin/configs.js
@@ -17,7 +17,7 @@ function smtpValidation() {
     auth: Joi.object({
       type: Joi.string().valid("login", "oauth2", null),
       user: Joi.string().required(),
-      pass: Joi.string().valid("", null),
+      pass: Joi.string().allow("", null),
     }).optional(),
   }).unknown(true)
 }

From 11ce48e1ff91176e6c1bf82f2d36146f187b9cf6 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 10 May 2021 12:06:31 +0100
Subject: [PATCH 02/15] editor styling

---
 packages/bbui/src/Typography/Body.svelte               |  8 ++++++--
 .../src/components/integration/QueryEditor.svelte      |  4 ++--
 packages/builder/src/pages/app/portal/_layout.svelte   |  7 ++++++-
 .../builder/src/pages/app/portal/email/index.svelte    | 10 +++++++++-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/bbui/src/Typography/Body.svelte b/packages/bbui/src/Typography/Body.svelte
index a45c6278a8..2879e73097 100644
--- a/packages/bbui/src/Typography/Body.svelte
+++ b/packages/bbui/src/Typography/Body.svelte
@@ -9,12 +9,16 @@
 <p
   class:noPadding
   class="spectrum-Body spectrum-Body--size{size}"
-  class:spectrum-Body--serif={serif}
->
+  class:spectrum-Body--serif={serif}>
   <slot />
 </p>
 
 <style>
+  p {
+    margin-top: 0.75em;
+    margin-bottom: 0.75em;
+  }
+
   .noPadding {
     padding: 0;
     margin: 0;
diff --git a/packages/builder/src/components/integration/QueryEditor.svelte b/packages/builder/src/components/integration/QueryEditor.svelte
index 47f47c0fc1..b06f56fcf9 100644
--- a/packages/builder/src/components/integration/QueryEditor.svelte
+++ b/packages/builder/src/components/integration/QueryEditor.svelte
@@ -117,7 +117,7 @@
       readOnly,
       autoCloseBrackets: true,
       autoCloseTags: true,
-      theme: $themeStore.darkMode ? THEMES.DARK : THEMES.LIGHT,
+      theme: THEMES.DARK,
     }
 
     if (!tab)
@@ -132,7 +132,7 @@
 
     if (destroyed) return
 
-    CodeMirror.commands.autocomplete = function (cm) {
+    CodeMirror.commands.autocomplete = function(cm) {
       CodeMirror.showHint(cm, CodeMirror.hint.javascript)
     }
 
diff --git a/packages/builder/src/pages/app/portal/_layout.svelte b/packages/builder/src/pages/app/portal/_layout.svelte
index 2c80768e7a..518e1ecb24 100644
--- a/packages/builder/src/pages/app/portal/_layout.svelte
+++ b/packages/builder/src/pages/app/portal/_layout.svelte
@@ -89,7 +89,7 @@
         <MenuItem icon="LogOut" on:click={auth.logout}>Log out</MenuItem>
       </ActionMenu>
     </div>
-    <div>
+    <div class="content">
       <slot />
     </div>
   </div>
@@ -156,4 +156,9 @@
     text-overflow: ellipsis;
     font-weight: 500;
   }
+
+  .content {
+    height: 100vh;
+    overflow-y: auto;
+  }
 </style>
diff --git a/packages/builder/src/pages/app/portal/email/index.svelte b/packages/builder/src/pages/app/portal/email/index.svelte
index 5ec74a159c..c4c15c5287 100644
--- a/packages/builder/src/pages/app/portal/email/index.svelte
+++ b/packages/builder/src/pages/app/portal/email/index.svelte
@@ -13,6 +13,7 @@
     Select,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
+  import Editor from "components/integration/QueryEditor.svelte"
   import api from "builderStore/api"
 
   const ConfigTypes = {
@@ -156,7 +157,14 @@
         <Button cta on:click={saveTemplate}>Save</Button>
       </div>
       {#if selectedTemplate}
-        <TextArea bind:value={selectedTemplate.contents} />
+        {#key templateIdx}
+          <Editor
+            mode="handlebars"
+            on:change={e => {
+              selectedTemplate.contents = e.detail.value
+            }}
+            value={selectedTemplate.contents} />
+          {/key}
       {/if}
     </div>
   {/if}

From 2be60b8c711840958fe6ce3b5a4a08264b6ed5a2 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 10 May 2021 14:47:16 +0100
Subject: [PATCH 03/15] edit template HTML in modal

---
 .../pages/builder/portal/email/index.svelte   | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/email/index.svelte b/packages/builder/src/pages/builder/portal/email/index.svelte
index c4c15c5287..22ee8b07f5 100644
--- a/packages/builder/src/pages/builder/portal/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/email/index.svelte
@@ -4,6 +4,8 @@
     Heading,
     Divider,
     Label,
+    Modal,
+    ModalContent,
     notifications,
     Layout,
     Input,
@@ -24,6 +26,7 @@
   let templateIdx = 0
   let templateDefinition
   let templates = []
+  let htmlModal
 
   $: templateTypes = templates.map((template, idx) => ({
     label: template.purpose,
@@ -154,19 +157,19 @@
       </Body>
       <div class="template-controls">
         <Select bind:value={templateIdx} options={templateTypes} />
-        <Button cta on:click={saveTemplate}>Save</Button>
+        <Button primary on:click={htmlModal.show}>Edit HTML</Button>
       </div>
-      {#if selectedTemplate}
-        {#key templateIdx}
-          <Editor
-            mode="handlebars"
-            on:change={e => {
-              selectedTemplate.contents = e.detail.value
-            }}
-            value={selectedTemplate.contents} />
-          {/key}
-      {/if}
     </div>
+    <Modal bind:this={htmlModal}>
+    <ModalContent title="Edit Template HTML" onConfirm={saveTemplate} size="XL">
+      <Editor
+        mode="handlebars"
+        on:change={e => {
+          selectedTemplate.contents = e.detail.value
+        }}
+        value={selectedTemplate.contents} />
+    </ModalContent>
+    </Modal>
   {/if}
 </Page>
 

From 4ccb326ece499854b86acf9b11ca9f19b3c48222 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 10 May 2021 14:50:37 +0100
Subject: [PATCH 04/15] lint

---
 packages/bbui/src/Typography/Body.svelte      |  3 ++-
 .../SetupPanel/AutomationBlockSetup.svelte    |  6 +++---
 .../SetupPanel/CodeEditorModal.svelte         |  3 ++-
 .../components/integration/QueryEditor.svelte |  2 +-
 .../pages/builder/portal/email/index.svelte   | 21 ++++++++++++-------
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/packages/bbui/src/Typography/Body.svelte b/packages/bbui/src/Typography/Body.svelte
index 2879e73097..b18400862d 100644
--- a/packages/bbui/src/Typography/Body.svelte
+++ b/packages/bbui/src/Typography/Body.svelte
@@ -9,7 +9,8 @@
 <p
   class:noPadding
   class="spectrum-Body spectrum-Body--size{size}"
-  class:spectrum-Body--serif={serif}>
+  class:spectrum-Body--serif={serif}
+>
   <slot />
 </p>
 
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 8756150346..73266b85b2 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -74,9 +74,9 @@
           on:change={e => (block.inputs[key] = e.detail)}
           {bindings}
         />
-      {:else if value.customType === 'query'}
+      {:else if value.customType === "query"}
         <QuerySelector bind:value={block.inputs[key]} />
-      {:else if value.customType === 'queryParams'}
+      {:else if value.customType === "queryParams"}
         <QueryParamSelector bind:value={block.inputs[key]} {bindings} />
       {:else if value.customType === "table"}
         <TableSelector bind:value={block.inputs[key]} />
@@ -91,7 +91,7 @@
           <pre>{JSON.stringify(bindings, null, 2)}</pre>
           <Editor
             mode="javascript"
-            on:change={e => { 
+            on:change={e => {
               block.inputs[key] = e.detail.value
             }}
             value={block.inputs[key]}
diff --git a/packages/builder/src/components/automation/SetupPanel/CodeEditorModal.svelte b/packages/builder/src/components/automation/SetupPanel/CodeEditorModal.svelte
index fb5a8c59ae..5da624950f 100644
--- a/packages/builder/src/components/automation/SetupPanel/CodeEditorModal.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CodeEditorModal.svelte
@@ -16,7 +16,8 @@
     size="XL"
     title="Edit Code"
     showConfirmButton={false}
-    showCancelButton={false}>
+    showCancelButton={false}
+  >
     <div class="container">
       <slot />
     </div>
diff --git a/packages/builder/src/components/integration/QueryEditor.svelte b/packages/builder/src/components/integration/QueryEditor.svelte
index b06f56fcf9..02f3218850 100644
--- a/packages/builder/src/components/integration/QueryEditor.svelte
+++ b/packages/builder/src/components/integration/QueryEditor.svelte
@@ -132,7 +132,7 @@
 
     if (destroyed) return
 
-    CodeMirror.commands.autocomplete = function(cm) {
+    CodeMirror.commands.autocomplete = function (cm) {
       CodeMirror.showHint(cm, CodeMirror.hint.javascript)
     }
 
diff --git a/packages/builder/src/pages/builder/portal/email/index.svelte b/packages/builder/src/pages/builder/portal/email/index.svelte
index 22ee8b07f5..9f37425a80 100644
--- a/packages/builder/src/pages/builder/portal/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/email/index.svelte
@@ -161,14 +161,19 @@
       </div>
     </div>
     <Modal bind:this={htmlModal}>
-    <ModalContent title="Edit Template HTML" onConfirm={saveTemplate} size="XL">
-      <Editor
-        mode="handlebars"
-        on:change={e => {
-          selectedTemplate.contents = e.detail.value
-        }}
-        value={selectedTemplate.contents} />
-    </ModalContent>
+      <ModalContent
+        title="Edit Template HTML"
+        onConfirm={saveTemplate}
+        size="XL"
+      >
+        <Editor
+          mode="handlebars"
+          on:change={e => {
+            selectedTemplate.contents = e.detail.value
+          }}
+          value={selectedTemplate.contents}
+        />
+      </ModalContent>
     </Modal>
   {/if}
 </Page>

From 075b00b534222f0cad83f59d569316c1f3cb8037 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 10 May 2021 15:05:06 +0100
Subject: [PATCH 05/15] Renaming registration to invite URL.

---
 packages/worker/src/constants/index.js                 | 4 ++--
 packages/worker/src/constants/templates/invitation.hbs | 4 ++--
 packages/worker/src/utilities/templates.js             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/worker/src/constants/index.js b/packages/worker/src/constants/index.js
index b7ac33cc28..ac0678eb2e 100644
--- a/packages/worker/src/constants/index.js
+++ b/packages/worker/src/constants/index.js
@@ -40,7 +40,7 @@ const TemplateBindings = {
   LOGO_URL: "logoUrl",
   STYLES: "styles",
   BODY: "body",
-  REGISTRATION_URL: "registrationUrl",
+  INVITE_URL: "inviteUrl",
   EMAIL: "email",
   RESET_URL: "resetUrl",
   USER: "user",
@@ -63,7 +63,7 @@ const TemplateMetadata = {
     {
       name: "Base Format",
       purpose: EmailTemplatePurpose.BASE,
-      bindings: ["company", "registrationUrl"],
+      bindings: ["company", "inviteUrl"],
     },
     {
       name: "Password Recovery",
diff --git a/packages/worker/src/constants/templates/invitation.hbs b/packages/worker/src/constants/templates/invitation.hbs
index fcaf7e7ca1..49564c7cf2 100644
--- a/packages/worker/src/constants/templates/invitation.hbs
+++ b/packages/worker/src/constants/templates/invitation.hbs
@@ -22,7 +22,7 @@
                   <table width="100%" border="0" cellspacing="0" cellpadding="0" role="presentation">
                     <tr>
                       <td align="center">
-                        <a href="{{ registrationUrl }}" class="f-fallback button" target="_blank">Set up account</a>
+                        <a href="{{ inviteUrl }}" class="f-fallback button" target="_blank">Set up account</a>
                       </td>
                     </tr>
                   </table>
@@ -38,7 +38,7 @@
               <tr>
                 <td>
                   <p class="f-fallback sub">If you’re having trouble with the button above, copy and paste the URL below into your web browser.</p>
-                  <p class="f-fallback sub">{{ registrationUrl }}</p>
+                  <p class="f-fallback sub">{{ inviteUrl }}</p>
                 </td>
               </tr>
             </table>
diff --git a/packages/worker/src/utilities/templates.js b/packages/worker/src/utilities/templates.js
index a9da10405b..64ef62060d 100644
--- a/packages/worker/src/utilities/templates.js
+++ b/packages/worker/src/utilities/templates.js
@@ -41,7 +41,7 @@ exports.getSettingsTemplateContext = async (purpose, code = null) => {
       break
     case EmailTemplatePurpose.INVITATION:
       context[TemplateBindings.INVITE_CODE] = code
-      context[TemplateBindings.REGISTRATION_URL] = checkSlashesInUrl(
+      context[TemplateBindings.INVITE_URL] = checkSlashesInUrl(
         `${URL}/invite?code=${code}`
       )
       break

From 773686914835de6617593a532e005bbf7692f8c7 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 May 2021 12:02:29 +0100
Subject: [PATCH 06/15] Some updates, working towards supporting automation
 send smtp email also removing the styling template, adding to base.

---
 packages/auth/src/environment.js              |   1 +
 packages/auth/src/middleware/authenticated.js |   7 +-
 packages/cli/src/hosting/makeEnv.js           |  14 +-
 packages/server/scripts/dev/manage.js         |   1 +
 packages/server/src/automations/actions.js    |   2 +-
 .../src/automations/steps/sendSmtpEmail.js    |   0
 .../steps/{sendEmail.js => sendgridEmail.js}  |   2 +-
 packages/server/src/environment.js            |   2 +-
 .../server/src/utilities/workerRequests.js    |  15 +-
 packages/worker/scripts/dev/manage.js         |   1 +
 packages/worker/src/constants/index.js        |   9 +-
 .../worker/src/constants/templates/base.hbs   | 421 +++++++++++++++++-
 .../worker/src/constants/templates/custom.hbs |  14 +
 .../worker/src/constants/templates/index.js   |   2 +-
 .../worker/src/constants/templates/style.hbs  | 408 -----------------
 packages/worker/src/environment.js            |   2 +-
 packages/worker/src/utilities/email.js        |  20 +-
 17 files changed, 478 insertions(+), 443 deletions(-)
 create mode 100644 packages/server/src/automations/steps/sendSmtpEmail.js
 rename packages/server/src/automations/steps/{sendEmail.js => sendgridEmail.js} (97%)
 create mode 100644 packages/worker/src/constants/templates/custom.hbs
 delete mode 100644 packages/worker/src/constants/templates/style.hbs

diff --git a/packages/auth/src/environment.js b/packages/auth/src/environment.js
index db24aaafcc..f582bd118a 100644
--- a/packages/auth/src/environment.js
+++ b/packages/auth/src/environment.js
@@ -15,5 +15,6 @@ module.exports = {
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   MINIO_URL: process.env.MINIO_URL,
+  INTERNAL_KEY: process.env.INTERNAL_KEY,
   isTest,
 }
diff --git a/packages/auth/src/middleware/authenticated.js b/packages/auth/src/middleware/authenticated.js
index 5d8d4e7e13..913e7c8cc8 100644
--- a/packages/auth/src/middleware/authenticated.js
+++ b/packages/auth/src/middleware/authenticated.js
@@ -2,6 +2,7 @@ const { Cookies } = require("../constants")
 const database = require("../db")
 const { getCookie, clearCookie } = require("../utils")
 const { StaticDatabases } = require("../db/utils")
+const env = require("../environment")
 
 const PARAM_REGEX = /\/:(.*?)\//g
 
@@ -35,10 +36,14 @@ module.exports = (noAuthPatterns = [], opts) => {
       return next()
     }
     try {
+      const apiKey = ctx.request.headers["x-budibase-api-key"]
       // check the actual user is authenticated first
       const authCookie = getCookie(ctx, Cookies.Auth)
 
-      if (authCookie) {
+      // this is an internal request, no user made it
+      if (apiKey && apiKey === env.INTERNAL_KEY) {
+        ctx.isAuthenticated = true
+      } else if (authCookie) {
         try {
           const db = database.getDB(StaticDatabases.GLOBAL.name)
           const user = await db.get(authCookie.userId)
diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js
index a4fbce6ee0..e8c4a8c830 100644
--- a/packages/cli/src/hosting/makeEnv.js
+++ b/packages/cli/src/hosting/makeEnv.js
@@ -6,14 +6,11 @@ const randomString = require("randomstring")
 
 const FILE_PATH = path.resolve("./.env")
 
-function getContents(port, hostingKey) {
+function getContents(port) {
   return `
 # Use the main port in the builder for your self hosting URL, e.g. localhost:10000
 MAIN_PORT=${port}
 
-# Use this password when configuring your self hosting settings
-HOSTING_KEY=${hostingKey}
-
 # This section contains all secrets pertaining to the system
 JWT_SECRET=${randomString.generate()}
 MINIO_ACCESS_KEY=${randomString.generate()}
@@ -21,6 +18,7 @@ MINIO_SECRET_KEY=${randomString.generate()}
 COUCH_DB_PASSWORD=${randomString.generate()}
 COUCH_DB_USER=${randomString.generate()}
 REDIS_PASSWORD=${randomString.generate()}
+INTERNAL_KEY=${randomString.generate()}
 
 # This section contains variables that do not need to be altered under normal circumstances
 APP_PORT=4002
@@ -33,7 +31,6 @@ BUDIBASE_ENVIRONMENT=PRODUCTION`
 
 module.exports.filePath = FILE_PATH
 module.exports.ConfigMap = {
-  HOSTING_KEY: "key",
   MAIN_PORT: "port",
 }
 module.exports.QUICK_CONFIG = {
@@ -42,18 +39,13 @@ module.exports.QUICK_CONFIG = {
 }
 
 module.exports.make = async (inputs = {}) => {
-  const hostingKey =
-    inputs.key ||
-    (await string(
-      "Please input the password you'd like to use as your hosting key: "
-    ))
   const hostingPort =
     inputs.port ||
     (await number(
       "Please enter the port on which you want your installation to run: ",
       10000
     ))
-  const fileContents = getContents(hostingPort, hostingKey)
+  const fileContents = getContents(hostingPort)
   fs.writeFileSync(FILE_PATH, fileContents)
   console.log(
     success(
diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js
index 24cac981cf..5349158036 100644
--- a/packages/server/scripts/dev/manage.js
+++ b/packages/server/scripts/dev/manage.js
@@ -39,6 +39,7 @@ async function init() {
     COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
     REDIS_URL: "localhost:6379",
     WORKER_URL: "http://localhost:4002",
+    INTERNAL_KEY: "budibase",
     JWT_SECRET: "testsecret",
     REDIS_PASSWORD: "budibase",
     MINIO_ACCESS_KEY: "budibase",
diff --git a/packages/server/src/automations/actions.js b/packages/server/src/automations/actions.js
index a83608da30..0f40fd6aae 100644
--- a/packages/server/src/automations/actions.js
+++ b/packages/server/src/automations/actions.js
@@ -1,4 +1,4 @@
-const sendEmail = require("./steps/sendEmail")
+const sendEmail = require("./steps/sendgridEmail")
 const createRow = require("./steps/createRow")
 const updateRow = require("./steps/updateRow")
 const deleteRow = require("./steps/deleteRow")
diff --git a/packages/server/src/automations/steps/sendSmtpEmail.js b/packages/server/src/automations/steps/sendSmtpEmail.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/server/src/automations/steps/sendEmail.js b/packages/server/src/automations/steps/sendgridEmail.js
similarity index 97%
rename from packages/server/src/automations/steps/sendEmail.js
rename to packages/server/src/automations/steps/sendgridEmail.js
index e08a3d8bc4..26c404257e 100644
--- a/packages/server/src/automations/steps/sendEmail.js
+++ b/packages/server/src/automations/steps/sendgridEmail.js
@@ -2,7 +2,7 @@ module.exports.definition = {
   description: "Send an email",
   tagline: "Send email to {{inputs.to}}",
   icon: "ri-mail-open-line",
-  name: "Send Email",
+  name: "Send Email (SendGrid)",
   type: "ACTION",
   stepId: "SEND_EMAIL",
   inputs: {},
diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js
index 061f38a985..412b05cab0 100644
--- a/packages/server/src/environment.js
+++ b/packages/server/src/environment.js
@@ -34,6 +34,7 @@ module.exports = {
   USE_QUOTAS: process.env.USE_QUOTAS,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
+  INTERNAL_KEY: process.env.INTERNAL_KEY,
   // environment
   NODE_ENV: process.env.NODE_ENV,
   JEST_WORKER_ID: process.env.JEST_WORKER_ID,
@@ -53,7 +54,6 @@ module.exports = {
   BUDIBASE_API_KEY: process.env.BUDIBASE_API_KEY,
   USERID_API_KEY: process.env.USERID_API_KEY,
   DEPLOYMENT_CREDENTIALS_URL: process.env.DEPLOYMENT_CREDENTIALS_URL,
-  HOSTING_KEY: process.env.HOSTING_KEY,
   _set(key, value) {
     process.env[key] = value
     module.exports[key] = value
diff --git a/packages/server/src/utilities/workerRequests.js b/packages/server/src/utilities/workerRequests.js
index f96d48092e..6bf3bf6461 100644
--- a/packages/server/src/utilities/workerRequests.js
+++ b/packages/server/src/utilities/workerRequests.js
@@ -26,7 +26,7 @@ function request(ctx, request) {
         ? JSON.stringify(request.body)
         : request.body
   }
-  if (ctx.headers) {
+  if (ctx && ctx.headers) {
     request.headers.cookie = ctx.headers.cookie
   }
   return request
@@ -34,6 +34,19 @@ function request(ctx, request) {
 
 exports.request = request
 
+exports.sendSmtpEmail = async (to, from, contents) => {
+  const response = await fetch(
+    checkSlashesInUrl(env.WORKER_URL + `/api/`),
+    request(null, {
+      method: "POST",
+      headers: {
+        "x-budibase-api-key": env.INTERNAL_KEY,
+      },
+      body: {},
+    })
+  )
+}
+
 exports.getDeployedApps = async ctx => {
   if (!env.SELF_HOSTED) {
     throw "Can only check apps for self hosted environments"
diff --git a/packages/worker/scripts/dev/manage.js b/packages/worker/scripts/dev/manage.js
index 7322349b72..f2784750c6 100644
--- a/packages/worker/scripts/dev/manage.js
+++ b/packages/worker/scripts/dev/manage.js
@@ -8,6 +8,7 @@ async function init() {
     SELF_HOSTED: 1,
     PORT: 4002,
     JWT_SECRET: "testsecret",
+    INTERNAL_KEY: "budibase",
     MINIO_ACCESS_KEY: "budibase",
     MINIO_SECRET_KEY: "budibase",
     COUCH_DB_USER: "budibase",
diff --git a/packages/worker/src/constants/index.js b/packages/worker/src/constants/index.js
index ac0678eb2e..39dad128f5 100644
--- a/packages/worker/src/constants/index.js
+++ b/packages/worker/src/constants/index.js
@@ -27,7 +27,6 @@ const TemplateTypes = {
 
 const EmailTemplatePurpose = {
   BASE: "base",
-  STYLES: "styles",
   PASSWORD_RECOVERY: "password_recovery",
   INVITATION: "invitation",
   WELCOME: "welcome",
@@ -38,7 +37,6 @@ const TemplateBindings = {
   PLATFORM_URL: "platformUrl",
   COMPANY: "company",
   LOGO_URL: "logoUrl",
-  STYLES: "styles",
   BODY: "body",
   INVITE_URL: "inviteUrl",
   EMAIL: "email",
@@ -51,15 +49,11 @@ const TemplateBindings = {
   CURRENT_DATE: "currentDate",
   RESET_CODE: "resetCode",
   INVITE_CODE: "inviteCode",
+  CONTENTS: "contents",
 }
 
 const TemplateMetadata = {
   [TemplateTypes.EMAIL]: [
-    {
-      name: "Styling",
-      purpose: EmailTemplatePurpose.STYLES,
-      bindings: ["url", "company", "companyUrl", "styles", "body"],
-    },
     {
       name: "Base Format",
       purpose: EmailTemplatePurpose.BASE,
@@ -76,6 +70,7 @@ const TemplateMetadata = {
     {
       name: "Custom",
       purpose: EmailTemplatePurpose.CUSTOM,
+      bindings: ["contents"],
     },
   ],
 }
diff --git a/packages/worker/src/constants/templates/base.hbs b/packages/worker/src/constants/templates/base.hbs
index 38ceff023a..960d6faff1 100644
--- a/packages/worker/src/constants/templates/base.hbs
+++ b/packages/worker/src/constants/templates/base.hbs
@@ -9,7 +9,426 @@
   <meta name="supported-color-schemes" content="light dark" />
   <title></title>
   <style type="text/css" rel="stylesheet" media="all">
-    {{ styles }}
+    @import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro&display=swap');
+
+    body {
+      width: 100% !important;
+      height: 100%;
+      margin: 0;
+      -webkit-text-size-adjust: none;
+    }
+
+    a {
+      color: #3869D4;
+    }
+
+    a img {
+      border: none;
+    }
+
+    td {
+      word-break: break-word;
+    }
+
+    .preheader {
+      display: none !important;
+      visibility: hidden;
+      mso-hide: all;
+      font-size: 1px;
+      line-height: 1px;
+      max-height: 0;
+      max-width: 0;
+      opacity: 0;
+      overflow: hidden;
+    }
+
+    /* Type ------------------------------ */
+
+    body,
+    td,
+    th {
+      font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
+    }
+
+    h1 {
+      margin-top: 0;
+      color: #333333;
+      font-size: 22px;
+      font-weight: bold;
+      text-align: left;
+    }
+
+    h2 {
+      margin-top: 0;
+      color: #333333;
+      font-size: 16px;
+      font-weight: bold;
+      text-align: left;
+    }
+
+    h3 {
+      margin-top: 0;
+      color: #333333;
+      font-size: 14px;
+      font-weight: bold;
+      text-align: left;
+    }
+
+    td,
+    th {
+      font-size: 16px;
+    }
+
+    p,
+    ul,
+    ol,
+    blockquote {
+      margin: .4em 0 1.1875em;
+      font-size: 16px;
+      line-height: 1.625;
+    }
+
+    p.sub {
+      font-size: 13px;
+    }
+
+    /* Utilities ------------------------------ */
+
+    .align-right {
+      text-align: right;
+    }
+
+    .align-left {
+      text-align: left;
+    }
+
+    .align-center {
+      text-align: center;
+    }
+
+    /* Buttons ------------------------------ */
+
+    .button {
+      background-color: #3869D4;
+      border-top: 10px solid #3869D4;
+      border-right: 18px solid #3869D4;
+      border-bottom: 10px solid #3869D4;
+      border-left: 18px solid #3869D4;
+      display: inline-block;
+      color: #FFF;
+      text-decoration: none;
+      border-radius: 3px;
+      box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
+      -webkit-text-size-adjust: none;
+      box-sizing: border-box;
+    }
+
+    .button--green {
+      background-color: #22BC66;
+      border-top: 10px solid #22BC66;
+      border-right: 18px solid #22BC66;
+      border-bottom: 10px solid #22BC66;
+      border-left: 18px solid #22BC66;
+    }
+
+    .button--red {
+      background-color: #FF6136;
+      border-top: 10px solid #FF6136;
+      border-right: 18px solid #FF6136;
+      border-bottom: 10px solid #FF6136;
+      border-left: 18px solid #FF6136;
+    }
+
+    @media only screen and (max-width: 500px) {
+      .button {
+        width: 100% !important;
+        text-align: center !important;
+      }
+    }
+
+    /* Attribute list ------------------------------ */
+
+    .attributes {
+      margin: 0 0 21px;
+    }
+
+    .attributes_content {
+      background-color: #F4F4F7;
+      padding: 16px;
+    }
+
+    .attributes_item {
+      padding: 0;
+    }
+
+    /* Related Items ------------------------------ */
+
+    .related {
+      width: 100%;
+      margin: 0;
+      padding: 25px 0 0 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+
+    .related_item {
+      padding: 10px 0;
+      color: #CBCCCF;
+      font-size: 15px;
+      line-height: 18px;
+    }
+
+    .related_item-title {
+      display: block;
+      margin: .5em 0 0;
+    }
+
+    .related_item-thumb {
+      display: block;
+      padding-bottom: 10px;
+    }
+
+    .related_heading {
+      border-top: 1px solid #CBCCCF;
+      text-align: center;
+      padding: 25px 0 10px;
+    }
+
+    /* Discount Code ------------------------------ */
+
+    .discount {
+      width: 100%;
+      margin: 0;
+      padding: 24px;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+      background-color: #F4F4F7;
+      border: 2px dashed #CBCCCF;
+    }
+
+    .discount_heading {
+      text-align: center;
+    }
+
+    .discount_body {
+      text-align: center;
+      font-size: 15px;
+    }
+
+    /* Social Icons ------------------------------ */
+
+    .social {
+      width: auto;
+    }
+
+    .social td {
+      padding: 0;
+      width: auto;
+    }
+
+    .social_icon {
+      height: 20px;
+      margin: 0 8px 10px 8px;
+      padding: 0;
+    }
+
+    /* Data table ------------------------------ */
+
+    .purchase {
+      width: 100%;
+      margin: 0;
+      padding: 35px 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+
+    .purchase_content {
+      width: 100%;
+      margin: 0;
+      padding: 25px 0 0 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+
+    .purchase_item {
+      padding: 10px 0;
+      color: #51545E;
+      font-size: 15px;
+      line-height: 18px;
+    }
+
+    .purchase_heading {
+      padding-bottom: 8px;
+      border-bottom: 1px solid #EAEAEC;
+    }
+
+    .purchase_heading p {
+      margin: 0;
+      color: #85878E;
+      font-size: 12px;
+    }
+
+    .purchase_footer {
+      padding-top: 15px;
+      border-top: 1px solid #EAEAEC;
+    }
+
+    .purchase_total {
+      margin: 0;
+      text-align: right;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    .purchase_total--label {
+      padding: 0 15px 0 0;
+    }
+
+    body {
+      background-color: #FFF;
+      color: #333;
+    }
+
+    p {
+      color: #333;
+    }
+
+    .email-wrapper {
+      width: 100%;
+      margin: 0;
+      padding: 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+
+    .email-content {
+      width: 100%;
+      margin: 0;
+      padding: 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+
+    /* Masthead ----------------------- */
+
+    .email-masthead {
+      padding: 25px 0;
+      text-align: center;
+    }
+
+    .email-masthead_logo {
+      width: 94px;
+    }
+
+    .email-masthead_name {
+      font-size: 16px;
+      font-weight: bold;
+      color: #A8AAAF;
+      text-decoration: none;
+      text-shadow: 0 1px 0 white;
+    }
+
+    /* Body ------------------------------ */
+
+    .email-body {
+      width: 100%;
+      margin: 0;
+      padding: 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+
+    .email-body_inner {
+      width: 570px;
+      margin: 0 auto;
+      padding: 0;
+      -premailer-width: 570px;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+    }
+
+    .email-footer {
+      width: 570px;
+      margin: 0 auto;
+      padding: 0;
+      -premailer-width: 570px;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+      text-align: center;
+    }
+
+    .email-footer p {
+      color: #A8AAAF;
+    }
+
+    .body-action {
+      width: 100%;
+      margin: 30px auto;
+      padding: 0;
+      -premailer-width: 100%;
+      -premailer-cellpadding: 0;
+      -premailer-cellspacing: 0;
+      text-align: center;
+    }
+
+    .body-sub {
+      margin-top: 25px;
+      padding-top: 25px;
+      border-top: 1px solid #EAEAEC;
+    }
+
+    .content-cell {
+      padding: 35px;
+    }
+
+    /*Media Queries ------------------------------ */
+
+    @media only screen and (max-width: 600px) {
+      .email-body_inner,
+      .email-footer {
+        width: 100% !important;
+      }
+    }
+
+    @media (prefers-color-scheme: dark) {
+      body {
+        background-color: #333333 !important;
+        color: #FFF !important;
+      }
+
+      p,
+      ul,
+      ol,
+      blockquote,
+      h1,
+      h2,
+      h3,
+      span,
+      .purchase_item {
+        color: #FFF !important;
+      }
+
+      .attributes_content,
+      .discount {
+        background-color: #222 !important;
+      }
+
+      .email-masthead_name {
+        text-shadow: none !important;
+      }
+    }
+
+    :root {
+      color-scheme: light dark;
+      supported-color-schemes: light dark;
+    }
   </style>
   <!--[if mso]>
   <style type="text/css">
diff --git a/packages/worker/src/constants/templates/custom.hbs b/packages/worker/src/constants/templates/custom.hbs
new file mode 100644
index 0000000000..fdbfc39bad
--- /dev/null
+++ b/packages/worker/src/constants/templates/custom.hbs
@@ -0,0 +1,14 @@
+<tr>
+  <td class="email-body" width="570" cellpadding="0" cellspacing="0">
+    <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
+      <!-- Body content -->
+      <tr>
+        <td class="content-cell">
+          <div class="f-fallback">
+            {{ contents }}
+          </div>
+        </td>
+      </tr>
+    </table>
+  </td>
+</tr>
\ No newline at end of file
diff --git a/packages/worker/src/constants/templates/index.js b/packages/worker/src/constants/templates/index.js
index 23e5508341..c677f504c4 100644
--- a/packages/worker/src/constants/templates/index.js
+++ b/packages/worker/src/constants/templates/index.js
@@ -17,10 +17,10 @@ exports.EmailTemplates = {
     join(__dirname, "invitation.hbs")
   ),
   [EmailTemplatePurpose.BASE]: readStaticFile(join(__dirname, "base.hbs")),
-  [EmailTemplatePurpose.STYLES]: readStaticFile(join(__dirname, "style.hbs")),
   [EmailTemplatePurpose.WELCOME]: readStaticFile(
     join(__dirname, "welcome.hbs")
   ),
+  [EmailTemplatePurpose.CUSTOM]: readStaticFile(join(__dirname, "custom.hbs")),
 }
 
 exports.addBaseTemplates = (templates, type = null) => {
diff --git a/packages/worker/src/constants/templates/style.hbs b/packages/worker/src/constants/templates/style.hbs
deleted file mode 100644
index 244e901787..0000000000
--- a/packages/worker/src/constants/templates/style.hbs
+++ /dev/null
@@ -1,408 +0,0 @@
-/* Based on templates: https://github.com/wildbit/postmark-templates/blob/master/templates/plain */
-/* Base ------------------------------ */
-
-@import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro&display=swap');
-body {
-width: 100% !important;
-height: 100%;
-margin: 0;
--webkit-text-size-adjust: none;
-}
-
-a {
-color: #3869D4;
-}
-
-a img {
-border: none;
-}
-
-td {
-word-break: break-word;
-}
-
-.preheader {
-display: none !important;
-visibility: hidden;
-mso-hide: all;
-font-size: 1px;
-line-height: 1px;
-max-height: 0;
-max-width: 0;
-opacity: 0;
-overflow: hidden;
-}
-/* Type ------------------------------ */
-
-body,
-td,
-th {
-font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
-}
-
-h1 {
-margin-top: 0;
-color: #333333;
-font-size: 22px;
-font-weight: bold;
-text-align: left;
-}
-
-h2 {
-margin-top: 0;
-color: #333333;
-font-size: 16px;
-font-weight: bold;
-text-align: left;
-}
-
-h3 {
-margin-top: 0;
-color: #333333;
-font-size: 14px;
-font-weight: bold;
-text-align: left;
-}
-
-td,
-th {
-font-size: 16px;
-}
-
-p,
-ul,
-ol,
-blockquote {
-margin: .4em 0 1.1875em;
-font-size: 16px;
-line-height: 1.625;
-}
-
-p.sub {
-font-size: 13px;
-}
-/* Utilities ------------------------------ */
-
-.align-right {
-text-align: right;
-}
-
-.align-left {
-text-align: left;
-}
-
-.align-center {
-text-align: center;
-}
-/* Buttons ------------------------------ */
-
-.button {
-background-color: #3869D4;
-border-top: 10px solid #3869D4;
-border-right: 18px solid #3869D4;
-border-bottom: 10px solid #3869D4;
-border-left: 18px solid #3869D4;
-display: inline-block;
-color: #FFF;
-text-decoration: none;
-border-radius: 3px;
-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.16);
--webkit-text-size-adjust: none;
-box-sizing: border-box;
-}
-
-.button--green {
-background-color: #22BC66;
-border-top: 10px solid #22BC66;
-border-right: 18px solid #22BC66;
-border-bottom: 10px solid #22BC66;
-border-left: 18px solid #22BC66;
-}
-
-.button--red {
-background-color: #FF6136;
-border-top: 10px solid #FF6136;
-border-right: 18px solid #FF6136;
-border-bottom: 10px solid #FF6136;
-border-left: 18px solid #FF6136;
-}
-
-@media only screen and (max-width: 500px) {
-.button {
-width: 100% !important;
-text-align: center !important;
-}
-}
-/* Attribute list ------------------------------ */
-
-.attributes {
-margin: 0 0 21px;
-}
-
-.attributes_content {
-background-color: #F4F4F7;
-padding: 16px;
-}
-
-.attributes_item {
-padding: 0;
-}
-/* Related Items ------------------------------ */
-
-.related {
-width: 100%;
-margin: 0;
-padding: 25px 0 0 0;
--premailer-width: 100%;
--premailer-cellpadding: 0;
--premailer-cellspacing: 0;
-}
-
-.related_item {
-padding: 10px 0;
-color: #CBCCCF;
-font-size: 15px;
-line-height: 18px;
-}
-
-.related_item-title {
-display: block;
-margin: .5em 0 0;
-}
-
-.related_item-thumb {
-display: block;
-padding-bottom: 10px;
-}
-
-.related_heading {
-border-top: 1px solid #CBCCCF;
-text-align: center;
-padding: 25px 0 10px;
-}
-/* Discount Code ------------------------------ */
-
-.discount {
-width: 100%;
-margin: 0;
-padding: 24px;
--premailer-width: 100%;
--premailer-cellpadding: 0;
--premailer-cellspacing: 0;
-background-color: #F4F4F7;
-border: 2px dashed #CBCCCF;
-}
-
-.discount_heading {
-text-align: center;
-}
-
-.discount_body {
-text-align: center;
-font-size: 15px;
-}
-/* Social Icons ------------------------------ */
-
-.social {
-width: auto;
-}
-
-.social td {
-padding: 0;
-width: auto;
-}
-
-.social_icon {
-height: 20px;
-margin: 0 8px 10px 8px;
-padding: 0;
-}
-/* Data table ------------------------------ */
-
-.purchase {
-width: 100%;
-margin: 0;
-padding: 35px 0;
--premailer-width: 100%;
--premailer-cellpadding: 0;
--premailer-cellspacing: 0;
-}
-
-.purchase_content {
-width: 100%;
-margin: 0;
-padding: 25px 0 0 0;
--premailer-width: 100%;
--premailer-cellpadding: 0;
--premailer-cellspacing: 0;
-}
-
-.purchase_item {
-padding: 10px 0;
-color: #51545E;
-font-size: 15px;
-line-height: 18px;
-}
-
-.purchase_heading {
-padding-bottom: 8px;
-border-bottom: 1px solid #EAEAEC;
-}
-
-.purchase_heading p {
-margin: 0;
-color: #85878E;
-font-size: 12px;
-}
-
-.purchase_footer {
-padding-top: 15px;
-border-top: 1px solid #EAEAEC;
-}
-
-.purchase_total {
-margin: 0;
-text-align: right;
-font-weight: bold;
-color: #333333;
-}
-
-.purchase_total--label {
-padding: 0 15px 0 0;
-}
-
-body {
-background-color: #FFF;
-color: #333;
-}
-
-p {
-color: #333;
-}
-
-.email-wrapper {
-width: 100%;
-margin: 0;
-padding: 0;
--premailer-width: 100%;
--premailer-cellpadding: 0;
--premailer-cellspacing: 0;
-}
-
-.email-content {
-width: 100%;
-margin: 0;
-padding: 0;
--premailer-width: 100%;
--premailer-cellpadding: 0;
--premailer-cellspacing: 0;
-}
-/* Masthead ----------------------- */
-
-.email-masthead {
-padding: 25px 0;
-text-align: center;
-}
-
-.email-masthead_logo {
-width: 94px;
-}
-
-.email-masthead_name {
-font-size: 16px;
-font-weight: bold;
-color: #A8AAAF;
-text-decoration: none;
-text-shadow: 0 1px 0 white;
-}
-/* Body ------------------------------ */
-
-.email-body {
-width: 100%;
-margin: 0;
-padding: 0;
--premailer-width: 100%;
--premailer-cellpadding: 0;
--premailer-cellspacing: 0;
-}
-
-.email-body_inner {
-width: 570px;
-margin: 0 auto;
-padding: 0;
--premailer-width: 570px;
--premailer-cellpadding: 0;
--premailer-cellspacing: 0;
-}
-
-.email-footer {
-width: 570px;
-margin: 0 auto;
-padding: 0;
--premailer-width: 570px;
--premailer-cellpadding: 0;
--premailer-cellspacing: 0;
-text-align: center;
-}
-
-.email-footer p {
-color: #A8AAAF;
-}
-
-.body-action {
-width: 100%;
-margin: 30px auto;
-padding: 0;
--premailer-width: 100%;
--premailer-cellpadding: 0;
--premailer-cellspacing: 0;
-text-align: center;
-}
-
-.body-sub {
-margin-top: 25px;
-padding-top: 25px;
-border-top: 1px solid #EAEAEC;
-}
-
-.content-cell {
-padding: 35px;
-}
-/*Media Queries ------------------------------ */
-
-@media only screen and (max-width: 600px) {
-.email-body_inner,
-.email-footer {
-width: 100% !important;
-}
-}
-
-@media (prefers-color-scheme: dark) {
-body {
-background-color: #333333 !important;
-color: #FFF !important;
-}
-p,
-ul,
-ol,
-blockquote,
-h1,
-h2,
-h3,
-span,
-.purchase_item {
-color: #FFF !important;
-}
-.attributes_content,
-.discount {
-background-color: #222 !important;
-}
-.email-masthead_name {
-text-shadow: none !important;
-}
-}
-
-:root {
-color-scheme: light dark;
-supported-color-schemes: light dark;
-}
\ No newline at end of file
diff --git a/packages/worker/src/environment.js b/packages/worker/src/environment.js
index 04c010ce16..dda3e842f1 100644
--- a/packages/worker/src/environment.js
+++ b/packages/worker/src/environment.js
@@ -28,8 +28,8 @@ module.exports = {
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
+  INTERNAL_KEY: process.env.INTERNAL_KEY,
   /* TODO: to remove - once deployment removed */
-  SELF_HOST_KEY: process.env.SELF_HOST_KEY,
   COUCH_DB_USERNAME: process.env.COUCH_DB_USERNAME,
   COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
   _set(key, value) {
diff --git a/packages/worker/src/utilities/email.js b/packages/worker/src/utilities/email.js
index e06b98a31e..7a2069bbb4 100644
--- a/packages/worker/src/utilities/email.js
+++ b/packages/worker/src/utilities/email.js
@@ -54,16 +54,14 @@ async function buildEmail(purpose, email, user) {
   if (FULL_EMAIL_PURPOSES.indexOf(purpose) === -1) {
     throw `Unable to build an email of type ${purpose}`
   }
-  let [base, styles, body] = await Promise.all([
+  let [base, body] = await Promise.all([
     getTemplateByPurpose(TYPE, EmailTemplatePurpose.BASE),
-    getTemplateByPurpose(TYPE, EmailTemplatePurpose.STYLES),
     getTemplateByPurpose(TYPE, purpose),
   ])
-  if (!base || !styles || !body) {
+  if (!base || !body) {
     throw "Unable to build email, missing base components"
   }
   base = base.contents
-  styles = styles.contents
   body = body.contents
 
   // if there is a link code needed this will retrieve it
@@ -75,11 +73,9 @@ async function buildEmail(purpose, email, user) {
   }
 
   body = await processString(body, context)
-  styles = await processString(styles, context)
   // this should now be the complete email HTML
   return processString(base, {
     ...context,
-    styles,
     body,
   })
 }
@@ -117,11 +113,17 @@ exports.isEmailConfigured = async (groupId = null) => {
  * @param {string} email The email address to send to.
  * @param {string} purpose The purpose of the email being sent (e.g. reset password).
  * @param {string|undefined} groupId If finer grain controls being used then this will lookup config for group.
- * @param {object|undefined} user if sending to an existing user the object can be provided, this is used in the context.
+ * @param {object|undefined} user If sending to an existing user the object can be provided, this is used in the context.
+ * @param {string|undefined} from If sending from an address that is not what is configured in the SMTP config.
+ * @param {string|undefined} contents If sending a custom email then can supply contents which will be added to it.
  * @return {Promise<object>} returns details about the attempt to send email, e.g. if it is successful; based on
  * nodemailer response.
  */
-exports.sendEmail = async (email, purpose, { groupId, user } = {}) => {
+exports.sendEmail = async (
+  email,
+  purpose,
+  { groupId, user, from, contents } = {}
+) => {
   const db = new CouchDB(GLOBAL_DB)
   const config = await getSmtpConfiguration(db, groupId)
   if (!config) {
@@ -129,7 +131,7 @@ exports.sendEmail = async (email, purpose, { groupId, user } = {}) => {
   }
   const transport = createSMTPTransport(config)
   const message = {
-    from: config.from,
+    from: from || config.from,
     subject: config.subject,
     to: email,
     html: await buildEmail(purpose, email, user),

From 1d643b6315575a0f2384ba275e91df97a50a8e2d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 May 2021 12:04:07 +0100
Subject: [PATCH 07/15] Adding link to the real email test.

---
 packages/worker/src/api/routes/tests/realEmail.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/worker/src/api/routes/tests/realEmail.spec.js b/packages/worker/src/api/routes/tests/realEmail.spec.js
index f593b2cc09..e87c5d5bf5 100644
--- a/packages/worker/src/api/routes/tests/realEmail.spec.js
+++ b/packages/worker/src/api/routes/tests/realEmail.spec.js
@@ -29,6 +29,7 @@ describe("/api/admin/email", () => {
       .expect(200)
     expect(res.body.message).toBeDefined()
     const testUrl = nodemailer.getTestMessageUrl(res.body)
+    console.log(`${purpose} URL: ${testUrl}`)
     expect(testUrl).toBeDefined()
     const response = await fetch(testUrl)
     const text = await response.text()

From 92cc0bc7cd197fec925f17540a2ec792a4da4c32 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 May 2021 15:08:59 +0100
Subject: [PATCH 08/15] Updating to support SMTP email automation action, as
 well as some general work around from and subject which previously we'ren't
 fully implemented.

---
 hosting/docker-compose.yaml                   |  4 +-
 hosting/hosting.properties                    |  5 +-
 packages/server/src/automations/actions.js    |  9 ++-
 .../src/automations/steps/sendSmtpEmail.js    | 67 +++++++++++++++++++
 .../src/automations/steps/sendgridEmail.js    |  2 +-
 .../server/src/utilities/workerRequests.js    | 18 ++++-
 .../worker/src/api/controllers/admin/auth.js  |  3 +-
 .../worker/src/api/controllers/admin/email.js |  4 +-
 .../worker/src/api/controllers/admin/users.js |  2 +-
 packages/worker/src/api/routes/admin/email.js |  5 +-
 packages/worker/src/utilities/email.js        | 67 +++++++++++++------
 packages/worker/src/utilities/templates.js    |  4 +-
 12 files changed, 148 insertions(+), 42 deletions(-)

diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index 6d9f64c07e..d04fd7c0e4 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
       MINIO_URL: http://minio-service:9000
       MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
       MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
-      HOSTING_KEY: ${HOSTING_KEY}
+      INTERNAL_KEY: ${INTERNAL_KEY}
       BUDIBASE_ENVIRONMENT: ${BUDIBASE_ENVIRONMENT}
       PORT: 4002
       JWT_SECRET: ${JWT_SECRET}
@@ -44,7 +44,7 @@ services:
       COUCH_DB_USERNAME: ${COUCH_DB_USER}
       COUCH_DB_PASSWORD: ${COUCH_DB_PASSWORD}
       COUCH_DB_URL: http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:5984
-      SELF_HOST_KEY: ${HOSTING_KEY}
+      INTERNAL_KEY: ${INTERNAL_KEY}
       REDIS_URL: redis-service:6379
       REDIS_PASSWORD: ${REDIS_PASSWORD}
     depends_on:
diff --git a/hosting/hosting.properties b/hosting/hosting.properties
index 4297ec60a1..6ad962c493 100644
--- a/hosting/hosting.properties
+++ b/hosting/hosting.properties
@@ -1,10 +1,6 @@
 # Use the main port in the builder for your self hosting URL, e.g. localhost:10000
 MAIN_PORT=10000
 
-# Use this password when configuring your self hosting settings
-# This should be updated
-HOSTING_KEY=budibase
-
 # This section contains all secrets pertaining to the system
 # These should be updated
 JWT_SECRET=testsecret
@@ -13,6 +9,7 @@ MINIO_SECRET_KEY=budibase
 COUCH_DB_PASSWORD=budibase
 COUCH_DB_USER=budibase
 REDIS_PASSWORD=budibase
+INTERNAL_KEY=budibase
 
 # This section contains variables that do not need to be altered under normal circumstances
 APP_PORT=4002
diff --git a/packages/server/src/automations/actions.js b/packages/server/src/automations/actions.js
index 0f40fd6aae..983e87854a 100644
--- a/packages/server/src/automations/actions.js
+++ b/packages/server/src/automations/actions.js
@@ -1,4 +1,5 @@
-const sendEmail = require("./steps/sendgridEmail")
+const sendgridEmail = require("./steps/sendgridEmail")
+const sendSmtpEmail = require("./steps/sendSmtpEmail")
 const createRow = require("./steps/createRow")
 const updateRow = require("./steps/updateRow")
 const deleteRow = require("./steps/deleteRow")
@@ -14,7 +15,8 @@ const {
 } = require("../utilities/fileSystem")
 
 const BUILTIN_ACTIONS = {
-  SEND_EMAIL: sendEmail.run,
+  SEND_EMAIL: sendgridEmail.run,
+  SEND_EMAIL_SMTP: sendSmtpEmail.run,
   CREATE_ROW: createRow.run,
   UPDATE_ROW: updateRow.run,
   DELETE_ROW: deleteRow.run,
@@ -24,7 +26,8 @@ const BUILTIN_ACTIONS = {
   EXECUTE_QUERY: executeQuery.run,
 }
 const BUILTIN_DEFINITIONS = {
-  SEND_EMAIL: sendEmail.definition,
+  SEND_EMAIL: sendgridEmail.definition,
+  SEND_EMAIL_SMTP: sendSmtpEmail.definition,
   CREATE_ROW: createRow.definition,
   UPDATE_ROW: updateRow.definition,
   DELETE_ROW: deleteRow.definition,
diff --git a/packages/server/src/automations/steps/sendSmtpEmail.js b/packages/server/src/automations/steps/sendSmtpEmail.js
index e69de29bb2..764972b402 100644
--- a/packages/server/src/automations/steps/sendSmtpEmail.js
+++ b/packages/server/src/automations/steps/sendSmtpEmail.js
@@ -0,0 +1,67 @@
+const { sendSmtpEmail } = require("../../utilities/workerRequests")
+
+module.exports.definition = {
+  description: "Send an email using SMTP",
+  tagline: "Send SMTP email to {{inputs.to}}",
+  icon: "ri-mail-open-line",
+  name: "Send Email (SMTP)",
+  type: "ACTION",
+  stepId: "SEND_EMAIL_SMTP",
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        to: {
+          type: "string",
+          title: "Send To",
+        },
+        from: {
+          type: "string",
+          title: "Send From",
+        },
+        subject: {
+          type: "string",
+          title: "Email Subject",
+        },
+        contents: {
+          type: "string",
+          title: "HTML Contents",
+        },
+      },
+      required: ["to", "from", "subject", "contents"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: "boolean",
+          description: "Whether the email was sent",
+        },
+        response: {
+          type: "object",
+          description: "A response from the email client, this may be an error",
+        },
+      },
+      required: ["success"],
+    },
+  },
+}
+
+module.exports.run = async function ({ inputs }) {
+  let { to, from, subject, contents } = inputs
+  if (!contents) {
+    contents = "<h1>No content</h1>"
+  }
+  try {
+    let response = await sendSmtpEmail(to, from, subject, contents)
+    return {
+      success: true,
+      response,
+    }
+  } catch (err) {
+    console.error(err)
+    return {
+      success: false,
+      response: err,
+    }
+  }
+}
diff --git a/packages/server/src/automations/steps/sendgridEmail.js b/packages/server/src/automations/steps/sendgridEmail.js
index 26c404257e..5485116e89 100644
--- a/packages/server/src/automations/steps/sendgridEmail.js
+++ b/packages/server/src/automations/steps/sendgridEmail.js
@@ -1,5 +1,5 @@
 module.exports.definition = {
-  description: "Send an email",
+  description: "Send an email using SendGrid",
   tagline: "Send email to {{inputs.to}}",
   icon: "ri-mail-open-line",
   name: "Send Email (SendGrid)",
diff --git a/packages/server/src/utilities/workerRequests.js b/packages/server/src/utilities/workerRequests.js
index 6bf3bf6461..8d4b1edad2 100644
--- a/packages/server/src/utilities/workerRequests.js
+++ b/packages/server/src/utilities/workerRequests.js
@@ -34,17 +34,29 @@ function request(ctx, request) {
 
 exports.request = request
 
-exports.sendSmtpEmail = async (to, from, contents) => {
+exports.sendSmtpEmail = async (to, from, subject, contents) => {
   const response = await fetch(
-    checkSlashesInUrl(env.WORKER_URL + `/api/`),
+    checkSlashesInUrl(env.WORKER_URL + `/api/admin/email/send`),
     request(null, {
       method: "POST",
       headers: {
         "x-budibase-api-key": env.INTERNAL_KEY,
       },
-      body: {},
+      body: {
+        email: to,
+        from,
+        contents,
+        subject,
+        purpose: "custom",
+      },
     })
   )
+
+  const json = await response.json()
+  if (json.status !== 200 && response.status !== 200) {
+    throw "Unable to send email."
+  }
+  return json
 }
 
 exports.getDeployedApps = async ctx => {
diff --git a/packages/worker/src/api/controllers/admin/auth.js b/packages/worker/src/api/controllers/admin/auth.js
index 598e43e8ad..30c7a264bd 100644
--- a/packages/worker/src/api/controllers/admin/auth.js
+++ b/packages/worker/src/api/controllers/admin/auth.js
@@ -53,8 +53,9 @@ exports.reset = async ctx => {
     )
   }
   try {
+
     const user = await getGlobalUserByEmail(email)
-    await sendEmail(email, EmailTemplatePurpose.PASSWORD_RECOVERY, { user })
+    await sendEmail(email, EmailTemplatePurpose.PASSWORD_RECOVERY, { user, subject: "{{ company }} platform password reset" })
   } catch (err) {
     // don't throw any kind of error to the user, this might give away something
   }
diff --git a/packages/worker/src/api/controllers/admin/email.js b/packages/worker/src/api/controllers/admin/email.js
index 04e85e7f44..9bfb281b9a 100644
--- a/packages/worker/src/api/controllers/admin/email.js
+++ b/packages/worker/src/api/controllers/admin/email.js
@@ -5,13 +5,13 @@ const authPkg = require("@budibase/auth")
 const GLOBAL_DB = authPkg.StaticDatabases.GLOBAL.name
 
 exports.sendEmail = async ctx => {
-  const { groupId, email, userId, purpose } = ctx.request.body
+  const { groupId, email, userId, purpose, contents, from, subject } = ctx.request.body
   let user
   if (userId) {
     const db = new CouchDB(GLOBAL_DB)
     user = await db.get(userId)
   }
-  const response = await sendEmail(email, purpose, { groupId, user })
+  const response = await sendEmail(email, purpose, { groupId, user, contents, from, subject })
   ctx.body = {
     ...response,
     message: `Email sent to ${email}.`,
diff --git a/packages/worker/src/api/controllers/admin/users.js b/packages/worker/src/api/controllers/admin/users.js
index 5c35c65e27..c6507b690a 100644
--- a/packages/worker/src/api/controllers/admin/users.js
+++ b/packages/worker/src/api/controllers/admin/users.js
@@ -136,7 +136,7 @@ exports.invite = async ctx => {
   if (existing) {
     ctx.throw(400, "Email address already in use.")
   }
-  await sendEmail(email, EmailTemplatePurpose.INVITATION)
+  await sendEmail(email, EmailTemplatePurpose.INVITATION, { subject: "{{ company }} platform invitation" })
   ctx.body = {
     message: "Invitation has been sent.",
   }
diff --git a/packages/worker/src/api/routes/admin/email.js b/packages/worker/src/api/routes/admin/email.js
index 66079c5fbb..d3d0d4faae 100644
--- a/packages/worker/src/api/routes/admin/email.js
+++ b/packages/worker/src/api/routes/admin/email.js
@@ -10,8 +10,11 @@ function buildEmailSendValidation() {
   // prettier-ignore
   return joiValidator.body(Joi.object({
     email: Joi.string().email(),
+    purpose: Joi.string().valid(...Object.values(EmailTemplatePurpose)),
     groupId: Joi.string().allow("", null),
-    purpose: Joi.string().allow(...Object.values(EmailTemplatePurpose)),
+    fromt: Joi.string().allow("", null),
+    contents: Joi.string().allow("", null),
+    subject: Joi.string().allow("", null),
   }).required().unknown(true))
 }
 
diff --git a/packages/worker/src/utilities/email.js b/packages/worker/src/utilities/email.js
index 7a2069bbb4..6a99863341 100644
--- a/packages/worker/src/utilities/email.js
+++ b/packages/worker/src/utilities/email.js
@@ -7,6 +7,7 @@ const { getSettingsTemplateContext } = require("./templates")
 const { processString } = require("@budibase/string-templates")
 const { getResetPasswordCode, getInviteCode } = require("../utilities/redis")
 
+const TEST_MODE = false
 const GLOBAL_DB = StaticDatabases.GLOBAL.name
 const TYPE = TemplateTypes.EMAIL
 
@@ -14,18 +15,32 @@ const FULL_EMAIL_PURPOSES = [
   EmailTemplatePurpose.INVITATION,
   EmailTemplatePurpose.PASSWORD_RECOVERY,
   EmailTemplatePurpose.WELCOME,
+  EmailTemplatePurpose.CUSTOM,
 ]
 
 function createSMTPTransport(config) {
-  const options = {
-    port: config.port,
-    host: config.host,
-    secure: config.secure || false,
-    auth: config.auth,
-  }
-  if (config.selfSigned) {
-    options.tls = {
-      rejectUnauthorized: false,
+  let options
+  if (!TEST_MODE) {
+    options = {
+      port: config.port,
+      host: config.host,
+      secure: config.secure || false,
+      auth: config.auth,
+    }
+    if (config.selfSigned) {
+      options.tls = {
+        rejectUnauthorized: false,
+      }
+    }
+  } else {
+    options = {
+      port: 587,
+      host: "smtp.ethereal.email",
+      secure: false,
+      auth: {
+        user: "don.bahringer@ethereal.email",
+        pass: "yCKSH8rWyUPbnhGYk9",
+      },
     }
   }
   return nodemailer.createTransport(options)
@@ -46,10 +61,12 @@ async function getLinkCode(purpose, email, user) {
  * Builds an email using handlebars and the templates found in the system (default or otherwise).
  * @param {string} purpose the purpose of the email being built, e.g. invitation, password reset.
  * @param {string} email the address which it is being sent to for contextual purposes.
- * @param {object|null} user If being sent to an existing user then the object can be provided for context.
+ * @param {object} context the context which is being used for building the email (hbs context).
+ * @param {object|null} user if being sent to an existing user then the object can be provided for context.
+ * @param {string|null} contents if using a custom template can supply contents for context.
  * @return {Promise<string>} returns the built email HTML if all provided parameters were valid.
  */
-async function buildEmail(purpose, email, user) {
+async function buildEmail(purpose, email, context, { user, contents } = {}) {
   // this isn't a full email
   if (FULL_EMAIL_PURPOSES.indexOf(purpose) === -1) {
     throw `Unable to build an email of type ${purpose}`
@@ -63,11 +80,9 @@ async function buildEmail(purpose, email, user) {
   }
   base = base.contents
   body = body.contents
-
-  // if there is a link code needed this will retrieve it
-  const code = await getLinkCode(purpose, email, user)
-  const context = {
-    ...(await getSettingsTemplateContext(purpose, code)),
+  context = {
+    ...context,
+    contents,
     email,
     user: user || {},
   }
@@ -116,27 +131,35 @@ exports.isEmailConfigured = async (groupId = null) => {
  * @param {object|undefined} user If sending to an existing user the object can be provided, this is used in the context.
  * @param {string|undefined} from If sending from an address that is not what is configured in the SMTP config.
  * @param {string|undefined} contents If sending a custom email then can supply contents which will be added to it.
+ * @param {string|undefined} subject A custom subject can be specified if the config one is not desired.
  * @return {Promise<object>} returns details about the attempt to send email, e.g. if it is successful; based on
  * nodemailer response.
  */
 exports.sendEmail = async (
   email,
   purpose,
-  { groupId, user, from, contents } = {}
+  { groupId, user, from, contents, subject } = {}
 ) => {
   const db = new CouchDB(GLOBAL_DB)
-  const config = await getSmtpConfiguration(db, groupId)
-  if (!config) {
+  let config = await getSmtpConfiguration(db, groupId) || {}
+  if (Object.keys(config).length === 0 && !TEST_MODE) {
     throw "Unable to find SMTP configuration."
   }
   const transport = createSMTPTransport(config)
+  // if there is a link code needed this will retrieve it
+  const code = await getLinkCode(purpose, email, user)
+  const context = await getSettingsTemplateContext(purpose, code)
   const message = {
     from: from || config.from,
-    subject: config.subject,
+    subject: await processString(subject || config.subject, context),
     to: email,
-    html: await buildEmail(purpose, email, user),
+    html: await buildEmail(purpose, email, context, { user, contents }),
   }
-  return transport.sendMail(message)
+  const response = await transport.sendMail(message)
+  if (TEST_MODE) {
+    console.log("Test email URL: " + nodemailer.getTestMessageUrl(response))
+  }
+  return response
 }
 
 /**
diff --git a/packages/worker/src/utilities/templates.js b/packages/worker/src/utilities/templates.js
index 64ef62060d..a4ee3d3c47 100644
--- a/packages/worker/src/utilities/templates.js
+++ b/packages/worker/src/utilities/templates.js
@@ -15,8 +15,8 @@ const BASE_COMPANY = "Budibase"
 exports.getSettingsTemplateContext = async (purpose, code = null) => {
   const db = new CouchDB(StaticDatabases.GLOBAL.name)
   // TODO: use more granular settings in the future if required
-  const settings = await getScopedConfig(db, { type: Configs.SETTINGS })
-  if (!settings.platformUrl) {
+  let settings = await getScopedConfig(db, { type: Configs.SETTINGS }) || {}
+  if (!settings || !settings.platformUrl) {
     settings.platformUrl = LOCAL_URL
   }
   const URL = settings.platformUrl

From 8e1f18e4564ed7449bd3416da8b7e9c35dacda8b Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 May 2021 15:23:03 +0100
Subject: [PATCH 09/15] Changing INTERNAL_KEY to INTERNAL_API_KEY.

---
 hosting/docker-compose.yaml                     | 4 ++--
 hosting/hosting.properties                      | 2 +-
 packages/auth/src/environment.js                | 2 +-
 packages/auth/src/middleware/authenticated.js   | 2 +-
 packages/cli/src/hosting/makeEnv.js             | 2 +-
 packages/server/scripts/dev/manage.js           | 2 +-
 packages/server/src/environment.js              | 2 +-
 packages/server/src/utilities/workerRequests.js | 2 +-
 packages/worker/scripts/dev/manage.js           | 2 +-
 packages/worker/src/environment.js              | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml
index d04fd7c0e4..00c93ca1c6 100644
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
       MINIO_URL: http://minio-service:9000
       MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
       MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
-      INTERNAL_KEY: ${INTERNAL_KEY}
+      INTERNAL_API_KEY: ${INTERNAL_API_KEY}
       BUDIBASE_ENVIRONMENT: ${BUDIBASE_ENVIRONMENT}
       PORT: 4002
       JWT_SECRET: ${JWT_SECRET}
@@ -44,7 +44,7 @@ services:
       COUCH_DB_USERNAME: ${COUCH_DB_USER}
       COUCH_DB_PASSWORD: ${COUCH_DB_PASSWORD}
       COUCH_DB_URL: http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:5984
-      INTERNAL_KEY: ${INTERNAL_KEY}
+      INTERNAL_API_KEY: ${INTERNAL_API_KEY}
       REDIS_URL: redis-service:6379
       REDIS_PASSWORD: ${REDIS_PASSWORD}
     depends_on:
diff --git a/hosting/hosting.properties b/hosting/hosting.properties
index 6ad962c493..d11972bc4b 100644
--- a/hosting/hosting.properties
+++ b/hosting/hosting.properties
@@ -9,7 +9,7 @@ MINIO_SECRET_KEY=budibase
 COUCH_DB_PASSWORD=budibase
 COUCH_DB_USER=budibase
 REDIS_PASSWORD=budibase
-INTERNAL_KEY=budibase
+INTERNAL_API_KEY=budibase
 
 # This section contains variables that do not need to be altered under normal circumstances
 APP_PORT=4002
diff --git a/packages/auth/src/environment.js b/packages/auth/src/environment.js
index f582bd118a..a6fe69e5fb 100644
--- a/packages/auth/src/environment.js
+++ b/packages/auth/src/environment.js
@@ -15,6 +15,6 @@ module.exports = {
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   MINIO_URL: process.env.MINIO_URL,
-  INTERNAL_KEY: process.env.INTERNAL_KEY,
+  INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
   isTest,
 }
diff --git a/packages/auth/src/middleware/authenticated.js b/packages/auth/src/middleware/authenticated.js
index 913e7c8cc8..34ed0ec186 100644
--- a/packages/auth/src/middleware/authenticated.js
+++ b/packages/auth/src/middleware/authenticated.js
@@ -41,7 +41,7 @@ module.exports = (noAuthPatterns = [], opts) => {
       const authCookie = getCookie(ctx, Cookies.Auth)
 
       // this is an internal request, no user made it
-      if (apiKey && apiKey === env.INTERNAL_KEY) {
+      if (apiKey && apiKey === env.INTERNAL_API_KEY) {
         ctx.isAuthenticated = true
       } else if (authCookie) {
         try {
diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js
index e8c4a8c830..e17e3374dc 100644
--- a/packages/cli/src/hosting/makeEnv.js
+++ b/packages/cli/src/hosting/makeEnv.js
@@ -18,7 +18,7 @@ MINIO_SECRET_KEY=${randomString.generate()}
 COUCH_DB_PASSWORD=${randomString.generate()}
 COUCH_DB_USER=${randomString.generate()}
 REDIS_PASSWORD=${randomString.generate()}
-INTERNAL_KEY=${randomString.generate()}
+INTERNAL_API_KEY=${randomString.generate()}
 
 # This section contains variables that do not need to be altered under normal circumstances
 APP_PORT=4002
diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js
index 5349158036..ffd8c6b9e3 100644
--- a/packages/server/scripts/dev/manage.js
+++ b/packages/server/scripts/dev/manage.js
@@ -39,7 +39,7 @@ async function init() {
     COUCH_DB_URL: "http://budibase:budibase@localhost:10000/db/",
     REDIS_URL: "localhost:6379",
     WORKER_URL: "http://localhost:4002",
-    INTERNAL_KEY: "budibase",
+    INTERNAL_API_KEY: "budibase",
     JWT_SECRET: "testsecret",
     REDIS_PASSWORD: "budibase",
     MINIO_ACCESS_KEY: "budibase",
diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js
index 412b05cab0..52c680f65a 100644
--- a/packages/server/src/environment.js
+++ b/packages/server/src/environment.js
@@ -34,7 +34,7 @@ module.exports = {
   USE_QUOTAS: process.env.USE_QUOTAS,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
-  INTERNAL_KEY: process.env.INTERNAL_KEY,
+  INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
   // environment
   NODE_ENV: process.env.NODE_ENV,
   JEST_WORKER_ID: process.env.JEST_WORKER_ID,
diff --git a/packages/server/src/utilities/workerRequests.js b/packages/server/src/utilities/workerRequests.js
index b9476f4d24..8922eee957 100644
--- a/packages/server/src/utilities/workerRequests.js
+++ b/packages/server/src/utilities/workerRequests.js
@@ -42,7 +42,7 @@ exports.sendSmtpEmail = async (to, from, subject, contents) => {
     request(null, {
       method: "POST",
       headers: {
-        "x-budibase-api-key": env.INTERNAL_KEY,
+        "x-budibase-api-key": env.INTERNAL_API_KEY,
       },
       body: {
         email: to,
diff --git a/packages/worker/scripts/dev/manage.js b/packages/worker/scripts/dev/manage.js
index f2784750c6..f7216befb5 100644
--- a/packages/worker/scripts/dev/manage.js
+++ b/packages/worker/scripts/dev/manage.js
@@ -8,7 +8,7 @@ async function init() {
     SELF_HOSTED: 1,
     PORT: 4002,
     JWT_SECRET: "testsecret",
-    INTERNAL_KEY: "budibase",
+    INTERNAL_API_KEY: "budibase",
     MINIO_ACCESS_KEY: "budibase",
     MINIO_SECRET_KEY: "budibase",
     COUCH_DB_USER: "budibase",
diff --git a/packages/worker/src/environment.js b/packages/worker/src/environment.js
index dda3e842f1..11eed33982 100644
--- a/packages/worker/src/environment.js
+++ b/packages/worker/src/environment.js
@@ -28,7 +28,7 @@ module.exports = {
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
-  INTERNAL_KEY: process.env.INTERNAL_KEY,
+  INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
   /* TODO: to remove - once deployment removed */
   COUCH_DB_USERNAME: process.env.COUCH_DB_USERNAME,
   COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,

From c70d4444a98e73a8f7092231270f6d749474934a Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 May 2021 15:24:17 +0100
Subject: [PATCH 10/15] Formatting.

---
 .../portal/email/TemplateBindings.svelte      | 13 +++++--
 .../builder/portal/email/TemplateLink.svelte  |  4 +-
 .../builder/portal/email/[template].svelte    | 38 +++++++++----------
 .../pages/builder/portal/email/index.svelte   |  2 +-
 .../worker/src/api/controllers/admin/auth.js  |  6 ++-
 .../worker/src/api/controllers/admin/email.js | 18 ++++++++-
 .../worker/src/api/controllers/admin/users.js |  4 +-
 packages/worker/src/utilities/email.js        |  2 +-
 packages/worker/src/utilities/templates.js    |  2 +-
 9 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/email/TemplateBindings.svelte b/packages/builder/src/pages/builder/portal/email/TemplateBindings.svelte
index 8719bf6338..0235eee60e 100644
--- a/packages/builder/src/pages/builder/portal/email/TemplateBindings.svelte
+++ b/packages/builder/src/pages/builder/portal/email/TemplateBindings.svelte
@@ -1,5 +1,12 @@
 <script>
-  import { Body, Menu, MenuItem, Detail, MenuSection, DetailSummary } from "@budibase/bbui"
+  import {
+    Body,
+    Menu,
+    MenuItem,
+    Detail,
+    MenuSection,
+    DetailSummary,
+  } from "@budibase/bbui"
 
   export let bindings
   export let onBindingClick = () => {}
@@ -8,8 +15,8 @@
 <Menu>
   {#each bindings as binding}
     <MenuItem on:click={() => onBindingClick(binding)}>
-    <Detail size="M">{binding.name}</Detail>
-     <Body size="XS" noPadding>{binding.description}</Body>
+      <Detail size="M">{binding.name}</Detail>
+      <Body size="XS" noPadding>{binding.description}</Body>
     </MenuItem>
   {/each}
 </Menu>
diff --git a/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte b/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
index fe140bafc4..78fa6b031a 100644
--- a/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
+++ b/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
@@ -1,8 +1,6 @@
 <script>
   import { url } from "@roxi/routify"
-  import {
-    Link,
-  } from "@budibase/bbui"
+  import { Link } from "@budibase/bbui"
   import { roles } from "stores/backend"
 
   export let value
diff --git a/packages/builder/src/pages/builder/portal/email/[template].svelte b/packages/builder/src/pages/builder/portal/email/[template].svelte
index 317accad60..0d8813d85b 100644
--- a/packages/builder/src/pages/builder/portal/email/[template].svelte
+++ b/packages/builder/src/pages/builder/portal/email/[template].svelte
@@ -83,25 +83,26 @@
           value={selectedTemplate.contents}
         />
         <div class="bindings-editor">
-  <Detail size="L">Bindings</Detail>
-  <Tabs selected={selectedBindingTab}>
-    <Tab title="Template">
-      <TemplateBindings
-        title="Template Bindings"
-        bindings={templateBindings}
-        onBindingClick={setTemplateBinding}
-      />
-    </Tab>
-    <Tab title="Common">
-      <TemplateBindings
-        title="Common Bindings"
-        bindings={$email.definitions.bindings.common}
-        onBindingClick={setTemplateBinding}
-      />
-    </Tab>
-    </Tabs>
+          <Detail size="L">Bindings</Detail>
+          <Tabs selected={selectedBindingTab}>
+            <Tab title="Template">
+              <TemplateBindings
+                title="Template Bindings"
+                bindings={templateBindings}
+                onBindingClick={setTemplateBinding}
+              />
+            </Tab>
+            <Tab title="Common">
+              <TemplateBindings
+                title="Common Bindings"
+                bindings={$email.definitions.bindings.common}
+                onBindingClick={setTemplateBinding}
+              />
+            </Tab>
+          </Tabs>
         </div>
-    </Tab>
+      </div></Tab
+    >
     <Tab title="Preview">
       <div class="preview" transition:fade>
         {@html selectedTemplate.contents}
@@ -136,5 +137,4 @@
     margin-bottom: var(--spacing-xl);
     cursor: pointer;
   }
-
 </style>
diff --git a/packages/builder/src/pages/builder/portal/email/index.svelte b/packages/builder/src/pages/builder/portal/email/index.svelte
index f14073571c..d9dc20d97a 100644
--- a/packages/builder/src/pages/builder/portal/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/email/index.svelte
@@ -34,7 +34,7 @@
   const templateSchema = {
     purpose: {
       displayName: "Email",
-      editable: false
+      editable: false,
     },
   }
 
diff --git a/packages/worker/src/api/controllers/admin/auth.js b/packages/worker/src/api/controllers/admin/auth.js
index 30c7a264bd..7298d726b3 100644
--- a/packages/worker/src/api/controllers/admin/auth.js
+++ b/packages/worker/src/api/controllers/admin/auth.js
@@ -53,9 +53,11 @@ exports.reset = async ctx => {
     )
   }
   try {
-
     const user = await getGlobalUserByEmail(email)
-    await sendEmail(email, EmailTemplatePurpose.PASSWORD_RECOVERY, { user, subject: "{{ company }} platform password reset" })
+    await sendEmail(email, EmailTemplatePurpose.PASSWORD_RECOVERY, {
+      user,
+      subject: "{{ company }} platform password reset",
+    })
   } catch (err) {
     // don't throw any kind of error to the user, this might give away something
   }
diff --git a/packages/worker/src/api/controllers/admin/email.js b/packages/worker/src/api/controllers/admin/email.js
index 9bfb281b9a..c4b17ee980 100644
--- a/packages/worker/src/api/controllers/admin/email.js
+++ b/packages/worker/src/api/controllers/admin/email.js
@@ -5,13 +5,27 @@ const authPkg = require("@budibase/auth")
 const GLOBAL_DB = authPkg.StaticDatabases.GLOBAL.name
 
 exports.sendEmail = async ctx => {
-  const { groupId, email, userId, purpose, contents, from, subject } = ctx.request.body
+  const {
+    groupId,
+    email,
+    userId,
+    purpose,
+    contents,
+    from,
+    subject,
+  } = ctx.request.body
   let user
   if (userId) {
     const db = new CouchDB(GLOBAL_DB)
     user = await db.get(userId)
   }
-  const response = await sendEmail(email, purpose, { groupId, user, contents, from, subject })
+  const response = await sendEmail(email, purpose, {
+    groupId,
+    user,
+    contents,
+    from,
+    subject,
+  })
   ctx.body = {
     ...response,
     message: `Email sent to ${email}.`,
diff --git a/packages/worker/src/api/controllers/admin/users.js b/packages/worker/src/api/controllers/admin/users.js
index c6507b690a..ce452d5c78 100644
--- a/packages/worker/src/api/controllers/admin/users.js
+++ b/packages/worker/src/api/controllers/admin/users.js
@@ -136,7 +136,9 @@ exports.invite = async ctx => {
   if (existing) {
     ctx.throw(400, "Email address already in use.")
   }
-  await sendEmail(email, EmailTemplatePurpose.INVITATION, { subject: "{{ company }} platform invitation" })
+  await sendEmail(email, EmailTemplatePurpose.INVITATION, {
+    subject: "{{ company }} platform invitation",
+  })
   ctx.body = {
     message: "Invitation has been sent.",
   }
diff --git a/packages/worker/src/utilities/email.js b/packages/worker/src/utilities/email.js
index 6a99863341..8d383b385c 100644
--- a/packages/worker/src/utilities/email.js
+++ b/packages/worker/src/utilities/email.js
@@ -141,7 +141,7 @@ exports.sendEmail = async (
   { groupId, user, from, contents, subject } = {}
 ) => {
   const db = new CouchDB(GLOBAL_DB)
-  let config = await getSmtpConfiguration(db, groupId) || {}
+  let config = (await getSmtpConfiguration(db, groupId)) || {}
   if (Object.keys(config).length === 0 && !TEST_MODE) {
     throw "Unable to find SMTP configuration."
   }
diff --git a/packages/worker/src/utilities/templates.js b/packages/worker/src/utilities/templates.js
index a4ee3d3c47..00ef9e6130 100644
--- a/packages/worker/src/utilities/templates.js
+++ b/packages/worker/src/utilities/templates.js
@@ -15,7 +15,7 @@ const BASE_COMPANY = "Budibase"
 exports.getSettingsTemplateContext = async (purpose, code = null) => {
   const db = new CouchDB(StaticDatabases.GLOBAL.name)
   // TODO: use more granular settings in the future if required
-  let settings = await getScopedConfig(db, { type: Configs.SETTINGS }) || {}
+  let settings = (await getScopedConfig(db, { type: Configs.SETTINGS })) || {}
   if (!settings || !settings.platformUrl) {
     settings.platformUrl = LOCAL_URL
   }

From 562b0cc40aec03820b98ccd60394d3cfd972242e Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 11 May 2021 19:54:01 +0100
Subject: [PATCH 11/15] tidy up

---
 .../src/pages/builder/portal/email/TemplateLink.svelte      | 6 ++----
 .../src/pages/builder/portal/email/[template].svelte        | 2 ++
 packages/cli/src/hosting/makeEnv.js                         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte b/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
index 78fa6b031a..060f533bd2 100644
--- a/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
+++ b/packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
@@ -1,12 +1,10 @@
 <script>
-  import { url } from "@roxi/routify"
-  import { Link } from "@budibase/bbui"
-  import { roles } from "stores/backend"
+  import { goto } from "@roxi/routify"
 
   export let value
 </script>
 
-<Link quiet href={$url(`./${value}`)}><span>{value}</span></Link>
+<span on:click={() => $goto(`./${value}`)}>{value}</span>
 
 <style>
   span {
diff --git a/packages/builder/src/pages/builder/portal/email/[template].svelte b/packages/builder/src/pages/builder/portal/email/[template].svelte
index 0d8813d85b..e819aafae4 100644
--- a/packages/builder/src/pages/builder/portal/email/[template].svelte
+++ b/packages/builder/src/pages/builder/portal/email/[template].svelte
@@ -123,6 +123,8 @@
     display: flex;
     width: 100%;
     justify-content: space-between;
+    margin-bottom: var(--spacing-l);
+    margin-top: var(--spacing-l);
   }
 
   .preview {
diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js
index e17e3374dc..8806c2e1e6 100644
--- a/packages/cli/src/hosting/makeEnv.js
+++ b/packages/cli/src/hosting/makeEnv.js
@@ -1,4 +1,4 @@
-const { string, number } = require("../questions")
+const { number } = require("../questions")
 const { success } = require("../utils")
 const fs = require("fs")
 const path = require("path")

From 09290c429dd846de1a83f6cd3ae438d7029c5ffc Mon Sep 17 00:00:00 2001
From: Joe <49767913+joebudi@users.noreply.github.com>
Date: Wed, 12 May 2021 10:51:02 +0100
Subject: [PATCH 12/15] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4691265f50..ca7299ff7c 100644
--- a/README.md
+++ b/README.md
@@ -8,10 +8,10 @@
 </h1>
 
 <h3 align="center">
-  Build internal tools 50x faster on your own infrastructure
+  Build custom business tools in minutes and on your own infrastructure
 </h3>
 <p align="center">
-  Budibase is an open-source low-code platform, helping developers and IT professionals build, automate, and ship internal tools 50x faster on their own infrastructure.
+  Budibase is an open-source low-code platform, helping developers and IT professionals build, automate, and ship custom business apps in minutes and on their own infrastructure.
 </p>
 
 <h3 align="center">

From a795d5e96ed563a64ca5a6a65bc95235a424ff5b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 12 May 2021 11:51:03 +0100
Subject: [PATCH 13/15] remove redundant handler

---
 packages/builder/src/pages/builder/portal/email/index.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/portal/email/index.svelte b/packages/builder/src/pages/builder/portal/email/index.svelte
index d9dc20d97a..d72659f644 100644
--- a/packages/builder/src/pages/builder/portal/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/email/index.svelte
@@ -157,7 +157,6 @@
     </div>
     <Table
       {customRenderers}
-      on:editrow={evt => $goto(`./${evt.detail.purpose}`)}
       data={$email.templates}
       schema={templateSchema}
       {loading}

From 283db05a1f9a4ec456f1d6585ce85a948e0ab81b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 12 May 2021 11:55:08 +0100
Subject: [PATCH 14/15] i18n folder, started spanish translation

---
 i18n/README.es.md | 198 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 198 insertions(+)
 create mode 100644 i18n/README.es.md

diff --git a/i18n/README.es.md b/i18n/README.es.md
new file mode 100644
index 0000000000..e0a5259cbc
--- /dev/null
+++ b/i18n/README.es.md
@@ -0,0 +1,198 @@
+<p align="center">
+  <a href="https://www.budibase.com">
+    <img alt="Budibase" src="https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg" width="60" />
+  </a>
+</p>
+<h1 align="center">
+  Budibase
+</h1>
+
+<h3 align="center">
+  Construye herramientas empresariales personalizadas en cuestión de minutos y en su propia infraestructura.
+</h3>
+<p align="center">
+  Budibase es una plataforma de código bajo de código abierto, que ayuda a desarrolladores y profesionales de TI a crear, automatizar y enviar aplicaciones empresariales personalizadas en cuestión de minutos y en su propia infraestructura
+</p>
+
+<h3 align="center">
+ 🤖 🎨 🚀
+</h3>
+
+
+<p align="center">
+  <img src="https://i.imgur.com/tPQHruf.png">
+</p>
+
+<p align="center">
+  <a href="https://github.com/Budibase/budibase/releases">
+    <img alt="GitHub all releases" src="https://img.shields.io/github/downloads/Budibase/budibase/total">
+  </a>
+  <a href="https://github.com/Budibase/budibase/releases">
+    <img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/Budibase/budibase">
+  </a>
+  <a href="https://discord.gg/rCYayfe">
+    <img alt="Discord" src="https://img.shields.io/discord/733030666647765003">
+  </a>
+  <a href="https://twitter.com/intent/follow?screen_name=budibase">
+    <img src="https://img.shields.io/twitter/follow/budibase?style=social" alt="Follow @budibase" />
+  </a>
+  <img src="https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg" alt="Code of conduct" />
+  <a href="https://codecov.io/gh/Budibase/budibase">
+    <img src="https://codecov.io/gh/Budibase/budibase/graph/badge.svg?token=E8W2ZFXQOH"/>
+  </a>
+</p>
+
+<h3 align="center">
+  <a href="https://portal.budi.live/signup">Sign-up</a>
+  <span> · </span>
+  <a href="https://docs.budibase.com">Docs</a>
+  <span> · </span>
+  <a href="https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas">Feature request</a>
+  <span> · </span>
+  <a href="https://github.com/Budibase/budibase/issues">Report a bug</a>
+  <span> · </span>
+  Support: <a href="https://github.com/Budibase/budibase/discussions">Discussions</a>
+  <span> & </span>
+  <a href="https://discord.gg/rCYayfe">Discord</a>
+</h3>
+
+
+## ✨ Features
+When other platforms chose the closed source route, we decided to go open source. When other platforms chose cloud builders, we decided a local builder offered the better developer experience. We like to do things differently at Budibase.
+
+- **Build and ship real software.** Unlike other platforms, with Budibase you build and ship single page applications. Budibase applications have performance baked in and can be designed responsively, providing your users with a great experience.
+
+- **Open source and extensable.** Budibase is open-source. The builder is licensed AGPL v3, the server is GPL v3, and the client is MPL. This should fill you with confidence that Budibase will always be around. You can also code against Budibase or fork it and make changes as you please, providing a developer-friendly experience.
+
+- **Load data or start from scratch.** Budibase pulls in data from multiple sources, including MongoDB, CouchDB, PostgreSQL, mySQL, Airtable, Google Sheets, S3, DyanmoDB, or a REST API. And unlike other platforms, with Budibase you can start from scratch and create business apps with no data sources. [Request new data sources](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+- **Design and build apps with powerful pre-made components.** Budibase comes out of the box with beautifully designed, powerful components which you can use like building blocks to build your UI. We also expose a lot of your favourite CSS styling options so you can go that extra creative mile. [Request new components](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+- **Automate processes, integrate with other tools, and connect to webhooks.** Save time by automating manual processes and workflows. From connecting to webhooks, to automating emails, simply tell Budibase what to do and let it work for you. You can easily [create new automations for Budibase here](https://github.com/Budibase/automations) or [request new integrations here](https://github.com/Budibase/budibase/discussions?discussions_q=category%3AIdeas).
+
+- **Cloud hosting and self-hosting.** Users can self-host (see below), or host their apps with Budibase. Currently, our cloud hosting offering is limited to the free tier but we aim to change this in the future. For heavy usage, we advise users to self-host.
+
+<p align="center">
+  <img alt="Budibase design ui" src="https://imgur.com/v8m6v3q.png">
+</p>
+
+
+## ⌛ Status
+- [x] Alpha: We are demoing Budibase to users and receiving feedback
+- [x] Private Beta: We are testing Budibase with a closed set of customers
+- [x] Public Beta: Anyone can [sign-up and use Budibase](https://portal.budi.live/signup).
+- [ ] Official Launch
+
+Watch "releases" of this repo to get notified of major updates, and give the star button a click whilst you're there.
+
+<p align="center">
+  <img src="https://i.imgur.com/cJpgqm8.png">
+</p>
+
+### Stargazers over time
+
+[![Stargazers over time](https://starchart.cc/Budibase/budibase.svg)](https://starchart.cc/Budibase/budibase)
+
+If you are having issues between updates of the builder, please use the guide [here](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md#troubleshooting) to clear down your environment.
+
+
+## 🏁 Getting Started with Budibase
+
+The Budibase builder runs in Electron, on Mac, PC and Linux. Follow the steps below to get started:
+- [ ] [Sign-up to Budibase](https://portal.budi.live/signup)
+- [ ] Create a username and password
+- [ ] Copy your API key
+- [ ] Download Budibase
+- [ ] Open Budibase and enter your API key
+
+[Here is a guided tutorial](https://docs.budibase.com/tutorial/tutorial-signing-up) if you need extra help.
+
+
+## 🤖 Self-hosting
+
+Budibase wants to make sure anyone can use the tools we develop and we know a lot of people need to be able to host the apps they make on their own systems - that is why we've decided to try and make self hosting as easy as possible!
+
+Currently, you can host your apps using Docker or Digital Ocean. The documentation for self-hosting can be found [here](https://docs.budibase.com/self-hosting/introduction-to-self-hosting).
+
+[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/droplets/new?onboarding_origin=marketplace&i=09038e&fleetUuid=bb04f9c8-1de8-4687-b2ae-1d5177a0535b&appId=77729671&type=applications&size=s-4vcpu-8gb&region=nyc1&refcode=0caaa6085a82&image=budibase-20-04)
+
+
+## 🎓 Learning Budibase
+
+The Budibase [documentation lives here](https://docs.budibase.com).
+
+You can also follow a quick tutorial on [how to build a CRM with Budibase](https://docs.budibase.com/tutorial/tutorial-introduction)
+
+
+## Roadmap
+
+Checkout our [Public Roadmap](https://github.com/Budibase/budibase/projects/10). If you would like to discuss some of the items on the roadmap, please feel to reach out on [Discord](https://discord.gg/rCYayfe), or via [Github discussions](https://github.com/Budibase/budibase/discussions)
+
+
+## ❗ Code of Conduct
+
+Budibase is dedicated to providing a welcoming, diverse, and harrassment-free experience for everyone. We expect everyone in the Budibase community to abide by our [**Code of Conduct**](https://github.com/Budibase/budibase/blob/HEAD/.github/CODE_OF_CONDUCT.md). Please read it.
+
+## 🙌 Contributing to Budibase
+
+From opening a bug report to creating a pull request: every contribution is appreciated and welcomed. If you're planning to implement a new feature or change the API please create an issue first. This way we can ensure your work is not in vain.
+
+### Not Sure Where to Start?
+A good place to start contributing, is the [First time issues project](https://github.com/Budibase/budibase/projects/22).
+
+### How the repository is organized
+Budibase is a monorepo managed by lerna. Lerna manages the building and publishing of the budibase packages. At a high level, here are the packages that make up Budibase.
+
+- [packages/builder](https://github.com/Budibase/budibase/tree/HEAD/packages/builder) - contains code for the budibase builder client side svelte application.
+
+- [packages/client](https://github.com/Budibase/budibase/tree/HEAD/packages/client) - A module that runs in the browser responsible for reading JSON definition and creating living, breathing web apps from it.
+
+- [packages/server](https://github.com/Budibase/budibase/tree/HEAD/packages/server) - The budibase server. This Koa app is responsible for serving the JS for the builder and budibase apps, as well as providing the API for interaction with the database and file system.
+
+For more information, see [CONTRIBUTING.md](https://github.com/Budibase/budibase/blob/HEAD/.github/CONTRIBUTING.md)
+
+## 📝 License
+
+Budibase is open-source. The builder is licensed [AGPL v3](https://www.gnu.org/licenses/agpl-3.0.en.html), the server is licensed [GPL v3](https://www.gnu.org/licenses/gpl-3.0.en.html), and the client is licensed [MPL](https://directory.fsf.org/wiki/License:MPL-2.0).
+
+## 💬 Get in touch
+
+If you have a question or would like to talk with other Budibase users, please hop over to [Github discussions](https://github.com/Budibase/budibase/discussions) or join our Discord server:
+
+[Discord chatroom](https://discord.gg/rCYayfe)
+
+![Discord Shield](https://discordapp.com/api/guilds/733030666647765003/widget.png?style=shield)
+
+
+## Contributors ✨
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="http://martinmck.com"><img src="https://avatars1.githubusercontent.com/u/11256663?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin McKeaveney</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=shogunpurple" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=shogunpurple" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=shogunpurple" title="Tests">⚠️</a> <a href="#infra-shogunpurple" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="http://www.michaeldrury.co.uk/"><img src="https://avatars2.githubusercontent.com/u/4407001?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Drury</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=mike12345567" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=mike12345567" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=mike12345567" title="Tests">⚠️</a> <a href="#infra-mike12345567" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/aptkingston"><img src="https://avatars3.githubusercontent.com/u/9075550?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrew Kingston</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=aptkingston" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=aptkingston" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=aptkingston" title="Tests">⚠️</a> <a href="#design-aptkingston" title="Design">🎨</a></td>
+    <td align="center"><a href="https://budibase.com/"><img src="https://avatars3.githubusercontent.com/u/3524181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Shanks</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/kevmodrome"><img src="https://avatars3.githubusercontent.com/u/534488?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Åberg Kultalahti</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://www.budibase.com/"><img src="https://avatars2.githubusercontent.com/u/49767913?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joe</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=joebudi" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=joebudi" title="Code">💻</a> <a href="#content-joebudi" title="Content">🖋</a> <a href="#design-joebudi" title="Design">🎨</a></td>
+    <td align="center"><a href="https://github.com/Conor-Mack"><img src="https://avatars1.githubusercontent.com/u/36074859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Conor_Mack</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=Conor-Mack" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=Conor-Mack" title="Tests">⚠️</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/pngwn"><img src="https://avatars1.githubusercontent.com/u/12937446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pngwn</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=pngwn" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=pngwn" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/HugoLd"><img src="https://avatars0.githubusercontent.com/u/26521848?v=4?s=100" width="100px;" alt=""/><br /><sub><b>HugoLd</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=HugoLd" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/victoriasloan"><img src="https://avatars.githubusercontent.com/u/9913651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>victoriasloan</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=victoriasloan" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/yashank09"><img src="https://avatars.githubusercontent.com/u/37672190?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yashank09</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=yashank09" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/SOVLOOKUP"><img src="https://avatars.githubusercontent.com/u/53158137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SOVLOOKUP</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=SOVLOOKUP" title="Code">💻</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

From 022f501dee30d80ff077f4368420a3587bb367a9 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 12 May 2021 12:38:49 +0100
Subject: [PATCH 15/15] fixes from PR

---
 .../builder/src/components/integration/QueryEditor.svelte   | 2 +-
 packages/worker/src/api/index.js                            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/integration/QueryEditor.svelte b/packages/builder/src/components/integration/QueryEditor.svelte
index 02f3218850..4016e2c1b2 100644
--- a/packages/builder/src/components/integration/QueryEditor.svelte
+++ b/packages/builder/src/components/integration/QueryEditor.svelte
@@ -117,7 +117,7 @@
       readOnly,
       autoCloseBrackets: true,
       autoCloseTags: true,
-      theme: THEMES.DARK,
+      theme: $themeStore.theme.includes("light") ? THEMES.LIGHT : THEMES.DARK,
     }
 
     if (!tab)
diff --git a/packages/worker/src/api/index.js b/packages/worker/src/api/index.js
index 6c4cd98a12..4142d0a832 100644
--- a/packages/worker/src/api/index.js
+++ b/packages/worker/src/api/index.js
@@ -53,9 +53,9 @@ router
   .use(buildAuthMiddleware(PUBLIC_ENDPOINTS))
   // for now no public access is allowed to worker (bar health check)
   .use((ctx, next) => {
-    // if (!ctx.isAuthenticated) {
-    //   ctx.throw(403, "Unauthorized - no public worker access")
-    // }
+    if (!ctx.isAuthenticated) {
+      ctx.throw(403, "Unauthorized - no public worker access")
+    }
     return next()
   })