Reorganize OIDC options (#2175)

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

@@ -2162,7 +2162,8 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
             'type' => 'int'
         },
         'oidcRPMetaDataOptionsIDTokenForceClaims' => {
-            'type' => 'bool'
+            'default' => 0,
+            'type'    => 'bool'
         },
         'oidcRPMetaDataOptionsIDTokenSignAlg' => {
             'default' => 'HS512',

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

@@ -3955,8 +3955,9 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
             ],
             default => 'HS512',
         },
-        oidcRPMetaDataOptionsIDTokenExpiration           => { type => 'int' },
+        oidcRPMetaDataOptionsIDTokenExpiration => { type => 'int' },
-        oidcRPMetaDataOptionsIDTokenForceClaims          => { type => 'bool' },
+        oidcRPMetaDataOptionsIDTokenForceClaims =>
+          { type => 'bool', default => 0 },
         oidcRPMetaDataOptionsAccessTokenExpiration       => { type => 'int' },
         oidcRPMetaDataOptionsAuthorizationCodeExpiration => { type => 'int' },
         oidcRPMetaDataOptionsOfflineSessionExpiration    => { type => 'int' },

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

@@ -192,27 +192,46 @@ sub cTrees {
             {
                 title => 'oidcRPMetaDataOptions',
                 nodes => [ {
-                        title => 'oidcRPMetaDataOptionsAuthentication',
+                        title => 'oidcRPMetaDataOptionsBasic',
                         form  => 'simpleInputContainer',
                         nodes => [
                             'oidcRPMetaDataOptionsClientID',
                             'oidcRPMetaDataOptionsClientSecret',
                             'oidcRPMetaDataOptionsPublic',
+                            'oidcRPMetaDataOptionsRedirectUris',
+                        ]
+                    },
+                    {
+                        title => 'oidcRPMetaDataOptionsAdvanced',
+                        form  => 'simpleInputContainer',
+                        nodes => [
+                            'oidcRPMetaDataOptionsUserIDAttr',
+                            'oidcRPMetaDataOptionsBypassConsent',
+                            'oidcRPMetaDataOptionsIDTokenForceClaims',
+                            'oidcRPMetaDataOptionsRefreshToken',
+                        ]
+                    },
+                    {
+                        title => 'security',
+                        form  => 'simpleInputContainer',
+                        nodes => [
+                            'oidcRPMetaDataOptionsIDTokenSignAlg',
                             'oidcRPMetaDataOptionsRequirePKCE',
+                            'oidcRPMetaDataOptionsAllowOffline',
+                            'oidcRPMetaDataOptionsAllowPasswordGrant',
+                            'oidcRPMetaDataOptionsRule',
+                        ]
+                    },
+                    {
+                        title => 'oidcRPMetaDataOptionsTimeouts',
+                        form  => 'simpleInputContainer',
+                        nodes => [
+                            'oidcRPMetaDataOptionsAuthorizationCodeExpiration',
+                            'oidcRPMetaDataOptionsIDTokenExpiration',
+                            'oidcRPMetaDataOptionsAccessTokenExpiration',
+                            'oidcRPMetaDataOptionsOfflineSessionExpiration',
                         ]
                     },
-                    'oidcRPMetaDataOptionsUserIDAttr',
-                    'oidcRPMetaDataOptionsIDTokenSignAlg',
-                    'oidcRPMetaDataOptionsIDTokenExpiration',
-                    'oidcRPMetaDataOptionsIDTokenForceClaims',
-                    'oidcRPMetaDataOptionsAccessTokenExpiration',
-                    'oidcRPMetaDataOptionsAuthorizationCodeExpiration',
-                    'oidcRPMetaDataOptionsAllowOffline',
-                    'oidcRPMetaDataOptionsRefreshToken',
-                    'oidcRPMetaDataOptionsOfflineSessionExpiration',
-                    'oidcRPMetaDataOptionsAllowPasswordGrant',
-                    'oidcRPMetaDataOptionsRedirectUris',
-                    'oidcRPMetaDataOptionsBypassConsent',
                     {
                         title => 'logout',
                         form  => 'simpleInputContainer',
@@ -223,7 +242,6 @@ sub cTrees {
                             'oidcRPMetaDataOptionsLogoutSessionRequired',
                         ]
                     },
-                    'oidcRPMetaDataOptionsRule',
                 ]
             },
             'oidcRPMetaDataMacros',

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

@@ -427,122 +427,149 @@ function templates(tpl,key) {
                   "type" : "bool"
                },
                {
-                  "default" : 0,
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRedirectUris",
-                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRequirePKCE",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRedirectUris",
-                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRequirePKCE",
+                  "title" : "oidcRPMetaDataOptionsRedirectUris"
-                  "title" : "oidcRPMetaDataOptionsRequirePKCE",
-                  "type" : "bool"
                }
             ],
-            "id" : "oidcRPMetaDataOptionsAuthentication",
+            "id" : "oidcRPMetaDataOptionsBasic",
-            "title" : "oidcRPMetaDataOptionsAuthentication",
+            "title" : "oidcRPMetaDataOptionsBasic",
             "type" : "simpleInputContainer"
          },
          {
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsUserIDAttr",
+            "_nodes" : [
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsUserIDAttr",
-            "title" : "oidcRPMetaDataOptionsUserIDAttr"
-         },
-         {
-            "default" : "HS512",
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenSignAlg",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenSignAlg",
-            "select" : [
                {
-                  "k" : "none",
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsUserIDAttr",
-                  "v" : "None"
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsUserIDAttr",
+                  "title" : "oidcRPMetaDataOptionsUserIDAttr"
+               },
+               {
+                  "default" : 0,
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsBypassConsent",
+                  "help" : "openidconnectclaims.html",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsBypassConsent",
+                  "title" : "oidcRPMetaDataOptionsBypassConsent",
+                  "type" : "bool"
                },
                {
-                  "k" : "HS256",
+                  "default" : 0,
-                  "v" : "HS256"
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenForceClaims",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenForceClaims",
+                  "title" : "oidcRPMetaDataOptionsIDTokenForceClaims",
+                  "type" : "bool"
                },
                {
-                  "k" : "HS384",
+                  "default" : 0,
-                  "v" : "HS384"
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRefreshToken",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRefreshToken",
+                  "title" : "oidcRPMetaDataOptionsRefreshToken",
+                  "type" : "bool"
+               }
+            ],
+            "id" : "oidcRPMetaDataOptionsAdvanced",
+            "title" : "oidcRPMetaDataOptionsAdvanced",
+            "type" : "simpleInputContainer"
+         },
+         {
+            "_nodes" : [
+               {
+                  "default" : "HS512",
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenSignAlg",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenSignAlg",
+                  "select" : [
+                     {
+                        "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"
+                     }
+                  ],
+                  "title" : "oidcRPMetaDataOptionsIDTokenSignAlg",
+                  "type" : "select"
                },
                {
-                  "k" : "HS512",
+                  "default" : 0,
-                  "v" : "HS512"
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRequirePKCE",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRequirePKCE",
+                  "title" : "oidcRPMetaDataOptionsRequirePKCE",
+                  "type" : "bool"
                },
                {
-                  "k" : "RS256",
+                  "default" : 0,
-                  "v" : "RS256"
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAllowOffline",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAllowOffline",
+                  "title" : "oidcRPMetaDataOptionsAllowOffline",
+                  "type" : "bool"
                },
                {
-                  "k" : "RS384",
+                  "default" : 0,
-                  "v" : "RS384"
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAllowPasswordGrant",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAllowPasswordGrant",
+                  "title" : "oidcRPMetaDataOptionsAllowPasswordGrant",
+                  "type" : "bool"
                },
                {
-                  "k" : "RS512",
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRule",
-                  "v" : "RS512"
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRule",
+                  "title" : "oidcRPMetaDataOptionsRule"
                }
             ],
-            "title" : "oidcRPMetaDataOptionsIDTokenSignAlg",
+            "id" : "security",
-            "type" : "select"
+            "title" : "security",
-         },
+            "type" : "simpleInputContainer"
-         {
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenExpiration",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenExpiration",
-            "title" : "oidcRPMetaDataOptionsIDTokenExpiration",
-            "type" : "int"
-         },
-         {
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenForceClaims",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenForceClaims",
-            "title" : "oidcRPMetaDataOptionsIDTokenForceClaims",
-            "type" : "bool"
-         },
-         {
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAccessTokenExpiration",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAccessTokenExpiration",
-            "title" : "oidcRPMetaDataOptionsAccessTokenExpiration",
-            "type" : "int"
-         },
-         {
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAuthorizationCodeExpiration",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAuthorizationCodeExpiration",
-            "title" : "oidcRPMetaDataOptionsAuthorizationCodeExpiration",
-            "type" : "int"
-         },
-         {
-            "default" : 0,
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAllowOffline",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAllowOffline",
-            "title" : "oidcRPMetaDataOptionsAllowOffline",
-            "type" : "bool"
-         },
-         {
-            "default" : 0,
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRefreshToken",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRefreshToken",
-            "title" : "oidcRPMetaDataOptionsRefreshToken",
-            "type" : "bool"
-         },
-         {
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsOfflineSessionExpiration",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsOfflineSessionExpiration",
-            "title" : "oidcRPMetaDataOptionsOfflineSessionExpiration",
-            "type" : "int"
-         },
-         {
-            "default" : 0,
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAllowPasswordGrant",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAllowPasswordGrant",
-            "title" : "oidcRPMetaDataOptionsAllowPasswordGrant",
-            "type" : "bool"
-         },
-         {
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRedirectUris",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRedirectUris",
-            "title" : "oidcRPMetaDataOptionsRedirectUris"
          },
          {
-            "default" : 0,
+            "_nodes" : [
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsBypassConsent",
+               {
-            "help" : "openidconnectclaims.html",
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAuthorizationCodeExpiration",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsBypassConsent",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAuthorizationCodeExpiration",
-            "title" : "oidcRPMetaDataOptionsBypassConsent",
+                  "title" : "oidcRPMetaDataOptionsAuthorizationCodeExpiration",
-            "type" : "bool"
+                  "type" : "int"
+               },
+               {
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenExpiration",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsIDTokenExpiration",
+                  "title" : "oidcRPMetaDataOptionsIDTokenExpiration",
+                  "type" : "int"
+               },
+               {
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAccessTokenExpiration",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsAccessTokenExpiration",
+                  "title" : "oidcRPMetaDataOptionsAccessTokenExpiration",
+                  "type" : "int"
+               },
+               {
+                  "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsOfflineSessionExpiration",
+                  "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsOfflineSessionExpiration",
+                  "title" : "oidcRPMetaDataOptionsOfflineSessionExpiration",
+                  "type" : "int"
+               }
+            ],
+            "id" : "oidcRPMetaDataOptionsTimeouts",
+            "title" : "oidcRPMetaDataOptionsTimeouts",
+            "type" : "simpleInputContainer"
          },
          {
             "_nodes" : [
@@ -584,11 +611,6 @@ function templates(tpl,key) {
             "id" : "logout",
             "title" : "logout",
             "type" : "simpleInputContainer"
-         },
-         {
-            "get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRule",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsRule",
-            "title" : "oidcRPMetaDataOptionsRule"
          }
       ],
       "id" : "oidcRPMetaDataOptions",

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

@@ -564,7 +564,9 @@
 "oidcOPMetaDataJWKS":"بيانات JWKS",
 "oidcOPMetaDataNode":" أوبين أيدي كونيكت بروفيدر",
 "oidcOPMetaDataOptions":"الخيارات",
-"oidcRPMetaDataOptionsAuthentication":"إثبات الهوية",
+"oidcRPMetaDataOptionsBasic":"Basic",
+"oidcRPMetaDataOptionsAdvanced":"Advanced",
+"oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsAllowOffline":"Allow offline access",
 "oidcOPMetaDataOptionsCheckJWTSignature":"توقيع",
 "oidcOPMetaDataOptionsClientID":"معرف العميل",

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

@@ -564,7 +564,9 @@
 "oidcOPMetaDataJWKS":"JWKS data",
 "oidcOPMetaDataNode":"OpenID Connect Providers",
 "oidcOPMetaDataOptions":"Optionen",
-"oidcRPMetaDataOptionsAuthentication":"Authentication",
+"oidcRPMetaDataOptionsBasic":"Basic",
+"oidcRPMetaDataOptionsAdvanced":"Advanced",
+"oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsAllowOffline":"Allow offline access",
 "oidcOPMetaDataOptionsCheckJWTSignature":"Check JWT signature",
 "oidcOPMetaDataOptionsClientID":"Client ID",

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

@@ -564,7 +564,9 @@
 "oidcOPMetaDataJWKS":"JWKS data",
 "oidcOPMetaDataNode":"OpenID Connect Providers",
 "oidcOPMetaDataOptions":"Options",
-"oidcRPMetaDataOptionsAuthentication":"Authentication",
+"oidcRPMetaDataOptionsBasic":"Basic",
+"oidcRPMetaDataOptionsAdvanced":"Advanced",
+"oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsAllowOffline":"Allow offline access",
 "oidcOPMetaDataOptionsCheckJWTSignature":"Check JWT signature",
 "oidcOPMetaDataOptionsClientID":"Client ID",

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

@@ -564,7 +564,9 @@
 "oidcOPMetaDataJWKS":"Données JWKS",
 "oidcOPMetaDataNode":"Fournisseurs OpenID Connect",
 "oidcOPMetaDataOptions":"Options",
-"oidcRPMetaDataOptionsAuthentication":"Authentification",
+"oidcRPMetaDataOptionsBasic":"Basic",
+"oidcRPMetaDataOptionsAdvanced":"Advanced",
+"oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsAllowOffline":"Autoriser l'accès hors ligne",
 "oidcOPMetaDataOptionsCheckJWTSignature":"Vérifier la signature des jetons",
 "oidcOPMetaDataOptionsClientID":"Identifiant",

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

@@ -564,7 +564,9 @@
 "oidcOPMetaDataJWKS":"Dati di JWKS",
 "oidcOPMetaDataNode":"Provider di OpenID Connect",
 "oidcOPMetaDataOptions":"Opzioni",
-"oidcRPMetaDataOptionsAuthentication":"Autenticazione",
+"oidcRPMetaDataOptionsBasic":"Basic",
+"oidcRPMetaDataOptionsAdvanced":"Advanced",
+"oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsAllowOffline":"Allow offline access",
 "oidcOPMetaDataOptionsCheckJWTSignature":"Controllare la firma JWT",
 "oidcOPMetaDataOptionsClientID":"ID Client",

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

@@ -564,7 +564,9 @@
 "oidcOPMetaDataJWKS":"JWKS verisi",
 "oidcOPMetaDataNode":"OpenID Connect Sağlayıcıları",
 "oidcOPMetaDataOptions":"Seçenekler",
-"oidcRPMetaDataOptionsAuthentication":"Doğrulama",
+"oidcRPMetaDataOptionsBasic":"Basic",
+"oidcRPMetaDataOptionsAdvanced":"Advanced",
+"oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsAllowOffline":"Çevrimdışı erişime izin ver",
 "oidcOPMetaDataOptionsCheckJWTSignature":"JWT imzasını kontrol et",
 "oidcOPMetaDataOptionsClientID":"İstemci ID",

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

@@ -564,7 +564,9 @@
 "oidcOPMetaDataJWKS":"Dữ liệu JWKS",
 "oidcOPMetaDataNode":"Nhà cung cấp Kết nối OpenID",
 "oidcOPMetaDataOptions":"Tùy chọn",
-"oidcRPMetaDataOptionsAuthentication":"Xác thực",
+"oidcRPMetaDataOptionsBasic":"Basic",
+"oidcRPMetaDataOptionsAdvanced":"Advanced",
+"oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsAllowOffline":"Allow offline access",
 "oidcOPMetaDataOptionsCheckJWTSignature":"Kiểm tra chữ ký JWT",
 "oidcOPMetaDataOptionsClientID":"Client ID",

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

@@ -564,7 +564,9 @@
 "oidcOPMetaDataJWKS":"JWKS data",
 "oidcOPMetaDataNode":"OpenID Connect Providers",
 "oidcOPMetaDataOptions":"Options",
-"oidcRPMetaDataOptionsAuthentication":"Authentication",
+"oidcRPMetaDataOptionsBasic":"Basic",
+"oidcRPMetaDataOptionsAdvanced":"Advanced",
+"oidcRPMetaDataOptionsTimeouts":"Timeouts",
 "oidcRPMetaDataOptionsAllowOffline":"Allow offline access",
 "oidcOPMetaDataOptionsCheckJWTSignature":"Check JWT signature",
 "oidcOPMetaDataOptionsClientID":"Client ID",

lemonldap-ng-portal/site/htdocs/static/common/js/u2fregistration.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.12.7
+// Generated by CoffeeScript 1.12.8
 
 /*
 LemonLDAP::NG U2F registration script