dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't require getDisplayType in Choice (#1800)

Browse Source
This commit is contained in:
Xavier Guimard 2019-06-13 17:51:36 +02:00
parent 266aa913a3
commit 2a021e37ea
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Choice.pm
View File

@ -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");

3
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
View File

@ -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 ");

6
lemonldap-ng-portal/t/28-AuthChoice-and-password.t
View File

@ -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',
}
} }
} }
); );