Merge pull request #1093 from travis-ci/as-add-email-to-user-renderer

Add email to user renderer

Author: artursmirnov

lib/travis/api/v3/renderer/user.rb

@@ -2,17 +2,26 @@
 
 module Travis::API::V3
   class Renderer::User < Renderer::Owner
-    representation(:standard, :is_syncing, :synced_at, :recently_signed_up, :secure_user_hash)
+    representation(:standard, :email, :is_syncing, :synced_at, :recently_signed_up, :secure_user_hash)
     representation(:additional, :emails)
 
+    def email
+      @model.email if current_user?
+    end
+
     def emails
-      return @model.emails.map(&:email) if access_control.class == Travis::API::V3::AccessControl::LegacyToken && access_control.user.id == @model.id
-      []
+      current_user? ? @model.emails.map(&:email) : []
     end
 
     def secure_user_hash
       hmac_secret_key = Travis.config.intercom && Travis.config.intercom.hmac_secret_key.to_s
       OpenSSL::HMAC.hexdigest('sha256', hmac_secret_key, @model.id.to_s) if @model.id && hmac_secret_key
     end
+
+    private
+
+    def current_user?
+      access_control.class == Travis::API::V3::AccessControl::LegacyToken && access_control.user.id == @model.id
+    end
   end
 end

spec/v3/services/installation/find_spec.rb

@@ -47,6 +47,7 @@
         "id" => 1,
         "login" => user.login,
         "name" => user.name,
+        "email" => "[email protected]",
         "github_id" => nil,
         "vcs_id" => user.vcs_id,
         "vcs_type" => user.vcs_type,

spec/v3/services/owner/find_spec.rb

@@ -250,6 +250,7 @@
         "id"             => user.id,
         "login"          => "example-user",
         "name"           => nil,
+        "email"          => nil,
         "github_id"      => 5678,
         "vcs_id"         => user.vcs_id,
         "vcs_type"       => user.vcs_type,
@@ -274,6 +275,7 @@
         "id"             => user.id,
         "login"          => "example-user",
         "name"           => nil,
+        "email"          => nil,
         "github_id"      => 5678,
         "vcs_id"         => user.vcs_id,
         "vcs_type"       => user.vcs_type,
@@ -298,6 +300,7 @@
         "id"               => user.id,
         "login"            => "example-user",
         "name"             => nil,
+        "email"            => nil,
         "github_id"        => 5678,
         "vcs_id"           => user.vcs_id,
         "vcs_type"         => user.vcs_type,
@@ -326,6 +329,7 @@
         "id"               => user.id,
         "login"            => "example-user",
         "name"             => nil,
+        "email"            => nil,
         "github_id"        => 5678,
         "vcs_id"           => user.vcs_id,
         "vcs_type"         => user.vcs_type,

spec/v3/services/user/current_spec.rb

@@ -14,7 +14,8 @@
       "@permissions"     => {"read"=>true, "sync"=>true},
       "id"               => user.id,
       "login"            => "svenfuchs",
-      "name"             =>"Sven Fuchs",
+      "name"             => "Sven Fuchs",
+      "email"            => "[email protected]",
       "github_id"        => user.github_id,
       "vcs_id"           => user.vcs_id,
       "vcs_type"         => user.vcs_type,

spec/v3/services/user/find_spec.rb

@@ -19,7 +19,8 @@
       "@permissions"     => {"read"=>true, "sync"=>true},
       "id"               => user.id,
       "login"            => "svenfuchs",
-      "name"             =>"Sven Fuchs",
+      "name"             => "Sven Fuchs",
+      "email"            => "[email protected]",
       "github_id"        => user.github_id,
       "vcs_id"           => user.vcs_id,
       "vcs_type"         => user.vcs_type,