Import r5060 (#1016)
This commit is contained in:
parent
a39c45b46c
commit
b394ba2523
|
@ -26,7 +26,7 @@ describe('Lemonldap::NG Manager', function() {
|
||||||
element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims')).click();
|
element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims')).click();
|
||||||
element(by.css('.glyphicon-plus-sign')).click();
|
element(by.css('.glyphicon-plus-sign')).click();
|
||||||
element(by.id('a-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims')).click();
|
element(by.id('a-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims')).click();
|
||||||
element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims/n1')).click();
|
element(by.id('t-oidcRPMetaDataNodes/new__rp-example/oidcRPMetaDataOptionsExtraClaims/n2')).click();
|
||||||
element(by.id('hashkeyinput')).clear().sendKeys('MyClaim');
|
element(by.id('hashkeyinput')).clear().sendKeys('MyClaim');
|
||||||
element(by.id('hashvalueinput')).clear().sendKeys('MyAttribute');
|
element(by.id('hashvalueinput')).clear().sendKeys('MyAttribute');
|
||||||
});
|
});
|
||||||
|
|
|
@ -434,7 +434,10 @@ sub _oidcMetaDataNodes {
|
||||||
my ( $id, $resp ) = ( 1, [] );
|
my ( $id, $resp ) = ( 1, [] );
|
||||||
|
|
||||||
# Return all exported attributes if asked
|
# Return all exported attributes if asked
|
||||||
if ( $query =~ /^oidc${type}MetaDataExportedVars$/ ) {
|
if ( $query =~
|
||||||
|
/^(?:oidc${type}MetaDataExportedVars|oidcRPMetaDataOptionsExtraClaims)$/
|
||||||
|
)
|
||||||
|
{
|
||||||
my $pk = eval { $self->getConfKey( $req, $query )->{$partner} } // {};
|
my $pk = eval { $self->getConfKey( $req, $query )->{$partner} } // {};
|
||||||
return $self->sendError( $req, undef, 400 ) if ( $req->error );
|
return $self->sendError( $req, undef, 400 ) if ( $req->error );
|
||||||
foreach my $h ( sort keys %$pk ) {
|
foreach my $h ( sort keys %$pk ) {
|
||||||
|
|
|
@ -370,7 +370,23 @@ sub _scanNodes {
|
||||||
elsif ( $target =~ /^oidc(?:O|R)PMetaDataOptions/ ) {
|
elsif ( $target =~ /^oidc(?:O|R)PMetaDataOptions/ ) {
|
||||||
my $optKey = $&;
|
my $optKey = $&;
|
||||||
hdebug " $base sub key: $target";
|
hdebug " $base sub key: $target";
|
||||||
if ( $target =~
|
if ( $target eq 'oidcRPMetaDataOptionsExtraClaims' ) {
|
||||||
|
if ( $leaf->{cnodes} ) {
|
||||||
|
hdebug(' unopened');
|
||||||
|
$self->newConf->{$target}->{$key} =
|
||||||
|
$self->refConf->{$target}->{$key} // {};
|
||||||
|
}
|
||||||
|
elsif ($h) {
|
||||||
|
hdebug(' opened');
|
||||||
|
$self->set( $target, $key, $leaf->{title},
|
||||||
|
$leaf->{data} );
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
hdebug(" $target: looking for subnodes");
|
||||||
|
$self->_scanNodes($subNodes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
elsif ( $target =~
|
||||||
/^(?:$oidcOPMetaDataNodeKeys|$oidcRPMetaDataNodeKeys)/o
|
/^(?:$oidcOPMetaDataNodeKeys|$oidcRPMetaDataNodeKeys)/o
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1149,7 +1149,7 @@ sub getAttributesListFromClaim {
|
||||||
|
|
||||||
# Additional claims
|
# Additional claims
|
||||||
my $extraClaims =
|
my $extraClaims =
|
||||||
$self->{oidcRPMetaDataOptions}->{$rp}->{oidcRPMetaDataOptionsExtraClaims};
|
$self->{oidcRPMetaDataOptionsExtraClaims}->{$rp};
|
||||||
|
|
||||||
if ($extraClaims) {
|
if ($extraClaims) {
|
||||||
foreach my $claim ( keys %$extraClaims ) {
|
foreach my $claim ( keys %$extraClaims ) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user