From 3d16c735d96ba2f88ed5d4fa7c8f0b54cac5726a Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Tue, 4 Feb 2025 16:45:03 +0800
Subject: [PATCH] fix: oauth error

---
 src/main/services/WindowService.ts                         | 4 ++--
 src/renderer/src/components/OAuth/OAuthButton.tsx          | 7 +++----
 .../pages/settings/ProviderSettings/ProviderSetting.tsx    | 6 ++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts
index e26501aa..dc9b42c0 100644
--- a/src/main/services/WindowService.ts
+++ b/src/main/services/WindowService.ts
@@ -163,9 +163,9 @@ export class WindowService {
     mainWindow.webContents.setWindowOpenHandler((details) => {
       const { url } = details
 
-      const oauthProviderUrls = ['https://account.siliconflow.cn']
+      const oauthProviderUrls = ['https://account.siliconflow.cn/oauth']
 
-      if (oauthProviderUrls.some((url) => url.startsWith(url))) {
+      if (oauthProviderUrls.some((link) => url.startsWith(link))) {
         return {
           action: 'allow',
           overrideBrowserWindowOptions: {
diff --git a/src/renderer/src/components/OAuth/OAuthButton.tsx b/src/renderer/src/components/OAuth/OAuthButton.tsx
index 9b73385b..a659f1ab 100644
--- a/src/renderer/src/components/OAuth/OAuthButton.tsx
+++ b/src/renderer/src/components/OAuth/OAuthButton.tsx
@@ -1,4 +1,3 @@
-import { useProvider } from '@renderer/hooks/useProvider'
 import { Provider } from '@renderer/types'
 import { oauthWithAihubmix, oauthWithSiliconFlow } from '@renderer/utils/oauth'
 import { Button, ButtonProps } from 'antd'
@@ -7,16 +6,16 @@ import { useTranslation } from 'react-i18next'
 
 interface Props extends ButtonProps {
   provider: Provider
+  onSuccess?: (key: string) => void
 }
 
-const OAuthButton: FC<Props> = (props) => {
+const OAuthButton: FC<Props> = ({ provider, ...props }) => {
   const { t } = useTranslation()
-  const { provider, updateProvider } = useProvider(props.provider.id)
 
   const onAuth = () => {
     const onSuccess = (key: string) => {
       if (key.trim()) {
-        updateProvider({ ...provider, apiKey: key })
+        props.onSuccess?.(key)
         window.message.success(t('auth.get_key_success'))
       }
     }
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
index 12c09be4..1bf9d8d1 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
@@ -240,7 +240,7 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
           type="password"
           autoFocus={provider.enabled && apiKey === ''}
         />
-        {isProviderSupportAuth(provider) && <OAuthButton provider={provider} />}
+        {isProviderSupportAuth(provider) && <OAuthButton provider={provider} onSuccess={setApiKey} />}
         <Button
           type={apiValid ? 'primary' : 'default'}
           ghost={apiValid}
@@ -266,7 +266,9 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
           onBlur={onUpdateApiHost}
         />
         {!isEmpty(configedApiHost) && apiHost !== configedApiHost && (
-          <Button onClick={onReset}>{t('settings.provider.api.url.reset')}</Button>
+          <Button danger onClick={onReset}>
+            {t('settings.provider.api.url.reset')}
+          </Button>
         )}
       </Space.Compact>
       {isOpenAIProvider(provider) && (