fetch contacts groups directly from contacts

Author: sni

lib/Thruk/Authentication/User.pm

@@ -215,7 +215,8 @@ sub _fetch_user_data {
     my($can_submit_commands,$alias,$email);
     my $src_peers = [];
     confess("no db") unless $c->db();
-    my $data = $c->db->get_can_submit_commands($self->{'username'});
+    my $groups;
+    my $data   = $c->db->get_can_submit_commands($self->{'username'});
     if(defined $data) {
         for my $dat (@{$data}) {
             $alias = $dat->{'alias'} if defined $dat->{'alias'};
@@ -224,11 +225,16 @@ sub _fetch_user_data {
                 $can_submit_commands = $dat->{'can_submit_commands'};
                 push @{$src_peers} , $dat->{'peer_key'};
             }
+            if(defined $dat->{'groups'}) {
+                $groups = [] unless defined $groups;
+                push(@{$groups}, @{$dat->{'groups'}});
+            }
         }
     }
 
     # add roles from groups in cgi.cfg
-    my $groups = [sort keys %{$c->db->get_contactgroups_by_contact($self->{'username'})}];
+    $groups = [sort keys %{$c->db->get_contactgroups_by_contact($self->{'username'})}] unless defined $groups;
+    $groups = Thruk::Base::array_uniq($groups);
 
     return($alias, $email, $can_submit_commands, $groups, $src_peers);
 }

lib/Thruk/Backend/Provider/Livestatus.pm

@@ -359,11 +359,13 @@ sub get_can_submit_commands {
         $options->{wrapped_json} = 1;
     }
 
+    my $columns = [qw/can_submit_commands alias email groups/];
+    $columns = $self->_clean_columns("contacts", $columns);
+
     $data = $self->_optimize(
                 $self->{'live'}
                     ->table('contacts')
-                    ->columns(qw/can_submit_commands
-                                 alias email/)
+                    ->columns(@{$columns})
                     ->filter({ name => $user })
                     ->options($options),
             )