diff --git a/.github/cla/signatures.json b/.github/cla/signatures.json index 67d475a7a3..8fcde8353e 100644 --- a/.github/cla/signatures.json +++ b/.github/cla/signatures.json @@ -31,6 +31,14 @@ "created_at": "2021-05-01T05:27:53Z", "repoId": 190729906, "pullRequestNo": 1431 + }, + { + "name": "mjashanks", + "id": 3524181, + "comment_id": 844846454, + "created_at": "2021-05-20T08:14:04Z", + "repoId": 190729906, + "pullRequestNo": 1510 } ] } \ No newline at end of file diff --git a/hosting/bootstrap.sh b/hosting/bootstrap.sh deleted file mode 100755 index 4e15481e64..0000000000 --- a/hosting/bootstrap.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -GITHUB_BASE_URL=https://raw.githubusercontent.com/Budibase/budibase/master/hosting - -if ! [ -x "$(command -v wget)" ]; then - echo 'Error: wget is not installed. Please install it for your operating system.' >&2 - exit 1 -fi - -fetch_config_files() { - wget $GITHUB_BASE_URL/docker-compose.yaml - wget $GITHUB_BASE_URL/envoy.yaml - wget $GITHUB_BASE_URL/hosting.properties - wget $GITHUB_BASE_URL/start.sh -} - -fetch_config_files - -# Start budibase -docker-compose --env-file hosting.properties up -d diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index 00c93ca1c6..73bbcfc39b 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -48,6 +48,7 @@ services: REDIS_URL: redis-service:6379 REDIS_PASSWORD: ${REDIS_PASSWORD} depends_on: + - redis-service - minio-service - couch-init diff --git a/hosting/start.sh b/hosting/start.sh deleted file mode 100755 index b32098a3b7..0000000000 --- a/hosting/start.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker-compose --env-file hosting.properties up diff --git a/hosting/update.sh b/hosting/update.sh deleted file mode 100644 index 3ccd5e59d0..0000000000 --- a/hosting/update.sh +++ /dev/null @@ -1 +0,0 @@ -docker-compose --env-file hosting.properties pull && ./start.sh diff --git a/lerna.json b/lerna.json index bf193f9a81..90690dbf98 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.8.16", + "version": "0.8.18", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js index 91a682d859..93217277e7 100644 --- a/packages/auth/src/db/utils.js +++ b/packages/auth/src/db/utils.js @@ -34,6 +34,10 @@ exports.APP_PREFIX = DocumentTypes.APP + SEPARATOR exports.APP_DEV_PREFIX = DocumentTypes.APP_DEV + SEPARATOR exports.SEPARATOR = SEPARATOR +function isDevApp(app) { + return app.appId.startsWith(exports.APP_DEV_PREFIX) +} + /** * If creating DB allDocs/query params with only a single top level ID this can be used, this * is usually the case as most of our docs are top level e.g. tables, automations, users and so on. @@ -160,7 +164,7 @@ exports.getDeployedAppID = appId => { * different users/companies apps as there is no security around it - all apps are returned. * @return {Promise} returns the app information document stored in each app database. */ -exports.getAllApps = async (devApps = false) => { +exports.getAllApps = async ({ dev, all } = {}) => { const CouchDB = getCouch() let allDbs = await CouchDB.allDbs() const appDbNames = allDbs.filter(dbName => @@ -176,12 +180,19 @@ exports.getAllApps = async (devApps = false) => { const apps = response .filter(result => result.status === "fulfilled") .map(({ value }) => value) - return apps.filter(app => { - if (devApps) { - return app.appId.startsWith(exports.APP_DEV_PREFIX) - } - return !app.appId.startsWith(exports.APP_DEV_PREFIX) - }) + if (!all) { + return apps.filter(app => { + if (dev) { + return isDevApp(app) + } + return !isDevApp(app) + }) + } else { + return apps.map(app => ({ + ...app, + status: isDevApp(app) ? "development" : "published", + })) + } } } diff --git a/packages/auth/src/utils.js b/packages/auth/src/utils.js index a0ba0d25b5..278ad07174 100644 --- a/packages/auth/src/utils.js +++ b/packages/auth/src/utils.js @@ -112,6 +112,9 @@ exports.isClient = ctx => { * @return {Promise} */ exports.getGlobalUserByEmail = async email => { + if (email == null) { + throw "Must supply an email address to view" + } const db = getDB(StaticDatabases.GLOBAL.name) try { let users = ( diff --git a/packages/bbui/src/Form/Core/Checkbox.svelte b/packages/bbui/src/Form/Core/Checkbox.svelte index 7d564d2a9d..e9a6b56fd9 100644 --- a/packages/bbui/src/Form/Core/Checkbox.svelte +++ b/packages/bbui/src/Form/Core/Checkbox.svelte @@ -45,3 +45,9 @@ {text || ""} + + diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte index 5b5c72b809..3315c923f8 100644 --- a/packages/bbui/src/Form/Core/Dropzone.svelte +++ b/packages/bbui/src/Form/Core/Dropzone.svelte @@ -37,9 +37,28 @@ const fieldId = id || generateID() let selectedImageIdx = 0 let fileDragged = false + let selectedUrl $: selectedImage = value?.[selectedImageIdx] ?? null $: fileCount = value?.length ?? 0 - $: isImage = imageExtensions.includes(selectedImage?.extension?.toLowerCase()) + $: isImage = + imageExtensions.includes(selectedImage?.extension?.toLowerCase()) || + selectedImage?.type?.startsWith("image") + + $: { + if (selectedImage?.url) { + selectedUrl = selectedImage?.url + } else if (selectedImage) { + try { + let reader = new FileReader() + reader.readAsDataURL(selectedImage) + reader.onload = e => { + selectedUrl = e.target.result + } + } catch (error) { + selectedUrl = null + } + } + } async function processFileList(fileList) { if ( @@ -102,11 +121,13 @@
{selectedImage.name}
-
- {#if selectedImage.size <= BYTES_IN_MB} - {`${selectedImage.size / BYTES_IN_KB} KB`} - {:else}{`${selectedImage.size / BYTES_IN_MB} MB`}{/if} -
+ {#if selectedImage.size} +
+ {#if selectedImage.size <= BYTES_IN_MB} + {`${selectedImage.size / BYTES_IN_KB} KB`} + {:else}{`${selectedImage.size / BYTES_IN_MB} MB`}{/if} +
+ {/if} {#if !disabled}
@@ -114,7 +135,7 @@ {/if}
{#if isImage} - preview + preview {:else}
{selectedImage.extension}
@@ -142,11 +163,13 @@
{file.name}
-
- {#if file.size <= BYTES_IN_MB} - {`${file.size / BYTES_IN_KB} KB`} - {:else}{`${file.size / BYTES_IN_MB} MB`}{/if} -
+ {#if file.size} +
+ {#if file.size <= BYTES_IN_MB} + {`${file.size / BYTES_IN_KB} KB`} + {:else}{`${file.size / BYTES_IN_MB} MB`}{/if} +
+ {/if} {#if !disabled}
diff --git a/packages/bbui/src/Form/Core/Search.svelte b/packages/bbui/src/Form/Core/Search.svelte index dbc8582ac3..b26c9567c0 100644 --- a/packages/bbui/src/Form/Core/Search.svelte +++ b/packages/bbui/src/Form/Core/Search.svelte @@ -2,10 +2,11 @@ import "@spectrum-css/search/dist/index-vars.css" import { createEventDispatcher } from "svelte" - export let value = "" + export let value = null export let placeholder = null export let disabled = false export let id = null + export let updateOnChange = true const dispatch = createEventDispatcher() let focus = false @@ -23,6 +24,13 @@ updateValue(event.target.value) } + const onInput = event => { + if (!updateOnChange) { + return + } + updateValue(event.target.value) + } + const updateValueOnEnter = event => { if (event.key === "Enter") { updateValue(event.target.value) @@ -44,15 +52,18 @@
+ + diff --git a/packages/bbui/src/Form/Core/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte index 1cf37f3468..e1793c74a6 100644 --- a/packages/bbui/src/Form/Core/TextField.svelte +++ b/packages/bbui/src/Form/Core/TextField.svelte @@ -2,13 +2,14 @@ import "@spectrum-css/textfield/dist/index-vars.css" import { createEventDispatcher } from "svelte" - export let value = "" + export let value = null export let placeholder = null export let type = "text" export let disabled = false export let error = null export let id = null export let readonly = false + export let updateOnChange = true const dispatch = createEventDispatcher() let focus = false @@ -37,7 +38,13 @@ } focus = false updateValue(event.target.value) - dispatch("blur") + } + + const onInput = event => { + if (readonly || !updateOnChange) { + return + } + updateValue(event.target.value) } const updateValueOnEnter = event => { @@ -66,16 +73,19 @@ {/if} diff --git a/packages/bbui/src/Form/Input.svelte b/packages/bbui/src/Form/Input.svelte index 07ebf4f4db..fcab178182 100644 --- a/packages/bbui/src/Form/Input.svelte +++ b/packages/bbui/src/Form/Input.svelte @@ -11,6 +11,7 @@ export let disabled = false export let readonly = false export let error = null + export let updateOnChange = true const dispatch = createEventDispatcher() const onChange = e => { @@ -21,6 +22,7 @@ diff --git a/packages/bbui/src/Form/Search.svelte b/packages/bbui/src/Form/Search.svelte index d41ecd4d6e..b5a6c17b4a 100644 --- a/packages/bbui/src/Form/Search.svelte +++ b/packages/bbui/src/Form/Search.svelte @@ -8,6 +8,7 @@ export let labelPosition = "above" export let placeholder = null export let disabled = false + export let updateOnChange = true const dispatch = createEventDispatcher() const onChange = e => { @@ -18,11 +19,14 @@ diff --git a/packages/bbui/src/Layout/Layout.svelte b/packages/bbui/src/Layout/Layout.svelte index 504db41133..86fd844ca1 100644 --- a/packages/bbui/src/Layout/Layout.svelte +++ b/packages/bbui/src/Layout/Layout.svelte @@ -22,6 +22,7 @@ .container { display: grid; grid-template-columns: 1fr; + position: relative; } .paddingX-S { padding-left: var(--spacing-s); diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 69c9adda14..f2a453dbd2 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -15,6 +15,7 @@ max-width: 80ch; margin: 0 auto; padding: calc(var(--spacing-xl) * 2); + min-height: calc(100% - var(--spacing-xl) * 4); } .wide { @@ -22,5 +23,6 @@ margin: 0; padding: var(--spacing-xl) calc(var(--spacing-xl) * 2) calc(var(--spacing-xl) * 2) calc(var(--spacing-xl) * 2); + min-height: calc(100% - var(--spacing-xl) * 3); } diff --git a/packages/bbui/src/Typography/Body.svelte b/packages/bbui/src/Typography/Body.svelte index 13e83434e4..9a1fe266fc 100644 --- a/packages/bbui/src/Typography/Body.svelte +++ b/packages/bbui/src/Typography/Body.svelte @@ -3,27 +3,17 @@ export let size = "M" export let serif = false - export let noPadding = false - export let textAlign + export let weight = null + export let textAlign = null

- - diff --git a/packages/builder/package.json b/packages/builder/package.json index 6422d8f686..7d86c79c70 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.8.16", + "version": "0.8.18", "license": "AGPL-3.0", "private": true, "scripts": { @@ -66,9 +66,9 @@ }, "dependencies": { "@budibase/bbui": "^1.58.13", - "@budibase/client": "^0.8.16", + "@budibase/client": "^0.8.18", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.8.16", + "@budibase/string-templates": "^0.8.18", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index 3697adb7ac..a030adfcf6 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -57,10 +57,12 @@ > {#if schema && Object.keys(schema).length > 0} - + {#if !isUsersTable} + + {/if} {#if isUsersTable} diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte index 6555197cb2..c23a6e3107 100644 --- a/packages/builder/src/components/backend/DataTable/Table.svelte +++ b/packages/builder/src/components/backend/DataTable/Table.svelte @@ -47,6 +47,8 @@ }) schema.email.displayName = "Email" schema.roleId.displayName = "Role" + schema.firstName.displayName = "First Name" + schema.lastName.displayName = "Last Name" if (schema.status) { schema.status.displayName = "Status" } @@ -101,7 +103,7 @@
- {#if selectedRows.length > 0} + {#if !isUsersTable && selectedRows.length > 0} {/if}
@@ -114,7 +116,7 @@ {customRenderers} {rowCount} bind:selectedRows - allowSelectRows={allowEditing} + allowSelectRows={allowEditing && !isUsersTable} allowEditRows={allowEditing} allowEditColumns={allowEditing} showAutoColumns={!hideAutocolumns} diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte index 11210db49f..62985d4285 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte @@ -32,6 +32,8 @@ delete customSchema["email"] delete customSchema["roleId"] delete customSchema["status"] + delete customSchema["firstName"] + delete customSchema["lastName"] return Object.entries(customSchema) } @@ -67,7 +69,7 @@ return false } - notifications.success("User saved successfully.") + notifications.success("User saved successfully") rows.save(rowResponse) } @@ -84,8 +86,14 @@ readonly={!creating} /> + @@ -97,16 +105,6 @@ getOptionLabel={role => role.name} getOptionValue={role => role._id} /> - - + $goto("./forgot")}> Forgot password? diff --git a/packages/builder/src/components/login/ResetForm.svelte b/packages/builder/src/components/login/ResetForm.svelte index 83e9ab7a6e..a0a56a2523 100644 --- a/packages/builder/src/components/login/ResetForm.svelte +++ b/packages/builder/src/components/login/ResetForm.svelte @@ -1,8 +1,8 @@ diff --git a/packages/builder/src/pages/builder/admin/_layout.svelte b/packages/builder/src/pages/builder/admin/_layout.svelte new file mode 100644 index 0000000000..70823b9a34 --- /dev/null +++ b/packages/builder/src/pages/builder/admin/_layout.svelte @@ -0,0 +1,19 @@ + + +{#if loaded} + +{/if} diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte index d3027f881e..77a1b43c57 100644 --- a/packages/builder/src/pages/builder/admin/index.svelte +++ b/packages/builder/src/pages/builder/admin/index.svelte @@ -9,7 +9,7 @@ } from "@budibase/bbui" import { goto } from "@roxi/routify" import api from "builderStore/api" - import { admin } from "stores/portal" + import { admin, organisation } from "stores/portal" let adminUser = {} @@ -32,22 +32,22 @@
- - - -
- + + + Create an admin user - The admin user has access to everything in Budibase. + + The admin user has access to everything in Budibase. + + + + + -
- - - - -
@@ -68,9 +68,6 @@ justify-content: flex-start; align-items: stretch; } - .center { - text-align: center; - } img { width: 40px; margin: 0 auto; diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index 53d6e17130..7fa584efd7 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -1,19 +1,7 @@ + +{#if $auth.user} + +{/if} diff --git a/packages/builder/src/pages/builder/apps/_components/ChangePasswordModal.svelte b/packages/builder/src/pages/builder/apps/_components/ChangePasswordModal.svelte new file mode 100644 index 0000000000..b0cb74cb64 --- /dev/null +++ b/packages/builder/src/pages/builder/apps/_components/ChangePasswordModal.svelte @@ -0,0 +1,27 @@ + + + + Enter your new password below. + + diff --git a/packages/builder/src/pages/builder/apps/_components/UpdateUserInfoModal.svelte b/packages/builder/src/pages/builder/apps/_components/UpdateUserInfoModal.svelte new file mode 100644 index 0000000000..61446f0c00 --- /dev/null +++ b/packages/builder/src/pages/builder/apps/_components/UpdateUserInfoModal.svelte @@ -0,0 +1,31 @@ + + + + + Personalise the platform by adding your first name and last name. + + + + diff --git a/packages/builder/src/pages/builder/apps/_layout.svelte b/packages/builder/src/pages/builder/apps/_layout.svelte new file mode 100644 index 0000000000..17f70bf815 --- /dev/null +++ b/packages/builder/src/pages/builder/apps/_layout.svelte @@ -0,0 +1,7 @@ + + +{#if $auth.user} + +{/if} diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte new file mode 100644 index 0000000000..cc10fc6e4a --- /dev/null +++ b/packages/builder/src/pages/builder/apps/index.svelte @@ -0,0 +1,163 @@ + + +{#if loaded} +
+ +
+ + +
+ + + Hey {$auth.user.firstName || $auth.user.email} + + + Welcome to the {$organisation.company} portal. Below you'll find + the list of apps that you have access to. + + + +
+ + +
+ userInfoModal.show()}> + Update user information + + changePasswordModal.show()} + > + Update password + + $goto("../portal")} + > + Open developer mode + + Log out + +
+ + {#if $apps.length} + Apps +
+ + {#each $apps as app, idx (app.appId)} + +
+
+ {app.name} + + Edited {Math.round(Math.random() * 10 + 1)} months ago + +
+ + + {/each} + +
+ {:else} + + You don't have access to any apps yet. + + The apps you have access to will be listed here. + + + {/if} + +
+ +
+ + + + + + +{/if} + + diff --git a/packages/builder/src/pages/builder/auth/index.svelte b/packages/builder/src/pages/builder/auth/index.svelte index bf30c6b310..12570aeeb5 100644 --- a/packages/builder/src/pages/builder/auth/index.svelte +++ b/packages/builder/src/pages/builder/auth/index.svelte @@ -1,4 +1,4 @@ diff --git a/packages/builder/src/pages/builder/index.svelte b/packages/builder/src/pages/builder/index.svelte index dc44c9e636..a4fe10f10d 100644 --- a/packages/builder/src/pages/builder/index.svelte +++ b/packages/builder/src/pages/builder/index.svelte @@ -1,4 +1,14 @@ diff --git a/packages/builder/src/pages/builder/invite/index.svelte b/packages/builder/src/pages/builder/invite/index.svelte index 2f2a778517..65b20f8a9d 100644 --- a/packages/builder/src/pages/builder/invite/index.svelte +++ b/packages/builder/src/pages/builder/invite/index.svelte @@ -1,8 +1,8 @@ -
-
- -
-
$goto("./apps")}> - Logotype - {$organisation?.company || "Budibase"} +{#if loaded} +
+
+ +
+
$goto("./apps")}> + Logotype + {$organisation?.company || "Budibase"} +
+
+ +
-
- +
+ + {#each menu as { title, href, heading }} + {title} + {/each} +
-
-
- - {#each menu as { title, href, heading }} - {title} - {/each} - -
- -
-
-
- - -
- - -
- - Old settings - - Log out - +
-
- +
+
+ + +
+ + +
+ + Old settings + + $goto("../apps")}> + Close developer mode + + Log out + +
+
+ +
-
- - - + + + +{/if} diff --git a/packages/builder/src/pages/builder/portal/manage/oauth/_logos/Google.svelte b/packages/builder/src/pages/builder/portal/manage/oauth/_logos/Google.svelte deleted file mode 100644 index 5686e50abc..0000000000 --- a/packages/builder/src/pages/builder/portal/manage/oauth/_logos/Google.svelte +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/builder/src/pages/builder/portal/manage/oauth/index.svelte b/packages/builder/src/pages/builder/portal/manage/oauth/index.svelte deleted file mode 100644 index f9d2c49cfd..0000000000 --- a/packages/builder/src/pages/builder/portal/manage/oauth/index.svelte +++ /dev/null @@ -1,115 +0,0 @@ - - - -
- OAuth - - Every budibase app comes with basic authentication (email/password) - included. You can add additional authentication methods from the options - below. - -
- - {#if google} -
- - - - - Google - - - {#each ConfigFields.Google as field} -
- - -
- {/each} - - -
- - {/if} - - - diff --git a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte index b8c55d6aca..a8d9a7c712 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte @@ -51,45 +51,55 @@ } async function openUpdateRolesModal({ detail }) { - console.log(detail) selectedApp = detail editRolesModal.show() } - -
- $goto("./")} quiet size="S" icon="BackAndroid" - >Back to users -
-
- - User: {$roleFetch?.data?.email} - Lorem ipsum dolor sit amet consectetur adipisicing elit. Debitis porro - ut nesciunt ipsam perspiciatis aliquam et hic minus alias beatae. Odit - veritatis quos quas laborum magnam tenetur perspiciatis ex hic. - - -
+ + +
+ $goto("./")} + quiet + size="S" + icon="BackAndroid" + > + Back to users + +
+ User: {$roleFetch?.data?.email} + + Lorem ipsum dolor sit amet consectetur adipisicing elit. Debitis porro ut + nesciunt ipsam perspiciatis aliquam et hic minus alias beatae. Odit + veritatis quos quas laborum magnam tenetur perspiciatis ex hic. + + -
+ General
+
+ + +
+
+ + +
- Regenerate password + + Regenerate password +
-
+ -
+ Configure roles - + -
- Delete user - Deleting a user completely removes them from your account. -
- -
+ + Delete user + Deleting a user completely removes them from your account. + +
+
@@ -122,10 +130,9 @@ cancelText="Cancel" showCloseIcon={false} > - Are you sure you want to delete {$roleFetch?.data?.email} + + Are you sure you want to delete {$roleFetch?.data?.email} + @@ -140,26 +147,12 @@ .fields { display: grid; grid-gap: var(--spacing-m); - margin-top: var(--spacing-xl); } .field { display: grid; grid-template-columns: 32% 1fr; align-items: center; } - .heading { - margin-bottom: var(--spacing-xl); - } - .general { - position: relative; - margin: var(--spacing-xl) 0; - } - .roles { - margin: var(--spacing-xl) 0; - } - .delete { - margin-top: var(--spacing-xl); - } .regenerate { position: absolute; top: 0; diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte index 8646da9c06..b60f15d976 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte @@ -30,18 +30,18 @@ - If you have SMTP configured and an email for the new user, you can use the + + If you have SMTP configured and an email for the new user, you can use the automated email onboarding flow. Otherwise, use our basic onboarding process - with autogenerated passwords. + with autogenerated passwords. + role != null) ?? [] + $: tags = roles.slice(0, displayLimit) + $: leftover = roles.length - tags.length diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte index 4e47d96552..d515c30d4b 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte @@ -1,7 +1,6 @@ -
+ Users - Users are the common denominator in Budibase. Each user is assigned to a + + Users are the common denominator in Budibase. Each user is assigned to a group that contains apps and permissions. In this section, you can add - users, or edit and delete an existing user. -
+ users, or edit and delete an existing user. + + - -
- Users + +
+ Users + + + + +
-
- - - - -
$goto(`./${detail._id}`)} {schema} @@ -75,31 +74,28 @@ allowSelectRows={false} customRenderers={[{ column: "group", component: TagsRenderer }]} /> - + - + + + diff --git a/packages/builder/src/pages/builder/portal/oauth/_logos/Google.svelte b/packages/builder/src/pages/builder/portal/oauth/_logos/Google.svelte deleted file mode 100644 index 5686e50abc..0000000000 --- a/packages/builder/src/pages/builder/portal/oauth/_logos/Google.svelte +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/builder/src/pages/builder/portal/oauth/index.svelte b/packages/builder/src/pages/builder/portal/oauth/index.svelte deleted file mode 100644 index f8d9b43dec..0000000000 --- a/packages/builder/src/pages/builder/portal/oauth/index.svelte +++ /dev/null @@ -1,114 +0,0 @@ - - - - -
- OAuth - - Every budibase app comes with basic authentication (email/password) - included. You can add additional authentication methods from the options - below. - -
- - {#if google} -
- - - - Google - - - - To allow users to authenticate using their Google accounts, fill out - the fields below. - -
- - {#each ConfigFields.Google as field} -
- - -
- {/each} -
- -
- - {/if} - - - - diff --git a/packages/builder/src/pages/builder/portal/settings/general.svelte b/packages/builder/src/pages/builder/portal/settings/general.svelte index e806bad4c3..bfd6c57b8d 100644 --- a/packages/builder/src/pages/builder/portal/settings/general.svelte +++ b/packages/builder/src/pages/builder/portal/settings/general.svelte @@ -14,118 +14,126 @@ import { organisation } from "stores/portal" import { post } from "builderStore/api" import analytics from "analytics" - let analyticsDisabled = analytics.disabled() - - function toggleAnalytics() { - if (analyticsDisabled) { - analytics.optIn() - } else { - analytics.optOut() - } - } + import { writable } from "svelte/store" + const values = writable({ + analytics: !analytics.disabled(), + company: $organisation.company, + platformUrl: $organisation.platformUrl, + logo: $organisation.logoUrl + ? { url: $organisation.logoUrl, type: "image", name: "Logo" } + : null, + }) let loading = false - let file - async function uploadLogo() { + async function uploadLogo(file) { let data = new FormData() data.append("file", file) - const res = await post("/api/admin/configs/upload/settings/logo", data, {}) return await res.json() } async function saveConfig() { loading = true - await toggleAnalytics() - if (file) { - await uploadLogo() + + // Set analytics preference + if ($values.analytics) { + analytics.optIn() + } else { + analytics.optOut() } + + // Upload logo if required + if ($values.logo && !$values.logo.url) { + await uploadLogo($values.logo) + await organisation.init() + } + + // Update settings const res = await organisation.save({ - company: $organisation.company, - platformUrl: $organisation.platformUrl, + company: $values.company ?? "", + platformUrl: $values.platformUrl ?? "", }) if (res.status === 200) { - notifications.success("Settings saved.") + notifications.success("Settings saved successfully") } else { notifications.error(res.message) } + loading = false } -
- -
- General - - General is the place where you edit your organisation name, logo. You - can also configure your platform URL as well as turn on or off - analytics. - + + + General + + General is the place where you edit your organisation name, logo. You can + also configure your platform URL as well as turn on or off analytics. + + + + + Information + Here you can update your logo and organization name. + +
+
+ +
- -
- Information - Here you can update your logo and organization name. -
-
- - -
- + - -
- Platform - Here you can set up general platform settings. -
-
- - -
-
+
+ + + Platform + Here you can set up general platform settings. + +
+
+ +
- -
+
+ + + Analytics - + If you would like to send analytics that help us make Budibase better, please let us know below. -
-
- - -
+ +
+
+ +
-
- -
-
+
+ +
+ diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte index 5ce4a2c43f..4c97b49763 100644 --- a/packages/builder/src/pages/index.svelte +++ b/packages/builder/src/pages/index.svelte @@ -1,4 +1,4 @@ diff --git a/packages/builder/src/stores/backend/index.js b/packages/builder/src/stores/backend/index.js index 3ea4ed9ea6..e020baaf4b 100644 --- a/packages/builder/src/stores/backend/index.js +++ b/packages/builder/src/stores/backend/index.js @@ -7,4 +7,3 @@ export { roles } from "./roles" export { datasources } from "./datasources" export { integrations } from "./integrations" export { queries } from "./queries" -export { auth } from "./auth" diff --git a/packages/builder/src/stores/backend/auth.js b/packages/builder/src/stores/portal/auth.js similarity index 83% rename from packages/builder/src/stores/backend/auth.js rename to packages/builder/src/stores/portal/auth.js index 40420657ec..baf5f1bfb4 100644 --- a/packages/builder/src/stores/backend/auth.js +++ b/packages/builder/src/stores/portal/auth.js @@ -7,7 +7,7 @@ export function createAuthStore() { return { subscribe: store.subscribe, checkAuth: async () => { - const response = await api.get("/api/self") + const response = await api.get("/api/admin/users/self") const user = await response.json() if (response.status === 200) { store.update(state => ({ ...state, user })) @@ -33,6 +33,14 @@ export function createAuthStore() { await response.json() store.update(state => ({ ...state, user: null })) }, + updateSelf: async user => { + const response = await api.post("/api/admin/users/self", user) + if (response.status === 200) { + store.update(state => ({ ...state, user: { ...state.user, ...user } })) + } else { + throw "Unable to update user details" + } + }, forgotPassword: async email => { const response = await api.post(`/api/admin/auth/reset`, { email, diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js index 7b43841a5f..5bebb2aa7a 100644 --- a/packages/builder/src/stores/portal/index.js +++ b/packages/builder/src/stores/portal/index.js @@ -3,3 +3,4 @@ export { users } from "./users" export { admin } from "./admin" export { apps } from "./apps" export { email } from "./email" +export { auth } from "./auth" diff --git a/packages/builder/src/stores/portal/organisation.js b/packages/builder/src/stores/portal/organisation.js index 97053897f9..5171016b99 100644 --- a/packages/builder/src/stores/portal/organisation.js +++ b/packages/builder/src/stores/portal/organisation.js @@ -1,15 +1,15 @@ import { writable, get } from "svelte/store" import api from "builderStore/api" -const FALLBACK_CONFIG = { - platformUrl: "", - logoUrl: "", - docsUrl: "", - company: "http://localhost:10000", +const DEFAULT_CONFIG = { + platformUrl: "http://localhost:1000", + logoUrl: "https://i.imgur.com/ZKyklgF.png", + docsUrl: undefined, + company: "Budibase", } export function createOrganisationStore() { - const store = writable({}) + const store = writable(DEFAULT_CONFIG) const { subscribe, set } = store async function init() { @@ -17,16 +17,16 @@ export function createOrganisationStore() { const json = await res.json() if (json.status === 400) { - set(FALLBACK_CONFIG) + set(DEFAULT_CONFIG) } else { - set({ ...json.config, _rev: json._rev }) + set({ ...DEFAULT_CONFIG, ...json.config, _rev: json._rev }) } } async function save(config) { const res = await api.post("/api/admin/configs", { type: "settings", - config, + config: { ...get(store), ...config }, _rev: get(store)._rev, }) const json = await res.json() diff --git a/packages/cli/package.json b/packages/cli/package.json index 65513ae33c..0630d0b0c9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "cli", - "version": "0.8.15", + "version": "0.8.18", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/cli/src/analytics/index.js b/packages/cli/src/analytics/index.js index 3d8ea8c5a7..d85323d1d0 100644 --- a/packages/cli/src/analytics/index.js +++ b/packages/cli/src/analytics/index.js @@ -11,13 +11,13 @@ async function optOut() { client.disable() console.log( success( - "Successfully opted out of budibase analytics. You can opt in at any time by running 'budi analytics opt-in'" + "Successfully opted out of Budibase analytics. You can opt in at any time by running 'budi analytics opt-in'" ) ) } catch (err) { console.log( error( - "Error opting out of budibase analytics. Please try again later.", + "Error opting out of Budibase analytics. Please try again later.", err ) ) @@ -30,12 +30,12 @@ async function optIn() { client.enable() console.log( success( - "Successfully opted in to budibase analytics. Thank you for helping us make budibase better!" + "Successfully opted in to Budibase analytics. Thank you for helping us make Budibase better!" ) ) } catch (err) { console.log( - error("Error opting in to budibase analytics. Please try again later.") + error("Error opting in to Budibase analytics. Please try again later.") ) } } @@ -51,12 +51,12 @@ async function status() { } const command = new Command(`${CommandWords.ANALYTICS}`) - .addHelp("Control the analytics you send to budibase.") - .addSubOption("--optin", "Opt in to sending analytics to budibase", optIn) - .addSubOption("--optout", "Opt out of sending analytics to budibase.", optOut) + .addHelp("Control the analytics you send to Budibase.") + .addSubOption("--optin", "Opt in to sending analytics to Budibase", optIn) + .addSubOption("--optout", "Opt out of sending analytics to Budibase.", optOut) .addSubOption( "--status", - "Check whether you are currently opted in to budibase analytics.", + "Check whether you are currently opted in to Budibase analytics.", status ) diff --git a/packages/client/package.json b/packages/client/package.json index b96c20a2f2..f5f4632de9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.8.16", + "version": "0.8.18", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -18,7 +18,7 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/string-templates": "^0.8.16", + "@budibase/string-templates": "^0.8.18", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" @@ -26,7 +26,7 @@ "devDependencies": { "@rollup/plugin-commonjs": "^18.0.0", "@rollup/plugin-node-resolve": "^11.2.1", - "@budibase/standard-components": "^0.8.16", + "@budibase/standard-components": "^0.8.18", "fs-extra": "^8.1.0", "jsdom": "^16.0.1", "postcss": "^8.2.9", diff --git a/packages/server/package.json b/packages/server/package.json index cc2f642792..d16368a144 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.8.16", + "version": "0.8.18", "description": "Budibase Web Server", "main": "src/electron.js", "repository": { @@ -80,8 +80,8 @@ "license": "AGPL-3.0-or-later", "dependencies": { "@budibase/auth": "^0.18.6", - "@budibase/client": "^0.8.16", - "@budibase/string-templates": "^0.8.16", + "@budibase/client": "^0.8.18", + "@budibase/string-templates": "^0.8.18", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", @@ -131,7 +131,7 @@ "zlib": "1.0.5" }, "devDependencies": { - "@budibase/standard-components": "^0.8.16", + "@budibase/standard-components": "^0.8.18", "@jest/test-sequencer": "^24.8.0", "docker-compose": "^0.23.6", "eslint": "^6.8.0", diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js index 157060e855..2956e45b11 100644 --- a/packages/server/src/api/controllers/application.js +++ b/packages/server/src/api/controllers/application.js @@ -117,13 +117,17 @@ async function createInstance(template) { } exports.fetch = async function (ctx) { - const isDev = ctx.query && ctx.query.status === AppStatus.DEV - const apps = await getAllApps(isDev) + const dev = ctx.query && ctx.query.status === AppStatus.DEV + const all = ctx.query && ctx.query.status === AppStatus.ALL + const apps = await getAllApps({ dev, all }) // get the locks for all the dev apps - if (isDev) { + if (dev || all) { const locks = await getAllLocks() for (let app of apps) { + if (app.status !== "development") { + continue + } const lock = locks.find(lock => lock.appId === app.appId) if (lock) { app.lockedBy = lock.user diff --git a/packages/server/src/api/controllers/query.js b/packages/server/src/api/controllers/query.js index d239ac0177..cd3dcbd305 100644 --- a/packages/server/src/api/controllers/query.js +++ b/packages/server/src/api/controllers/query.js @@ -119,9 +119,8 @@ exports.preview = async function (ctx) { const enrichedQuery = await enrichQueryFields(fields, parameters) - const rows = formatResponse( - await new Integration(datasource.config)[queryVerb](enrichedQuery) - ) + const integration = new Integration(datasource.config) + const rows = formatResponse(await integration[queryVerb](enrichedQuery)) // get all the potential fields in the schema const keys = rows.flatMap(Object.keys) @@ -130,6 +129,10 @@ exports.preview = async function (ctx) { rows, schemaFields: [...new Set(keys)], } + // cleanup + if (integration.end) { + integration.end() + } } exports.execute = async function (ctx) { @@ -149,10 +152,13 @@ exports.execute = async function (ctx) { ctx.request.body.parameters ) + const integration = new Integration(datasource.config) // call the relevant CRUD method on the integration class - ctx.body = formatResponse( - await new Integration(datasource.config)[query.queryVerb](enrichedQuery) - ) + ctx.body = formatResponse(await integration[query.queryVerb](enrichedQuery)) + // cleanup + if (integration.end) { + integration.end() + } } exports.destroy = async function (ctx) { diff --git a/packages/server/src/api/controllers/row.js b/packages/server/src/api/controllers/row.js index 1d73abea47..1bdafb7354 100644 --- a/packages/server/src/api/controllers/row.js +++ b/packages/server/src/api/controllers/row.js @@ -56,13 +56,28 @@ async function findRow(ctx, db, tableId, rowId) { exports.patch = async function (ctx) { const appId = ctx.appId const db = new CouchDB(appId) - let dbRow = await db.get(ctx.params.rowId) - let dbTable = await db.get(dbRow.tableId) - const patchfields = ctx.request.body + const inputs = ctx.request.body + const tableId = inputs.tableId + const isUserTable = tableId === InternalTables.USER_METADATA + let dbRow + try { + dbRow = await db.get(ctx.params.rowId) + } catch (err) { + if (isUserTable) { + // don't include the rev, it'll be the global rev + // this time + dbRow = { + _id: inputs._id, + } + } else { + ctx.throw(400, "Row does not exist") + } + } + let dbTable = await db.get(tableId) // need to build up full patch fields before coerce - for (let key of Object.keys(patchfields)) { + for (let key of Object.keys(inputs)) { if (!dbTable.schema[key]) continue - dbRow[key] = patchfields[key] + dbRow[key] = inputs[key] } // this returns the table and row incase they have been updated @@ -90,13 +105,9 @@ exports.patch = async function (ctx) { table, }) - // TODO remove special user case in future - if (row.tableId === InternalTables.USER_METADATA) { + if (isUserTable) { // the row has been updated, need to put it into the ctx - ctx.request.body = { - ...row, - password: ctx.request.body.password, - } + ctx.request.body = row await userController.updateMetadata(ctx) return } @@ -129,12 +140,9 @@ exports.save = async function (ctx) { // if the row obj had an _id then it will have been retrieved if (inputs._id && inputs._rev) { - const existingRow = await db.get(inputs._id) - if (existingRow) { - ctx.params.rowId = inputs._id - await exports.patch(ctx) - return - } + ctx.params.rowId = inputs._id + await exports.patch(ctx) + return } if (!inputs._rev && !inputs._id) { @@ -167,14 +175,6 @@ exports.save = async function (ctx) { table, }) - // TODO remove special user case in future - if (row.tableId === InternalTables.USER_METADATA) { - // the row has been updated, need to put it into the ctx - ctx.request.body = row - await userController.createMetadata(ctx) - return - } - row.type = "row" const response = await db.put(row) // don't worry about rev, tables handle rev/lastID updates diff --git a/packages/server/src/api/controllers/user.js b/packages/server/src/api/controllers/user.js index 39901990c2..73ba56943a 100644 --- a/packages/server/src/api/controllers/user.js +++ b/packages/server/src/api/controllers/user.js @@ -2,17 +2,23 @@ const CouchDB = require("../../db") const { generateUserMetadataID, getUserMetadataParams, - getGlobalIDFromUserMetadataID, } = require("../../db/utils") const { InternalTables } = require("../../db/utils") -const { getRole, BUILTIN_ROLE_IDS } = require("@budibase/auth/roles") +const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles") const { getGlobalUsers, - saveGlobalUser, - deleteGlobalUser, + addAppRoleToUser, } = require("../../utilities/workerRequests") const { getFullUser } = require("../../utilities/users") +function removeGlobalProps(user) { + // make sure to always remove some of the global user props + delete user.password + delete user.roles + delete user.builder + return user +} + exports.fetchMetadata = async function (ctx) { const database = new CouchDB(ctx.appId) const global = await getGlobalUsers(ctx, ctx.appId) @@ -38,43 +44,12 @@ exports.fetchMetadata = async function (ctx) { ctx.body = users } -exports.createMetadata = async function (ctx) { - const appId = ctx.appId - const db = new CouchDB(appId) - const { roleId } = ctx.request.body - - if (ctx.request.body._id) { - return exports.updateMetadata(ctx) - } - - // check role valid - const role = await getRole(appId, roleId) - if (!role) ctx.throw(400, "Invalid Role") - - const globalUser = await saveGlobalUser(ctx, appId, ctx.request.body) - - const user = { - ...globalUser, - _id: generateUserMetadataID(globalUser._id), - type: "user", - tableId: InternalTables.USER_METADATA, - } - - const response = await db.post(user) - // for automations to make it obvious was successful - ctx.status = 200 - ctx.body = { - _id: response.id, - _rev: response.rev, - email: ctx.request.body.email, - } -} - exports.updateSelfMetadata = async function (ctx) { // overwrite the ID with current users ctx.request.body._id = ctx.user._id if (ctx.user.builder && ctx.user.builder.global) { - ctx.request.body.roleId = BUILTIN_ROLE_IDS.ADMIN + // specific case, update self role in global user + await addAppRoleToUser(ctx, ctx.appId, BUILTIN_ROLE_IDS.ADMIN) } // make sure no stale rev delete ctx.request.body._rev @@ -84,23 +59,19 @@ exports.updateSelfMetadata = async function (ctx) { exports.updateMetadata = async function (ctx) { const appId = ctx.appId const db = new CouchDB(appId) - const user = ctx.request.body - const globalUser = await saveGlobalUser(ctx, appId, { - ...user, - _id: getGlobalIDFromUserMetadataID(user._id), - }) + const user = removeGlobalProps(ctx.request.body) + if (user.roleId) { + await addAppRoleToUser(ctx, appId, user.roleId, user._id) + } const metadata = { - ...globalUser, tableId: InternalTables.USER_METADATA, - _id: user._id || generateUserMetadataID(globalUser._id), - _rev: user._rev, + ...user, } ctx.body = await db.put(metadata) } exports.destroyMetadata = async function (ctx) { const db = new CouchDB(ctx.appId) - await deleteGlobalUser(ctx, getGlobalIDFromUserMetadataID(ctx.params.id)) try { const dbUser = await db.get(ctx.params.id) await db.remove(dbUser._id, dbUser._rev) @@ -108,7 +79,7 @@ exports.destroyMetadata = async function (ctx) { // error just means the global user has no config in this app } ctx.body = { - message: `User ${ctx.params.id} deleted.`, + message: `User metadata ${ctx.params.id} deleted.`, } } diff --git a/packages/server/src/api/routes/tests/auth.spec.js b/packages/server/src/api/routes/tests/auth.spec.js index fa307bf96f..e8abc2abe8 100644 --- a/packages/server/src/api/routes/tests/auth.spec.js +++ b/packages/server/src/api/routes/tests/auth.spec.js @@ -1,20 +1,6 @@ const setup = require("./utilities") const { generateUserMetadataID } = require("../../../db/utils") -require("../../../utilities/workerRequests") -jest.mock("../../../utilities/workerRequests", () => ({ - getGlobalUsers: jest.fn(() => { - return { - _id: "us_uuid1", - } - }), - saveGlobalUser: jest.fn(() => { - return { - _id: "us_uuid1", - } - }), -})) - describe("/authenticate", () => { let request = setup.getRequest() let config = setup.getConfig() @@ -27,7 +13,7 @@ describe("/authenticate", () => { describe("fetch self", () => { it("should be able to fetch self", async () => { - const user = await config.createUser("test@test.com", "p4ssw0rd") + await config.createUser("test@test.com", "p4ssw0rd") const headers = await config.login("test@test.com", "p4ssw0rd", { userId: "us_uuid1" }) const res = await request .get(`/api/self`) diff --git a/packages/server/src/api/routes/tests/user.spec.js b/packages/server/src/api/routes/tests/user.spec.js index 4581cdf798..129a5f44fa 100644 --- a/packages/server/src/api/routes/tests/user.spec.js +++ b/packages/server/src/api/routes/tests/user.spec.js @@ -8,12 +8,7 @@ jest.mock("../../../utilities/workerRequests", () => ({ getGlobalUsers: jest.fn(() => { return {} }), - saveGlobalUser: jest.fn(() => { - const uuid = require("uuid/v4") - return { - _id: `us_${uuid()}` - } - }), + addAppRoleToUser: jest.fn(), deleteGlobalUser: jest.fn(), })) @@ -67,59 +62,8 @@ describe("/users", () => { }) }) - describe("create", () => { - beforeEach(() => { - workerRequests.getGlobalUsers.mockImplementationOnce(() => ([ - { - _id: "us_uuid1", - }, - { - _id: "us_uuid2", - } - ] - )) - }) - - async function create(user, status = 200) { - return request - .post(`/api/users/metadata`) - .set(config.defaultHeaders()) - .send(user) - .expect(status) - .expect("Content-Type", /json/) - } - - it("returns a success message when a user is successfully created", async () => { - const body = basicUser(BUILTIN_ROLE_IDS.POWER) - const res = await create(body) - - expect(res.res.statusMessage).toEqual("OK") - expect(res.body._id).toBeDefined() - }) - - it("should apply authorization to endpoint", async () => { - const body = basicUser(BUILTIN_ROLE_IDS.POWER) - await checkPermissionsEndpoint({ - config, - method: "POST", - body, - url: `/api/users/metadata`, - passRole: BUILTIN_ROLE_IDS.ADMIN, - failRole: BUILTIN_ROLE_IDS.PUBLIC, - }) - }) - - it("should error if no role provided", async () => { - const user = basicUser(null) - await create(user, 400) - }) - }) - describe("update", () => { beforeEach(() => { - workerRequests.saveGlobalUser.mockImplementationOnce(() => ({ - _id: "us_test@test.com" - })) }) it("should be able to update the user", async () => { @@ -144,16 +88,12 @@ describe("/users", () => { .expect(200) .expect("Content-Type", /json/) expect(res.body.message).toBeDefined() - expect(workerRequests.deleteGlobalUser).toHaveBeenCalled() }) }) describe("find", () => { beforeEach(() => { jest.resetAllMocks() - workerRequests.saveGlobalUser.mockImplementationOnce(() => ({ - _id: "us_uuid1", - })) workerRequests.getGlobalUsers.mockImplementationOnce(() => ({ _id: "us_uuid1", roleId: BUILTIN_ROLE_IDS.POWER, diff --git a/packages/server/src/api/routes/tests/utilities/index.js b/packages/server/src/api/routes/tests/utilities/index.js index e9361aa67d..6a9f982bcb 100644 --- a/packages/server/src/api/routes/tests/utilities/index.js +++ b/packages/server/src/api/routes/tests/utilities/index.js @@ -3,8 +3,7 @@ const structures = require("../../../../tests/utilities/structures") const env = require("../../../../environment") jest.mock("../../../../utilities/workerRequests", () => ({ - getGlobalUsers: jest.fn(), - saveGlobalUser: jest.fn(() => { + getGlobalUsers: jest.fn(() => { return { _id: "us_uuid1", } diff --git a/packages/server/src/api/routes/user.js b/packages/server/src/api/routes/user.js index 01af18b933..b3b486fe45 100644 --- a/packages/server/src/api/routes/user.js +++ b/packages/server/src/api/routes/user.js @@ -25,12 +25,6 @@ router authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.updateMetadata ) - .post( - "/api/users/metadata", - authorized(PermissionTypes.USER, PermissionLevels.WRITE), - usage, - controller.createMetadata - ) .post( "/api/users/metadata/self", authorized(PermissionTypes.USER, PermissionLevels.WRITE), diff --git a/packages/server/src/automations/actions.js b/packages/server/src/automations/actions.js index 983e87854a..ad102e7b67 100644 --- a/packages/server/src/automations/actions.js +++ b/packages/server/src/automations/actions.js @@ -3,7 +3,6 @@ const sendSmtpEmail = require("./steps/sendSmtpEmail") const createRow = require("./steps/createRow") const updateRow = require("./steps/updateRow") const deleteRow = require("./steps/deleteRow") -const createUser = require("./steps/createUser") const executeScript = require("./steps/executeScript") const executeQuery = require("./steps/executeQuery") const outgoingWebhook = require("./steps/outgoingWebhook") @@ -20,7 +19,6 @@ const BUILTIN_ACTIONS = { CREATE_ROW: createRow.run, UPDATE_ROW: updateRow.run, DELETE_ROW: deleteRow.run, - CREATE_USER: createUser.run, OUTGOING_WEBHOOK: outgoingWebhook.run, EXECUTE_SCRIPT: executeScript.run, EXECUTE_QUERY: executeQuery.run, @@ -31,7 +29,6 @@ const BUILTIN_DEFINITIONS = { CREATE_ROW: createRow.definition, UPDATE_ROW: updateRow.definition, DELETE_ROW: deleteRow.definition, - CREATE_USER: createUser.definition, OUTGOING_WEBHOOK: outgoingWebhook.definition, EXECUTE_SCRIPT: executeScript.definition, EXECUTE_QUERY: executeQuery.definition, diff --git a/packages/server/src/automations/steps/createUser.js b/packages/server/src/automations/steps/createUser.js deleted file mode 100644 index 02250901fc..0000000000 --- a/packages/server/src/automations/steps/createUser.js +++ /dev/null @@ -1,90 +0,0 @@ -const roles = require("@budibase/auth/roles") -const userController = require("../../api/controllers/user") -const env = require("../../environment") -const usage = require("../../utilities/usageQuota") - -module.exports.definition = { - description: "Create a new user", - tagline: "Create user {{inputs.email}}", - icon: "ri-user-add-line", - name: "Create User", - type: "ACTION", - stepId: "CREATE_USER", - inputs: { - roleId: roles.BUILTIN_ROLE_IDS.POWER, - }, - schema: { - inputs: { - properties: { - email: { - type: "string", - customType: "email", - title: "Email", - }, - password: { - type: "string", - title: "Password", - }, - roleId: { - type: "string", - title: "Role", - enum: roles.BUILTIN_ROLE_ID_ARRAY, - pretty: roles.BUILTIN_ROLE_NAME_ARRAY, - }, - }, - required: ["email", "password", "roleId"], - }, - outputs: { - properties: { - id: { - type: "string", - description: "The identifier of the new user", - }, - revision: { - type: "string", - description: "The revision of the new user", - }, - response: { - type: "object", - description: "The response from the user table", - }, - success: { - type: "boolean", - description: "Whether the action was successful", - }, - }, - required: ["id", "revision", "success"], - }, - }, -} - -module.exports.run = async function ({ inputs, appId, apiKey, emitter }) { - const { email, password, roleId } = inputs - const ctx = { - appId, - request: { - body: { email, password, roleId }, - }, - eventEmitter: emitter, - } - - try { - if (env.isProd()) { - await usage.update(apiKey, usage.Properties.USER, 1) - } - await userController.createMetadata(ctx) - return { - response: ctx.body, - // internal property not returned through the API - id: ctx.body._id, - revision: ctx.body._rev, - success: ctx.status === 200, - } - } catch (err) { - console.error(err) - return { - success: false, - response: err, - } - } -} diff --git a/packages/server/src/automations/tests/createUser.spec.js b/packages/server/src/automations/tests/createUser.spec.js deleted file mode 100644 index 3adfa637dd..0000000000 --- a/packages/server/src/automations/tests/createUser.spec.js +++ /dev/null @@ -1,42 +0,0 @@ -const usageQuota = require("../../utilities/usageQuota") -const setup = require("./utilities") -const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles") -const { InternalTables } = require("../../db/utils") - -jest.mock("../../utilities/usageQuota") - -describe("test the create user action", () => { - let config = setup.getConfig() - let user - - beforeEach(async () => { - await config.init() - user = { - email: "test@test.com", - password: "password", - roleId: BUILTIN_ROLE_IDS.POWER - } - }) - - afterAll(setup.afterAll) - - it("should be able to run the action", async () => { - const res = await setup.runStep(setup.actions.CREATE_USER.stepId, user) - expect(res.id).toBeDefined() - expect(res.revision).toBeDefined() - const userDoc = await config.getRow(InternalTables.USER_METADATA, res.id) - expect(userDoc).toBeDefined() - }) - - it("should return an error if no inputs provided", async () => { - const res = await setup.runStep(setup.actions.CREATE_USER.stepId, {}) - expect(res.success).toEqual(false) - }) - - it("check usage quota attempts", async () => { - await setup.runInProd(async () => { - await setup.runStep(setup.actions.CREATE_USER.stepId, user) - expect(usageQuota.update).toHaveBeenCalledWith(setup.apiKey, "users", 1) - }) - }) -}) diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js index de1f72d4c6..516c803612 100644 --- a/packages/server/src/constants/index.js +++ b/packages/server/src/constants/index.js @@ -54,6 +54,24 @@ exports.USERS_TABLE_SCHEMA = { fieldName: "email", name: "email", }, + firstName: { + name: "firstName", + fieldName: "firstName", + type: exports.FieldTypes.STRING, + constraints: { + type: exports.FieldTypes.STRING, + presence: false, + }, + }, + lastName: { + name: "lastName", + fieldName: "lastName", + type: exports.FieldTypes.STRING, + constraints: { + type: exports.FieldTypes.STRING, + presence: false, + }, + }, roleId: { fieldName: "roleId", name: "roleId", diff --git a/packages/server/src/db/dynamoClient.js b/packages/server/src/db/dynamoClient.js index 19924b1a7e..58e469f80d 100644 --- a/packages/server/src/db/dynamoClient.js +++ b/packages/server/src/db/dynamoClient.js @@ -2,6 +2,7 @@ let { merge } = require("lodash") let env = require("../environment") const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1" +exports.AWS_REGION = AWS_REGION const TableInfo = { API_KEYS: { diff --git a/packages/server/src/db/utils.js b/packages/server/src/db/utils.js index ed63dff2a4..eacf0cbc6f 100644 --- a/packages/server/src/db/utils.js +++ b/packages/server/src/db/utils.js @@ -19,6 +19,7 @@ const StaticDatabases = { const AppStatus = { DEV: "dev", + ALL: "all", DEPLOYED: "PUBLISHED", } diff --git a/packages/server/src/integrations/dynamodb.js b/packages/server/src/integrations/dynamodb.js index 4897690075..8e74b84c6d 100644 --- a/packages/server/src/integrations/dynamodb.js +++ b/packages/server/src/integrations/dynamodb.js @@ -1,5 +1,6 @@ const AWS = require("aws-sdk") const { FIELD_TYPES, QUERY_TYPES } = require("./Integration") +const { AWS_REGION } = require("../db/dynamoClient") const SCHEMA = { docs: "https://github.com/dabit3/dynamodb-documentclient-cheat-sheet", @@ -16,7 +17,7 @@ const SCHEMA = { type: FIELD_TYPES.PASSWORD, required: true, }, - secretKey: { + secretAccessKey: { type: FIELD_TYPES.PASSWORD, required: true, }, @@ -114,10 +115,22 @@ class DynamoDBIntegration { }) } - async connect() { + end() { + this.disconnect() + } + + connect() { AWS.config.update(this.config) } + disconnect() { + AWS.config.update({ + secretAccessKey: undefined, + accessKeyId: undefined, + region: AWS_REGION, + }) + } + async create(query) { const params = { TableName: query.table, diff --git a/packages/server/src/tests/utilities/TestConfiguration.js b/packages/server/src/tests/utilities/TestConfiguration.js index cd33f14cd1..60e503c128 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.js +++ b/packages/server/src/tests/utilities/TestConfiguration.js @@ -77,7 +77,11 @@ class TestConfiguration { if (builder) { user.builder = { global: true } } - await db.put(user) + const resp = await db.put(user) + return { + _rev: resp._rev, + ...user, + } } async init(appName = "test_application") { @@ -302,24 +306,14 @@ class TestConfiguration { return await this._req(config, null, controllers.layout.save) } - async createUser( - email = EMAIL, - password = PASSWORD, - roleId = BUILTIN_ROLE_IDS.POWER - ) { + async createUser(roleId = BUILTIN_ROLE_IDS.POWER) { const globalId = `us_${Math.random()}` - await this.globalUser(globalId, roleId === BUILTIN_ROLE_IDS.BUILDER) - const user = await this._req( - { - email, - password, - roleId, - }, - null, - controllers.user.createMetadata + const resp = await this.globalUser( + globalId, + roleId === BUILTIN_ROLE_IDS.BUILDER ) return { - ...user, + ...resp, globalId, } } diff --git a/packages/server/src/utilities/queue/inMemoryQueue.js b/packages/server/src/utilities/queue/inMemoryQueue.js index 6c1d73801d..1a9fc90d5c 100644 --- a/packages/server/src/utilities/queue/inMemoryQueue.js +++ b/packages/server/src/utilities/queue/inMemoryQueue.js @@ -73,6 +73,14 @@ class InMemoryQueue { this._messages.push(newJob(this._name, msg)) this._emitter.emit("message") } + + /** + * This removes a cron which has been implemented, this is part of Bull API. + * @param {string} cronJobId The cron which is to be removed. + */ + removeRepeatableByKey(cronJobId) { + // TODO: implement for testing + } } module.exports = InMemoryQueue diff --git a/packages/server/src/utilities/users.js b/packages/server/src/utilities/users.js index 4c637c1865..eb52f4b867 100644 --- a/packages/server/src/utilities/users.js +++ b/packages/server/src/utilities/users.js @@ -1,5 +1,5 @@ const CouchDB = require("../db") -const { getGlobalIDFromUserMetadataID } = require("../db/utils") +const { getGlobalIDFromUserMetadataID, InternalTables } = require("../db/utils") const { getGlobalUsers } = require("../utilities/workerRequests") exports.getFullUser = async (ctx, userId) => { @@ -21,6 +21,7 @@ exports.getFullUser = async (ctx, userId) => { return { ...global, ...metadata, + tableId: InternalTables.USER_METADATA, // make sure the ID is always a local ID, not a global one _id: userId, } diff --git a/packages/server/src/utilities/workerRequests.js b/packages/server/src/utilities/workerRequests.js index 14296aa94b..49e24e5d60 100644 --- a/packages/server/src/utilities/workerRequests.js +++ b/packages/server/src/utilities/workerRequests.js @@ -3,6 +3,7 @@ const env = require("../environment") const { checkSlashesInUrl } = require("./index") const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles") const { getDeployedAppID } = require("@budibase/auth/db") +const { getGlobalIDFromUserMetadataID } = require("../db/utils") function getAppRole(appId, user) { if (!user.roles) { @@ -118,53 +119,50 @@ exports.getGlobalUsers = async (ctx, appId = null, globalId = null) => { return users } -exports.saveGlobalUser = async (ctx, appId, body) => { - const globalUser = body._id - ? await exports.getGlobalUsers(ctx, appId, body._id) - : {} - const preRoles = globalUser.roles || {} - if (body.roleId) { - preRoles[appId] = body.roleId - } - // make sure no dev app IDs in roles - const roles = {} - for (let [appId, roleId] of Object.entries(preRoles)) { - roles[getDeployedAppID(appId)] = roleId - } - const endpoint = `/api/admin/users` - const reqCfg = { - method: "POST", - body: { - ...globalUser, - password: body.password || undefined, - status: body.status, - email: body.email, - roles, - builder: { - global: true, - }, - }, - } - +exports.getGlobalSelf = async ctx => { + const endpoint = `/api/admin/users/self` const response = await fetch( checkSlashesInUrl(env.WORKER_URL + endpoint), - request(ctx, reqCfg) + request(ctx, { method: "GET" }) ) const json = await response.json() if (json.status !== 200 && response.status !== 200) { - ctx.throw(400, "Unable to save global user.") - } - delete body.password - delete body.roles - delete body.builder - // TODO: for now these have been left in as they are - // TODO: pretty important to keeping relationships working - // TODO: however if user metadata is changed this should be removed - // delete body.email - // delete body.roleId - // delete body.status - return { - ...body, - _id: json._id, + ctx.throw(400, "Unable to get self globally.") } + return json +} + +exports.addAppRoleToUser = async (ctx, appId, roleId, userId = null) => { + appId = getDeployedAppID(appId) + let user, + endpoint, + body = {} + if (!userId) { + user = await exports.getGlobalSelf(ctx) + endpoint = `/api/admin/users/self` + } else { + userId = getGlobalIDFromUserMetadataID(userId) + user = await exports.getGlobalUsers(ctx, appId, userId) + body._id = userId + endpoint = `/api/admin/users` + } + body = { + ...body, + roles: { + ...user.roles, + [appId]: roleId, + }, + } + const response = await fetch( + checkSlashesInUrl(env.WORKER_URL + endpoint), + request(ctx, { + method: "POST", + body, + }) + ) + const json = await response.json() + if (json.status !== 200 && response.status !== 200) { + ctx.throw(400, "Unable to save self globally.") + } + return json } diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json index 48c966f558..6d58d25144 100644 --- a/packages/standard-components/package.json +++ b/packages/standard-components/package.json @@ -29,7 +29,7 @@ "keywords": [ "svelte" ], - "version": "0.8.16", + "version": "0.8.18", "license": "MIT", "gitHead": "4b6efc42ed3273595c7a129411f4d883733d3321", "dependencies": { diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c5ebe0f995..5e8e06bc33 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.8.16", + "version": "0.8.18", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 6d68f3ff1b..45d2ea7311 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.8.16", + "version": "0.8.18", "description": "Budibase background service", "main": "src/index.js", "repository": { diff --git a/packages/worker/src/api/controllers/admin/roles.js b/packages/worker/src/api/controllers/admin/roles.js index 84f5ab2b71..0f6daf8aa2 100644 --- a/packages/worker/src/api/controllers/admin/roles.js +++ b/packages/worker/src/api/controllers/admin/roles.js @@ -8,7 +8,7 @@ const CouchDB = require("../../../db") exports.fetch = async ctx => { // always use the dev apps as they'll be most up to date (true) - const apps = await getAllApps(true) + const apps = await getAllApps({ dev: true }) const promises = [] for (let app of apps) { // use dev app IDs diff --git a/packages/worker/src/api/controllers/admin/users.js b/packages/worker/src/api/controllers/admin/users.js index ce452d5c78..d7b198dfdb 100644 --- a/packages/worker/src/api/controllers/admin/users.js +++ b/packages/worker/src/api/controllers/admin/users.js @@ -16,9 +16,14 @@ exports.save = async ctx => { const { email, password, _id } = ctx.request.body // make sure another user isn't using the same email - const dbUser = await getGlobalUserByEmail(email) - if (dbUser != null && (dbUser._id !== _id || Array.isArray(dbUser))) { - ctx.throw(400, "Email address already in use.") + let dbUser + if (email) { + dbUser = await getGlobalUserByEmail(email) + if (dbUser != null && (dbUser._id !== _id || Array.isArray(dbUser))) { + ctx.throw(400, "Email address already in use.") + } + } else { + dbUser = await db.get(_id) } // get the password, make sure one is defined @@ -96,6 +101,33 @@ exports.destroy = async ctx => { } } +exports.getSelf = async ctx => { + ctx.params = { + id: ctx.user._id, + } + // this will set the body + await exports.find(ctx) +} + +exports.updateSelf = async ctx => { + const db = new CouchDB(GLOBAL_DB) + const user = await db.get(ctx.user._id) + if (ctx.request.body.password) { + ctx.request.body.password = await hash(ctx.request.body.password) + } + // don't allow sending up an ID/Rev, always use the existing one + delete ctx.request.body._id + delete ctx.request.body._rev + const response = await db.put({ + ...user, + ...ctx.request.body, + }) + ctx.body = { + _id: response.id, + _rev: response.rev, + } +} + // called internally by app server user fetch exports.fetch = async ctx => { const db = new CouchDB(GLOBAL_DB) @@ -145,12 +177,16 @@ exports.invite = async ctx => { } exports.inviteAccept = async ctx => { - const { inviteCode } = ctx.request.body + const { inviteCode, password, firstName, lastName } = ctx.request.body try { const email = await checkInviteCode(inviteCode) - // redirect the request - delete ctx.request.body.inviteCode - ctx.request.body.email = email + // only pass through certain props for accepting + ctx.request.body = { + firstName, + lastName, + password, + email, + } // this will flesh out the body response await exports.save(ctx) } catch (err) { diff --git a/packages/worker/src/api/routes/admin/configs.js b/packages/worker/src/api/routes/admin/configs.js index a028ebdd81..09b8f97f84 100644 --- a/packages/worker/src/api/routes/admin/configs.js +++ b/packages/worker/src/api/routes/admin/configs.js @@ -1,6 +1,7 @@ const Router = require("@koa/router") const controller = require("../../controllers/admin/configs") const joiValidator = require("../../../middleware/joi-validator") +const adminOnly = require("../../../middleware/adminOnly") const Joi = require("joi") const { Configs, ConfigUploads } = require("../../../constants") @@ -77,8 +78,13 @@ function buildConfigGetValidation() { } router - .post("/api/admin/configs", buildConfigSaveValidation(), controller.save) - .delete("/api/admin/configs/:id", controller.destroy) + .post( + "/api/admin/configs", + adminOnly, + buildConfigSaveValidation(), + controller.save + ) + .delete("/api/admin/configs/:id", adminOnly, controller.destroy) .get("/api/admin/configs", controller.fetch) .get("/api/admin/configs/checklist", controller.configChecklist) .get( @@ -89,6 +95,7 @@ router .get("/api/admin/configs/:type", buildConfigGetValidation(), controller.find) .post( "/api/admin/configs/upload/:type/:name", + adminOnly, buildUploadValidation(), controller.upload ) diff --git a/packages/worker/src/api/routes/admin/groups.js b/packages/worker/src/api/routes/admin/groups.js index 6ae8780a22..4611e67079 100644 --- a/packages/worker/src/api/routes/admin/groups.js +++ b/packages/worker/src/api/routes/admin/groups.js @@ -1,6 +1,7 @@ const Router = require("@koa/router") const controller = require("../../controllers/admin/groups") const joiValidator = require("../../../middleware/joi-validator") +const adminOnly = require("../../../middleware/adminOnly") const Joi = require("joi") const router = Router() @@ -24,9 +25,14 @@ function buildGroupSaveValidation() { } router - .post("/api/admin/groups", buildGroupSaveValidation(), controller.save) + .post( + "/api/admin/groups", + adminOnly, + buildGroupSaveValidation(), + controller.save + ) .get("/api/admin/groups", controller.fetch) - .delete("/api/admin/groups/:id", controller.destroy) + .delete("/api/admin/groups/:id", adminOnly, controller.destroy) .get("/api/admin/groups/:id", controller.find) module.exports = router diff --git a/packages/worker/src/api/routes/admin/roles.js b/packages/worker/src/api/routes/admin/roles.js index 3e14eb0601..2deef6b3fe 100644 --- a/packages/worker/src/api/routes/admin/roles.js +++ b/packages/worker/src/api/routes/admin/roles.js @@ -1,10 +1,11 @@ const Router = require("@koa/router") const controller = require("../../controllers/admin/roles") +const adminOnly = require("../../../middleware/adminOnly") const router = Router() router - .get("/api/admin/roles", controller.fetch) - .get("/api/admin/roles/:appId", controller.find) + .get("/api/admin/roles", adminOnly, controller.fetch) + .get("/api/admin/roles/:appId", adminOnly, controller.find) module.exports = router diff --git a/packages/worker/src/api/routes/admin/templates.js b/packages/worker/src/api/routes/admin/templates.js index a00278ccac..52ab24878b 100644 --- a/packages/worker/src/api/routes/admin/templates.js +++ b/packages/worker/src/api/routes/admin/templates.js @@ -3,6 +3,7 @@ const controller = require("../../controllers/admin/templates") const joiValidator = require("../../../middleware/joi-validator") const Joi = require("joi") const { TemplatePurpose, TemplateTypes } = require("../../../constants") +const adminOnly = require("../../../middleware/adminOnly") const router = Router() @@ -21,11 +22,16 @@ function buildTemplateSaveValidation() { router .get("/api/admin/template/definitions", controller.definitions) - .post("/api/admin/template", buildTemplateSaveValidation(), controller.save) + .post( + "/api/admin/template", + adminOnly, + buildTemplateSaveValidation(), + controller.save + ) .get("/api/admin/template", controller.fetch) .get("/api/admin/template/:type", controller.fetchByType) .get("/api/admin/template/:ownerId", controller.fetchByOwner) .get("/api/admin/template/:id", controller.find) - .delete("/api/admin/template/:id/:rev", controller.destroy) + .delete("/api/admin/template/:id/:rev", adminOnly, controller.destroy) module.exports = router diff --git a/packages/worker/src/api/routes/admin/users.js b/packages/worker/src/api/routes/admin/users.js index cac1d5af9c..2e49c1bc40 100644 --- a/packages/worker/src/api/routes/admin/users.js +++ b/packages/worker/src/api/routes/admin/users.js @@ -1,27 +1,34 @@ const Router = require("@koa/router") const controller = require("../../controllers/admin/users") const joiValidator = require("../../../middleware/joi-validator") +const adminOnly = require("../../../middleware/adminOnly") const Joi = require("joi") const router = Router() -function buildUserSaveValidation() { - // prettier-ignore - return joiValidator.body(Joi.object({ - _id: Joi.string(), - _rev: Joi.string(), - email: Joi.string(), +function buildUserSaveValidation(isSelf = false) { + let schema = { + email: Joi.string().allow(null, ""), password: Joi.string().allow(null, ""), + firstName: Joi.string().allow(null, ""), + lastName: Joi.string().allow(null, ""), builder: Joi.object({ global: Joi.boolean().optional(), apps: Joi.array().optional(), - }).unknown(true).optional(), - // maps appId -> roleId for the user - roles: Joi.object() - .pattern(/.*/, Joi.string()) - .required() + }) .unknown(true) - }).required().unknown(true)) + .optional(), + // maps appId -> roleId for the user + roles: Joi.object().pattern(/.*/, Joi.string()).required().unknown(true), + } + if (!isSelf) { + schema = { + ...schema, + _id: Joi.string(), + _rev: Joi.string(), + } + } + return joiValidator.body(Joi.object(schema).required().unknown(true)) } function buildInviteValidation() { @@ -40,13 +47,29 @@ function buildInviteAcceptValidation() { } router - .post("/api/admin/users", buildUserSaveValidation(), controller.save) + .post( + "/api/admin/users", + adminOnly, + buildUserSaveValidation(), + controller.save + ) .get("/api/admin/users", controller.fetch) .post("/api/admin/users/init", controller.adminUser) - .delete("/api/admin/users/:id", controller.destroy) + .get("/api/admin/users/self", controller.getSelf) + .post( + "/api/admin/users/self", + buildUserSaveValidation(true), + controller.updateSelf + ) + .delete("/api/admin/users/:id", adminOnly, controller.destroy) .get("/api/admin/users/:id", controller.find) .get("/api/admin/roles/:appId") - .post("/api/admin/users/invite", buildInviteValidation(), controller.invite) + .post( + "/api/admin/users/invite", + adminOnly, + buildInviteValidation(), + controller.invite + ) .post( "/api/admin/users/invite/accept", buildInviteAcceptValidation(), diff --git a/packages/worker/src/api/routes/tests/auth.spec.js b/packages/worker/src/api/routes/tests/auth.spec.js index df90210433..8b9b699839 100644 --- a/packages/worker/src/api/routes/tests/auth.spec.js +++ b/packages/worker/src/api/routes/tests/auth.spec.js @@ -30,7 +30,7 @@ describe("/api/admin/auth", () => { expect(sendMailMock).toHaveBeenCalled() const emailCall = sendMailMock.mock.calls[0][0] // after this URL there should be a code - const parts = emailCall.html.split("http://localhost:10000/reset?code=") + const parts = emailCall.html.split("http://localhost:10000/builder/auth/reset?code=") code = parts[1].split("\"")[0] expect(code).toBeDefined() }) diff --git a/packages/worker/src/api/routes/tests/configs.spec.js b/packages/worker/src/api/routes/tests/configs.spec.js index 0b01c5b261..13ba2bd3bc 100644 --- a/packages/worker/src/api/routes/tests/configs.spec.js +++ b/packages/worker/src/api/routes/tests/configs.spec.js @@ -13,7 +13,7 @@ describe("/api/admin/configs/checklist", () => { let config = setup.getConfig() beforeAll(async () => { - await config.init() + await config.init(false) }) afterAll(setup.afterAll) diff --git a/packages/worker/src/api/routes/tests/users.spec.js b/packages/worker/src/api/routes/tests/users.spec.js index 0a4812ea09..bf5b67ab1a 100644 --- a/packages/worker/src/api/routes/tests/users.spec.js +++ b/packages/worker/src/api/routes/tests/users.spec.js @@ -30,7 +30,7 @@ describe("/api/admin/users", () => { expect(sendMailMock).toHaveBeenCalled() const emailCall = sendMailMock.mock.calls[0][0] // after this URL there should be a code - const parts = emailCall.html.split("http://localhost:10000/invite?code=") + const parts = emailCall.html.split("http://localhost:10000/builder/invite?code=") code = parts[1].split("\"")[0] expect(code).toBeDefined() }) diff --git a/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js b/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js index 7e9d56aa66..746a26c800 100644 --- a/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js +++ b/packages/worker/src/api/routes/tests/utilities/TestConfiguration.js @@ -38,20 +38,25 @@ class TestConfiguration { return request.body } - async init() { - // create a test user - await this._req( - { - email: "test@test.com", - password: "test", - _id: "us_uuid1", - builder: { - global: true, + async init(createUser = true) { + if (createUser) { + // create a test user + await this._req( + { + email: "test@test.com", + password: "test", + _id: "us_uuid1", + builder: { + global: true, + }, + admin: { + global: true, + }, }, - }, - null, - controllers.users.save - ) + null, + controllers.users.save + ) + } } async end() { diff --git a/packages/worker/src/middleware/adminOnly.js b/packages/worker/src/middleware/adminOnly.js new file mode 100644 index 0000000000..507fbda9a2 --- /dev/null +++ b/packages/worker/src/middleware/adminOnly.js @@ -0,0 +1,6 @@ +module.exports = async (ctx, next) => { + if (!ctx.user || !ctx.user.admin || !ctx.user.admin.global) { + ctx.throw(403, "Admin user only endpoint.") + } + return next() +} diff --git a/packages/worker/src/utilities/email.js b/packages/worker/src/utilities/email.js index 179f662a96..e6e1db2184 100644 --- a/packages/worker/src/utilities/email.js +++ b/packages/worker/src/utilities/email.js @@ -155,10 +155,12 @@ exports.sendEmail = async ( const context = await getSettingsTemplateContext(purpose, code) const message = { from: from || config.from, - subject: await processString(subject || config.subject, context), to: email, html: await buildEmail(purpose, email, context, { user, contents }), } + if (subject || config.subject) { + message.subject = await processString(subject || config.subject, context) + } const response = await transport.sendMail(message) if (TEST_MODE) { console.log("Test email URL: " + nodemailer.getTestMessageUrl(response))