X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher%2FAuthHandler%2FUser.pm;h=7a8fd1d75efbfdc309b328740e7edb530512d962;hb=8abdaf4026ee63628e524146ded609df44fc92af;hp=e126d872f9045c2478b50a43cbd40baeb47b10ce;hpb=6c21fd13caa00ecee7acac38ac6395948dad20a7;p=kivitendo-erp.git

diff --git a/SL/Dispatcher/AuthHandler/User.pm b/SL/Dispatcher/AuthHandler/User.pm
index e126d872f..7a8fd1d75 100644
--- a/SL/Dispatcher/AuthHandler/User.pm
+++ b/SL/Dispatcher/AuthHandler/User.pm
@@ -11,6 +11,9 @@ sub handle {
   my $login = $::form->{'{AUTH}login'} || $::auth->get_session_value('login');
   return $self->_error(%param) if !defined $login;
 
+  my $client_id = $::form->{'{AUTH}client_id'} || $::auth->get_session_value('client_id');
+  return $self->_error(%param) if !$client_id || !$::auth->set_client($client_id);
+
   %::myconfig = $::auth->read_user(login => $login);
 
   return $self->_error(%param) unless $::myconfig{login};
@@ -18,7 +21,7 @@ sub handle {
   $::locale = Locale->new($::myconfig{countrycode});
   $::request->{layout} = SL::Layout::Dispatcher->new(style => $::myconfig{menustyle});
 
-  my $ok   =  $::auth->get_api_token_cookie ? 1 : 0;
+  my $ok   =  $::auth->is_api_token_cookie_valid;
   $ok    ||=  $::form->{'{AUTH}login'} && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, $::form->{'{AUTH}password'}));
   $ok    ||= !$::form->{'{AUTH}login'} && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, undef));
 
@@ -26,6 +29,7 @@ sub handle {
 
   $::auth->create_or_refresh_session;
   $::auth->delete_session_value('FLASH');
+  $::instance_conf->reload->data;
 
   return 1;
 }