Merge branch 'add-public-email-to-graphql-user' into 'master'

Expose public email for users in GraphQL

See merge request gitlab-org/gitlab!48468

app/graphql/types/user_type.rb

@@ -20,6 +20,8 @@ module Types
           description: 'State of the user'
     field :email, GraphQL::STRING_TYPE, null: true,
           description: 'User email'
+    field :public_email, GraphQL::STRING_TYPE, null: true,
+          description: "User's public email"
     field :avatar_url, GraphQL::STRING_TYPE, null: true,
           description: "URL of the user's avatar"
     field :web_url, GraphQL::STRING_TYPE, null: false,

changelogs/unreleased/add-public-email-to-graphql-user.yml

+---
+title: Expose public email field for user in GraphQL
+merge_request: 48468
+author:
+type: changed

doc/api/graphql/reference/gitlab_schema.graphql

@@ -23369,6 +23369,11 @@ type User {
     last: Int
   ): ProjectMemberConnection
 
+  """
+  User's public email
+  """
+  publicEmail: String
+
   """
   Snippets authored by the user
   """

doc/api/graphql/reference/gitlab_schema.json

@@ -67886,6 +67886,20 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "publicEmail",
+              "description": "User's public email",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "snippets",
               "description": "Snippets authored by the user",

doc/api/graphql/reference/index.md

@@ -3494,6 +3494,7 @@ Autogenerated return type of UpdateSnippet.
 | `location` | String | The location of the user. |
 | `name` | String! | Human-readable name of the user |
 | `projectMemberships` | ProjectMemberConnection | Project memberships of the user |
+| `publicEmail` | String | User's public email |
 | `snippets` | SnippetConnection | Snippets authored by the user |
 | `starredProjects` | ProjectConnection | Projects starred by the user |
 | `state` | UserState! | State of the user |

spec/graphql/types/user_type_spec.rb

@@ -15,6 +15,7 @@ RSpec.describe GitlabSchema.types['User'] do
       name
       username
       email
+      publicEmail
       avatarUrl
       webUrl
       webPath

spec/requests/api/graphql/user_query_spec.rb

@@ -82,7 +82,8 @@ RSpec.describe 'getting user information' do
             'username' => presenter.username,
             'webUrl' => presenter.web_url,
             'avatarUrl' => presenter.avatar_url,
-            'email' => presenter.email
+            'email' => presenter.email,
+            'publicEmail' => presenter.public_email
           ))
 
         expect(graphql_data['user']['status']).to match(