Don't require getDisplayType in Choice (#1800)
This commit is contained in:
parent
266aa913a3
commit
2a021e37ea
|
@ -231,8 +231,10 @@ sub _buildAuthLoop {
|
||||||
|
|
||||||
# Get displayType for this module
|
# Get displayType for this module
|
||||||
no strict 'refs';
|
no strict 'refs';
|
||||||
my $displayType = "Lemonldap::NG::Portal::Auth::${auth}"
|
my $displayType = eval {
|
||||||
|
"Lemonldap::NG::Portal::Auth::${auth}"
|
||||||
->can('getDisplayType')->( $self, $req );
|
->can('getDisplayType')->( $self, $req );
|
||||||
|
} || 'logo';
|
||||||
|
|
||||||
$self->logger->debug(
|
$self->logger->debug(
|
||||||
"Display type $displayType for module $auth");
|
"Display type $displayType for module $auth");
|
||||||
|
|
|
@ -388,7 +388,8 @@ sub display {
|
||||||
else {
|
else {
|
||||||
|
|
||||||
my $displayType =
|
my $displayType =
|
||||||
eval { $self->_authentication->getDisplayType($req) };
|
eval { $self->_authentication->getDisplayType($req) }
|
||||||
|
|| 'logo';
|
||||||
|
|
||||||
$self->logger->debug("Display type $displayType ");
|
$self->logger->debug("Display type $displayType ");
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ SKIP: {
|
||||||
authChoiceModules => {
|
authChoiceModules => {
|
||||||
ldap => 'LDAP;LDAP;LDAP',
|
ldap => 'LDAP;LDAP;LDAP',
|
||||||
sql => 'DBI;DBI;DBI',
|
sql => 'DBI;DBI;DBI',
|
||||||
|
slave => 'Slave;LDAP;LDAP',
|
||||||
},
|
},
|
||||||
|
|
||||||
dbiAuthChain => 'dbi:SQLite:dbname=t/userdb.db',
|
dbiAuthChain => 'dbi:SQLite:dbname=t/userdb.db',
|
||||||
|
@ -47,6 +48,11 @@ SKIP: {
|
||||||
ldapBase => 'ou=users,dc=example,dc=com',
|
ldapBase => 'ou=users,dc=example,dc=com',
|
||||||
managerDn => 'cn=admin,dc=example,dc=com',
|
managerDn => 'cn=admin,dc=example,dc=com',
|
||||||
managerPassword => 'admin',
|
managerPassword => 'admin',
|
||||||
|
|
||||||
|
slaveUserHeader => 'My-Test',
|
||||||
|
slaveExportedVars => {
|
||||||
|
name => 'Name',
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user