diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js index 105e038907..4bc0427976 100644 --- a/packages/auth/src/db/utils.js +++ b/packages/auth/src/db/utils.js @@ -132,29 +132,32 @@ const determineScopedConfig = async function (db, { type, user, group }) { } ) ) - const configs = response.rows.map(row => { + + function determineScore(row) { const config = row.doc // Config is specific to a user and a group if (config._id.includes(generateConfigID({ type, user, group }))) { - config.score = 4 + return 4 } else if (config._id.includes(generateConfigID({ type, user }))) { // Config is specific to a user only - config.score = 3 + return 3 } else if (config._id.includes(generateConfigID({ type, group }))) { // Config is specific to a group only - config.score = 2 + return 2 } else if (config._id.includes(generateConfigID({ type }))) { // Config is specific to a type only - config.score = 1 + return 1 } - return config - }) + return 0 + } // Find the config with the most granular scope based on context - const scopedConfig = configs.sort((a, b) => b.score - a.score)[0] + const scopedConfig = response.rows.sort( + (a, b) => determineScore(a) - determineScore(b) + )[0] - return scopedConfig + return scopedConfig.doc } exports.generateConfigID = generateConfigID diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js index 6fecda84c0..bd849c834f 100644 --- a/packages/builder/src/builderStore/index.js +++ b/packages/builder/src/builderStore/index.js @@ -2,6 +2,7 @@ import { getFrontendStore } from "./store/frontend" import { getAutomationStore } from "./store/automation" import { getHostingStore } from "./store/hosting" import { getThemeStore } from "./store/theme" +import { getAdminStore } from "./store/admin" import { derived, writable } from "svelte/store" import analytics from "analytics" import { FrontendTypes, LAYOUT_NAMES } from "../constants" @@ -11,6 +12,7 @@ export const store = getFrontendStore() export const automationStore = getAutomationStore() export const themeStore = getThemeStore() export const hostingStore = getHostingStore() +export const adminPanelStore = getAdminStore() export const currentAsset = derived(store, $store => { const type = $store.currentFrontEndType diff --git a/packages/builder/src/builderStore/store/admin.js b/packages/builder/src/builderStore/store/admin.js new file mode 100644 index 0000000000..dcf7fef485 --- /dev/null +++ b/packages/builder/src/builderStore/store/admin.js @@ -0,0 +1,11 @@ +import { writable } from "svelte/store" + +const INITIAL_ADMIN_STATE = { + oauth: [], +} + +export const getAdminStore = () => { + const store = writable({ ...INITIAL_ADMIN_STATE }) + store.actions = {} + return store +} diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte index c01de46334..de657a63ac 100644 --- a/packages/builder/src/pages/builder/_layout.svelte +++ b/packages/builder/src/pages/builder/_layout.svelte @@ -16,11 +16,14 @@ {#if $auth.user}
- +
Apps + OAuth Hosting diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index 293a4270de..b92febbb4c 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -1,5 +1,9 @@ + +
+
+ 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/portal/oauth/logos/Google.svelte b/packages/builder/src/pages/portal/oauth/logos/Google.svelte new file mode 100644 index 0000000000..518a668f75 --- /dev/null +++ b/packages/builder/src/pages/portal/oauth/logos/Google.svelte @@ -0,0 +1,38 @@ + + + + + + + + + + + + + diff --git a/packages/worker/src/api/controllers/admin/configs.js b/packages/worker/src/api/controllers/admin/configs.js index bf9259f953..c24d123727 100644 --- a/packages/worker/src/api/controllers/admin/configs.js +++ b/packages/worker/src/api/controllers/admin/configs.js @@ -12,14 +12,11 @@ const GLOBAL_DB = StaticDatabases.GLOBAL.name exports.save = async function (ctx) { const db = new CouchDB(GLOBAL_DB) - const { type, config } = ctx.request.body - const { group, user } = config - // insert the type into the doc - config.type = type + const { type, group, user, config } = ctx.request.body // Config does not exist yet - if (!config._id) { - config._id = generateConfigID({ + if (!ctx.request.body._id) { + ctx.request.body._id = generateConfigID({ type, group, user, @@ -34,7 +31,7 @@ exports.save = async function (ctx) { } try { - const response = await db.put(config) + const response = await db.put(ctx.request.body) ctx.body = { type, _id: response.id, diff --git a/packages/worker/src/api/controllers/admin/email.js b/packages/worker/src/api/controllers/admin/email.js index 9f4060d20f..e7f79546f9 100644 --- a/packages/worker/src/api/controllers/admin/email.js +++ b/packages/worker/src/api/controllers/admin/email.js @@ -65,7 +65,7 @@ exports.sendEmail = async ctx => { if (userId) { user = db.get(userId) } - const config = await determineScopedConfig(db, params) + const { config } = await determineScopedConfig(db, params) if (!config) { ctx.throw(400, "Unable to find SMTP configuration") } diff --git a/packages/worker/src/api/routes/admin/configs.js b/packages/worker/src/api/routes/admin/configs.js index 5865259a29..c214f02fcf 100644 --- a/packages/worker/src/api/routes/admin/configs.js +++ b/packages/worker/src/api/routes/admin/configs.js @@ -44,6 +44,9 @@ function googleValidation() { function buildConfigSaveValidation() { // prettier-ignore return joiValidator.body(Joi.object({ + _id: Joi.string(), + _rev: Joi.string(), + group: Joi.string(), type: Joi.string().valid(...Object.values(Configs)).required(), config: Joi.alternatives() .conditional("type", {