Improve phrasing of #2547

doc/sources/admin/idpopenidconnect.rst

@@ -314,11 +314,9 @@ Options
       (RSXXX) or HMAC (HSXXX) based signature algorithms
    -  **Access Token signature algorithm**: Select one of the available public
       key signature algorithms
-   -  **Userinfo signature algorithm** (since version ``2.0.12``): Select one
-      of the available signature algorithms to release user information as a JWT
-      on the ``/userinfo`` endpoint. If this option is left empty, user
-      information will be released as a plain JSON object. The ``None`` value
-      will release user information as an unsigned JWT.
+   -  **Userinfo response format** (since version ``2.0.12``): By default,
+      UserInfo is returned as a simple JSON object. You can also choose to
+      return it as a JWT, using one of the available signature algorithms.
    -  **Require PKCE** (since version ``2.0.4``): a code challenge is
       required at token endpoint (see
       `RFC7636 <https://tools.ietf.org/html/rfc7636>`__)

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm

@@ -2453,35 +2453,35 @@ m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
             'default' => '',
             'select'  => [ {
                     'k' => '',
-                    'v' => ''
+                    'v' => 'JSON'
                 },
                 {
                     'k' => 'none',
-                    'v' => 'None'
+                    'v' => 'JWT/None'
                 },
                 {
                     'k' => 'HS256',
-                    'v' => 'HS256'
+                    'v' => 'JWT/HS256'
                 },
                 {
                     'k' => 'HS384',
-                    'v' => 'HS384'
+                    'v' => 'JWT/HS384'
                 },
                 {
                     'k' => 'HS512',
-                    'v' => 'HS512'
+                    'v' => 'JWT/HS512'
                 },
                 {
                     'k' => 'RS256',
-                    'v' => 'RS256'
+                    'v' => 'JWT/RS256'
                 },
                 {
                     'k' => 'RS384',
-                    'v' => 'RS384'
+                    'v' => 'JWT/RS384'
                 },
                 {
                     'k' => 'RS512',
-                    'v' => 'RS512'
+                    'v' => 'JWT/RS512'
                 }
             ],
             'type' => 'select'

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -4255,14 +4255,14 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
         oidcRPMetaDataOptionsUserInfoSignAlg => {
             type   => 'select',
             select => [
-                { k => '',  v => '' },
-                { k => 'none',  v => 'None' },
-                { k => 'HS256', v => 'HS256' },
-                { k => 'HS384', v => 'HS384' },
-                { k => 'HS512', v => 'HS512' },
-                { k => 'RS256', v => 'RS256' },
-                { k => 'RS384', v => 'RS384' },
-                { k => 'RS512', v => 'RS512' },
+                { k => '',  v => 'JSON' },
+                { k => 'none',  v => 'JWT/None' },
+                { k => 'HS256', v => 'JWT/HS256' },
+                { k => 'HS384', v => 'JWT/HS384' },
+                { k => 'HS512', v => 'JWT/HS512' },
+                { k => 'RS256', v => 'JWT/RS256' },
+                { k => 'RS384', v => 'JWT/RS384' },
+                { k => 'RS512', v => 'JWT/RS512' },
             ],
             default => '',
         },

lemonldap-ng-manager/site/htdocs/static/js/conftree.js

@@ -574,35 +574,35 @@ function templates(tpl,key) {
                   "select" : [
                      {
                         "k" : "",
-                        "v" : ""
+                        "v" : "JSON"
                      },
                      {
                         "k" : "none",
-                        "v" : "None"
+                        "v" : "JWT/None"
                      },
                      {
                         "k" : "HS256",
-                        "v" : "HS256"
+                        "v" : "JWT/HS256"
                      },
                      {
                         "k" : "HS384",
-                        "v" : "HS384"
+                        "v" : "JWT/HS384"
                      },
                      {
                         "k" : "HS512",
-                        "v" : "HS512"
+                        "v" : "JWT/HS512"
                      },
                      {
                         "k" : "RS256",
-                        "v" : "RS256"
+                        "v" : "JWT/RS256"
                      },
                      {
                         "k" : "RS384",
-                        "v" : "RS384"
+                        "v" : "JWT/RS384"
                      },
                      {
                         "k" : "RS512",
-                        "v" : "RS512"
+                        "v" : "JWT/RS512"
                      }
                   ],
                   "title" : "oidcRPMetaDataOptionsUserInfoSignAlg",

lemonldap-ng-manager/site/htdocs/static/languages/ar.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"قاعدة الدخول",
 "oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsUserIDAttr":"خاصّيّة المستخدم",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Userinfo signature algorithm",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"UserInfo response format",
 "oidcRPMetaDataScopeRules":"Scope rules",
 "oidcRPName":"اسم أوبين أيدي كونيكت RP",
 "oidcRPStateTimeout":"حالة مهلة الجلسة",
@@ -1207,4 +1207,4 @@
 "yubikey2fUrl":"خدمة أل يو أر ل",
 "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey",
 "zeroConfExplanations":"لا يحتوي الخادم على إعدادات. استخدام قالب لحفظ الأول"
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/de.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"Access rule",
 "oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsUserIDAttr":"User attribute",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Userinfo signature algorithm",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"UserInfo response format",
 "oidcRPMetaDataScopeRules":"Scope rules",
 "oidcRPName":"OpenID Connect RP Name",
 "oidcRPStateTimeout":"State session timeout",
@@ -1207,4 +1207,4 @@
 "yubikey2fUrl":"Service URL",
 "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey",
 "zeroConfExplanations":"Server has no configuration. Use template to save the first."
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/en.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"Access rule",
 "oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsUserIDAttr":"User attribute",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Userinfo signature algorithm",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"UserInfo response format",
 "oidcRPMetaDataScopeRules":"Scope rules",
 "oidcRPName":"OpenID Connect RP Name",
 "oidcRPStateTimeout":"State session timeout",

lemonldap-ng-manager/site/htdocs/static/languages/es.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"Regla de acceso",
 "oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsUserIDAttr":"Atributo de usuario",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Userinfo signature algorithm",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"UserInfo response format",
 "oidcRPMetaDataScopeRules":"Scope rules",
 "oidcRPName":"OpenID Connect RP Name",
 "oidcRPStateTimeout":"Caducidad de estado de sesión",
@@ -1207,4 +1207,4 @@
 "yubikey2fUrl":"Service URL",
 "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey",
 "zeroConfExplanations":"Server has no configuration. Use template to save the first."
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/fr.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"Règle d'accès",
 "oidcRPMetaDataOptionsTimeouts":"Expiration",
 "oidcRPMetaDataOptionsUserIDAttr":"Attribut de l'utilisateur",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Algorithme de signature des informations utilisateur",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"Format de réponse Userinfo",
 "oidcRPMetaDataScopeRules":"Règles de scope",
 "oidcRPName":"Nom du client OpenID Connect",
 "oidcRPStateTimeout":"Durée d'une session state",

lemonldap-ng-manager/site/htdocs/static/languages/it.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"Regola di accesso",
 "oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsUserIDAttr":"Attributo utente",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Userinfo signature algorithm",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"UserInfo response format",
 "oidcRPMetaDataScopeRules":"Scope rules",
 "oidcRPName":"Nome di OpenID Connect RP",
 "oidcRPStateTimeout":"Durata della sessione stato",
@@ -1207,4 +1207,4 @@
 "yubikey2fUrl":"URL del servizio",
 "yubikey2fUserCanRemoveKey":"Autorizza l'utente a rimuovere la Yubikey",
 "zeroConfExplanations":"Il server non ha alcuna configurazione. Utilizza il modello per salvare il primo."
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/pl.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"Reguła dostępu",
 "oidcRPMetaDataOptionsTimeouts":"Limit czasu",
 "oidcRPMetaDataOptionsUserIDAttr":"Atrybut użytkownika",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Userinfo signature algorithm",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"UserInfo response format",
 "oidcRPMetaDataScopeRules":"Zasady dotyczące zakresu",
 "oidcRPName":"Nazwa RP OpenID Connect",
 "oidcRPStateTimeout":"Limit czasu sesji stanowej",
@@ -1207,4 +1207,4 @@
 "yubikey2fUrl":"URL usługi",
 "yubikey2fUserCanRemoveKey":"Pozwól użytkownikowi usunąć Yubikey",
 "zeroConfExplanations":"Serwer nie ma konfiguracji. Użyj szablonu, aby zapisać pierwszy."
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/tr.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"Erişim kuralı",
 "oidcRPMetaDataOptionsTimeouts":"Zaman aşımları",
 "oidcRPMetaDataOptionsUserIDAttr":"Kullanıcı niteliği",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Userinfo signature algorithm",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"UserInfo response format",
 "oidcRPMetaDataScopeRules":"Kapsam kuralları",
 "oidcRPName":"OpenID Connect RP Adı",
 "oidcRPStateTimeout":"Oturum zaman aşımını belirle",
@@ -1207,4 +1207,4 @@
 "yubikey2fUrl":"Servis URL'si",
 "yubikey2fUserCanRemoveKey":"Yubikey'i kaldırmak için kullanıcıya izin ver",
 "zeroConfExplanations":"Sunucunun yapılandırması yok. Şimdi bir tane kaydetmek için şablonu kullanın."
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/vi.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"Quy tắc truy cập",
 "oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsUserIDAttr":"thuộc tính người dùng",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Userinfo signature algorithm",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"UserInfo response format",
 "oidcRPMetaDataScopeRules":"Scope rules",
 "oidcRPName":"OpenID Connect RP Name",
 "oidcRPStateTimeout":"Thời gian chờ của trạng thái phiên làm việc",
@@ -1207,4 +1207,4 @@
 "yubikey2fUrl":"Dịch vụ URL",
 "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey",
 "zeroConfExplanations":"Máy chủ không có cấu hình. Sử dụng mẫu để lưu đầu tiên. "
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/zh.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"Access rule",
 "oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsUserIDAttr":"User attribute",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Userinfo signature algorithm",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"UserInfo response format",
 "oidcRPMetaDataScopeRules":"Scope rules",
 "oidcRPName":"OpenID Connect RP Name",
 "oidcRPStateTimeout":"State session timeout",
@@ -1207,4 +1207,4 @@
 "yubikey2fUrl":"Service URL",
 "yubikey2fUserCanRemoveKey":"Allow user to remove Yubikey",
 "zeroConfExplanations":"Server has no configuration. Use template to save the first."
-}
+}

lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json

@@ -686,7 +686,7 @@
 "oidcRPMetaDataOptionsRule":"存取規則",
 "oidcRPMetaDataOptionsTimeouts":"逾時",
 "oidcRPMetaDataOptionsUserIDAttr":"使用者屬性",
-"oidcRPMetaDataOptionsUserInfoSignAlg":"Userinfo signature algorithm",
+"oidcRPMetaDataOptionsUserInfoSignAlg":"UserInfo response format",
 "oidcRPMetaDataScopeRules":"Scope rules",
 "oidcRPName":"OpenID 連線 RP 名稱",
 "oidcRPStateTimeout":"狀態工作階段逾時",
@@ -1207,4 +1207,4 @@
 "yubikey2fUrl":"服務 URL",
 "yubikey2fUserCanRemoveKey":"允許使用者移除 Yubikey",
 "zeroConfExplanations":"伺服器未設定。使用飯本來儲存第一個。"
-}
+}