Better fix (#2005)

This commit is contained in:
Christophe Maudoux 2019-12-15 12:54:28 +01:00
parent e4c5a9d723
commit c21ab76900

View File

@ -164,7 +164,7 @@ sub refresh {
my ( $self, $req ) = @_; my ( $self, $req ) = @_;
$req->mustRedirect(1); $req->mustRedirect(1);
my %data = %{ $req->userData }; my %data = %{ $req->userData };
$req->user( $data{ $self->conf->{whatToTrace} } ); $req->user( $data{_user} || $data{ $self->conf->{whatToTrace} } );
$req->id( $data{_session_id} ); $req->id( $data{_session_id} );
$self->userLogger->notice( 'Refresh request for ' . $req->user ); $self->userLogger->notice( 'Refresh request for ' . $req->user );
foreach ( keys %data ) { foreach ( keys %data ) {
@ -174,8 +174,8 @@ sub refresh {
$self->logger->debug( $self->logger->debug(
"Set session $req->{id} _updateTime with $data{_updateTime}"); "Set session $req->{id} _updateTime with $data{_updateTime}");
$req->steps( [ $req->steps( [
#'getUser', Fix #2005 'getUser',
#@{ $self->betweenAuthAndData }, @{ $self->betweenAuthAndData },
'setAuthSessionInfo', 'setAuthSessionInfo',
'setSessionInfo', 'setSessionInfo',
'setMacros', 'setMacros',
@ -237,7 +237,7 @@ sub do {
} }
# Remove userData if authentication fails # Remove userData if authentication fails
if ( $err == PE_BADCREDENTIALS or $err == PE_BADOTP) { if ( $err == PE_BADCREDENTIALS or $err == PE_BADOTP ) {
$req->userData( {} ); $req->userData( {} );
} }