Skip to content

Commit 8108af2

Browse files
perf(X-Pack): Optimize OAuth2 customization logic
1 parent f940c84 commit 8108af2

File tree

5 files changed

+27
-4
lines changed

5 files changed

+27
-4
lines changed

backend/common/core/config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ def all_cors_origins(self) -> list[str]:
6464
LOG_DIR: str = "logs"
6565
LOG_FORMAT: str = "%(asctime)s - %(name)s - %(levelname)s:%(lineno)d - %(message)s"
6666
SQL_DEBUG: bool = False
67-
67+
BASE_DIR: str = "/opt/sqlbot"
68+
SCRIPT_DIR: str = f"{BASE_DIR}/scripts"
6869
UPLOAD_DIR: str = "/opt/sqlbot/data/file"
6970
SQLBOT_KEY_EXPIRED: int = 100 # License key expiration timestamp, 0 means no expiration
7071

frontend/src/i18n/en.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,9 @@
723723
"userinfo_url": "User Info URL",
724724
"token_url": "Token URL",
725725
"revoke_url": "Revocation URL",
726-
"oauth2_field_mapping_placeholder": "Example: {'{'}\"account\": \"OAuth2Account\", \"name\": \"OAuth2Name\", \"email\": \"email\"{'}'}"
726+
"oauth2_field_mapping_placeholder": "Example: {'{'}\"account\": \"OAuth2Account\", \"name\": \"OAuth2Name\", \"email\": \"email\"{'}'}",
727+
"token_auth_method": "Token auth method",
728+
"userinfo_auth_method": "Userinfo auth method"
727729
},
728730
"login": {
729731
"default_login": "Default",

frontend/src/i18n/ko-KR.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,9 @@
723723
"userinfo_url": "사용자 정보 URL",
724724
"token_url": "토큰 URL",
725725
"revoke_url": "취소 URL",
726-
"oauth2_field_mapping_placeholder": "예: {'{'}\"account\": \"OAuth2Account\", \"name\": \"OAuth2Name\", \"email\": \"email\"{'}'}"
726+
"oauth2_field_mapping_placeholder": "예: {'{'}\"account\": \"OAuth2Account\", \"name\": \"OAuth2Name\", \"email\": \"email\"{'}'}",
727+
"token_auth_method": "토큰 인증 방식",
728+
"userinfo_auth_method": "사용자 정보 인증 방식"
727729
},
728730
"login": {
729731
"default_login": "기본값",

frontend/src/i18n/zh-CN.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,9 @@
723723
"userinfo_url": "用户信息地址",
724724
"token_url": "令牌地址",
725725
"revoke_url": "撤销地址",
726-
"oauth2_field_mapping_placeholder": "例如:{'{'}\"account\": \"oauth2Account\", \"name\": \"oauth2Name\", \"email\": \"email\"{'}'}"
726+
"oauth2_field_mapping_placeholder": "例如:{'{'}\"account\": \"oauth2Account\", \"name\": \"oauth2Name\", \"email\": \"email\"{'}'}",
727+
"token_auth_method": "Token 认证方式",
728+
"userinfo_auth_method": "用户信息认证方式"
727729
},
728730
"login": {
729731
"default_login": "默认",

frontend/src/views/system/authentication/Oauth2Editor.vue

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ const state = reactive({
2727
client_id: '',
2828
client_secret: '',
2929
redirect_url: '',
30+
token_auth_method: 'basic',
31+
userinfo_auth_method: 'header',
3032
mapping: '',
3133
}),
3234
})
@@ -359,6 +361,20 @@ onBeforeMount(() => {
359361
</el-radio-group>
360362
</el-form-item> -->
361363

364+
<el-form-item :label="t('authentication.token_auth_method')" prop="token_auth_method">
365+
<el-radio-group v-model="state.form.token_auth_method">
366+
<el-radio value="basic">Basic</el-radio>
367+
<el-radio value="body">Body</el-radio>
368+
</el-radio-group>
369+
</el-form-item>
370+
371+
<el-form-item :label="t('authentication.userinfo_auth_method')" prop="userinfo_auth_method">
372+
<el-radio-group v-model="state.form.userinfo_auth_method">
373+
<el-radio value="header">Header</el-radio>
374+
<el-radio value="query">Query</el-radio>
375+
</el-radio-group>
376+
</el-form-item>
377+
362378
<el-form-item
363379
v-for="form_item in form_config_list"
364380
:key="form_item.field"

0 commit comments

Comments
 (0)