use SL::DB::Employee;
use SL::Locale::String qw(t8);
use SL::User;
+use SL::Version;
use Rose::Object::MakeMethods::Generic (
'scalar --get_set_init' => [ qw(clients default_client_id) ],
}
%::myconfig = $login ? $::auth->read_user(login => $login) : ();
- $::form->{login} = $login;
$::locale = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
- SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});
+ my $auth_result = SL::Dispatcher::AuthHandler::User->new->handle(callback => $::form->{callback});
+
+ $::dispatcher->end_request unless $auth_result;
$::request->layout(SL::Layout::Dispatcher->new(style => $::myconfig{menustyle}));
# Auth DB needs update? If so log the user out forcefully.
if (User::LOGIN_AUTH_DBUPDATE_AVAILABLE() == $result) {
$::auth->destroy_session;
- return $self->render('login_screen/auth_db_needs_update');
+ # must be without layout because menu rights might not exist yet
+ return $self->render('login_screen/auth_db_needs_update', { layout => 0 });
}
# Basic client tables available? If not tell the user to create them
}
# Database update available?
- ::end_of_request() if User::LOGIN_DBUPDATE_AVAILABLE() == $result;
+ $::dispatcher->end_request if User::LOGIN_DBUPDATE_AVAILABLE() == $result;
# Other login errors.
if (User::LOGIN_OK() != $result) {
sub _redirect_to_main_script {
my ($self) = @_;
- $self->_ensure_employees_for_authorized_users_exist;
-
return $self->redirect_to($::form->{callback}) if $::form->{callback};
$self->redirect_to(controller => "login.pl", action => 'company_logo');
my %user = $::auth->read_user(login => $login);
return if ($user{login} || '') ne $login;
+ # Check if there's a client set in the session -- and whether or not
+ # the user still has access to the client.
+ my $client_id = $::auth->get_session_value('client_id');
+ return if !$client_id;
+
+ if (!$::auth->set_client($client_id)) {
+ $::auth->punish_wrong_login;
+ $::auth->destroy_session;
+ $::auth->create_or_refresh_session;
+ $self->show_login_form(error => t8('Incorrect username or password or no access to selected client!'));
+ return 1;
+ }
+
# Check if the session is logged in correctly.
return if SL::Auth::OK() != $::auth->authenticate($login, undef);
return 1;
}
-sub _ensure_employees_for_authorized_users_exist {
- my ($self) = @_;
-
- my %employees_by_login = map { ($_->login => $_) } @{ SL::DB::Manager::Employee->get_all };
-
- foreach my $user (@{ SL::DB::AuthClient->new(id => $::auth->client->{id})->load->users || [] }) {
- my $user_config = $user->config_values;
- my $employee = $employees_by_login{$user->login} || SL::DB::Employee->new(login => $user->login);
-
- $employee->update_attributes(
- name => $user_config->{name},
- workphone => $user_config->{tel},
- deleted => 0,
- );
- }
-}
-
sub error_state {
my %states = (
session => { warning => t8('The session has expired. Please log in again.') },
password => { error => t8('Incorrect username or password or no access to selected client!') },
+ action => { warning => t8('The action is missing or invalid.') },
);
return %{ $states{$_[0]} || {} };
}
sub set_layout {
- $::request->{layout} = SL::Layout::Dispatcher->new(style => 'login');
+ $::request->{layout} = $::request->is_mobile
+ ? SL::Layout::Dispatcher->new(style => 'mobile_login')
+ : SL::Layout::Dispatcher->new(style => 'login');
}
sub init_clients {
sub show_login_form {
my ($self, %params) = @_;
- $self->render('login_screen/user_login', %params);
+ $self->render('login_screen/user_login', %params, version => SL::Version->get_version, callback => $::form->{callback});
}
1;