Browse Source

simpler check using checklist

gh-pages
Martin McKeaveney 5 years ago
parent
commit
2636c9450b
  1. 10
      packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
  2. 6
      packages/worker/src/api/controllers/admin/configs.js

10
packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte

@ -2,17 +2,11 @@
import { onMount } from "svelte"
import { ActionButton } from "@budibase/bbui"
import GoogleLogo from "/assets/google-logo.png"
import { admin } from "stores/portal"
let show = false
async function fetchConfig() {
const googleResponse = await api.get(
`/api/admin/configs/${ConfigTypes.Google}`
)
const googleDoc = await googleResponse.json()
if (googleDoc._id) show = true
}
$: show = $admin.checklist?.oauth
</script>
{#if show}

6
packages/worker/src/api/controllers/admin/configs.js

@ -168,6 +168,11 @@ exports.configChecklist = async function (ctx) {
type: Configs.SMTP,
})
// They have set up Google Auth
const oauthConfig = await getScopedFullConfig(db, {
type: Configs.GOOGLE,
})
// They have set up an admin user
const users = await db.allDocs(
getGlobalUserParams(null, {
@ -180,6 +185,7 @@ exports.configChecklist = async function (ctx) {
apps: appDbNames.length,
smtp: !!smtpConfig,
adminUser,
oauth: !!oauthConfig,
}
} catch (err) {
ctx.throw(err.status, err)

Loading…
Cancel
Save