projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SL::DB::Order: bei Wandlung in Lieferschein delivered auf 1 setzen
[kivitendo-erp.git]
/
SL
/
Dispatcher
/
AuthHandler
/
User.pm
diff --git
a/SL/Dispatcher/AuthHandler/User.pm
b/SL/Dispatcher/AuthHandler/User.pm
index
e1c080e
..
7b2a5eb
100644
(file)
--- 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 $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};
%::myconfig = $::auth->read_user(login => $login);
return $self->_error(%param) unless $::myconfig{login};
@@
-18,7
+21,8
@@
sub handle {
$::locale = Locale->new($::myconfig{countrycode});
$::request->{layout} = SL::Layout::Dispatcher->new(style => $::myconfig{menustyle});
$::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;
$ok ||= !$::form->{'{AUTH}login'} && (SL::Auth::OK() == $::auth->authenticate($::myconfig{login}, undef));
return $self->_error(%param) if !$ok;