MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Budibase/budibase into develop

This commit is contained in:
mike12345567 2022-08-04 21:35:55 +01:00
parent 96958cb1b8 8c67f0a2b3
commit 71992cf5a3
69 changed files with 783 additions and 614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"npmClient": "yarn",
"packages": [
"packages/*"

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@budibase/types": "1.1.33-alpha.4",
"@budibase/types": "^1.2.12",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",
"bcrypt": "5.0.1",

4
packages/backend-core/src/auth.js
View File

@ -19,6 +19,8 @@ const {
csrf,
internalApi,
adminOnly,
builderOnly,
builderOrAdmin,
joiValidator,
} = require("./middleware")
@ -176,5 +178,7 @@ module.exports = {
updateUserOAuth,
ssoCallbackUrl,
adminOnly,
builderOnly,
builderOrAdmin,
joiValidator,
}

1
packages/backend-core/src/environment.ts
View File

@ -55,6 +55,7 @@ const env = {
DEFAULT_LICENSE: process.env.DEFAULT_LICENSE,
SERVICE: process.env.SERVICE || "budibase",
MEMORY_LEAK_CHECK: process.env.MEMORY_LEAK_CHECK || false,
LOG_LEVEL: process.env.LOG_LEVEL,
DEPLOYMENT_ENVIRONMENT:
process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose",
_set(key: any, value: any) {

2
packages/backend-core/src/index.ts
View File

@ -15,6 +15,7 @@ import auth from "./auth"
import constants from "./constants"
import * as dbConstants from "./db/constants"
import logging from "./logging"
import pino from "./pino"
// mimic the outer package exports
import * as db from "./pkg/db"
@ -53,6 +54,7 @@ const core = {
errors,
logging,
roles,
...pino,
...errorClasses,
}

2
packages/backend-core/src/middleware/authenticated.js
View File

@ -81,7 +81,7 @@ module.exports = (
const session = await getSession(userId, sessionId)
if (!session) {
error = "No session found"
error = `Session not found - ${userId} - ${sessionId}`
} else {
try {
if (opts && opts.populateUser) {

0
packages/worker/src/middleware/builderOnly.js → packages/backend-core/src/middleware/builderOnly.js
View File

0
packages/worker/src/middleware/builderOrAdmin.js → packages/backend-core/src/middleware/builderOrAdmin.js
View File

4
packages/backend-core/src/middleware/index.js
View File

@ -10,6 +10,8 @@ const internalApi = require("./internalApi")
const datasourceGoogle = require("./passport/datasource/google")
const csrf = require("./csrf")
const adminOnly = require("./adminOnly")
const builderOrAdmin = require("./builderOrAdmin")
const builderOnly = require("./builderOnly")
const joiValidator = require("./joi-validator")
module.exports = {
google,
@ -27,5 +29,7 @@ module.exports = {
},
csrf,
adminOnly,
builderOnly,
builderOrAdmin,
joiValidator,
}

4
packages/backend-core/src/migrations/definitions.ts
View File

@ -37,4 +37,8 @@ export const DEFINITIONS: MigrationDefinition[] = [
type: MigrationType.INSTALLATION,
name: MigrationName.EVENT_INSTALLATION_BACKFILL,
},
{
type: MigrationType.GLOBAL,
name: MigrationName.GLOBAL_INFO_SYNC_USERS,
},
]

11
packages/backend-core/src/pino.js Normal file
View File

@ -0,0 +1,11 @@
const env = require("./environment")
exports.pinoSettings = () => ({
prettyPrint: {
levelFirst: true,
},
level: env.LOG_LEVEL || "error",
autoLogging: {
ignore: req => req.url.includes("/health"),
},
})

23
packages/backend-core/src/security/roles.js
View File

@ -203,15 +203,24 @@ exports.getAllRoles = async appId => {
if (appId) {
return doWithDB(appId, internal)
} else {
return internal(getAppDB())
let appDB
try {
appDB = getAppDB()
} catch (error) {
// We don't have any apps, so we'll just use the built-in roles
}
return internal(appDB)
}
async function internal(db) {
const body = await db.allDocs(
getRoleParams(null, {
include_docs: true,
})
)
let roles = body.rows.map(row => row.doc)
let roles = []
if (db) {
const body = await db.allDocs(
getRoleParams(null, {
include_docs: true,
})
)
roles = body.rows.map(row => row.doc)
}
const builtinRoles = exports.getBuiltinRoles()
// need to combine builtin with any DB record of them (for sake of permissions)

21
packages/backend-core/src/security/sessions.js
View File

@ -1,5 +1,7 @@
const redis = require("../redis/init")
const { v4: uuidv4 } = require("uuid")
const { logWarn } = require("../logging")
const env = require("../environment")
// a week in seconds
const EXPIRY_SECONDS = 86400 * 7
@ -33,12 +35,21 @@ async function invalidateSessions(userId, sessionIds = null) {
}))
}
const client = await redis.getSessionClient()
const promises = []
for (let session of sessions) {
promises.push(client.delete(session.key))
if (sessions && sessions.length > 0) {
const client = await redis.getSessionClient()
const promises = []
for (let session of sessions) {
promises.push(client.delete(session.key))
}
if (!env.isTest()) {
logWarn(
`Invalidating sessions for ${userId} - ${sessions
.map(session => session.key)
.join(", ")}`
)
}
await Promise.all(promises)
}
await Promise.all(promises)
} catch (err) {
console.error(`Error invalidating sessions: ${err}`)
}

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "1.1.33-alpha.4",
"@budibase/string-templates": "^1.2.12",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

38
packages/bbui/src/Form/Core/PickerDropdown.svelte
View File

@ -15,7 +15,6 @@
export let id = null
export let placeholder = "Choose an option or type"
export let disabled = false
export let readonly = false
export let updateOnChange = true
export let error = null
export let secondaryOptions = []
@ -35,6 +34,7 @@
export let isOptionSelected = () => false
export let isPlaceholder = false
export let placeholderOption = null
export let showClearIcon = true
const dispatch = createEventDispatcher()
let primaryOpen = false
@ -50,17 +50,11 @@
}
const updateValue = newValue => {
if (readonly) {
return
}
dispatch("change", newValue)
}
const onClickSecondary = () => {
dispatch("click")
if (readonly) {
return
}
secondaryOpen = true
}
@ -80,24 +74,15 @@
}
const onBlur = event => {
if (readonly) {
return
}
focus = false
updateValue(event.target.value)
}
const onInput = event => {
if (readonly || !updateOnChange) {
return
}
updateValue(event.target.value)
}
const updateValueOnEnter = event => {
if (readonly) {
return
}
if (event.key === "Enter") {
updateValue(event.target.value)
}
@ -140,11 +125,12 @@
value={primaryLabel || ""}
placeholder={placeholder || ""}
{disabled}
{readonly}
readonly
class="spectrum-Textfield-input spectrum-InputGroup-input"
class:labelPadding={iconData}
class:open={primaryOpen}
/>
{#if primaryValue}
{#if primaryValue && showClearIcon}
<button
on:click={() => onClearPrimary()}
type="reset"
@ -198,7 +184,7 @@
</li>
{/if}
{#each groupTitles as title}
<div class="spectrum-Menu-item">
<div class="spectrum-Menu-item title">
<Detail>{title}</Detail>
</div>
{#if primaryOptions}
@ -433,4 +419,18 @@
.spectrum-Search-clearButton {
position: absolute;
}
/* Fix focus borders to show only when opened */
.spectrum-Textfield-input {
border-color: var(--spectrum-global-color-gray-400) !important;
border-right-width: 1px;
}
.spectrum-Textfield-input.open {
border-color: var(--spectrum-global-color-blue-400) !important;
}
/* Fix being able to hover and select titles */
.spectrum-Menu-item.title {
pointer-events: none;
}
</style>

2
packages/bbui/src/Form/PickerDropdown.svelte
View File

@ -27,6 +27,7 @@
export let primaryOptions = []
export let secondaryOptions = []
export let searchTerm
export let showClearIcon = true
let primaryLabel
let secondaryLabel
@ -120,6 +121,7 @@
{secondaryValue}
{primaryLabel}
{secondaryLabel}
{showClearIcon}
on:pickprimary={onPickPrimary}
on:picksecondary={onPickSecondary}
on:search={updateSearchTerm}

10
packages/bbui/src/List/ListItem.svelte
View File

@ -9,11 +9,12 @@
export let avatar = false
export let title = null
export let subtitle = null
export let hoverable = false
$: initials = avatar ? title?.[0] : null
</script>
<div class="list-item">
<div class="list-item" class:hoverable on:click>
<div class="left">
{#if icon}
<div class="icon" style="background: {iconBackground || `transparent`};">
@ -39,11 +40,12 @@
.list-item {
padding: 0 16px;
height: 56px;
background: var(--spectrum-alias-background-color-tertiary);
background: var(--spectrum-global-color-gray-50);
display: flex;
flex-direction: row;
justify-content: space-between;
border: 1px solid var(--spectrum-global-color-gray-300);
transition: background 130ms ease-out;
}
.list-item:not(:first-child) {
border-top: none;
@ -56,6 +58,10 @@
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
.hoverable:hover {
cursor: pointer;
background: var(--spectrum-global-color-gray-75);
}
.left,
.right {
display: flex;

4
packages/bbui/src/Modal/ModalContent.svelte
View File

@ -106,7 +106,9 @@
{/if}
{#if showCancelButton}
<Button group secondary on:click={close}>{cancelText}</Button>
<Button group secondary newStyles on:click={close}>
{cancelText}
</Button>
{/if}
{#if showConfirmButton}
<span class="confirm-wrap">

13
packages/bbui/src/Table/Table.svelte
View File

@ -503,12 +503,6 @@
.spectrum-Table-headCell--alignRight {
justify-content: flex-end;
}
.spectrum-Table-headCell--divider {
padding-right: var(--cell-padding);
}
.spectrum-Table-headCell--divider + .spectrum-Table-headCell {
padding-left: var(--cell-padding);
}
.spectrum-Table-headCell--edit {
position: sticky;
left: 0;
@ -580,13 +574,6 @@
background-color: var(--table-bg);
z-index: auto;
}
.spectrum-Table-cell--divider {
padding-right: var(--cell-padding);
}
.spectrum-Table-cell--divider + .spectrum-Table-cell {
padding-left: var(--cell-padding);
}
.spectrum-Table-cell--edit {
position: sticky;
left: 0;

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -69,10 +69,10 @@
}
},
"dependencies": {
"@budibase/bbui": "1.1.33-alpha.4",
"@budibase/client": "1.1.33-alpha.4",
"@budibase/frontend-core": "1.1.33-alpha.4",
"@budibase/string-templates": "1.1.33-alpha.4",
"@budibase/bbui": "^1.2.12",
"@budibase/client": "^1.2.12",
"@budibase/frontend-core": "^1.2.12",
"@budibase/string-templates": "^1.2.12",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

15
packages/builder/src/components/backend/DataTable/DataTable.svelte
View File

@ -14,7 +14,13 @@
import Table from "./Table.svelte"
import { TableNames } from "constants"
import CreateEditRow from "./modals/CreateEditRow.svelte"
import { Pagination, Heading, Body, Layout } from "@budibase/bbui"
import {
Pagination,
Heading,
Body,
Layout,
notifications,
} from "@budibase/bbui"
import { fetchData } from "@budibase/frontend-core"
import { API } from "api"
@ -29,6 +35,13 @@
$: fetch = createFetch(id)
$: hasCols = checkHasCols(schema)
$: hasRows = !!$fetch.rows?.length
$: showError($fetch.error)
const showError = error => {
if (error) {
notifications.error(error?.message || "Unable to fetch data.")
}
}
const enrichSchema = schema => {
let tempSchema = { ...schema }

7
packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte
View File

@ -5,6 +5,7 @@
export let selectedRows
export let deleteRows
export let item = "row"
const dispatch = createEventDispatcher()
let modal
@ -14,12 +15,14 @@
modal?.hide()
dispatch("updaterows")
}
$: text = `${item}${selectedRows?.length === 1 ? "" : "s"}`
</script>
<Button icon="Delete" size="s" primary quiet on:click={modal.show}>
Delete
{selectedRows.length}
row(s)
{text}
</Button>
<ConfirmDialog
bind:this={modal}
@ -29,5 +32,5 @@
>
Are you sure you want to delete
{selectedRows.length}
row{selectedRows.length > 1 ? "s" : ""}?
{text}?
</ConfirmDialog>

7
packages/builder/src/pages/builder/portal/apps/index.svelte
View File

@ -27,7 +27,6 @@
import { AppStatus } from "constants"
import Logo from "assets/bb-space-man.svg"
import AccessFilter from "./_components/AcessFilter.svelte"
import { Constants } from "@budibase/frontend-core"
let sortBy = "name"
let template
@ -69,10 +68,6 @@
$: unlocked = lockedApps?.length === 0
$: automationErrors = getAutomationErrors(enrichedApps)
$: hasGroupsLicense = $auth.user?.license.features.includes(
Constants.Features.USER_GROUPS
)
const enrichApps = (apps, user, sortBy) => {
const enrichedApps = apps.map(app => ({
...app,
@ -360,7 +355,7 @@
</Button>
{/if}
<div class="filter">
{#if hasGroupsLicense && $groups.length}
{#if $auth.groupsEnabled && $groups.length}
<AccessFilter on:change={accessFilterAction} />
{/if}
<Select

1
packages/builder/src/pages/builder/portal/manage/_layout.svelte
View File

@ -12,7 +12,6 @@
$: wide =
$page.path.includes("email/:template") ||
($page.path.includes("users") && !$page.path.includes(":userId")) ||
($page.path.includes("groups") && !$page.path.includes(":groupId"))
</script>

21
packages/builder/src/pages/builder/portal/manage/groups/index.svelte
View File

@ -11,7 +11,6 @@
} from "@budibase/bbui"
import { groups, auth } from "stores/portal"
import { onMount } from "svelte"
import { Constants } from "@budibase/frontend-core"
import CreateEditGroupModal from "./_components/CreateEditGroupModal.svelte"
import UserGroupsRow from "./_components/UserGroupsRow.svelte"
import { cloneDeep } from "lodash/fp"
@ -27,10 +26,6 @@
let modal
let group = cloneDeep(DefaultGroup)
$: hasGroupsLicense = $auth.user?.license.features.includes(
Constants.Features.USER_GROUPS
)
async function deleteGroup(group) {
try {
groups.actions.delete(group)
@ -54,7 +49,7 @@
onMount(async () => {
try {
if (hasGroupsLicense) {
if ($auth.groupsEnabled) {
await groups.actions.init()
}
} catch (error) {
@ -67,7 +62,7 @@
<Layout gap="XS" noPadding>
<div style="display: flex;">
<Heading size="M">User groups</Heading>
{#if !hasGroupsLicense}
{#if !$auth.groupsEnabled}
<Tags>
<div class="tags">
<div class="tag">
@ -82,15 +77,15 @@
<div class="align-buttons">
<Button
newStyles
icon={hasGroupsLicense ? "UserGroup" : ""}
cta={hasGroupsLicense}
on:click={hasGroupsLicense
icon={$auth.groupsEnabled ? "UserGroup" : ""}
cta={$auth.groupsEnabled}
on:click={$auth.groupsEnabled
? showCreateGroupModal
: window.open("https://budibase.com/pricing/", "_blank")}
>
{hasGroupsLicense ? "Create user group" : "Upgrade Account"}
{$auth.groupsEnabled ? "Create user group" : "Upgrade Account"}
</Button>
{#if !hasGroupsLicense}
{#if !$auth.groupsEnabled}
<Button
newStyles
secondary
@ -101,7 +96,7 @@
{/if}
</div>
{#if hasGroupsLicense && $groups.length}
{#if $auth.groupsEnabled && $groups.length}
<div class="groupTable">
{#each $groups as group}
<div>

202
packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
View File

@ -18,6 +18,7 @@
Select,
Modal,
notifications,
Divider,
StatusLight,
} from "@budibase/bbui"
import { onMount } from "svelte"
@ -41,18 +42,13 @@
let allAppList = []
let user
let loaded = false
$: fetchUser(userId)
$: fetchUser(userId)
$: fullName = $userFetch?.data?.firstName
? $userFetch?.data?.firstName + " " + $userFetch?.data?.lastName
: ""
$: hasGroupsLicense = $auth.user?.license.features.includes(
Constants.Features.USER_GROUPS
)
$: nameLabel = getNameLabel($userFetch)
$: initials = getInitials(nameLabel)
$: allAppList = $apps
.filter(x => {
if ($userFetch.data?.roles) {
@ -85,7 +81,6 @@
return y._id === userId
})
})
$: globalRole = $userFetch?.data?.admin?.global
? "admin"
: $userFetch?.data?.builder?.global
@ -216,15 +211,14 @@
</script>
{#if loaded}
<Layout gap="L" noPadding>
<Layout gap="XS" noPadding>
<div>
<ActionButton on:click={() => $goto("./")} size="S" icon="ArrowLeft">
Back
</ActionButton>
</div>
</Layout>
<Layout gap="XS" noPadding>
<Layout gap="XL" noPadding>
<div>
<ActionButton on:click={() => $goto("./")} icon="ArrowLeft">
Back
</ActionButton>
</div>
<Layout noPadding gap="M">
<div class="title">
<div>
<div style="display: flex;">
@ -232,74 +226,83 @@
<div class="subtitle">
<Heading size="S">{nameLabel}</Heading>
{#if nameLabel !== $userFetch?.data?.email}
<Body size="XS">{$userFetch?.data?.email}</Body>
<Body size="S">{$userFetch?.data?.email}</Body>
{/if}
</div>
</div>
</div>
<div>
<ActionMenu align="right">
<span slot="control">
<Icon hoverable name="More" />
</span>
<MenuItem on:click={resetPasswordModal.show} icon="Refresh"
>Force Password Reset</MenuItem
>
<MenuItem on:click={deleteModal.show} icon="Delete">Delete</MenuItem
>
</ActionMenu>
</div>
</div>
</Layout>
<Layout gap="S" noPadding>
<div class="fields">
<div class="field">
<Label size="L">First name</Label>
<Input
thin
value={$userFetch?.data?.firstName}
on:blur={updateUserFirstName}
/>
</div>
<div class="field">
<Label size="L">Last name</Label>
<Input
thin
value={$userFetch?.data?.lastName}
on:blur={updateUserLastName}
/>
</div>
<!-- don't let a user remove the privileges that let them be here -->
{#if userId !== $auth.user._id}
<div class="field">
<Label size="L">Role</Label>
<Select
value={globalRole}
options={Constants.BbRoles}
on:change={updateUserRole}
/>
<div>
<ActionMenu align="right">
<span slot="control">
<Icon hoverable name="More" />
</span>
<MenuItem on:click={resetPasswordModal.show} icon="Refresh">
Force password reset
</MenuItem>
<MenuItem on:click={deleteModal.show} icon="Delete">
Delete
</MenuItem>
</ActionMenu>
</div>
{/if}
</div>
<Divider size="S" />
<Layout noPadding gap="S">
<Heading size="S">Details</Heading>
<div class="fields">
<div class="field">
<Label size="L">Email</Label>
<Input disabled value={$userFetch?.data?.email} />
</div>
<div class="field">
<Label size="L">First name</Label>
<Input
value={$userFetch?.data?.firstName}
on:blur={updateUserFirstName}
/>
</div>
<div class="field">
<Label size="L">Last name</Label>
<Input
value={$userFetch?.data?.lastName}
on:blur={updateUserLastName}
/>
</div>
<!-- don't let a user remove the privileges that let them be here -->
{#if userId !== $auth.user._id}
<div class="field">
<Label size="L">Role</Label>
<Select
value={globalRole}
options={Constants.BudibaseRoleOptions}
on:change={updateUserRole}
/>
</div>
{/if}
</div>
</Layout>
</Layout>
{#if hasGroupsLicense}
{#if $auth.groupsEnabled}
<!-- User groups -->
<Layout gap="XS" noPadding>
<Layout gap="S" noPadding>
<div class="tableTitle">
<div>
<Heading size="XS">User groups</Heading>
<Body size="S">Add or remove this user from user groups</Body>
</div>
<Heading size="S">User groups</Heading>
<div bind:this={popoverAnchor}>
<Button on:click={popover.show()} icon="UserGroup" cta>
Add user group
<Button
on:click={popover.show()}
icon="UserGroup"
secondary
newStyles
>
Add to user group
</Button>
</div>
<Popover align="right" bind:this={popover} anchor={popoverAnchor}>
<UserGroupPicker
key={"name"}
title={"Group"}
title={"User group"}
bind:searchTerm
bind:selected={selectedGroups}
bind:filtered={filteredGroups}
@ -308,7 +311,6 @@
/>
</Popover>
</div>
<List>
{#if userGroups.length}
{#each userGroups as group}
@ -316,13 +318,16 @@
title={group.name}
icon={group.icon}
iconBackground={group.color}
><Icon
hoverable
on:click={() => $goto(`../groups/${group._id}`)}
>
<Icon
on:click={removeGroup(group._id)}
hoverable
size="L"
size="S"
name="Close"
/></ListItem
>
/>
</ListItem>
{/each}
{:else}
<ListItem icon="UserGroup" title="No groups" />
@ -330,37 +335,28 @@
</List>
</Layout>
{/if}
<!-- User Apps -->
<Layout gap="S" noPadding>
<div class="appsTitle">
<Heading weight="light" size="XS">Apps</Heading>
<div style="margin-top: var(--spacing-xs)">
<Body size="S">Manage apps that this user has been assigned to</Body>
</div>
</div>
<Layout gap="S" noPadding>
<Heading size="S">Apps</Heading>
<List>
{#if allAppList.length}
{#each allAppList as app}
<div
class="pointer"
on:click={$goto(`../../overview/${app.devId}`)}
<ListItem
title={app.name}
iconBackground={app?.icon?.color || ""}
icon={app?.icon?.name || "Apps"}
hoverable
on:click={() => $goto(`../../overview/${app.devId}`)}
>
<ListItem
title={app.name}
iconBackground={app?.icon?.color || ""}
icon={app?.icon?.name || "Apps"}
>
<div class="title ">
<StatusLight
square
color={RoleUtils.getRoleColour(getHighestRole(app.roles))}
>
{getRoleLabel(getHighestRole(app.roles))}
</StatusLight>
</div>
</ListItem>
</div>
<div class="title ">
<StatusLight
square
color={RoleUtils.getRoleColour(getHighestRole(app.roles))}
>
{getRoleLabel(getHighestRole(app.roles))}
</StatusLight>
</div>
</ListItem>
{/each}
{:else}
<ListItem icon="Apps" title="No apps" />
@ -381,16 +377,13 @@
</Modal>
<style>
.pointer {
cursor: pointer;
}
.fields {
display: grid;
grid-gap: var(--spacing-m);
}
.field {
display: grid;
grid-template-columns: 32% 1fr;
grid-template-columns: 120px 1fr;
align-items: center;
}
@ -403,7 +396,7 @@
.tableTitle {
display: flex;
justify-content: space-between;
margin-bottom: var(--spacing-m);
align-items: flex-end;
}
.subtitle {
@ -413,9 +406,4 @@
justify-content: center;
align-items: stretch;
}
.appsTitle {
display: flex;
flex-direction: column;
}
</style>

69
packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte
View File

@ -13,13 +13,10 @@
import { emailValidator } from "helpers/validation"
export let showOnboardingTypeModal
const password = Math.random().toString(36).substring(2, 22)
let disabled
let userGroups = []
$: errors = []
$: hasGroupsLicense = $auth.user?.license.features.includes(
Constants.Features.USER_GROUPS
)
$: userData = [
{
@ -29,6 +26,7 @@
forceResetPassword: true,
},
]
$: hasError = userData.find(x => x.error != null)
function removeInput(idx) {
userData = userData.filter((e, i) => i !== idx)
@ -41,38 +39,49 @@
role: "appUser",
password: Math.random().toString(36).substring(2, 22),
forceResetPassword: true,
error: null,
},
]
}
function validateInput(email, index) {
if (email) {
if (emailValidator(email) === true) {
errors[index] = true
return null
const res = emailValidator(email)
if (res === true) {
delete userData[index].error
} else {
errors[index] = false
return emailValidator(email)
userData[index].error = res
}
} else {
userData[index].error = "Please enter an email address"
}
return userData[index].error == null
}
const onConfirm = () => {
let valid = true
userData.forEach((input, index) => {
valid = validateInput(input.email, index) && valid
})
if (!valid) {
return false
}
showOnboardingTypeModal({ users: userData, groups: userGroups })
}
</script>
<ModalContent
onConfirm={async () =>
showOnboardingTypeModal({ users: userData, groups: userGroups })}
{onConfirm}
size="M"
title="Add new user"
confirmText="Add user"
title="Add new users"
confirmText="Add users"
confirmDisabled={disabled}
cancelText="Cancel"
showCloseIcon={false}
disabled={errors.some(x => x === false) ||
userData.some(x => x.email === "" || x.email === null)}
disabled={hasError || !userData.length}
>
<Layout noPadding gap="XS">
<Label>Email Address</Label>
<Label>Email address</Label>
{#each userData as input, index}
<div
style="display: flex;
@ -84,15 +93,12 @@
inputType="email"
bind:inputValue={input.email}
bind:dropdownValue={input.role}
options={Constants.BbRoles}
error={validateInput(input.email, index)}
options={Constants.BudibaseRoleOptions}
error={input.error}
on:blur={() => validateInput(input.email, index)}
/>
</div>
<div
class:fix-height={errors.length && !errors[index]}
class:normal-height={errors.length && !!errors[index]}
style="width: 10% "
>
<div class="icon">
<Icon
name="Close"
hoverable
@ -107,11 +113,11 @@
</div>
</Layout>
{#if hasGroupsLicense}
{#if $auth.groupsEnabled}
<Multiselect
bind:value={userGroups}
placeholder="Select User Groups"
label="User Groups"
placeholder="No groups"
label="Groups"
options={$groups}
getOptionLabel={option => option.name}
getOptionValue={option => option._id}
@ -120,10 +126,9 @@
</ModalContent>
<style>
.fix-height {
margin-bottom: 5%;
}
.normal-height {
margin-bottom: 0%;
.icon {
width: 10%;
align-self: flex-start;
margin-top: 8px;
}
</style>

17
packages/builder/src/pages/builder/portal/manage/users/_components/GroupsTableRenderer.svelte
View File

@ -1,5 +1,6 @@
<script>
import { Icon, Body } from "@budibase/bbui"
import { Icon } from "@budibase/bbui"
export let value
</script>
@ -7,17 +8,9 @@
<div class="spacing">
<Icon name="UserGroup" />
</div>
{#if value?.length === 0}
<div class="opacity">0</div>
{:else if value?.length === 1}
<div class="opacity">
<Body size="S">{value[0]?.name}</Body>
</div>
{:else}
<div class="opacity">
{parseInt(value?.length) || 0} groups
</div>
{/if}
<div class="opacity">
{value?.length || 0}
</div>
</div>
<style>

24
packages/builder/src/pages/builder/portal/manage/users/_components/ImportUsersModal.svelte
View File

@ -7,7 +7,7 @@
notifications,
} from "@budibase/bbui"
import { groups, auth, admin } from "stores/portal"
import { emailValidator } from "../../../../../../helpers/validation"
import { emailValidator } from "helpers/validation"
import { Constants } from "@budibase/frontend-core"
const BYTES_IN_MB = 1000000
@ -22,9 +22,6 @@
let usersRole = null
$: invalidEmails = []
$: hasGroupsLicense = $auth.user?.license.features.includes(
Constants.Features.USER_GROUPS
)
const validEmails = userEmails => {
if ($admin.cloud && userEmails.length > MAX_USERS_UPLOAD_LIMIT) {
@ -81,7 +78,7 @@
onConfirm={() => createUsersFromCsv({ userEmails, usersRole, userGroups })}
disabled={!userEmails.length || !validEmails(userEmails) || !usersRole}
>
<Body size="S">Import your users email addrresses from a CSV</Body>
<Body size="S">Import your users email addresses from a CSV file</Body>
<div class="dropzone">
<input id="file-upload" accept=".csv" type="file" on:change={handleFile} />
@ -95,11 +92,11 @@
options={Constants.BuilderRoleDescriptions}
/>
{#if hasGroupsLicense}
{#if $auth.groupsEnabled}
<Multiselect
bind:value={userGroups}
placeholder="Select User Groups"
label="User Groups"
placeholder="No groups"
label="Groups"
options={$groups}
getOptionLabel={option => option.name}
getOptionValue={option => option._id}
@ -122,14 +119,12 @@
label {
font-family: var(--font-sans);
cursor: pointer;
font-weight: 600;
box-sizing: border-box;
overflow: hidden;
border-radius: var(--border-radius-s);
color: var(--ink);
padding: var(--spacing-m) var(--spacing-l);
transition: all 0.2s ease 0s;
display: inline-flex;
text-rendering: optimizeLegibility;
min-width: auto;
@ -141,10 +136,15 @@
align-items: center;
justify-content: center;
width: 100%;
background-color: var(--grey-2);
font-size: var(--font-size-xs);
background: var(--spectrum-global-color-gray-200);
font-size: 12px;
line-height: normal;
border: var(--border-transparent);
transition: background-color 130ms ease-out;
}
label:hover {
background: var(--spectrum-global-color-gray-300);
cursor: pointer;
}
input[type="file"] {

8
packages/builder/src/pages/builder/portal/manage/users/_components/PasswordModal.svelte
View File

@ -49,10 +49,10 @@
cancelText="Cancel"
showCloseIcon={false}
>
<Body size="XS"
>All your new users can be accessed through the autogenerated passwords.
Make not of these passwords or download the csv</Body
>
<Body size="XS">
All your new users can be accessed through the autogenerated passwords. Take
note of these passwords or download the CSV file.
</Body>
<div class="container" on:click={downloadCsvFile}>
<div class="inner">

20
packages/builder/src/pages/builder/portal/manage/users/_components/RoleTableRenderer.svelte
View File

@ -3,14 +3,20 @@
import { Constants } from "@budibase/frontend-core"
export let row
$: value =
Constants.BbRoles.find(x => x.value === users.getUserRole(row))?.label ||
"Not Available"
const TooltipMap = {
appUser: "Only has access to published apps",
developer: "Access to the app builder",
admin: "Full access",
}
$: role = Constants.BudibaseRoleOptions.find(
x => x.value === users.getUserRole(row)
)
$: value = role?.label || "Not available"
$: tooltip = TooltipMap[role?.value] || ""
</script>
<div on:click|stopPropagation>
<div on:click|stopPropagation title={tooltip}>
{value}
</div>
<style>
</style>

164
packages/builder/src/pages/builder/portal/manage/users/index.svelte
View File

@ -8,11 +8,10 @@
Layout,
Modal,
ModalContent,
Icon,
Search,
notifications,
Pagination,
Search,
Label,
Divider,
} from "@budibase/bbui"
import AddUserModal from "./_components/AddUserModal.svelte"
import { users, groups, auth } from "stores/portal"
@ -20,68 +19,42 @@
import DeleteRowsButton from "components/backend/DataTable/buttons/DeleteRowsButton.svelte"
import GroupsTableRenderer from "./_components/GroupsTableRenderer.svelte"
import AppsTableRenderer from "./_components/AppsTableRenderer.svelte"
import NameTableRenderer from "./_components/NameTableRenderer.svelte"
import RoleTableRenderer from "./_components/RoleTableRenderer.svelte"
import { goto } from "@roxi/routify"
import OnboardingTypeModal from "./_components/OnboardingTypeModal.svelte"
import PasswordModal from "./_components/PasswordModal.svelte"
import ImportUsersModal from "./_components/ImportUsersModal.svelte"
import { createPaginationStore } from "helpers/pagination"
import { get } from "svelte/store"
import { Constants } from "@budibase/frontend-core"
const accessTypes = [
{
icon: "User",
description: "App user - Only has access to published apps",
},
{
icon: "Hammer",
description: "Developer - Access to the app builder",
},
{
icon: "Draw",
description: "Admin - Full access",
},
]
//let email
let enrichedUsers = []
let createUserModal,
inviteConfirmationModal,
onboardingTypeModal,
passwordModal,
importUsersModal
let pageInfo = createPaginationStore()
let prevEmail = undefined,
searchEmail = undefined
let selectedRows = []
let customRenderers = [
{ column: "userGroups", component: GroupsTableRenderer },
{ column: "apps", component: AppsTableRenderer },
{ column: "name", component: NameTableRenderer },
{ column: "role", component: RoleTableRenderer },
]
$: hasGroupsLicense = $auth.user?.license.features.includes(
Constants.Features.USER_GROUPS
)
$: schema = {
name: {},
email: {},
role: {
sortable: false,
},
...(hasGroupsLicense && {
userGroups: { sortable: false, displayName: "User groups" },
...($auth.groupsEnabled && {
userGroups: { sortable: false, displayName: "Groups" },
}),
apps: {},
}
$: userData = []
$: page = $pageInfo.page
$: fetchUsers(page, searchEmail)
$: {
@ -104,6 +77,7 @@
}
})
}
const showOnboardingTypeModal = async addUsersData => {
userData = await removingDuplicities(addUsersData)
if (!userData?.users?.length) return
@ -112,13 +86,13 @@
}
async function createUserFlow() {
let emails = userData?.users?.map(x => x.email) || []
const payload = userData?.users?.map(user => ({
email: user.email,
builder: user.role === Constants.BudibaseRoles.Developer,
admin: user.role === Constants.BudibaseRoles.Admin,
}))
try {
const res = await users.invite({
emails: emails,
builder: false,
admin: false,
})
const res = await users.invite(payload)
notifications.success(res.message)
inviteConfirmationModal.show()
} catch (error) {
@ -198,6 +172,10 @@
const deleteRows = async () => {
try {
let ids = selectedRows.map(user => user._id)
if (ids.includes(get(auth).user._id)) {
notifications.error("You cannot delete yourself")
return
}
await users.bulkDelete(ids)
notifications.success(`Successfully deleted ${selectedRows.length} rows`)
selectedRows = []
@ -227,23 +205,13 @@
}
</script>
<Layout noPadding>
<Layout noPadding gap="M">
<Layout gap="XS" noPadding>
<Heading>Users</Heading>
<Body>Add users and control who gets access to your published apps</Body>
<div>
{#each accessTypes as type}
<div class="access-description">
<Icon name={type.icon} />
<div class="access-text">
<Body size="S">{type.description}</Body>
</div>
</div>
{/each}
</div>
</Layout>
<Layout gap="S" noPadding>
<Divider size="S" />
<div class="controls">
<ButtonGroup>
<Button
dataCy="add-user"
@ -251,39 +219,47 @@
icon="UserAdd"
cta>Add users</Button
>
<Button on:click={importUsersModal.show} icon="Import" primary
>Import users</Button
<Button
on:click={importUsersModal.show}
icon="Import"
secondary
newStyles
>
<div class="field">
<Label size="L">Search email</Label>
<Search bind:value={searchEmail} placeholder="" />
</div>
{#if selectedRows.length > 0}
<DeleteRowsButton on:updaterows {selectedRows} {deleteRows} />
{/if}
Import users
</Button>
</ButtonGroup>
<Table
on:click={({ detail }) => $goto(`./${detail._id}`)}
{schema}
bind:selectedRows
data={enrichedUsers}
allowEditColumns={false}
allowEditRows={false}
allowSelectRows={true}
showHeaderBorder={false}
{customRenderers}
/>
<div class="pagination">
<Pagination
page={$pageInfo.pageNumber}
hasPrevPage={$pageInfo.loading ? false : $pageInfo.hasPrevPage}
hasNextPage={$pageInfo.loading ? false : $pageInfo.hasNextPage}
goToPrevPage={pageInfo.prevPage}
goToNextPage={pageInfo.nextPage}
/>
<div class="controls-right">
<Search bind:value={searchEmail} placeholder="Search email" />
{#if selectedRows.length > 0}
<DeleteRowsButton
item="user"
on:updaterows
{selectedRows}
{deleteRows}
/>
{/if}
</div>
</Layout>
</div>
<Table
on:click={({ detail }) => $goto(`./${detail._id}`)}
{schema}
bind:selectedRows
data={enrichedUsers}
allowEditColumns={false}
allowEditRows={false}
allowSelectRows={true}
showHeaderBorder={false}
{customRenderers}
/>
<div class="pagination">
<Pagination
page={$pageInfo.pageNumber}
hasPrevPage={$pageInfo.loading ? false : $pageInfo.hasPrevPage}
hasNextPage={$pageInfo.loading ? false : $pageInfo.hasNextPage}
goToPrevPage={pageInfo.prevPage}
goToNextPage={pageInfo.nextPage}
/>
</div>
</Layout>
<Modal bind:this={createUserModal}>
@ -320,28 +296,22 @@
display: flex;
flex-direction: row;
justify-content: flex-end;
margin-top: var(--spacing-xl);
}
.field {
.controls {
display: flex;
align-items: center;
flex-direction: row;
grid-gap: var(--spacing-m);
margin-left: auto;
justify-content: space-between;
align-items: center;
}
.field > :global(*) + :global(*) {
margin-left: var(--spacing-m);
}
.access-description {
.controls-right {
display: flex;
margin-top: var(--spacing-xl);
opacity: 0.8;
flex-direction: row;
justify-content: flex-end;
align-items: center;
gap: var(--spacing-xl);
}
.access-text {
margin-left: var(--spacing-m);
.controls-right :global(.spectrum-Search) {
width: 200px;
}
</style>

11
packages/builder/src/pages/builder/portal/overview/_components/AccessTab.svelte
View File

@ -17,10 +17,10 @@
import { users, groups, apps, auth } from "stores/portal"
import AssignmentModal from "./AssignmentModal.svelte"
import { createPaginationStore } from "helpers/pagination"
import { Constants } from "@budibase/frontend-core"
import { roles } from "stores/backend"
export let app
let assignmentModal
let appGroups = []
let appUsers = []
@ -28,14 +28,9 @@
search = undefined
let pageInfo = createPaginationStore()
let fixedAppId
$: page = $pageInfo.page
$: hasGroupsLicense = $auth.user?.license.features.includes(
Constants.Features.USER_GROUPS
)
$: fixedAppId = apps.getProdAppID(app.devId)
$: appGroups = $groups.filter(x => {
return x.apps.includes(app.appId)
})
@ -161,7 +156,7 @@
>
</div>
</div>
{#if hasGroupsLicense && appGroups.length}
{#if $auth.groupsEnabled && appGroups.length}
<List title="User Groups">
{#each appGroups as group}
<ListItem

149
packages/builder/src/pages/builder/portal/overview/_components/AssignmentModal.svelte
View File

@ -4,22 +4,65 @@
PickerDropdown,
ActionButton,
Layout,
Icon,
notifications,
} from "@budibase/bbui"
import { roles } from "stores/backend"
import { groups, users } from "stores/portal"
import { groups, users, auth } from "stores/portal"
import { RoleUtils } from "@budibase/frontend-core"
import { createPaginationStore } from "helpers/pagination"
export let app
export let addData
export let appUsers = []
let prevSearch = undefined,
search = undefined
let pageInfo = createPaginationStore()
let appData = [{ id: "", role: "" }]
$: page = $pageInfo.page
$: fetchUsers(page, search)
$: availableUsers = getAvailableUsers($users, appUsers, appData)
$: filteredGroups = $groups.filter(group => {
return !group.apps.find(appId => {
return appId === app.appId
})
})
$: valid =
appData?.length && !appData?.some(x => !x.id?.length || !x.role?.length)
$: optionSections = {
...($auth.groupsEnabled &&
filteredGroups.length && {
["User groups"]: {
data: filteredGroups,
getLabel: group => group.name,
getValue: group => group._id,
getIcon: group => group.icon,
getColour: group => group.color,
},
}),
users: {
data: availableUsers,
getLabel: user => user.email,
getValue: user => user._id,
getIcon: user => user.icon,
getColour: user => user.color,
},
}
const getAvailableUsers = (allUsers, appUsers, newUsers) => {
return (allUsers.data || []).filter(user => {
// Filter out assigned users
if (appUsers.find(x => x._id === user._id)) {
return false
}
// Filter out new users which are going to be assigned
return !newUsers.find(x => x.id === user._id)
})
}
async function fetchUsers(page, search) {
if ($pageInfo.loading) {
return
@ -39,36 +82,13 @@
}
}
$: filteredGroups = $groups.filter(group => {
return !group.apps.find(appId => {
return appId === app.appId
})
})
$: optionSections = {
...(filteredGroups.length && {
groups: {
data: filteredGroups,
getLabel: group => group.name,
getValue: group => group._id,
getIcon: group => group.icon,
getColour: group => group.color,
},
}),
users: {
data: $users.data.filter(u => !appUsers.find(x => x._id === u._id)),
getLabel: user => user.email,
getValue: user => user._id,
getIcon: user => user.icon,
getColour: user => user.color,
},
}
$: appData = [{ id: "", role: "" }]
function addNewInput() {
appData = [...appData, { id: "", role: "" }]
}
const removeItem = index => {
appData = appData.filter((x, idx) => idx !== index)
}
</script>
<ModalContent
@ -78,28 +98,61 @@
cancelText="Cancel"
onConfirm={() => addData(appData)}
showCloseIcon={false}
disabled={!valid}
>
<Layout noPadding gap="XS">
{#each appData as input, index}
<PickerDropdown
autocomplete
primaryOptions={optionSections}
secondaryOptions={$roles}
secondaryPlaceholder="Access"
bind:primaryValue={input.id}
bind:secondaryValue={input.role}
bind:searchTerm={search}
getPrimaryOptionLabel={group => group.name}
getPrimaryOptionValue={group => group.name}
getPrimaryOptionIcon={group => group.icon}
getPrimaryOptionColour={group => group.colour}
getSecondaryOptionLabel={role => role.name}
getSecondaryOptionValue={role => role._id}
getSecondaryOptionColour={role => RoleUtils.getRoleColour(role._id)}
/>
{/each}
</Layout>
{#if appData?.length}
<Layout noPadding gap="XS">
{#each appData as input, index}
<div class="item">
<div class="picker">
<PickerDropdown
autocomplete
showClearIcon={false}
primaryOptions={optionSections}
secondaryOptions={$roles}
secondaryPlaceholder="Access"
bind:primaryValue={input.id}
bind:secondaryValue={input.role}
bind:searchTerm={search}
getPrimaryOptionLabel={group => group.name}
getPrimaryOptionValue={group => group.name}
getPrimaryOptionIcon={group => group.icon}
getPrimaryOptionColour={group => group.colour}
getSecondaryOptionLabel={role => role.name}
getSecondaryOptionValue={role => role._id}
getSecondaryOptionColour={role =>
RoleUtils.getRoleColour(role._id)}
/>
</div>
<div class="icon">
<Icon
name="Close"
hoverable
size="S"
on:click={() => removeItem(index)}
/>
</div>
</div>
{/each}
</Layout>
{/if}
<div>
<ActionButton on:click={addNewInput} icon="Add">Add email</ActionButton>
</div>
</ModalContent>
<style>
.item {
position: relative;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.picker {
width: calc(100% - 30px);
}
.icon {
width: 20px;
}
</style>

8
packages/builder/src/stores/portal/auth.js
View File

@ -2,6 +2,8 @@ import { derived, writable, get } from "svelte/store"
import { API } from "api"
import { admin } from "stores/portal"
import analytics from "analytics"
import { FEATURE_FLAGS } from "helpers/featureFlags"
import { Constants } from "@budibase/frontend-core"
export function createAuthStore() {
const auth = writable({
@ -10,11 +12,13 @@ export function createAuthStore() {
tenantSet: false,
loaded: false,
postLogout: false,
groupsEnabled: false,
})
const store = derived(auth, $store => {
let initials = null
let isAdmin = false
let isBuilder = false
let groupsEnabled = false
if ($store.user) {
const user = $store.user
if (user.firstName) {
@ -29,6 +33,9 @@ export function createAuthStore() {
}
isAdmin = !!user.admin?.global
isBuilder = !!user.builder?.global
groupsEnabled =
user?.license.features.includes(Constants.Features.USER_GROUPS) &&
user?.featureFlags.includes(FEATURE_FLAGS.USER_GROUPS)
}
return {
user: $store.user,
@ -39,6 +46,7 @@ export function createAuthStore() {
initials,
isAdmin,
isBuilder,
groupsEnabled,
}
})

8
packages/builder/src/stores/portal/users.js
View File

@ -26,12 +26,8 @@ export function createUsersStore() {
return await API.getUsers()
}
async function invite({ emails, builder, admin }) {
return API.inviteUsers({
emails,
builder,
admin,
})
async function invite(payload) {
return API.inviteUsers(payload)
}
async function acceptInvite(inviteCode, password) {
return API.acceptInvite({

1
packages/cli/.gitignore vendored
View File

@ -5,3 +5,4 @@ build/
docker-error.log
envoy.yaml
*.tar.gz
prebuilds/

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/bbui": "1.1.33-alpha.4",
"@budibase/frontend-core": "1.1.33-alpha.4",
"@budibase/string-templates": "1.1.33-alpha.4",
"@budibase/bbui": "^1.2.12",
"@budibase/frontend-core": "^1.2.12",
"@budibase/string-templates": "^1.2.12",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "1.1.33-alpha.4",
"@budibase/bbui": "^1.2.12",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

18
packages/frontend-core/src/api/user.js
View File

@ -141,20 +141,18 @@ export const buildUserEndpoints = API => ({
/**
* Invites multiple users to the current tenant.
* @param email An array of email addresses
* @param builder whether the user should be a global builder
* @param admin whether the user should be a global admin
* @param users An array of users to invite
*/
inviteUsers: async ({ emails, builder, admin }) => {
inviteUsers: async users => {
return await API.post({
url: "/api/global/users/inviteMultiple",
body: {
emails,
url: "/api/global/users/multi/invite",
body: users.map(user => ({
email: user.email,
userInfo: {
admin: admin ? { global: true } : undefined,
builder: builder ? { global: true } : undefined,
admin: user.admin ? { global: true } : undefined,
builder: user.admin || user.builder ? { global: true } : undefined,
},
},
})),
})
},

20
packages/frontend-core/src/constants.js
View File

@ -60,25 +60,31 @@ export const TableNames = {
USERS: "ta_users",
}
export const BbRoles = [
{ label: "App User", value: "appUser" },
{ label: "Developer", value: "developer" },
{ label: "Admin", value: "admin" },
export const BudibaseRoles = {
AppUser: "appUser",
Developer: "developer",
Admin: "admin",
}
export const BudibaseRoleOptions = [
{ label: "App User", value: BudibaseRoles.AppUser },
{ label: "Developer", value: BudibaseRoles.Developer },
{ label: "Admin", value: BudibaseRoles.Admin },
]
export const BuilderRoleDescriptions = [
{
value: "appUser",
value: BudibaseRoles.AppUser,
icon: "User",
label: "App user - Only has access to published apps",
},
{
value: "developer",
value: BudibaseRoles.Developer,
icon: "Hammer",
label: "Developer - Access to the app builder",
},
{
value: "admin",
value: BudibaseRoles.Admin,
icon: "Draw",
label: "Admin - Full access",
},

20
packages/frontend-core/src/fetch/DataFetch.js
View File

@ -170,6 +170,7 @@ export default class DataFetch {
rows: page.rows,
info: page.info,
cursors: paginate && page.hasNextPage ? [null, page.cursor] : [null],
error: page.error,
}))
}
@ -182,7 +183,7 @@ export default class DataFetch {
const features = get(this.featureStore)
// Get the actual data
let { rows, info, hasNextPage, cursor } = await this.getData()
let { rows, info, hasNextPage, cursor, error } = await this.getData()
// If we don't support searching, do a client search
if (!features.supportsSearch) {
@ -204,6 +205,7 @@ export default class DataFetch {
info,
hasNextPage,
cursor,
error,
}
}
@ -345,8 +347,14 @@ export default class DataFetch {
return
}
this.store.update($store => ({ ...$store, loading: true }))
const { rows, info } = await this.getPage()
this.store.update($store => ({ ...$store, rows, info, loading: false }))
const { rows, info, error } = await this.getPage()
this.store.update($store => ({
...$store,
rows,
info,
loading: false,
error,
}))
}
/**
@ -386,7 +394,7 @@ export default class DataFetch {
cursor: nextCursor,
pageNumber: $store.pageNumber + 1,
}))
const { rows, info, hasNextPage, cursor } = await this.getPage()
const { rows, info, hasNextPage, cursor, error } = await this.getPage()
// Update state
this.store.update($store => {
@ -400,6 +408,7 @@ export default class DataFetch {
info,
cursors,
loading: false,
error,
}
})
}
@ -421,7 +430,7 @@ export default class DataFetch {
cursor: prevCursor,
pageNumber: $store.pageNumber - 1,
}))
const { rows, info } = await this.getPage()
const { rows, info, error } = await this.getPage()
// Update state
this.store.update($store => {
@ -430,6 +439,7 @@ export default class DataFetch {
rows,
info,
loading: false,
error,
}
})
}

1
packages/frontend-core/src/fetch/TableFetch.js
View File

@ -37,6 +37,7 @@ export default class TableFetch extends DataFetch {
return {
rows: [],
hasNextPage: false,
error,
}
}
}

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -77,11 +77,11 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "1.1.33-alpha.4",
"@budibase/client": "1.1.33-alpha.4",
"@budibase/pro": "1.1.33-alpha.4",
"@budibase/string-templates": "1.1.33-alpha.4",
"@budibase/types": "1.1.33-alpha.4",
"@budibase/backend-core": "^1.2.12",
"@budibase/client": "^1.2.12",
"@budibase/pro": "1.2.12",
"@budibase/string-templates": "^1.2.12",
"@budibase/types": "^1.2.12",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

40
packages/server/src/api/controllers/row/external.js
View File

@ -128,25 +128,35 @@ exports.search = async ctx => {
[params.sort]: direction,
}
}
const rows = await handleRequest(DataSourceOperation.READ, tableId, {
filters: query,
sort,
paginate: paginateObj,
})
let hasNextPage = false
if (paginate && rows.length === limit) {
const nextRows = await handleRequest(DataSourceOperation.READ, tableId, {
try {
const rows = await handleRequest(DataSourceOperation.READ, tableId, {
filters: query,
sort,
paginate: {
limit: 1,
page: bookmark * limit + 1,
},
paginate: paginateObj,
})
hasNextPage = nextRows.length > 0
let hasNextPage = false
if (paginate && rows.length === limit) {
const nextRows = await handleRequest(DataSourceOperation.READ, tableId, {
filters: query,
sort,
paginate: {
limit: 1,
page: bookmark * limit + 1,
},
})
hasNextPage = nextRows.length > 0
}
// need wrapper object for bookmarks etc when paginating
return { rows, hasNextPage, bookmark: bookmark + 1 }
} catch (err) {
if (err.message && err.message.includes("does not exist")) {
throw new Error(
`Table updated externally, please re-fetch - ${err.message}`
)
} else {
throw err
}
}
// need wrapper object for bookmarks etc when paginating
return { rows, hasNextPage, bookmark: bookmark + 1 }
}
exports.validate = async () => {

10
packages/server/src/app.ts
View File

@ -15,6 +15,7 @@ const Sentry = require("@sentry/node")
const fileSystem = require("./utilities/fileSystem")
const bullboard = require("./automations/bullboard")
const { logAlert } = require("@budibase/backend-core/logging")
const { pinoSettings } = require("@budibase/backend-core")
const { Thread } = require("./threads")
import redis from "./utilities/redis"
import * as migrations from "./migrations"
@ -35,14 +36,7 @@ app.use(
})
)
app.use(
pino({
prettyPrint: {
levelFirst: true,
},
level: env.LOG_LEVEL || "error",
})
)
app.use(pino(pinoSettings()))
if (!env.isTest()) {
const plugin = bullboard.init()

3
packages/server/src/integrations/utils.ts
View File

@ -224,8 +224,9 @@ function shouldCopySpecialColumn(
FieldTypes.ARRAY,
FieldTypes.FORMULA,
]
// column has been deleted, remove
if (column && !fetchedColumn) {
return true
return false
}
const fetchedIsNumber =
!fetchedColumn || fetchedColumn.type === FieldTypes.NUMBER

31
packages/server/yarn.lock
View File

@ -1094,19 +1094,18 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.1.33-alpha.4":
version "1.1.33-alpha.4"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.33-alpha.4.tgz#207ffe45d41535e59ccc21cca9892d1e41818a14"
integrity sha512-p8SZkODBF4+BhfIYWIkUtJhR04OjvkmkrVTSFWXv2NTkIbSpaJGTkx9Kao+1Dn4N3H4jU4OBdmScy+C8F5MeSw==
"@budibase/backend-core@1.2.12":
version "1.2.12"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.12.tgz#a09ef7c4b7d1217b65e385199f2d044d1f30f450"
integrity sha512-o6tsX9bfpMLfAEfxBI4StC6Lvt1PkJ6b0JYlgp8QiXa0WxZX7np24cOxt2fWrP3ASIMDCrzLn2e3k3eOnzvh8w==
dependencies:
"@budibase/types" "1.1.33-alpha.4"
"@budibase/types" "^1.2.12"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
dotenv "16.0.1"
emitter-listener "1.1.2"
ioredis "4.28.0"
joi "17.6.0"
jsonwebtoken "8.5.1"
koa-passport "4.1.4"
lodash "4.17.21"
@ -1178,13 +1177,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@1.1.33-alpha.4":
version "1.1.33-alpha.4"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.33-alpha.4.tgz#d25bc2ca73d11adfdc659e324b1e8de31c17657a"
integrity sha512-CQ3zVbom4ndzIfUznUSERQ4Bz6ZVuy4HbOYGKKkU/FjoWqrYRK1tqlhmfCNQy8P9rnKURCUf3PMoWVWSOAS24g==
"@budibase/pro@1.2.12":
version "1.2.12"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.12.tgz#252f8f1c6730a3395d9d340f2e843052bf0293bb"
integrity sha512-1zhMMVBCX+VX/ILPlSbI7tdsQLcrxf1W29IQD4W55AbevlFnpQs4qNVveIdXFm+GWvCJbdN5I26CXBOftbVUhA==
dependencies:
"@budibase/backend-core" "1.1.33-alpha.4"
"@budibase/types" "1.1.33-alpha.4"
"@budibase/backend-core" "1.2.12"
"@budibase/types" "1.2.12"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1207,10 +1206,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@1.1.33-alpha.4":
version "1.1.33-alpha.4"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.33-alpha.4.tgz#a8de79c385280389be8b2cc214185caddf5fe4d3"
integrity sha512-od/gbLgbJnHsVlCvBQkuJf3t/Y9VLUNRYPl3Y4IbNOylpj3rSOKVGF3jANQgkI+pOBt5ni3Xlhc7aOI3qAning==
"@budibase/types@1.2.12", "@budibase/types@^1.2.12":
version "1.2.12"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.12.tgz#c460d1b39116538e47e00178116ad066aa6a6f1c"
integrity sha512-EeWadHUzeLx4X27Pv6XWlpSXbeLIMvg7r+Q52kYyOZFkmjtdCNFQW5PCu1bYUw9L1Xa64t7fvRLjKiNs2xGX7g==
"@bull-board/api@3.7.0":
version "3.7.0"

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

1
packages/types/src/sdk/migrations.ts
View File

@ -46,6 +46,7 @@ export enum MigrationName {
EVENT_APP_BACKFILL = "event_app_backfill",
EVENT_GLOBAL_BACKFILL = "event_global_backfill",
EVENT_INSTALLATION_BACKFILL = "event_installation_backfill",
GLOBAL_INFO_SYNC_USERS = "global_info_sync_users",
}
export interface MigrationDefinition {

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.1.33-alpha.4",
"version": "1.2.12",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -35,10 +35,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "1.1.33-alpha.4",
"@budibase/pro": "1.1.33-alpha.4",
"@budibase/string-templates": "1.1.33-alpha.4",
"@budibase/types": "1.1.33-alpha.4",
"@budibase/backend-core": "^1.2.12",
"@budibase/pro": "1.2.12",
"@budibase/string-templates": "^1.2.12",
"@budibase/types": "^1.2.12",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

50
packages/worker/src/api/controllers/global/users.ts
View File

@ -3,17 +3,18 @@ import { checkInviteCode } from "../../../utilities/redis"
import { sendEmail } from "../../../utilities/email"
import { users } from "../../../sdk"
import env from "../../../environment"
import { User, CloudAccount } from "@budibase/types"
import { CloudAccount, User } from "@budibase/types"
import {
events,
errors,
accounts,
users as usersCore,
tenancy,
cache,
errors,
events,
tenancy,
users as usersCore,
} from "@budibase/backend-core"
import { checkAnyUserExists } from "../../../utilities/users"
import { groups as groupUtils } from "@budibase/pro"
const MAX_USERS_UPLOAD_LIMIT = 1000
export const save = async (ctx: any) => {
@ -117,8 +118,7 @@ export const adminUser = async (ctx: any) => {
export const countByApp = async (ctx: any) => {
const appId = ctx.params.appId
try {
const response = await users.countUsersByApp(appId)
ctx.body = response
ctx.body = await users.countUsersByApp(appId)
} catch (err: any) {
ctx.throw(err.status || 400, err)
}
@ -126,6 +126,9 @@ export const countByApp = async (ctx: any) => {
export const destroy = async (ctx: any) => {
const id = ctx.params.id
if (id === ctx.user._id) {
ctx.throw(400, "Unable to delete self.")
}
await users.destroy(id, ctx.user)
@ -136,6 +139,10 @@ export const destroy = async (ctx: any) => {
export const bulkDelete = async (ctx: any) => {
const { userIds } = ctx.request.body
if (userIds?.indexOf(ctx.user._id) !== -1) {
ctx.throw(400, "Unable to delete self.")
}
try {
let usersResponse = await users.bulkDelete(userIds)
@ -207,13 +214,13 @@ export const invite = async (ctx: any) => {
}
export const inviteMultiple = async (ctx: any) => {
let { emails, userInfo } = ctx.request.body
let users = ctx.request.body
let existing = false
let existingEmail
for (let email of emails) {
if (await usersCore.getGlobalUserByEmail(email)) {
for (let user of users) {
if (await usersCore.getGlobalUserByEmail(user.email)) {
existing = true
existingEmail = email
existingEmail = user.email
break
}
}
@ -221,17 +228,18 @@ export const inviteMultiple = async (ctx: any) => {
if (existing) {
ctx.throw(400, `${existingEmail} already exists`)
}
if (!userInfo) {
userInfo = {}
}
userInfo.tenantId = tenancy.getTenantId()
const opts: any = {
subject: "{{ company }} platform invitation",
info: userInfo,
}
for (let i = 0; i < emails.length; i++) {
await sendEmail(emails[i], EmailTemplatePurpose.INVITATION, opts)
for (let i = 0; i < users.length; i++) {
let userInfo = users[i].userInfo
if (!userInfo) {
userInfo = {}
}
userInfo.tenantId = tenancy.getTenantId()
const opts: any = {
subject: "{{ company }} platform invitation",
info: userInfo,
}
await sendEmail(users[i].email, EmailTemplatePurpose.INVITATION, opts)
}
ctx.body = {

13
packages/worker/src/api/controllers/system/migrations.ts Normal file
View File

@ -0,0 +1,13 @@
const { migrate, MIGRATIONS } = require("../../../migrations")
export const runMigrations = async (ctx: any) => {
const options = ctx.request.body
// don't await as can take a while, just return
migrate(options)
ctx.status = 200
}
export const fetchDefinitions = async (ctx: any) => {
ctx.body = MIGRATIONS
ctx.status = 200
}

5
packages/worker/src/api/index.js
View File

@ -106,7 +106,10 @@ router
if (ctx.publicEndpoint) {
return next()
}
if ((!ctx.isAuthenticated || !ctx.user.budibaseAccess) && !ctx.internal) {
if (
(!ctx.isAuthenticated || (ctx.user && !ctx.user.budibaseAccess)) &&
!ctx.internal
) {
ctx.throw(403, "Unauthorized - no public worker access")
}
return next()

8
packages/worker/src/api/routes/global/roles.js
View File

@ -1,12 +1,12 @@
const Router = require("@koa/router")
const controller = require("../../controllers/global/roles")
const { adminOnly } = require("@budibase/backend-core/auth")
const { builderOrAdmin } = require("@budibase/backend-core/auth")
const router = Router()
router
.get("/api/global/roles", adminOnly, controller.fetch)
.get("/api/global/roles/:appId", adminOnly, controller.find)
.delete("/api/global/roles/:appId", adminOnly, controller.removeAppRole)
.get("/api/global/roles", builderOrAdmin, controller.fetch)
.get("/api/global/roles/:appId", builderOrAdmin, controller.find)
.delete("/api/global/roles/:appId", builderOrAdmin, controller.removeAppRole)
module.exports = router

2
packages/worker/src/api/routes/global/self.js
View File

@ -1,6 +1,6 @@
const Router = require("@koa/router")
const controller = require("../../controllers/global/self")
const builderOnly = require("../../../middleware/builderOnly")
const { builderOnly } = require("@budibase/backend-core/auth")
const { users } = require("../validation")
const router = Router()

16
packages/worker/src/api/routes/global/users.js
View File

@ -6,7 +6,7 @@ const Joi = require("joi")
const cloudRestricted = require("../../../middleware/cloudRestricted")
const { users } = require("../validation")
const selfController = require("../../controllers/global/self")
const builderOrAdmin = require("../../../middleware/builderOrAdmin")
const { builderOrAdmin } = require("@budibase/backend-core/auth")
const router = Router()
@ -32,10 +32,12 @@ function buildInviteValidation() {
function buildInviteMultipleValidation() {
// prettier-ignore
return joiValidator.body(Joi.object({
emails: Joi.array().required(),
userInfo: Joi.object().optional(),
}).required())
return joiValidator.body(Joi.array().required().items(
Joi.object({
email: Joi.string(),
userInfo: Joi.object().optional(),
})
))
}
function buildInviteAcceptValidation() {
@ -64,7 +66,7 @@ router
.post("/api/global/users/search", builderOrAdmin, controller.search)
.delete("/api/global/users/:id", adminOnly, controller.destroy)
.post("/api/global/users/bulkDelete", adminOnly, controller.bulkDelete)
.get("/api/global/users/count/:appId", adminOnly, controller.countByApp)
.get("/api/global/users/count/:appId", builderOrAdmin, controller.countByApp)
.get("/api/global/roles/:appId")
.post(
"/api/global/users/invite",
@ -79,7 +81,7 @@ router
controller.invite
)
.post(
"/api/global/users/inviteMultiple",
"/api/global/users/multi/invite",
adminOnly,
buildInviteMultipleValidation(),
controller.inviteMultiple

2
packages/worker/src/api/routes/index.js
View File

@ -12,6 +12,7 @@ const tenantsRoutes = require("./system/tenants")
const statusRoutes = require("./system/status")
const selfRoutes = require("./global/self")
const licenseRoutes = require("./global/license")
const migrationRoutes = require("./system/migrations")
let userGroupRoutes = api.groups
exports.routes = [
@ -29,4 +30,5 @@ exports.routes = [
selfRoutes,
licenseRoutes,
userGroupRoutes,
migrationRoutes,
]

19
packages/worker/src/api/routes/system/migrations.ts Normal file
View File

@ -0,0 +1,19 @@
import Router from "@koa/router"
import * as migrationsController from "../../controllers/system/migrations"
import { auth } from "@budibase/backend-core"
const router = new Router()
router
.post(
"/api/system/migrations/run",
auth.internalApi,
migrationsController.runMigrations
)
.get(
"/api/system/migrations/definitions",
auth.internalApi,
migrationsController.fetchDefinitions
)
export = router

2
packages/worker/src/api/routes/validation/users.ts
View File

@ -1,4 +1,4 @@
import joiValidator from "../../../middleware/joi-validator"
const { joiValidator } = require("@budibase/backend-core/auth")
import Joi from "joi"
let schema: any = {

11
packages/worker/src/index.ts
View File

@ -18,7 +18,7 @@ const http = require("http")
const api = require("./api")
const redis = require("./utilities/redis")
const Sentry = require("@sentry/node")
import { events } from "@budibase/backend-core"
import { events, pinoSettings } from "@budibase/backend-core"
// this will setup http and https proxies form env variables
bootstrap()
@ -30,14 +30,7 @@ app.keys = ["secret", "key"]
// set up top level koa middleware
app.use(koaBody({ multipart: true }))
app.use(koaSession(app))
app.use(
logger({
prettyPrint: {
levelFirst: true,
},
level: env.LOG_LEVEL || "error",
})
)
app.use(logger(pinoSettings()))
// authentication
app.use(passport.initialize())

9
packages/worker/src/middleware/adminOnly.js
View File

@ -1,9 +0,0 @@
module.exports = async (ctx, next) => {
if (
!ctx.internal &&
(!ctx.user || !ctx.user.admin || !ctx.user.admin.global)
) {
ctx.throw(403, "Admin user only endpoint.")
}
return next()
}

36
packages/worker/src/middleware/joi-validator.js
View File

@ -1,36 +0,0 @@
const Joi = require("joi")
function validate(schema, property) {
// Return a Koa middleware function
return (ctx, next) => {
if (!schema) {
return next()
}
let params = null
if (ctx[property] != null) {
params = ctx[property]
} else if (ctx.request[property] != null) {
params = ctx.request[property]
}
schema = schema.append({
createdAt: Joi.any().optional(),
updatedAt: Joi.any().optional(),
})
const { error } = schema.validate(params)
if (error) {
ctx.throw(400, `Invalid ${property} - ${error.message}`)
return
}
return next()
}
}
module.exports.body = schema => {
return validate(schema, "body")
}
module.exports.params = schema => {
return validate(schema, "params")
}

20
packages/worker/src/migrations/functions/globalInfoSyncUsers.ts Normal file
View File

@ -0,0 +1,20 @@
import { User } from "@budibase/types"
import * as sdk from "../../sdk"
/**
* Date:
* Aug 2022
*
* Description:
* Re-sync the global-db users to the global-info db users
*/
export const run = async (globalDb: any) => {
const users = (await sdk.users.allUsers()) as User[]
const promises = []
for (let user of users) {
promises.push(
sdk.users.addTenant(user.tenantId, user._id as string, user.email)
)
}
await Promise.all(promises)
}

74
packages/worker/src/migrations/index.ts Normal file
View File

@ -0,0 +1,74 @@
import { migrations, redis } from "@budibase/backend-core"
import { Migration, MigrationOptions, MigrationName } from "@budibase/types"
import env from "../environment"
// migration functions
import * as syncUserInfo from "./functions/globalInfoSyncUsers"
/**
* Populate the migration function and additional configuration from
* the static migration definitions.
*/
export const buildMigrations = () => {
const definitions = migrations.DEFINITIONS
const workerMigrations: Migration[] = []
for (const definition of definitions) {
switch (definition.name) {
case MigrationName.GLOBAL_INFO_SYNC_USERS: {
// only needed in cloud
if (!env.SELF_HOSTED) {
workerMigrations.push({
...definition,
fn: syncUserInfo.run,
})
}
break
}
}
}
return workerMigrations
}
export const MIGRATIONS = buildMigrations()
export const migrate = async (options?: MigrationOptions) => {
if (env.SELF_HOSTED) {
await migrateWithLock(options)
} else {
await migrations.runMigrations(MIGRATIONS, options)
}
}
const migrateWithLock = async (options?: MigrationOptions) => {
// get a new lock client
const redlock = await redis.clients.getMigrationsRedlock()
// lock for 15 minutes
const ttl = 1000 * 60 * 15
let migrationLock
// acquire lock
try {
migrationLock = await redlock.lock("migrations", ttl)
} catch (e: any) {
if (e.name === "LockError") {
return
} else {
throw e
}
}
// run migrations
try {
await migrations.runMigrations(MIGRATIONS, options)
} finally {
// release lock
try {
await migrationLock.unlock()
} catch (e) {
console.error("unable to release migration lock")
}
}
}

24
packages/worker/src/sdk/users/users.ts
View File

@ -101,12 +101,11 @@ interface SaveUserOpts {
bulkCreate?: boolean
}
export const buildUser = async (
const buildUser = async (
user: any,
opts: SaveUserOpts = {
hashPassword: true,
requirePassword: true,
bulkCreate: false,
},
tenantId: string,
dbUser?: any
@ -185,15 +184,12 @@ export const save = async (
dbUser = await db.get(_id)
}
let builtUser = await buildUser(
user,
{
hashPassword: true,
requirePassword: user.requirePassword,
},
tenantId,
dbUser
)
let builtUser = await buildUser(user, opts, tenantId, dbUser)
// make sure we set the _id field for a new user
if (!_id) {
_id = builtUser._id
}
try {
const putOpts = {
@ -220,7 +216,7 @@ export const save = async (
await addTenant(tenantId, _id, email)
await cache.user.invalidateUser(response.id)
// let server know to sync user
await apps.syncUserInApps(builtUser._id)
await apps.syncUserInApps(_id)
return {
_id: response.id,
@ -293,7 +289,6 @@ export const bulkCreate = async (
{
hashPassword: true,
requirePassword: user.requirePassword,
bulkCreate: false,
},
tenantId
)
@ -305,6 +300,9 @@ export const bulkCreate = async (
// Post processing of bulk added users, i.e events and cache operations
for (const user of usersToBulkSave) {
// TODO: Refactor to bulk insert users into the info db
// instead of relying on looping tenant creation
await addTenant(tenantId, user._id, user.email)
await eventHelpers.handleSaveEvents(user, null)
await apps.syncUserInApps(user._id)
}

31
packages/worker/yarn.lock
View File

@ -291,19 +291,18 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.1.33-alpha.4":
version "1.1.33-alpha.4"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.1.33-alpha.4.tgz#207ffe45d41535e59ccc21cca9892d1e41818a14"
integrity sha512-p8SZkODBF4+BhfIYWIkUtJhR04OjvkmkrVTSFWXv2NTkIbSpaJGTkx9Kao+1Dn4N3H4jU4OBdmScy+C8F5MeSw==
"@budibase/backend-core@1.2.12":
version "1.2.12"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.12.tgz#a09ef7c4b7d1217b65e385199f2d044d1f30f450"
integrity sha512-o6tsX9bfpMLfAEfxBI4StC6Lvt1PkJ6b0JYlgp8QiXa0WxZX7np24cOxt2fWrP3ASIMDCrzLn2e3k3eOnzvh8w==
dependencies:
"@budibase/types" "1.1.33-alpha.4"
"@budibase/types" "^1.2.12"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
bcrypt "5.0.1"
dotenv "16.0.1"
emitter-listener "1.1.2"
ioredis "4.28.0"
joi "17.6.0"
jsonwebtoken "8.5.1"
koa-passport "4.1.4"
lodash "4.17.21"
@ -325,21 +324,21 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@1.1.33-alpha.4":
version "1.1.33-alpha.4"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.1.33-alpha.4.tgz#d25bc2ca73d11adfdc659e324b1e8de31c17657a"
integrity sha512-CQ3zVbom4ndzIfUznUSERQ4Bz6ZVuy4HbOYGKKkU/FjoWqrYRK1tqlhmfCNQy8P9rnKURCUf3PMoWVWSOAS24g==
"@budibase/pro@1.2.12":
version "1.2.12"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.12.tgz#252f8f1c6730a3395d9d340f2e843052bf0293bb"
integrity sha512-1zhMMVBCX+VX/ILPlSbI7tdsQLcrxf1W29IQD4W55AbevlFnpQs4qNVveIdXFm+GWvCJbdN5I26CXBOftbVUhA==
dependencies:
"@budibase/backend-core" "1.1.33-alpha.4"
"@budibase/types" "1.1.33-alpha.4"
"@budibase/backend-core" "1.2.12"
"@budibase/types" "1.2.12"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.1.33-alpha.4":
version "1.1.33-alpha.4"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.1.33-alpha.4.tgz#a8de79c385280389be8b2cc214185caddf5fe4d3"
integrity sha512-od/gbLgbJnHsVlCvBQkuJf3t/Y9VLUNRYPl3Y4IbNOylpj3rSOKVGF3jANQgkI+pOBt5ni3Xlhc7aOI3qAning==
"@budibase/types@1.2.12", "@budibase/types@^1.2.12":
version "1.2.12"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.12.tgz#c460d1b39116538e47e00178116ad066aa6a6f1c"
integrity sha512-EeWadHUzeLx4X27Pv6XWlpSXbeLIMvg7r+Q52kYyOZFkmjtdCNFQW5PCu1bYUw9L1Xa64t7fvRLjKiNs2xGX7g==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"