From a860bed34f5afd2f7c2436931aafffb0063884b0 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Wed, 29 Apr 2020 16:57:10 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9config=5Fexample?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=88openid=EF=BC=89=20(#3951)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 修改config_example配置（openid）

* [Update] 修改config_example配置（openid）2
---
 config_example.yml | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/config_example.yml b/config_example.yml
index 3f99d609f..30cfabc3e 100644
--- a/config_example.yml
+++ b/config_example.yml
@@ -55,29 +55,9 @@ REDIS_PORT: 6379
 
 # Use OpenID Authorization
 # 使用 OpenID 进行认证设置
-#
-# 配置方式1:
-# 1. 版本 <= 1.5.8
-# 2. OpenID Provider 是 Keycloak
-#
-# BASE_SITE_URL: http://localhost:8080
-# AUTH_OPENID: False  # True or False
-# AUTH_OPENID_SERVER_URL: https://openid-auth-server.com/
-# AUTH_OPENID_REALM_NAME: realm-name
-# AUTH_OPENID_CLIENT_ID: client-id
-# AUTH_OPENID_CLIENT_SECRET: client-secret
-# AUTH_OPENID_SHARE_SESSION: True
-# AUTH_OPENID_IGNORE_SSL_VERIFICATION: True
-#
-# 配置方式2: (version >=1.5.8)
-# 1. 版本 >= 1.5.8
-# 2. 支持标准 OpenID Connect Provider
-#
 # AUTH_OPENID: False # True or False
 # AUTH_OPENID_CLIENT_ID: client-id
 # AUTH_OPENID_CLIENT_SECRET: client-secret
-# AUTH_OPENID_SHARE_SESSION: True
-# AUTH_OPENID_IGNORE_SSL_VERIFICATION: True
 # AUTH_OPENID_PROVIDER_ENDPOINT: https://op-example.com/
 # AUTH_OPENID_PROVIDER_AUTHORIZATION_ENDPOINT: https://op-example.com/authorize
 # AUTH_OPENID_PROVIDER_TOKEN_ENDPOINT: https://op-example.com/token
@@ -86,15 +66,14 @@ REDIS_PORT: 6379
 # AUTH_OPENID_PROVIDER_END_SESSION_ENDPOINT: https://op-example.com/logout
 # AUTH_OPENID_PROVIDER_SIGNATURE_ALG: HS256
 # AUTH_OPENID_PROVIDER_SIGNATURE_KEY: None
-# AUTH_OPENID_PROVIDER_CLAIMS_NAME: None
-# AUTH_OPENID_PROVIDER_CLAIMS_USERNAME: None
-# AUTH_OPENID_PROVIDER_CLAIMS_EMAIL: None
 # AUTH_OPENID_SCOPES: "openid profile email"
 # AUTH_OPENID_ID_TOKEN_MAX_AGE: 60
-# AUTH_OPENID_ID_TOKEN_INCLUDE_USERINFO: True
+# AUTH_OPENID_ID_TOKEN_INCLUDE_CLAIMS: True
 # AUTH_OPENID_USE_STATE: True
 # AUTH_OPENID_USE_NONCE: True
-# AUTH_OPENID_ALWAYS_UPDATE_USER_INFORMATION: True
+# AUTH_OPENID_SHARE_SESSION: True
+# AUTH_OPENID_IGNORE_SSL_VERIFICATION: True
+# AUTH_OPENID_ALWAYS_UPDATE_USER: True
 
 # Use Radius authorization
 # 使用Radius来认证