diff --git a/packages/builder/src/components/integration/rest/AuthPicker.svelte b/packages/builder/src/components/integration/rest/AuthPicker.svelte index e8bf25d9ce..fd7773a7d2 100644 --- a/packages/builder/src/components/integration/rest/AuthPicker.svelte +++ b/packages/builder/src/components/integration/rest/AuthPicker.svelte @@ -11,8 +11,7 @@ import { goto } from "@roxi/routify" import { appStore, oauth2 } from "@/stores/builder" import DetailPopover from "@/components/common/DetailPopover.svelte" - import { featureFlag } from "@/helpers" - import { FeatureFlag, RestAuthType } from "@budibase/types" + import { RestAuthType } from "@budibase/types" import { onMount } from "svelte" type Config = { label: string; value: string } @@ -57,15 +56,13 @@ $: title = !authConfig ? "Authentication" : `Auth: ${authConfig.label}` - $: oauth2Enabled = featureFlag.isEnabled(FeatureFlag.OAUTH2_CONFIG) - onMount(() => { oauth2.fetch() }) -
+
{#if !authConfig} Authentication @@ -96,25 +93,23 @@ >
- {#if oauth2Enabled} - + - - OAuth 2.0 (Token-Based Authentication) - + + OAuth 2.0 (Token-Based Authentication) + + + {#if $oauth2.configs.length} + + {#each $oauth2.configs as config} + selectConfiguration(config._id, RestAuthType.OAUTH2)} + selected={config._id === authConfigId} + /> + {/each} + - {#if $oauth2.configs.length} - - {#each $oauth2.configs as config} - - selectConfiguration(config._id, RestAuthType.OAUTH2)} - selected={config._id === authConfigId} - /> - {/each} - - {/if}
@@ -48,13 +44,11 @@ url={$url("./version")} active={$isActive("./version")} /> - {#if oauth2Enabled} - - {/if} +