fix: update OAuth button logic to improve configuration handling

feat/tool-oauth
Harry 7 months ago
parent 25e0013db9
commit 364e0f1450

@ -5,7 +5,6 @@ import {
useState, useState,
} from 'react' } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { IS_CE_EDITION } from '@/config'
import { import {
RiClipboardLine, RiClipboardLine,
RiEqualizer2Line, RiEqualizer2Line,
@ -61,7 +60,7 @@ const AddOAuthButton = ({
client_params, client_params,
redirect_uri, redirect_uri,
} = data || {} } = data || {}
const isConfigured = is_system_oauth_params_exists || Object.keys(client_params || {}).length > 0 const isConfigured = is_system_oauth_params_exists || is_oauth_custom_client_enabled
const handleOAuth = useCallback(async () => { const handleOAuth = useCallback(async () => {
const { authorization_url } = await getPluginOAuthUrl() const { authorization_url } = await getPluginOAuthUrl()
@ -156,19 +155,17 @@ const AddOAuthButton = ({
}, [schema, renderCustomLabel, t, is_system_oauth_params_exists, is_oauth_custom_client_enabled, client_params]) }, [schema, renderCustomLabel, t, is_system_oauth_params_exists, is_oauth_custom_client_enabled, client_params])
const __auth_client__ = useMemo(() => { const __auth_client__ = useMemo(() => {
if (!isConfigured) { if (isConfigured) {
if (IS_CE_EDITION) if (is_oauth_custom_client_enabled)
return 'custom' return 'custom'
return 'default' return 'default'
} }
else { else {
if (is_oauth_custom_client_enabled) if (is_system_oauth_params_exists)
return 'custom'
return 'default' return 'default'
return 'custom'
} }
}, [isConfigured, is_oauth_custom_client_enabled]) }, [isConfigured, is_oauth_custom_client_enabled, is_system_oauth_params_exists])
return ( return (
<> <>

Loading…
Cancel
Save