CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-02 04:50:44 +12:00
Code Issues Projects Releases Wiki Activity

Formatting.

Browse source
This commit is contained in:
mike12345567 2021-05-11 15:24:17 +01:00
parent 2ea05c44b4
commit 5230dcd3ac
9 changed files with 56 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/builder/src/pages/builder/portal/email/TemplateBindings.svelte
View file

@ -1,5 +1,12 @@
<script> <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 bindings
export let onBindingClick = () => {} export let onBindingClick = () => {}
@ -8,8 +15,8 @@
<Menu> <Menu>
{#each bindings as binding} {#each bindings as binding}
<MenuItem on:click={() => onBindingClick(binding)}> <MenuItem on:click={() => onBindingClick(binding)}>
<Detail size="M">{binding.name}</Detail> <Detail size="M">{binding.name}</Detail>
<Body size="XS" noPadding>{binding.description}</Body> <Body size="XS" noPadding>{binding.description}</Body>
</MenuItem> </MenuItem>
{/each} {/each}
</Menu> </Menu>

4
packages/builder/src/pages/builder/portal/email/TemplateLink.svelte
View file

@ -1,8 +1,6 @@
<script> <script>
import { url } from "@roxi/routify" import { url } from "@roxi/routify"
import { import { Link } from "@budibase/bbui"
Link,
} from "@budibase/bbui"
import { roles } from "stores/backend" import { roles } from "stores/backend"
export let value export let value

38
packages/builder/src/pages/builder/portal/email/[template].svelte
View file

@ -83,25 +83,26 @@
value={selectedTemplate.contents} value={selectedTemplate.contents}
/> />
<div class="bindings-editor"> <div class="bindings-editor">
<Detail size="L">Bindings</Detail> <Detail size="L">Bindings</Detail>
<Tabs selected={selectedBindingTab}> <Tabs selected={selectedBindingTab}>
<Tab title="Template"> <Tab title="Template">
<TemplateBindings <TemplateBindings
title="Template Bindings" title="Template Bindings"
bindings={templateBindings} bindings={templateBindings}
onBindingClick={setTemplateBinding} onBindingClick={setTemplateBinding}
/> />
</Tab> </Tab>
<Tab title="Common"> <Tab title="Common">
<TemplateBindings <TemplateBindings
title="Common Bindings" title="Common Bindings"
bindings={$email.definitions.bindings.common} bindings={$email.definitions.bindings.common}
onBindingClick={setTemplateBinding} onBindingClick={setTemplateBinding}
/> />
</Tab> </Tab>
</Tabs> </Tabs>
</div> </div>
</Tab> </div></Tab
>
<Tab title="Preview"> <Tab title="Preview">
<div class="preview" transition:fade> <div class="preview" transition:fade>
{@html selectedTemplate.contents} {@html selectedTemplate.contents}
@ -136,5 +137,4 @@
margin-bottom: var(--spacing-xl); margin-bottom: var(--spacing-xl);
cursor: pointer; cursor: pointer;
} }
</style> </style>

2
packages/builder/src/pages/builder/portal/email/index.svelte
View file

@ -34,7 +34,7 @@
const templateSchema = { const templateSchema = {
purpose: { purpose: {
displayName: "Email", displayName: "Email",
editable: false editable: false,
}, },
} }

6
packages/worker/src/api/controllers/admin/auth.js
View file

@ -53,9 +53,11 @@ exports.reset = async ctx => {
) )
} }
try { try {
const user = await getGlobalUserByEmail(email) 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) { } catch (err) {
// don't throw any kind of error to the user, this might give away something // don't throw any kind of error to the user, this might give away something
} }

18
packages/worker/src/api/controllers/admin/email.js
View file

@ -5,13 +5,27 @@ const authPkg = require("@budibase/auth")
const GLOBAL_DB = authPkg.StaticDatabases.GLOBAL.name const GLOBAL_DB = authPkg.StaticDatabases.GLOBAL.name
exports.sendEmail = async ctx => { 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 let user
if (userId) { if (userId) {
const db = new CouchDB(GLOBAL_DB) const db = new CouchDB(GLOBAL_DB)
user = await db.get(userId) 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 = { ctx.body = {
...response, ...response,
message: `Email sent to ${email}.`, message: `Email sent to ${email}.`,

4
packages/worker/src/api/controllers/admin/users.js
View file

@ -136,7 +136,9 @@ exports.invite = async ctx => {
if (existing) { if (existing) {
ctx.throw(400, "Email address already in use.") 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 = { ctx.body = {
message: "Invitation has been sent.", message: "Invitation has been sent.",
} }

2
packages/worker/src/utilities/email.js
View file

@ -141,7 +141,7 @@ exports.sendEmail = async (
{ groupId, user, from, contents, subject } = {} { groupId, user, from, contents, subject } = {}
) => { ) => {
const db = new CouchDB(GLOBAL_DB) 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) { if (Object.keys(config).length === 0 && !TEST_MODE) {
throw "Unable to find SMTP configuration." throw "Unable to find SMTP configuration."
} }

2
packages/worker/src/utilities/templates.js
View file

@ -15,7 +15,7 @@ const BASE_COMPANY = "Budibase"
exports.getSettingsTemplateContext = async (purpose, code = null) => { exports.getSettingsTemplateContext = async (purpose, code = null) => {
const db = new CouchDB(StaticDatabases.GLOBAL.name) const db = new CouchDB(StaticDatabases.GLOBAL.name)
// TODO: use more granular settings in the future if required // 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) { if (!settings || !settings.platformUrl) {
settings.platformUrl = LOCAL_URL settings.platformUrl = LOCAL_URL
} }