X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FLoginScreen.pm;h=a06686af235d399c08b80ab29d012c0a3960a166;hb=8abd9ce32e946691e0953f9a8e2c183183d7854e;hp=c32d0a3b6e66b32ad5385301094457fcd9f68d47;hpb=1c7afd9ee2b5d6233302774c6a69a154a3de29fa;p=kivitendo-erp.git

diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index c32d0a3b6..a06686af2 100644
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -10,6 +10,8 @@ use SL::Dispatcher::AuthHandler::User;
 use SL::DB::AuthClient;
 use SL::DB::AuthGroup;
 use SL::DB::AuthUser;
+use SL::DB::Employee;
+use SL::Locale::String qw(t8);
 use SL::User;
 
 use Rose::Object::MakeMethods::Generic (
@@ -30,7 +32,7 @@ sub action_user_login {
   return if $self->_redirect_to_main_script_if_already_logged_in;
 
   # Otherwise show the login form.
-  $self->show_login_form(error => error_state($::form->{error}));
+  $self->show_login_form(error_state($::form->{error}));
 }
 
 sub action_logout {
@@ -38,7 +40,7 @@ sub action_logout {
 
   $::auth->destroy_session;
   $::auth->create_or_refresh_session;
-  $self->show_login_form(error => $::locale->text('You are logged out!'));
+  $self->show_login_form(info => $::locale->text('You are logged out!'));
 }
 
 sub action_login {
@@ -54,26 +56,33 @@ sub action_login {
   }
 
   %::myconfig      = $login ? $::auth->read_user(login => $login) : ();
-  SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});
-  $::form->{login} = $::myconfig{login};
+  $::form->{login} = $login;
   $::locale        = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
-  my $user         = User->new(login => $::myconfig{login});
-  $::request->{layout} = SL::Layout::Dispatcher->new(style => $user->{menustyle});
+  SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});
 
-  # if we get an error back, bale out
-  my $result = $user->login($::form);
+  $::request->layout(SL::Layout::Dispatcher->new(style => $::myconfig{menustyle}));
 
-  # Database update available?
-  ::end_of_request() if -2 == $result;
+  # if we get an error back, bale out
+  my $result = User->new(login => $::myconfig{login})->login($::form);
 
   # Auth DB needs update? If so log the user out forcefully.
-  if (-3 == $result) {
+  if (User::LOGIN_AUTH_DBUPDATE_AVAILABLE() == $result) {
     $::auth->destroy_session;
     return $self->render('login_screen/auth_db_needs_update');
   }
 
+  # Basic client tables available? If not tell the user to create them
+  # and log the user out forcefully.
+  if (User::LOGIN_BASIC_TABLES_MISSING() == $result) {
+    $::auth->destroy_session;
+    return $self->render('login_screen/basic_tables_missing');
+  }
+
+  # Database update available?
+  ::end_of_request() if User::LOGIN_DBUPDATE_AVAILABLE() == $result;
+
   # Other login errors.
-  if (0 > $result) {
+  if (User::LOGIN_OK() != $result) {
     $::auth->punish_wrong_login;
     return $self->show_login_form(error => $error);
   }
@@ -81,10 +90,7 @@ sub action_login {
   # Everything is fine.
   $::auth->set_cookie_environment_variable();
 
-  # TODO: Employees anlegen/checken
-  # $self->_ensure_employees_for_authorized_users_exist;
-
-  $self->_redirect_to_main_script($user);
+  $self->_redirect_to_main_script;
 }
 
 #
@@ -103,7 +109,9 @@ sub keep_auth_vars_in_form {
 #
 
 sub _redirect_to_main_script {
-  my ($self, $user) = @_;
+  my ($self) = @_;
+
+  $self->_ensure_employees_for_authorized_users_exist;
 
   return $self->redirect_to($::form->{callback}) if $::form->{callback};
 
@@ -132,11 +140,30 @@ sub _redirect_to_main_script_if_already_logged_in {
   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 {
-  return {
-    session  => $::locale->text('The session is invalid or has expired.'),
-    password => $::locale->text('Incorrect password!'),
-  }->{$_[0]};
+  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!') },
+  );
+
+  return %{ $states{$_[0]} || {} };
 }
 
 sub set_layout {
@@ -156,7 +183,6 @@ sub init_default_client_id {
 sub show_login_form {
   my ($self, %params) = @_;
 
-  $::request->layout->focus('#auth_login');
   $self->render('login_screen/user_login', %params);
 }