Merge branch 'fix-remember-login-2616' into 'v2.0'
Remember login when password fails See merge request lemonldap-ng/lemonldap-ng!222
This commit is contained in:
commit
8fc59823aa
|
@ -364,13 +364,7 @@ sub display {
|
||||||
# 3 Authentication has been refused OR first access
|
# 3 Authentication has been refused OR first access
|
||||||
else {
|
else {
|
||||||
$skinfile = 'login';
|
$skinfile = 'login';
|
||||||
my $login = $self->userId($req);
|
my $login = $req->user;
|
||||||
if ( $login eq 'anonymous' ) {
|
|
||||||
$login = '';
|
|
||||||
}
|
|
||||||
elsif ( $req->user ) {
|
|
||||||
$login = $req->{user};
|
|
||||||
}
|
|
||||||
%templateParams = (
|
%templateParams = (
|
||||||
MAIN_LOGO => $self->conf->{portalMainLogo},
|
MAIN_LOGO => $self->conf->{portalMainLogo},
|
||||||
LANGS => $self->conf->{showLanguages},
|
LANGS => $self->conf->{showLanguages},
|
||||||
|
|
|
@ -2,6 +2,8 @@ use Test::More;
|
||||||
use strict;
|
use strict;
|
||||||
use IO::String;
|
use IO::String;
|
||||||
use MIME::Base64;
|
use MIME::Base64;
|
||||||
|
use URI;
|
||||||
|
use URI::QueryParam;
|
||||||
|
|
||||||
require 't/test-lib.pm';
|
require 't/test-lib.pm';
|
||||||
|
|
||||||
|
@ -80,6 +82,14 @@ ok( $res->[2]->[0] =~ m%<span trspan="connect">Connect</span>%,
|
||||||
or print STDERR Dumper( $res->[2]->[0] );
|
or print STDERR Dumper( $res->[2]->[0] );
|
||||||
count(3);
|
count(3);
|
||||||
|
|
||||||
|
my ( $host, $uri, $query ) =
|
||||||
|
expectForm( $res, undef, undef, 'user', 'password' );
|
||||||
|
my $uri = URI->new;
|
||||||
|
$uri->query($query);
|
||||||
|
is( $uri->query_param("user"), 'jdoe',
|
||||||
|
"Login is pre-filled on second attemps" );
|
||||||
|
count(1);
|
||||||
|
|
||||||
# Try to authenticate with bad password
|
# Try to authenticate with bad password
|
||||||
# -------------------------------------
|
# -------------------------------------
|
||||||
ok(
|
ok(
|
||||||
|
|
|
@ -63,7 +63,7 @@ foreach (@form) {
|
||||||
expectForm( [ $res->[0], $res->[1], [$_] ], undef, undef, 'test' );
|
expectForm( [ $res->[0], $res->[1], [$_] ], undef, undef, 'test' );
|
||||||
}
|
}
|
||||||
|
|
||||||
$query =~ s/user=/user=dwho/;
|
$query =~ s/user=[^&]*/user=dwho/;
|
||||||
$query =~ s/password=/password=dwho/;
|
$query =~ s/password=/password=dwho/;
|
||||||
$query =~ s/test=\w*\b/test=1_demo/;
|
$query =~ s/test=\w*\b/test=1_demo/;
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ count(1);
|
||||||
my ( $host, $url, $query ) =
|
my ( $host, $url, $query ) =
|
||||||
expectForm( $res, '#', undef, 'user', 'password', 'spoofId', 'token' );
|
expectForm( $res, '#', undef, 'user', 'password', 'spoofId', 'token' );
|
||||||
|
|
||||||
$query =~ s/user=/user=rtyler/;
|
$query =~ s/user=[^&]*/user=rtyler/;
|
||||||
$query =~ s/password=/password=rtyler/;
|
$query =~ s/password=/password=rtyler/;
|
||||||
$query =~ s/spoofId=/spoofId=dwho/;
|
$query =~ s/spoofId=/spoofId=dwho/;
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ count(1);
|
||||||
( $host, $url, $query ) =
|
( $host, $url, $query ) =
|
||||||
expectForm( $res, '#', undef, 'user', 'password', 'spoofId', 'token' );
|
expectForm( $res, '#', undef, 'user', 'password', 'spoofId', 'token' );
|
||||||
|
|
||||||
$query =~ s/user=/user=rtyler/;
|
$query =~ s/user=[^&]*/user=rtyler/;
|
||||||
$query =~ s/password=/password=rtyler/;
|
$query =~ s/password=/password=rtyler/;
|
||||||
$query =~ s/spoofId=/spoofId=msmith/;
|
$query =~ s/spoofId=/spoofId=msmith/;
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ count(2);
|
||||||
( $host, $url, $query ) =
|
( $host, $url, $query ) =
|
||||||
expectForm( $res, '#', undef, 'user', 'password', 'spoofId', 'token' );
|
expectForm( $res, '#', undef, 'user', 'password', 'spoofId', 'token' );
|
||||||
|
|
||||||
$query =~ s/user=/user=dwho/;
|
$query =~ s/user=[^&]*/user=dwho/;
|
||||||
$query =~ s/password=/password=dwho/;
|
$query =~ s/password=/password=dwho/;
|
||||||
$query =~ s/spoofId=/spoofId=msmith/;
|
$query =~ s/spoofId=/spoofId=msmith/;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user