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

FIX logins history display (#1501)

Browse Source
This commit is contained in:
Christophe Maudoux 2018-09-22 10:14:29 +02:00
parent e65c086af6
commit e7d7ef1e0a
5 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,7 +284,7 @@ sub getUser {
sub authenticate {
my ( $self, $req ) = @_;
my $ret = $req->authResult( $self->_authentication->authenticate($req) );
$self->logger->debug(" -> authResult = $ret");
$self->logger->debug(" -> authResult = " . $req->authResult);
if ( $ret == PE_OK ) {
$req->{sessionInfo}->{_lastAuthnUTime} = time();
return $ret;
@ -297,6 +297,7 @@ sub authenticate {
sub {PE_BADCREDENTIALS}
]
);
return PE_OK;
}

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
View File

@ -843,6 +843,8 @@ sub registerLogin {
$login->{error} = $self->error( $req->authResult )
if ( $req->authResult );
$self->logger->debug(" Current login -> " . $login->{error} );
# Add current login into history
unshift @{ $history->{$type} }, $login;

8
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/History.pm
View File

@ -1,5 +1,6 @@
package Lemonldap::NG::Portal::Plugins::History;
use Data::Dumper;
use strict;
use Mouse;
use Lemonldap::NG::Portal::Main::Constants qw(PE_INFO PE_OK);
@ -21,6 +22,8 @@ sub run {
my ( $self, $req ) = @_;
if ( $req->param('checkLogins') ) {
$self->logger->debug('History asked');
$self->logger->debug(' successLogins -> ' . Dumper($req->sessionInfo->{_loginHistory}->{successLogin} ));
$self->logger->debug(' failedLogins -> ' . Dumper($req->sessionInfo->{_loginHistory}->{failedLogin} ));
$req->info(
(
$req->sessionInfo->{_loginHistory}->{successLogin}
@ -28,8 +31,9 @@ sub run {
$req->sessionInfo->{_loginHistory}->{successLogin},
'lastLogins', 0, 0 )
: ""
)
. (
)
. ("<hr>") .
(
$req->sessionInfo->{_loginHistory}->{failedLogin}
? $self->p->mkSessionArray(
$req->sessionInfo->{_loginHistory}->{failedLogin},

20
lemonldap-ng-portal/site/templates/bootstrap/info.tpl
View File

@ -19,16 +19,16 @@
<div id="divToHide" class="alert alert-info">
<p id="timer" trspan="redirectedIn">You'll be redirected in 30 seconds</p>
</div>
<div class="buttons">
<button type="submit" class="positive btn btn-success">
<span class="glyphicon glyphicon-ok"></span>
<span trspan="continue">Continue</span>
</button>
<button id="wait" type="reset" class="negative btn btn-danger">
<span class="glyphicon glyphicon-stop"></span>
<span trspan="wait">Wait</span>
</button>
</div>
<div class="buttons">
<button type="submit" class="positive btn btn-success">
<span class="glyphicon glyphicon-ok"></span>
<span trspan="continue">Continue</span>
</button>
<button id="wait" type="reset" class="negative btn btn-danger">
<span class="glyphicon glyphicon-stop"></span>
<span trspan="wait">Wait</span>
</button>
</div>
</form>
<!-- //if:jsminified
<script type="text/javascript" src="<TMPL_VAR NAME="STATIC_PREFIX">common/js/info.min.js"></script>

4
lemonldap-ng-portal/site/templates/bootstrap/sessionArray.tpl
View File

@ -28,8 +28,8 @@
<TMPL_LOOP NAME="values">
<td><TMPL_VAR NAME="v"></td>
</TMPL_LOOP>
<TMPL_IF NAME="displayError">
<td><TMPL_VAR NAME="error"></td>
<TMPL_IF NAME="error">
<td trspan="PE<TMPL_VAR NAME="error">">PE<TMPL_VAR NAME="error"></td>
</TMPL_IF>
</tr>
</TMPL_LOOP>