Browse Source

Invert logos config naming to prevent conflict

pull/4023/head
Rory Powell 5 years ago
parent
commit
3152bd1839
  1. 2
      packages/auth/src/constants.js
  2. 2
      packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
  3. 4
      packages/builder/src/pages/builder/portal/manage/auth/index.svelte

2
packages/auth/src/constants.js

@ -21,5 +21,5 @@ exports.Configs = {
SMTP: "smtp", SMTP: "smtp",
GOOGLE: "google", GOOGLE: "google",
OIDC: "oidc", OIDC: "oidc",
OIDC_LOGOS: "oidc_logos", OIDC_LOGOS: "logos_oidc",
} }

2
packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte

@ -22,7 +22,7 @@
$: show = $admin.checklist?.oidc $: show = $admin.checklist?.oidc
$: src = !$oidc.logo $: src = !$oidc.logo
? OidcLogo ? OidcLogo
: preDefinedIcons[$oidc.logo] || `/global/oidc_logos/${$oidc.logo}` : preDefinedIcons[$oidc.logo] || `/global/logos_oidc/${$oidc.logo}`
</script> </script>
{#if show} {#if show}

4
packages/builder/src/pages/builder/portal/manage/auth/index.svelte

@ -83,7 +83,7 @@
let data = new FormData() let data = new FormData()
data.append("file", file) data.append("file", file)
const res = await api.post( const res = await api.post(
`/api/admin/configs/upload/oidc_logos/${file.name}`, `/api/admin/configs/upload/logos_oidc/${file.name}`,
data, data,
{} {}
) )
@ -153,7 +153,7 @@
//Get the list of user uploaded logos and push it to the dropdown options. //Get the list of user uploaded logos and push it to the dropdown options.
//This needs to be done before the config call so they're available when the dropdown renders //This needs to be done before the config call so they're available when the dropdown renders
const res = await api.get(`/api/admin/configs/oidc_logos`) const res = await api.get(`/api/admin/configs/logos_oidc`)
const configSettings = await res.json() const configSettings = await res.json()
if (configSettings.config) { if (configSettings.config) {

Loading…
Cancel
Save