diff --git a/common/config/config.go b/common/config/config.go index f9e4a540..43f56862 100644 --- a/common/config/config.go +++ b/common/config/config.go @@ -71,8 +71,9 @@ var GitHubClientSecret = "" var LarkClientId = "" var LarkClientSecret = "" -var OidcAppId = "" -var OidcAppSecret = "" +var OidcClientId = "" +var OidcClientSecret = "" +var OidcWellKnown = "" var OidcAuthorizationEndpoint = "" var OidcTokenEndpoint = "" var OidcUserinfoEndpoint = "" diff --git a/controller/auth/oidc.go b/controller/auth/oidc.go index 02865c60..7b4ad4b9 100644 --- a/controller/auth/oidc.go +++ b/controller/auth/oidc.go @@ -38,8 +38,8 @@ func getOidcUserInfoByCode(code string) (*OidcUser, error) { return nil, errors.New("无效的参数") } values := map[string]string{ - "client_id": config.OidcAppId, - "client_secret": config.OidcAppSecret, + "client_id": config.OidcClientId, + "client_secret": config.OidcClientSecret, "code": code, "grant_type": "authorization_code", "redirect_uri": fmt.Sprintf("%s/oauth/oidc", config.ServerAddress), diff --git a/controller/misc.go b/controller/misc.go index 0aef52c0..ae900870 100644 --- a/controller/misc.go +++ b/controller/misc.go @@ -37,7 +37,8 @@ func GetStatus(c *gin.Context) { "quota_per_unit": config.QuotaPerUnit, "display_in_currency": config.DisplayInCurrencyEnabled, "oidc": config.OidcEnabled, - "oidc_app_id": config.OidcAppId, + "oidc_client_id": config.OidcClientId, + "oidc_well_known": config.OidcWellKnown, "oidc_authorization_endpoint": config.OidcAuthorizationEndpoint, "oidc_token_endpoint": config.OidcTokenEndpoint, "oidc_userinfo_endpoint": config.OidcUserinfoEndpoint, diff --git a/model/option.go b/model/option.go index fa9f9c98..8fd30aee 100644 --- a/model/option.go +++ b/model/option.go @@ -179,10 +179,12 @@ func updateOptionMap(key string, value string) (err error) { config.LarkClientId = value case "LarkClientSecret": config.LarkClientSecret = value - case "OidcAppId": - config.OidcAppId = value - case "OidcAppSecret": - config.OidcAppSecret = value + case "OidcClientId": + config.OidcClientId = value + case "OidcClientSecret": + config.OidcClientSecret = value + case "OidcWellKnown": + config.OidcWellKnown = value case "OidcAuthorizationEndpoint": config.OidcAuthorizationEndpoint = value case "OidcTokenEndpoint":