MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing conflict with OIDCButton

This commit is contained in:
Peter Clement 2021-07-08 12:36:09 +01:00
parent b1c5b5cf35
commit cd1e5c8087
2 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/builder/src/pages/builder/auth/_components/OidcButton.svelte
View File

@ -1,39 +0,0 @@
<script>
import { ActionButton } from "@budibase/bbui"
import OidcLogo from "assets/oidc-logo.png"
import { admin } from "stores/portal"
let show = false
$: show = $admin.checklist?.oidc
</script>
{#if show}
<ActionButton
on:click={() => window.open("/api/admin/auth/oidc", "_blank")}
>
<div class="inner">
<img src={OidcLogo} alt="oidc icon" />
<p>Sign in with OIDC</p>
</div>
</ActionButton>
{/if}
<style>
.inner {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
padding-top: var(--spacing-xs);
padding-bottom: var(--spacing-xs);
}
.inner img {
width: 18px;
margin: 3px 10px 3px 3px;
}
.inner p {
margin: 0;
}
</style>

20
packages/builder/src/pages/builder/portal/manage/auth/index.svelte
View File

@ -85,7 +85,7 @@
let fileName = e.target.files[0].name let fileName = e.target.files[0].name
image = e.target.files[0] image = e.target.files[0]
providers.oidc.config["iconName"] = fileName providers.oidc.config["iconName"] = fileName
iconDropdownOptions.unshift({label: fileName, value: fileName}) iconDropdownOptions.unshift({ label: fileName, value: fileName })
} }
const providers = { google, oidc } const providers = { google, oidc }
@ -140,17 +140,17 @@
const configSettings = await res.json() const configSettings = await res.json()
if (configSettings.config) { if (configSettings.config) {
const logoKeys = Object.keys(configSettings.config) const logoKeys = Object.keys(configSettings.config)
logoKeys.map(logoKey => { logoKeys.map(logoKey => {
const logoUrl = configSettings.config[logoKey] const logoUrl = configSettings.config[logoKey]
iconDropdownOptions.unshift({ iconDropdownOptions.unshift({
label: logoKey, label: logoKey,
value: logoKey, value: logoKey,
icon: logoUrl, icon: logoUrl,
})
}) })
}) }
}
const oidcResponse = await api.get(`/api/admin/configs/${ConfigTypes.OIDC}`) const oidcResponse = await api.get(`/api/admin/configs/${ConfigTypes.OIDC}`)
const oidcDoc = await oidcResponse.json() const oidcDoc = await oidcResponse.json()