Apply modification for oidcRPMetaDataOptionsExtraClaims to trunk (#1105)

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm

@@ -171,6 +171,7 @@ sub defaultValues {
         },
         'oidcRPMetaDataOptionsAccessTokenExpiration' => 3600,
         'oidcRPMetaDataOptionsBypassConsent'         => 0,
+        'oidcRPMetaDataOptionsExtraClaims'           => {},
         'oidcRPMetaDataOptionsIDTokenExpiration'     => 3600,
         'oidcRPMetaDataOptionsIDTokenSignAlg'        => 'HS512',
         'oidcRPStateTimeout'                         => 600,

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

@@ -1544,7 +1544,8 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
             'type' => 'text'
         },
         'oidcRPMetaDataOptionsExtraClaims' => {
-            'type' => 'keyTextContainer'
+            'default' => {},
+            'type'    => 'keyTextContainer'
         },
         'oidcRPMetaDataOptionsIcon' => {
             'type' => 'text'

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

@@ -152,9 +152,9 @@ sub run {
     my $sessionTypes = join( "', '", @sessionTypes );
 
     open F, ">", $self->managerConstantsFile or die($!);
-    my $exportedVars =
+    my $exportedVars = '$'
-        '$'
+      . join( 'Keys $',
-      . join( 'Keys $', 'simpleHash', 'doubleHash', 'specialNode', sort keys %cnodesRe )
+        'simpleHash', 'doubleHash', 'specialNode', sort keys %cnodesRe )
       . 'Keys $specialNodeHash @sessionTypes $authParameters $issuerParameters $samlServiceParameters $oidcServiceParameters';
     print F <<EOF;
 # This file is generated by $module. Don't modify it by hand
@@ -175,7 +175,7 @@ our \$specialNodeHash = {
     samlIDPMetaDataNodes => [qw(samlIDPMetaDataXML samlIDPMetaDataExportedAttributes samlIDPMetaDataOptions)],
     samlSPMetaDataNodes  => [qw(samlSPMetaDataXML samlSPMetaDataExportedAttributes samlSPMetaDataOptions)],
     oidcOPMetaDataNodes  => [qw(oidcOPMetaDataJSON oidcOPMetaDataJWKS oidcOPMetaDataOptions oidcOPMetaDataExportedVars)],
-    oidcRPMetaDataNodes  => [qw(oidcRPMetaDataOptions oidcRPMetaDataExportedVars)],
+    oidcRPMetaDataNodes  => [qw(oidcRPMetaDataOptions oidcRPMetaDataExportedVars oidcRPMetaDataOptionsExtraClaims)],
 };
 
 our \@sessionTypes = ( '$sessionTypes' );

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

@@ -2419,8 +2419,9 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
           { type => 'int', default => 3600 },
         oidcRPMetaDataOptionsAccessTokenExpiration =>
           { type => 'int', default => 3600 },
-        oidcRPMetaDataOptionsRedirectUris  => { type => 'text', },
+        oidcRPMetaDataOptionsRedirectUris => { type => 'text', },
-        oidcRPMetaDataOptionsExtraClaims   => { type => 'keyTextContainer', },
+        oidcRPMetaDataOptionsExtraClaims =>
+          { type => 'keyTextContainer', default => {} },
         oidcRPMetaDataOptionsBypassConsent => { type => 'bool', default => 0 },
 
     };

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

@@ -196,9 +196,9 @@ sub cTrees {
                     'oidcRPMetaDataOptionsAccessTokenExpiration',
                     'oidcRPMetaDataOptionsRedirectUris',
                     'oidcRPMetaDataOptionsBypassConsent',
-                    'oidcRPMetaDataOptionsExtraClaims'
                 ]
             },
+            'oidcRPMetaDataOptionsExtraClaims',
         ],
     };
 }

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

@@ -16,7 +16,7 @@ our $specialNodeHash = {
     samlIDPMetaDataNodes => [qw(samlIDPMetaDataXML samlIDPMetaDataExportedAttributes samlIDPMetaDataOptions)],
     samlSPMetaDataNodes  => [qw(samlSPMetaDataXML samlSPMetaDataExportedAttributes samlSPMetaDataOptions)],
     oidcOPMetaDataNodes  => [qw(oidcOPMetaDataJSON oidcOPMetaDataJWKS oidcOPMetaDataOptions oidcOPMetaDataExportedVars)],
-    oidcRPMetaDataNodes  => [qw(oidcRPMetaDataOptions oidcRPMetaDataExportedVars)],
+    oidcRPMetaDataNodes  => [qw(oidcRPMetaDataOptions oidcRPMetaDataExportedVars oidcRPMetaDataOptionsExtraClaims)],
 };
 
 our @sessionTypes = ( 'captcha', 'remoteGlobal', 'cas', 'global', 'localSession', 'persistent', 'saml', 'oidc' );

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

@@ -350,16 +350,17 @@ function templates(tpl,key) {
             "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsBypassConsent",
             "title" : "oidcRPMetaDataOptionsBypassConsent",
             "type" : "bool"
-         },
-         {
-            "cnodes" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
-            "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
-            "title" : "oidcRPMetaDataOptionsExtraClaims",
-            "type" : "keyTextContainer"
          }
       ],
       "id" : "oidcRPMetaDataOptions",
       "title" : "oidcRPMetaDataOptions"
+   },
+   {
+      "cnodes" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
+      "default" : [],
+      "id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
+      "title" : "oidcRPMetaDataOptionsExtraClaims",
+      "type" : "keyTextContainer"
    }
 ]
 ;