From 3f332ec42d6fc19d37334f3c8c4354e444b41049 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 19 Aug 2024 14:57:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A4=E8=AF=81=E8=AE=BE=E7=BD=AE=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1045225 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001045225
---
 .../system/config/components/authConfig.vue   | 20 +++++++++----------
 .../setting/system/config/locale/en-US.ts     |  1 +
 .../setting/system/config/locale/zh-CN.ts     |  1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/setting/system/config/components/authConfig.vue b/frontend/src/views/setting/system/config/components/authConfig.vue
index 1ad6ecee74..af088adc21 100644
--- a/frontend/src/views/setting/system/config/components/authConfig.vue
+++ b/frontend/src/views/setting/system/config/components/authConfig.vue
@@ -163,7 +163,7 @@
               :max-length="255"
               :placeholder="
                 t('system.config.auth.commonUrlPlaceholder', {
-                  url: 'http://<meteresphere-endpoint>/sso/callback/cas/suthld',
+                  url: 'http://<meteresphere-endpoint>/sso/callback/cas/{authId}',
                 })
               "
               allow-clear
@@ -286,7 +286,7 @@
               allow-clear
             ></a-input-password>
           </a-form-item>
-          <a-form-item
+          <!--          <a-form-item
             :label="t('system.config.auth.logoutSessionUrl')"
             field="configuration.logoutUrl"
             asterisk-position="end"
@@ -303,7 +303,7 @@
               "
               allow-clear
             ></a-input>
-          </a-form-item>
+          </a-form-item>-->
           <!--          <a-form-item :label="t('system.config.auth.loginUrl')" field="configuration.loginUrl" asterisk-position="end">
             <a-input
               v-model:model-value="activeAuthForm.configuration.loginUrl"
@@ -327,7 +327,7 @@
               :max-length="255"
               :placeholder="
                 t('system.config.auth.commonUrlPlaceholder', {
-                  url: 'http://<keyclock>auth/realms/<metersphere>/protocol/openid-connect/auth',
+                  url: 'http://<meteresphere-endpoint>/login/oauth/authorize',
                 })
               "
               allow-clear
@@ -345,7 +345,7 @@
               :max-length="255"
               :placeholder="
                 t('system.config.auth.commonUrlPlaceholder', {
-                  url: 'http://<keyclock>auth/realms/<metersphere>/protocol/openid-connect/token',
+                  url: 'https://<meteresphere-endpoint>/login/oauth/access_token',
                 })
               "
               allow-clear
@@ -363,7 +363,7 @@
               :max-length="255"
               :placeholder="
                 t('system.config.auth.commonUrlPlaceholder', {
-                  url: 'http://<keyclock>auth/realms/<metersphere>/protocol/openid-connect/userinfo',
+                  url: 'https://<meteresphere-endpoint>/user',
                 })
               "
               allow-clear
@@ -381,7 +381,7 @@
               :max-length="255"
               :placeholder="
                 t('system.config.auth.commonUrlPlaceholder', {
-                  url: 'http://<meteresphere-endpoint>/sso/callback/cas/suthld',
+                  url: 'http://<meteresphere-endpoint>/sso/callback/oauth2',
                 })
               "
               allow-clear
@@ -411,7 +411,7 @@
             <a-input-password
               v-model:model-value="activeAuthForm.configuration.secret"
               :max-length="255"
-              :placeholder="t('system.config.auth.clientSecretPlaceholder')"
+              :placeholder="t('system.config.auth.oauth.clientSecretPlaceholder')"
               allow-clear
             ></a-input-password>
           </a-form-item>
@@ -429,7 +429,7 @@
               allow-clear
             ></a-input>
           </a-form-item>
-          <a-form-item
+          <!--          <a-form-item
             :label="t('system.config.auth.logoutSessionUrl')"
             field="configuration.logoutUrl"
             asterisk-position="end"
@@ -444,7 +444,7 @@
               "
               allow-clear
             ></a-input>
-          </a-form-item>
+          </a-form-item>-->
           <a-form-item :label="t('system.config.auth.linkRange')" field="configuration.scope" asterisk-position="end">
             <a-input
               v-model:model-value="activeAuthForm.configuration.scope"
diff --git a/frontend/src/views/setting/system/config/locale/en-US.ts b/frontend/src/views/setting/system/config/locale/en-US.ts
index 7696a8435c..a0b043e256 100644
--- a/frontend/src/views/setting/system/config/locale/en-US.ts
+++ b/frontend/src/views/setting/system/config/locale/en-US.ts
@@ -153,6 +153,7 @@ export default {
   'system.config.auth.clientSecret': 'Client secret',
   'system.config.auth.clientSecretRequired': 'Client secret cannot be empty',
   'system.config.auth.clientSecretPlaceholder': 'OIDC client secret',
+  'system.config.auth.oauth.clientSecretPlaceholder': 'OAuth2.0 client secret',
   'system.config.auth.logoutSessionUrl': 'Logout session address',
   'system.config.auth.logoutSessionUrlRequired': 'Logout session address cannot be empty',
   'system.config.auth.password': 'Password',
diff --git a/frontend/src/views/setting/system/config/locale/zh-CN.ts b/frontend/src/views/setting/system/config/locale/zh-CN.ts
index e2440f35a5..ac1e425f7d 100644
--- a/frontend/src/views/setting/system/config/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/config/locale/zh-CN.ts
@@ -149,6 +149,7 @@ export default {
   'system.config.auth.clientSecret': '客户端密钥',
   'system.config.auth.clientSecretRequired': '客户端密钥不能为空',
   'system.config.auth.clientSecretPlaceholder': 'OIDC client secret',
+  'system.config.auth.oauth.clientSecretPlaceholder': 'OAuth2.0 client secret',
   'system.config.auth.logoutSessionUrl': '注销会话端地址',
   'system.config.auth.logoutSessionUrlRequired': '注销会话端地址不能为空',
   'system.config.auth.password': '密码',