fix(trigger): oauth client config

web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx

@@ -100,7 +100,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
     ]
   }, [t, oauthConfig, supportedMethods, methodType])
 
-  const onChooseCreateType = (type: SupportedCreationMethods) => {
+  const onChooseCreateType = async (type: SupportedCreationMethods) => {
     if (type === SupportedCreationMethods.OAUTH) {
       if (oauthConfig?.configured) {
         initiateOAuth(detail?.provider || '', {
@@ -115,10 +115,10 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
               }
             })
           },
-          onError: (error: any) => {
+          onError: () => {
             Toast.notify({
               type: 'error',
-              message: error?.message || t('pluginTrigger.modal.errors.authFailed'),
+              message: t('pluginTrigger.modal.oauth.authorization.authFailed'),
             })
           },
         })

web/app/components/plugins/plugin-detail-panel/subscription-list/create/oauth-client.tsx

@@ -7,6 +7,7 @@ import Toast from '@/app/components/base/toast'
 import type { TriggerOAuthClientParams, TriggerOAuthConfig, TriggerSubscriptionBuilder } from '@/app/components/workflow/block-selector/types'
 import OptionCard from '@/app/components/workflow/nodes/_base/components/option-card'
 import { openOAuthPopup } from '@/hooks/use-oauth'
+import type { ConfigureTriggerOAuthPayload } from '@/service/use-triggers'
 import {
   useConfigureTriggerOAuth,
   useDeleteTriggerOAuth,
@@ -71,10 +72,11 @@ export const OAuthClientSettingsModal = ({ oauthConfig, onClose, showOAuthCreate
           }
         })
       },
-      onError: (error: any) => {
+      onError: () => {
+        setAuthorizationStatus(AuthorizationStatusEnum.Failed)
         Toast.notify({
           type: 'error',
-          message: error?.message || t('pluginTrigger.modal.errors.authFailed'),
+          message: t('pluginTrigger.modal.oauth.authorization.authFailed'),
         })
       },
     })
@@ -125,28 +127,32 @@ export const OAuthClientSettingsModal = ({ oauthConfig, onClose, showOAuthCreate
   }
 
   const handleSave = (needAuth: boolean) => {
-    const clientParams = clientFormRef.current?.getFormValues({})?.values || {}
+    const isCustom = clientType === ClientTypeEnum.Custom
-    if (clientParams.client_id === oauthConfig?.params.client_id)
+    const params: ConfigureTriggerOAuthPayload = {
-      clientParams.client_id = '[__HIDDEN__]'
-
-    if (clientParams.client_secret === oauthConfig?.params.client_secret)
-      clientParams.client_secret = '[__HIDDEN__]'
-
-    configureOAuth({
       provider: providerName,
-      client_params: clientParams as TriggerOAuthClientParams,
+      enabled: isCustom,
-      enabled: clientType === ClientTypeEnum.Custom,
+    }
-    }, {
+
+    if (isCustom) {
+      const clientFormValues = clientFormRef.current?.getFormValues({}) as { values: TriggerOAuthClientParams, isCheckValidated: boolean }
+      if (!clientFormValues.isCheckValidated)
+        return
+      const clientParams = clientFormValues.values
+      if (clientParams.client_id === oauthConfig?.params.client_id)
+        clientParams.client_id = '[__HIDDEN__]'
+
+      if (clientParams.client_secret === oauthConfig?.params.client_secret)
+        clientParams.client_secret = '[__HIDDEN__]'
+
+      params.client_params = clientParams
+    }
+
+    configureOAuth(params, {
       onSuccess: () => {
         if (needAuth)
           handleAuthorization()
         else
           onClose()
-
-        Toast.notify({
-          type: 'success',
-          message: t('pluginTrigger.modal.oauth.configuration.success'),
-        })
       },
       onError: (error: any) => {
         Toast.notify({

web/i18n/en-US/plugin-trigger.ts

@@ -116,7 +116,7 @@ const translation = {
         authorizeButton: 'Authorize with {{provider}}',
         waitingAuth: 'Waiting for authorization...',
         authSuccess: 'Authorization successful',
-        authFailed: 'Authorization failed',
+        authFailed: 'Failed to get OAuth authorization information',
         waitingJump: 'Authorized, waiting for jump',
       },
       configuration: {

web/i18n/zh-Hans/plugin-trigger.ts

@@ -116,7 +116,7 @@ const translation = {
         authorizeButton: '使用 {{provider}} 授权',
         waitingAuth: '等待授权中...',
         authSuccess: '授权成功',
-        authFailed: '授权失败',
+        authFailed: '获取 OAuth 授权信息失败',
         waitingJump: '已授权，待跳转',
       },
       configuration: {

web/service/use-triggers.ts

@@ -233,14 +233,16 @@ export const useTriggerOAuthConfig = (provider: string, enabled = true) => {
   })
 }
 
+export type ConfigureTriggerOAuthPayload = {
+  provider: string
+  client_params?: TriggerOAuthClientParams
+  enabled: boolean
+}
+
 export const useConfigureTriggerOAuth = () => {
   return useMutation({
     mutationKey: [NAME_SPACE, 'configure-oauth'],
-    mutationFn: (payload: {
+    mutationFn: (payload: ConfigureTriggerOAuthPayload) => {
-      provider: string
-      client_params: TriggerOAuthClientParams
-      enabled: boolean
-    }) => {
       const { provider, ...body } = payload
       return post<{ result: string }>(
         `/workspaces/current/trigger-provider/${provider}/oauth/client`,
@@ -267,6 +269,8 @@ export const useInitiateTriggerOAuth = () => {
     mutationFn: (provider: string) => {
       return get<{ authorization_url: string; subscription_builder: TriggerSubscriptionBuilder }>(
         `/workspaces/current/trigger-provider/${provider}/subscriptions/oauth/authorize`,
+        {},
+        { silent: true },
       )
     },
   })