1 files changed, 107 insertions, 10 deletions

diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index deb7518ec..758c69aa8 100644
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -29,6 +29,7 @@ use Bugzilla::Group;
 use Bugzilla::User;
 use Bugzilla::Util qw(trim);
 use Bugzilla::WebService::Util qw(filter validate);
+use Bugzilla::Hook;
 
 # Don't need auth to login
 use constant LOGIN_EXEMPT => {
@@ -126,6 +127,8 @@ sub create {
 sub get {
     my ($self, $params) = validate(@_, 'names', 'ids');
 
+    Bugzilla->switch_to_shadow_db();
+
     defined($params->{names}) || defined($params->{ids})
         || defined($params->{match})
         || ThrowCodeError('params_required', 
@@ -154,8 +157,8 @@ sub get {
             \@user_objects, $params);
         @users = map {filter $params, {
                      id        => $self->type('int', $_->id),
-                     real_name => $self->type('string', $_->name), 
-                     name      => $self->type('string', $_->login),
+                     real_name => $self->type('string', $_->name),
+                     name      => $self->type('email', $_->login),
                  }} @$in_group;
 
         return { users => \@users };
@@ -196,33 +199,39 @@ sub get {
             }
         }
     }
-   
+
     my $in_group = $self->_filter_users_by_group(
         \@user_objects, $params); 
     if (Bugzilla->user->in_group('editusers')) {
-        @users =
+        @users = 
             map {filter $params, {
                 id        => $self->type('int', $_->id),
                 real_name => $self->type('string', $_->name),
-                name      => $self->type('string', $_->login),
-                email     => $self->type('string', $_->email),
+                name      => $self->type('email', $_->login),
+                email     => $self->type('email', $_->email),
                 can_login => $self->type('boolean', $_->is_enabled ? 1 : 0),
+                groups    => $self->_filter_bless_groups($_->groups), 
                 email_enabled     => $self->type('boolean', $_->email_enabled),
                 login_denied_text => $self->type('string', $_->disabledtext),
+                saved_searches    => [map { $self->_query_to_hash($_) } @{ $_->queries }],
             }} @$in_group;
-
     }    
     else {
         @users =
             map {filter $params, {
                 id        => $self->type('int', $_->id),
                 real_name => $self->type('string', $_->name),
-                name      => $self->type('string', $_->login),
-                email     => $self->type('string', $_->email),
+                name      => $self->type('email', $_->login),
+                email     => $self->type('email', $_->email),
                 can_login => $self->type('boolean', $_->is_enabled ? 1 : 0),
+                groups    => $self->_filter_bless_groups($_->groups),
+                saved_searches => [map { $self->_query_to_hash($_) } @{ $_->queries }],
             }} @$in_group;
     }
 
+    Bugzilla::Hook::process('webservice_user_get', 
+        { webservice => $self, params => $params, users => \@users });
+
     return { users => \@users };
 }
 
@@ -259,6 +268,40 @@ sub _user_in_any_group {
     return 0;
 }
 
+sub _filter_bless_groups {
+    my ($self, $groups) = @_;
+    my $user = Bugzilla->user;
+
+    my @filtered_groups;
+    foreach my $group (@$groups) {
+        next unless ($user->in_group('editusers') || $user->can_bless($group->id));
+        push(@filtered_groups, $self->_group_to_hash($group));
+    }
+
+    return \@filtered_groups;
+}
+
+sub _group_to_hash {
+    my ($self, $group) = @_;
+    my $item = {
+        id          => $self->type('int', $group->id), 
+        name        => $self->type('string', $group->name), 
+        description => $self->type('string', $group->description), 
+    };
+    return $item;
+}
+
+sub _query_to_hash {
+    my ($self, $query) = @_;
+    my $item = {
+        id   => $self->type('int', $query->id),
+        name => $self->type('string', $query->name),
+        url  => $self->type('string', $query->url),
+    };
+
+    return $item;
+}
+
 1;
 
 __END__
@@ -581,10 +624,60 @@ C<string> A text field that holds the reason for disabling a user from logging
 into bugzilla, if empty then the user account is enabled. Otherwise it is 
 disabled/closed.
 
+=item groups
+
+C<array> An array of group hashes the user is a member of. Each hash describes
+the group and contains the following items:
+
+=over
+
+=item id
+
+C<int> The group id
+
+=item name
+
+C<string> The name of the group
+
+=item description
+
+C<string> The description for the group
+
+=back
+
+=over
+
+=item saved_searches
+
+C<array> An array of hashes, each of which represents a user's saved search and has
+the following keys:
+
+=over
+
+=item id
+
+C<int> An integer id uniquely identifying the saved search.
+
+=item name
+
+C<string> The name of the saved search.
+
+=item url
+
+C<string> The CGI parameters for the saved search.
+
+=back
+
+B<Note>: The elements of the returned array (i.e. hashes) are ordered by the 
+name of each saved search.
+
+=back
+
 B<Note>: If you are not logged in to Bugzilla when you call this function, you
 will only be returned the C<id>, C<name>, and C<real_name> items. If you are
 logged in and not in editusers group, you will only be returned the C<id>, C<name>, 
-C<real_name>, C<email>, and C<can_login> items.
+C<real_name>, C<email>, and C<can_login> items. The groups returned are filtered
+based on your permission to bless each group.
 
 =back
 
@@ -625,6 +718,10 @@ exist or you do not belong to it.
 =item C<include_disabled> added in Bugzilla B<4.0>. Default behavior 
 for C<match> has changed to only returning enabled accounts.
 
+=item C<groups> Added in Bugzilla B<4.4>.
+
+=item C<saved_searches> Added in Bugzilla B<4.4>.
+
 =item Error 804 has been added in Bugzilla 4.0.9 and 4.2.4. It's now
 illegal to pass a group name you don't belong to.