This commit is contained in:
mike12345567 2021-01-06 17:28:22 +00:00
parent c706a623de
commit e98f9a9e94
6 changed files with 35 additions and 29 deletions

View File

@ -1,5 +1,4 @@
<script> <script>
import { Label, DropdownMenu } from "@budibase/bbui" import { Label, DropdownMenu } from "@budibase/bbui"
import ThemeEditor from "./ThemeEditor.svelte" import ThemeEditor from "./ThemeEditor.svelte"

View File

@ -27,7 +27,6 @@
} }
function updateSelfHosting(event) { function updateSelfHosting(event) {
if (hostingInfo.type === "cloud" && event.target.checked) { if (hostingInfo.type === "cloud" && event.target.checked) {
hostingInfo.hostingUrl = "localhost:10000" hostingInfo.hostingUrl = "localhost:10000"
hostingInfo.useHttps = false hostingInfo.useHttps = false
@ -41,10 +40,7 @@
}) })
</script> </script>
<ModalContent <ModalContent title="Builder settings" confirmText="Save" onConfirm={save}>
title="Builder settings"
confirmText="Save"
onConfirm={save}>
<h5>Theme</h5> <h5>Theme</h5>
<ThemeEditor /> <ThemeEditor />
<h5>Hosting</h5> <h5>Hosting</h5>
@ -52,7 +48,11 @@
This section contains settings that relate to the deployment and hosting of This section contains settings that relate to the deployment and hosting of
apps made in this builder. apps made in this builder.
</p> </p>
<Toggle thin text="Self hosted" on:change={updateSelfHosting} bind:checked={selfhosted} /> <Toggle
thin
text="Self hosted"
on:change={updateSelfHosting}
bind:checked={selfhosted} />
{#if selfhosted} {#if selfhosted}
<Input bind:value={hostingInfo.hostingUrl} label="Hosting URL" /> <Input bind:value={hostingInfo.hostingUrl} label="Hosting URL" />
<Input bind:value={hostingInfo.selfHostKey} label="Hosting Key" /> <Input bind:value={hostingInfo.selfHostKey} label="Hosting Key" />

View File

@ -1,6 +1,11 @@
<script> <script>
import { writable } from "svelte/store" import { writable } from "svelte/store"
import { store, automationStore, backendUiStore, hostingStore } from "builderStore" import {
store,
automationStore,
backendUiStore,
hostingStore,
} from "builderStore"
import { string, object } from "yup" import { string, object } from "yup"
import api, { get } from "builderStore/api" import api, { get } from "builderStore/api"
import Form from "@svelteschool/svelte-forms" import Form from "@svelteschool/svelte-forms"
@ -12,7 +17,7 @@
import { fade } from "svelte/transition" import { fade } from "svelte/transition"
import { post } from "builderStore/api" import { post } from "builderStore/api"
import analytics from "analytics" import analytics from "analytics"
import {onMount} from "svelte" import { onMount } from "svelte"
//Move this to context="module" once svelte-forms is updated so that it can bind to stores correctly //Move this to context="module" once svelte-forms is updated so that it can bind to stores correctly
const createAppStore = writable({ currentStep: 0, values: {} }) const createAppStore = writable({ currentStep: 0, values: {} })

View File

@ -11,7 +11,7 @@ const PUBLIC_READ_POLICY = {
{ {
Effect: "Allow", Effect: "Allow",
Principal: { Principal: {
AWS: ["*"] AWS: ["*"],
}, },
Action: "s3:GetObject", Action: "s3:GetObject",
Resource: [`arn:aws:s3:::${APP_BUCKET}/*`], Resource: [`arn:aws:s3:::${APP_BUCKET}/*`],
@ -65,8 +65,7 @@ async function getMinioSession() {
Bucket: APP_BUCKET, Bucket: APP_BUCKET,
}) })
.promise() .promise()
} } else {
else {
throw err throw err
} }
} }

View File

@ -1,7 +1,10 @@
const env = require("../environment") const env = require("../environment")
module.exports = async (ctx, next) => { module.exports = async (ctx, next) => {
if (!ctx.request.body.selfHostKey || env.SELF_HOST_KEY !== ctx.request.body.selfHostKey) { if (
!ctx.request.body.selfHostKey ||
env.SELF_HOST_KEY !== ctx.request.body.selfHostKey
) {
ctx.throw(401, "Deployment unauthorised") ctx.throw(401, "Deployment unauthorised")
} else { } else {
await next() await next()