X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/4a12c839937370488b8b8a40bef376e7cb0a2ce6..7647d46:/SL/Dispatcher/AuthHandler/User.pm

diff --git a/SL/Dispatcher/AuthHandler/User.pm b/SL/Dispatcher/AuthHandler/User.pm
index 6dc200bae..e126d872f 100644
--- a/SL/Dispatcher/AuthHandler/User.pm
+++ b/SL/Dispatcher/AuthHandler/User.pm
@@ -3,30 +3,31 @@ package SL::Dispatcher::AuthHandler::User;
 use strict;
 use parent qw(Rose::Object);
 
-use SL::Controller::Layout;
+use SL::Layout::Dispatcher;
 
 sub handle {
   my ($self, %param) = @_;
 
   my $login = $::form->{'{AUTH}login'} || $::auth->get_session_value('login');
-  $self->_error(%param) if !defined $login;
+  return $self->_error(%param) if !defined $login;
 
   %::myconfig = $::auth->read_user(login => $login);
 
-  $self->_error(%param) unless $::myconfig{login};
+  return $self->_error(%param) unless $::myconfig{login};
 
   $::locale = Locale->new($::myconfig{countrycode});
-  $::request->{layout} = SL::Controller::Layout->new(style => $::myconfig{menustyle});
+  $::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->get_api_token_cookie ? 1 : 0;
+  $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));
 
-  $self->_error(%param) if !$ok;
+  return $self->_error(%param) if !$ok;
 
   $::auth->create_or_refresh_session;
   $::auth->delete_session_value('FLASH');
 
-  return %::myconfig;
+  return 1;
 }
 
 sub _error {
@@ -34,6 +35,7 @@ sub _error {
 
   $::auth->punish_wrong_login;
   print $::request->{cgi}->redirect('controller.pl?action=LoginScreen/user_login&error=password');
+  return 0;
 }
 
 1;