X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDispatcher%2FAuthHandler%2FUser.pm;h=ba5071a1dccb2affa1afc77ad2e2f96b04656519;hb=e5e8dfae3a1edcdcfe64338112923ec40fc0353c;hp=e1c080e1f03abf94a3c1312d0e45161fde2b9b5a;hpb=0e451e1bd489910141207434861a848ddf4da2ce;p=kivitendo-erp.git

diff --git a/SL/Dispatcher/AuthHandler/User.pm b/SL/Dispatcher/AuthHandler/User.pm
index e1c080e1f..ba5071a1d 100644
--- a/SL/Dispatcher/AuthHandler/User.pm
+++ b/SL/Dispatcher/AuthHandler/User.pm
@@ -11,20 +11,25 @@ sub handle {
   my $login = $::form->{'{AUTH}login'} || $::auth->get_session_value('login');
   return $self->_error(%param) if !defined $login;
 
-  %::myconfig = $::auth->read_user(login => $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 = User->get_default_myconfig($::auth->read_user(login => $login));
 
   return $self->_error(%param) unless $::myconfig{login};
 
   $::locale = Locale->new($::myconfig{countrycode});
   $::request->{layout} = SL::Layout::Dispatcher->new(style => $::myconfig{menustyle});
 
-  my $ok   =  $::form->{'{AUTH}login'} && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, $::form->{'{AUTH}password'}));
+  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));
 
   return $self->_error(%param) if !$ok;
 
   $::auth->create_or_refresh_session;
   $::auth->delete_session_value('FLASH');
+  $::instance_conf->reload->data;
 
   return 1;
 }
@@ -33,7 +38,9 @@ sub _error {
   my $self = shift;
 
   $::auth->punish_wrong_login;
-  print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login&error=password');
+
+  require SL::Controller::Base;
+  SL::Controller::Base->new->redirect_to('controller.pl?action=LoginScreen/user_login&error=password');
   return 0;
 }