Skip to content

Commit 20ded06

Browse files
perf(X-Pack): Optimize OAuth2 customization logic (#478)
1 parent c5ce41f commit 20ded06

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
@@ -725,7 +725,9 @@
725725
"userinfo_url": "User Info URL",
726726
"token_url": "Token URL",
727727
"revoke_url": "Revocation URL",
728-
"oauth2_field_mapping_placeholder": "Example: {'{'}\"account\": \"OAuth2Account\", \"name\": \"OAuth2Name\", \"email\": \"email\"{'}'}"
728+
"oauth2_field_mapping_placeholder": "Example: {'{'}\"account\": \"OAuth2Account\", \"name\": \"OAuth2Name\", \"email\": \"email\"{'}'}",
729+
"token_auth_method": "Token auth method",
730+
"userinfo_auth_method": "Userinfo auth method"
729731
},
730732
"login": {
731733
"default_login": "Default",

frontend/src/i18n/ko-KR.json

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

frontend/src/i18n/zh-CN.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,9 @@
725725
"userinfo_url": "用户信息地址",
726726
"token_url": "令牌地址",
727727
"revoke_url": "撤销地址",
728-
"oauth2_field_mapping_placeholder": "例如:{'{'}\"account\": \"oauth2Account\", \"name\": \"oauth2Name\", \"email\": \"email\"{'}'}"
728+
"oauth2_field_mapping_placeholder": "例如:{'{'}\"account\": \"oauth2Account\", \"name\": \"oauth2Name\", \"email\": \"email\"{'}'}",
729+
"token_auth_method": "Token 认证方式",
730+
"userinfo_auth_method": "用户信息认证方式"
729731
},
730732
"login": {
731733
"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
logout_redirect_url: '',
3133
mapping: '',
3234
}),
@@ -367,6 +369,20 @@ onBeforeMount(() => {
367369
</el-radio-group>
368370
</el-form-item> -->
369371

372+
<el-form-item :label="t('authentication.token_auth_method')" prop="token_auth_method">
373+
<el-radio-group v-model="state.form.token_auth_method">
374+
<el-radio value="basic">Basic</el-radio>
375+
<el-radio value="body">Body</el-radio>
376+
</el-radio-group>
377+
</el-form-item>
378+
379+
<el-form-item :label="t('authentication.userinfo_auth_method')" prop="userinfo_auth_method">
380+
<el-radio-group v-model="state.form.userinfo_auth_method">
381+
<el-radio value="header">Header</el-radio>
382+
<el-radio value="query">Query</el-radio>
383+
</el-radio-group>
384+
</el-form-item>
385+
370386
<el-form-item
371387
v-for="form_item in form_config_list"
372388
:key="form_item.field"

0 commit comments

Comments
 (0)