diff --git a/web/berry/src/config.js b/web/berry/src/config.js index 14e6ffcb..8c1faf9b 100644 --- a/web/berry/src/config.js +++ b/web/berry/src/config.js @@ -24,7 +24,7 @@ const config = { wechat_login: false, wechat_qrcode: '', oidc: false, - oidc_app_id: '', + oidc_client_id: '', oidc_authorization_endpoint: '', oidc_token_endpoint: '', oidc_userinfo_endpoint: '', diff --git a/web/berry/src/views/Authentication/AuthForms/AuthLogin.js b/web/berry/src/views/Authentication/AuthForms/AuthLogin.js index 7e4abc1c..7efd0362 100644 --- a/web/berry/src/views/Authentication/AuthForms/AuthLogin.js +++ b/web/berry/src/views/Authentication/AuthForms/AuthLogin.js @@ -152,7 +152,7 @@ const LoginForm = ({ ...others }) => { diff --git a/web/berry/src/views/Setting/component/SystemSetting.js b/web/berry/src/views/Setting/component/SystemSetting.js index 0815d40b..186eec5f 100644 --- a/web/berry/src/views/Setting/component/SystemSetting.js +++ b/web/berry/src/views/Setting/component/SystemSetting.js @@ -34,8 +34,8 @@ const SystemSetting = () => { LarkClientId: '', LarkClientSecret: '', OidcEnabled: '', - OidcAppId: '', - OidcAppSecret: '', + OidcClientId: '', + OidcClientSecret: '', OidcAuthorizationEndpoint: '', OidcTokenEndpoint: '', OidcUserinfoEndpoint: '', @@ -240,18 +240,18 @@ const SystemSetting = () => { const submitOidc = async () => { const OidcConfig = { - OidcAppId: inputs.OidcAppId, - OidcAppSecret: inputs.OidcAppSecret, + OidcClientId: inputs.OidcClientId, + OidcClientSecret: inputs.OidcClientSecret, OidcAuthorizationEndpoint: inputs.OidcAuthorizationEndpoint, OidcTokenEndpoint: inputs.OidcTokenEndpoint, OidcUserinfoEndpoint: inputs.OidcUserinfoEndpoint }; console.log(OidcConfig); - if (originInputs['OidcAppId'] !== inputs.OidcAppId) { - await updateOption('OidcAppId', inputs.OidcAppId); + if (originInputs['OidcClientId'] !== inputs.OidcClientId) { + await updateOption('OidcClientId', inputs.OidcClientId); } - if (originInputs['OidcAppSecret'] !== inputs.OidcAppSecret && inputs.OidcAppSecret !== '') { - await updateOption('OidcAppSecret', inputs.OidcAppSecret); + if (originInputs['OidcClientSecret'] !== inputs.OidcClientSecret && inputs.OidcClientSecret !== '') { + await updateOption('OidcClientSecret', inputs.OidcClientSecret); } if (originInputs['OidcAuthorizationEndpoint'] !== inputs.OidcAuthorizationEndpoint) { await updateOption('OidcAuthorizationEndpoint', inputs.OidcAuthorizationEndpoint); @@ -332,7 +332,7 @@ const SystemSetting = () => { } /> @@ -679,27 +679,27 @@ const SystemSetting = () => { - App ID + Client ID - App Secret + Client Secret @@ -707,49 +707,49 @@ const SystemSetting = () => { - 授权地址 + Authorization Endpoint - 认证地址 + Token Endpoint - 用户地址 + Userinfo Endpoint