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 enhanced-app-list

This commit is contained in:
Andrew Kingston 2021-05-21 11:11:43 +01:00
parent 28e71e8cef f76c7d9684
commit b904bba4c7
22 changed files with 90 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/LogIn.svelte
View File

@ -1,40 +0,0 @@
<script>
import { Label } from "@budibase/bbui"
import { getBindableProperties } from "builderStore/dataBinding"
import { currentAsset, store } from "builderStore"
import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
export let parameters
let bindingDrawer
$: bindings = getBindableProperties($currentAsset, $store.selectedComponentId)
</script>
<div class="root">
<Label small>Email</Label>
<DrawerBindableInput
title="Email"
value={parameters.email}
on:change={value => (parameters.email = value.detail)}
{bindings}
/>
<Label small>Password</Label>
<DrawerBindableInput
title="Password"
value={parameters.password}
on:change={value => (parameters.password = value.detail)}
{bindings}
/>
</div>
<style>
.root {
display: grid;
column-gap: var(--spacing-l);
row-gap: var(--spacing-s);
grid-template-columns: auto 1fr;
align-items: baseline;
max-width: 800px;
margin: 0 auto;
}
</style>

14
packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/LogOut.svelte
View File

@ -1,14 +0,0 @@
<script>
import { Body } from "@budibase/bbui"
</script>
<div class="root">
<Body size="S">This action doesn't require any additional settings.</Body>
</div>
<style>
.root {
max-width: 800px;
margin: 0 auto;
}
</style>

10
packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
View File

@ -4,8 +4,6 @@ import DeleteRow from "./DeleteRow.svelte"
import ExecuteQuery from "./ExecuteQuery.svelte" import ExecuteQuery from "./ExecuteQuery.svelte"
import TriggerAutomation from "./TriggerAutomation.svelte" import TriggerAutomation from "./TriggerAutomation.svelte"
import ValidateForm from "./ValidateForm.svelte" import ValidateForm from "./ValidateForm.svelte"
import LogIn from "./LogIn.svelte"
import LogOut from "./LogOut.svelte"
// defines what actions are available, when adding a new one // defines what actions are available, when adding a new one
// the component is the setup panel for the action // the component is the setup panel for the action
@ -37,12 +35,4 @@ export default [
name: "Validate Form", name: "Validate Form",
component: ValidateForm, component: ValidateForm,
}, },
{
name: "Log In",
component: LogIn,
},
{
name: "Log Out",
component: LogOut,
},
] ]

10
packages/builder/src/components/login/LoginForm.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { goto } from "@roxi/routify" import { goto, params } from "@roxi/routify"
import { import {
notifications, notifications,
Input, Input,
@ -22,8 +22,12 @@
username, username,
password, password,
}) })
notifications.success("Logged in successfully") if ($params["?returnUrl"]) {
$goto("../portal") window.location = decodeURIComponent($params["?returnUrl"])
} else {
notifications.success("Logged in successfully")
$goto("../portal")
}
} catch (err) { } catch (err) {
console.error(err) console.error(err)
notifications.error("Invalid credentials") notifications.error("Invalid credentials")

3
packages/builder/src/pages/builder/_layout.svelte
View File

@ -28,7 +28,8 @@
!$isActive("./auth") && !$isActive("./auth") &&
!$isActive("./invite") !$isActive("./invite")
) { ) {
$redirect("./auth/login") const returnUrl = encodeURIComponent(window.location.pathname)
$redirect("./auth/login?", { returnUrl })
} }
} }
</script> </script>

18
packages/builder/src/pages/builder/auth/_layout.svelte Normal file
View File

@ -0,0 +1,18 @@
<script>
import { auth } from "stores/portal"
import { onMount } from "svelte"
import { redirect } from "@roxi/routify"
// If already authenticated, redirect away from the auth section.
// Check this onMount rather than a reactive statement to avoid trumping
// the login return URL functionality.
onMount(() => {
if ($auth.user) {
$redirect("../")
}
})
</script>
{#if !$auth.user}
<slot />
{/if}

12
packages/builder/src/pages/builder/portal/_layout.svelte
View File

@ -36,11 +36,13 @@
onMount(async () => { onMount(async () => {
// Prevent non-builders from accessing the portal // Prevent non-builders from accessing the portal
if (!$auth.user?.builder?.global) { if ($auth.user) {
$redirect("../") if (!$auth.user?.builder?.global) {
} else { $redirect("../")
await organisation.init() } else {
loaded = true await organisation.init()
loaded = true
}
} }
}) })
</script> </script>

21
packages/client/src/components/ClientApp.svelte
View File

@ -10,6 +10,8 @@
initialise, initialise,
screenStore, screenStore,
authStore, authStore,
routeStore,
builderStore,
} from "../store" } from "../store"
import { TableNames, ActionTypes } from "../constants" import { TableNames, ActionTypes } from "../constants"
@ -18,13 +20,13 @@
setContext("component", writable({})) setContext("component", writable({}))
setContext("context", createContextStore()) setContext("context", createContextStore())
let loaded = false let dataLoaded = false
// Load app config // Load app config
onMount(async () => { onMount(async () => {
await initialise() await initialise()
await authStore.actions.fetchUser() await authStore.actions.fetchUser()
loaded = true dataLoaded = true
}) })
// Register this as a refreshable datasource so that user changes cause // Register this as a refreshable datasource so that user changes cause
@ -36,9 +38,22 @@
metadata: { dataSource: { type: "table", tableId: TableNames.USERS } }, metadata: { dataSource: { type: "table", tableId: TableNames.USERS } },
}, },
] ]
// Redirect to home layout if no matching route
$: {
if (dataLoaded && $routeStore.routerLoaded && !$routeStore.activeRoute) {
if ($authStore) {
routeStore.actions.navigate("/")
} else {
const returnUrl = `${window.location.pathname}${window.location.hash}`
const encodedUrl = encodeURIComponent(returnUrl)
window.location = `/builder/auth/login?returnUrl=${encodedUrl}`
}
}
}
</script> </script>
{#if loaded && $screenStore.activeLayout} {#if dataLoaded && $screenStore.activeLayout}
<div lang="en" dir="ltr" class="spectrum spectrum--medium spectrum--light"> <div lang="en" dir="ltr" class="spectrum spectrum--medium spectrum--light">
<Provider key="user" data={$authStore} {actions}> <Provider key="user" data={$authStore} {actions}>
<Component definition={$screenStore.activeLayout.props} /> <Component definition={$screenStore.activeLayout.props} />

1
packages/client/src/components/Router.svelte
View File

@ -3,6 +3,7 @@
import Router from "svelte-spa-router" import Router from "svelte-spa-router"
import { routeStore } from "../store" import { routeStore } from "../store"
import Screen from "./Screen.svelte" import Screen from "./Screen.svelte"
import { onMount } from "svelte"
const { styleable } = getContext("sdk") const { styleable } = getContext("sdk")
const component = getContext("component") const component = getContext("component")

10
packages/client/src/components/Screen.svelte
View File

@ -1,8 +1,8 @@
<script> <script>
import { fade } from "svelte/transition"
import { screenStore, routeStore } from "../store" import { screenStore, routeStore } from "../store"
import Component from "./Component.svelte" import Component from "./Component.svelte"
import Provider from "./Provider.svelte" import Provider from "./Provider.svelte"
import { onMount } from "svelte"
// Keep route params up to date // Keep route params up to date
export let params = {} export let params = {}
@ -11,8 +11,12 @@
// Get the screen definition for the current route // Get the screen definition for the current route
$: screenDefinition = $screenStore.activeScreen?.props $: screenDefinition = $screenStore.activeScreen?.props
// Redirect to home layout if no matching route // Mark the router as loaded whenever the screen mounts
$: screenDefinition == null && routeStore.actions.navigate("/") onMount(() => {
if (!$routeStore.routerLoaded) {
routeStore.actions.setRouterLoaded()
}
})
</script> </script>
<!-- Ensure to fully remount when screen changes --> <!-- Ensure to fully remount when screen changes -->

12
packages/client/src/store/routes.js
View File

@ -8,6 +8,7 @@ const createRouteStore = () => {
routeParams: {}, routeParams: {},
activeRoute: null, activeRoute: null,
routeSessionId: Math.random(), routeSessionId: Math.random(),
routerLoaded: false,
} }
const store = writable(initialState) const store = writable(initialState)
@ -47,10 +48,19 @@ const createRouteStore = () => {
}) })
} }
const navigate = push const navigate = push
const setRouterLoaded = () => {
store.update(state => ({ ...state, routerLoaded: true }))
}
return { return {
subscribe: store.subscribe, subscribe: store.subscribe,
actions: { fetchRoutes, navigate, setRouteParams, setActiveRoute }, actions: {
fetchRoutes,
navigate,
setRouteParams,
setActiveRoute,
setRouterLoaded,
},
} }
} }

9
packages/client/src/store/screens.js
View File

@ -18,12 +18,11 @@ const createScreenStore = () => {
activeLayout = $builderStore.layout activeLayout = $builderStore.layout
activeScreen = $builderStore.screen activeScreen = $builderStore.screen
} else { } else {
// Otherwise find the correct screen by matching the current route activeLayout = { props: { _component: "screenslot" } }
// Find the correct screen by matching the current route
const { screens, layouts } = $config const { screens, layouts } = $config
activeLayout = layouts[0] if ($routeStore.activeRoute) {
if (screens.length === 1) {
activeScreen = screens[0]
} else if ($routeStore.activeRoute) {
activeScreen = screens.find( activeScreen = screens.find(
screen => screen._id === $routeStore.activeRoute.screenId screen => screen._id === $routeStore.activeRoute.screenId
) )

13
packages/server/src/api/controllers/application.js
View File

@ -22,10 +22,7 @@ const {
} = require("../../db/utils") } = require("../../db/utils")
const { BUILTIN_ROLE_IDS, AccessController } = require("@budibase/auth/roles") const { BUILTIN_ROLE_IDS, AccessController } = require("@budibase/auth/roles")
const { BASE_LAYOUTS } = require("../../constants/layouts") const { BASE_LAYOUTS } = require("../../constants/layouts")
const { const { createHomeScreen } = require("../../constants/screens")
createHomeScreen,
createLoginScreen,
} = require("../../constants/screens")
const { cloneDeep } = require("lodash/fp") const { cloneDeep } = require("lodash/fp")
const { processObject } = require("@budibase/string-templates") const { processObject } = require("@budibase/string-templates")
const { getAllApps } = require("../../utilities") const { getAllApps } = require("../../utilities")
@ -208,7 +205,6 @@ exports.create = async function (ctx) {
ctx.status = 200 ctx.status = 200
ctx.body = newApplication ctx.body = newApplication
ctx.message = `Application ${ctx.request.body.name} created successfully`
} }
exports.update = async function (ctx) { exports.update = async function (ctx) {
@ -229,13 +225,11 @@ exports.update = async function (ctx) {
data._rev = response.rev data._rev = response.rev
ctx.status = 200 ctx.status = 200
ctx.message = `Application ${application.name} updated successfully.`
ctx.body = response ctx.body = response
} }
exports.delete = async function (ctx) { exports.delete = async function (ctx) {
const db = new CouchDB(ctx.params.appId) const db = new CouchDB(ctx.params.appId)
const app = await db.get(DocumentTypes.APP_METADATA)
const result = await db.destroy() const result = await db.destroy()
/* istanbul ignore next */ /* istanbul ignore next */
if (!env.isTest()) { if (!env.isTest()) {
@ -243,7 +237,6 @@ exports.delete = async function (ctx) {
} }
ctx.status = 200 ctx.status = 200
ctx.message = `Application ${app.name} deleted successfully.`
ctx.body = result ctx.body = result
} }
@ -260,9 +253,5 @@ const createEmptyAppPackage = async (ctx, app) => {
homeScreen._id = generateScreenID() homeScreen._id = generateScreenID()
screensAndLayouts.push(homeScreen) screensAndLayouts.push(homeScreen)
const loginScreen = createLoginScreen(app)
loginScreen._id = generateScreenID()
screensAndLayouts.push(loginScreen)
await db.bulkDocs(screensAndLayouts) await db.bulkDocs(screensAndLayouts)
} }

3
packages/server/src/api/controllers/auth.js
View File

@ -4,9 +4,6 @@ const { InternalTables } = require("../../db/utils")
const { getFullUser } = require("../../utilities/users") const { getFullUser } = require("../../utilities/users")
exports.fetchSelf = async ctx => { exports.fetchSelf = async ctx => {
if (!ctx.user) {
ctx.throw(403, "No user logged in")
}
const appId = ctx.appId const appId = ctx.appId
const { userId } = ctx.user const { userId } = ctx.user
/* istanbul ignore next */ /* istanbul ignore next */

5
packages/server/src/api/routes/tests/application.spec.js
View File

@ -28,7 +28,6 @@ describe("/applications", () => {
.set(config.defaultHeaders()) .set(config.defaultHeaders())
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(200) .expect(200)
expect(res.res.statusMessage).toEqual("Application My App created successfully")
expect(res.body._id).toBeDefined() expect(res.body._id).toBeDefined()
}) })
@ -74,7 +73,7 @@ describe("/applications", () => {
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(200) .expect(200)
// should have empty packages // should have empty packages
expect(res.body.screens.length).toEqual(2) expect(res.body.screens.length).toEqual(1)
expect(res.body.layouts.length).toEqual(2) expect(res.body.layouts.length).toEqual(2)
}) })
}) })
@ -87,7 +86,7 @@ describe("/applications", () => {
.expect('Content-Type', /json/) .expect('Content-Type', /json/)
.expect(200) .expect(200)
expect(res.body.application).toBeDefined() expect(res.body.application).toBeDefined()
expect(res.body.screens.length).toEqual(2) expect(res.body.screens.length).toEqual(1)
expect(res.body.layouts.length).toEqual(2) expect(res.body.layouts.length).toEqual(2)
}) })
}) })

2
packages/server/src/api/routes/tests/screen.spec.js
View File

@ -21,7 +21,7 @@ describe("/screens", () => {
.set(config.defaultHeaders()) .set(config.defaultHeaders())
.expect("Content-Type", /json/) .expect("Content-Type", /json/)
.expect(200) .expect(200)
expect(res.body.length).toEqual(3) expect(res.body.length).toEqual(2)
expect(res.body.some(s => s._id === screen._id)).toEqual(true) expect(res.body.some(s => s._id === screen._id)).toEqual(true)
}) })

58
packages/server/src/constants/screens.js
View File

@ -1,6 +1,5 @@
const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles") const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles")
const { BASE_LAYOUT_PROP_IDS } = require("./layouts") const { BASE_LAYOUT_PROP_IDS } = require("./layouts")
const { LOGO_URL } = require("../constants")
exports.createHomeScreen = () => ({ exports.createHomeScreen = () => ({
description: "", description: "",
@ -49,60 +48,3 @@ exports.createHomeScreen = () => ({
}, },
name: "home-screen", name: "home-screen",
}) })
exports.createLoginScreen = app => ({
description: "",
url: "",
layoutId: BASE_LAYOUT_PROP_IDS.PUBLIC,
props: {
_instanceName: "LoginScreenContainer",
_id: "5beb4c7b-3c8b-49b2-b8b3-d447dc76dda7",
_component: "@budibase/standard-components/container",
_styles: {
normal: {
flex: "1 1 auto",
display: "flex",
"flex-direction": "column",
"justify-content": "center",
"align-items": "center",
},
hover: {},
active: {},
selected: {},
},
_transition: "fade",
type: "div",
_children: [
{
_id: "781e497e-2e7c-11eb-adc1-0242ac120002",
_component: "@budibase/standard-components/login",
_styles: {
normal: {
padding: "64px",
background: "rgba(255, 255, 255, 0.4)",
"border-radius": "0.5rem",
"margin-top": "0px",
"box-shadow":
"0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04)",
"font-size": "16px",
"font-family": "Inter",
flex: "0 1 auto",
},
hover: {},
active: {},
selected: {},
},
logo: LOGO_URL,
title: `Log in to ${app.name}`,
buttonText: "Log In",
_children: [],
_instanceName: "Login",
},
],
},
routing: {
route: "/",
roleId: BUILTIN_ROLE_IDS.PUBLIC,
},
name: "login-screen",
})

2
packages/server/src/db/utils.js
View File

@ -160,7 +160,7 @@ exports.generateUserMetadataID = globalId => {
*/ */
exports.getGlobalIDFromUserMetadataID = id => { exports.getGlobalIDFromUserMetadataID = id => {
const prefix = `${DocumentTypes.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}` const prefix = `${DocumentTypes.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`
if (!id.includes(prefix)) { if (!id || !id.includes(prefix)) {
return id return id
} }
return id.split(prefix)[1] return id.split(prefix)[1]

5
packages/server/src/middleware/authorized.js
View File

@ -18,6 +18,11 @@ const WEBHOOK_ENDPOINTS = new RegExp(
async function checkDevAppLocks(ctx) { async function checkDevAppLocks(ctx) {
const appId = ctx.appId const appId = ctx.appId
// if any public usage, don't proceed
if (!ctx.user._id && !ctx.user.userId) {
return
}
// not a development app, don't need to do anything // not a development app, don't need to do anything
if (!appId || !appId.startsWith(APP_DEV_PREFIX)) { if (!appId || !appId.startsWith(APP_DEV_PREFIX)) {
return return

1
packages/server/src/middleware/tests/authorized.spec.js
View File

@ -108,6 +108,7 @@ describe("Authorization middleware", () => {
it("passes on to next() middleware if user is an admin", async () => { it("passes on to next() middleware if user is an admin", async () => {
config.setUser({ config.setUser({
_id: "user",
role: { role: {
_id: "ADMIN", _id: "ADMIN",
} }

10
packages/standard-components/src/Navigation.svelte
View File

@ -5,13 +5,6 @@
const component = getContext("component") const component = getContext("component")
export let logoUrl export let logoUrl
const logOut = async () => {
if ($builderStore.inBuilder) {
return
}
await authStore.actions.logOut()
}
</script> </script>
<div class="nav" use:styleable={$component.styles}> <div class="nav" use:styleable={$component.styles}>
@ -21,9 +14,6 @@
<img class="logo" alt="logo" src={logoUrl} height="48" /> <img class="logo" alt="logo" src={logoUrl} height="48" />
{/if} {/if}
</a> </a>
<div class="nav__controls">
<div on:click={logOut}>Log out</div>
</div>
</div> </div>
<div class="nav__menu"> <div class="nav__menu">
<slot /> <slot />

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

@ -33,6 +33,10 @@ const PUBLIC_ENDPOINTS = [
route: "/api/admin/configs/checklist", route: "/api/admin/configs/checklist",
method: "GET", method: "GET",
}, },
{
route: "/api/apps",
method: "GET",
},
] ]
const router = new Router() const router = new Router()