Commit 585b1b3f authored by Alexis Reigel's avatar Alexis Reigel

add user's public_email attribute to api

parent 0a94bdfa
...@@ -55,6 +55,7 @@ Example of response ...@@ -55,6 +55,7 @@ Example of response
"created_at": "2015-12-21T13:14:24.077Z", "created_at": "2015-12-21T13:14:24.077Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
...@@ -113,6 +114,7 @@ Example of response ...@@ -113,6 +114,7 @@ Example of response
"created_at": "2015-12-21T13:14:24.077Z", "created_at": "2015-12-21T13:14:24.077Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
......
...@@ -62,6 +62,7 @@ Example of response ...@@ -62,6 +62,7 @@ Example of response
"created_at": "2015-12-21T13:14:24.077Z", "created_at": "2015-12-21T13:14:24.077Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
...@@ -120,6 +121,7 @@ Example of response ...@@ -120,6 +121,7 @@ Example of response
"created_at": "2015-12-21T13:14:24.077Z", "created_at": "2015-12-21T13:14:24.077Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
...@@ -193,6 +195,7 @@ Example of response ...@@ -193,6 +195,7 @@ Example of response
"created_at": "2015-12-21T13:14:24.077Z", "created_at": "2015-12-21T13:14:24.077Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
...@@ -251,6 +254,7 @@ Example of response ...@@ -251,6 +254,7 @@ Example of response
"created_at": "2015-12-21T13:14:24.077Z", "created_at": "2015-12-21T13:14:24.077Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
...@@ -322,6 +326,7 @@ Example of response ...@@ -322,6 +326,7 @@ Example of response
"created_at": "2015-12-21T13:14:24.077Z", "created_at": "2015-12-21T13:14:24.077Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
......
...@@ -28,6 +28,7 @@ Parameters: ...@@ -28,6 +28,7 @@ Parameters:
"created_at": "2015-09-03T07:24:01.670Z", "created_at": "2015-09-03T07:24:01.670Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "john@example.com",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
......
...@@ -286,6 +286,7 @@ Example response: ...@@ -286,6 +286,7 @@ Example response:
"created_at": "2017-11-16T18:38:46.000Z", "created_at": "2017-11-16T18:38:46.000Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
......
...@@ -199,6 +199,7 @@ Parameters: ...@@ -199,6 +199,7 @@ Parameters:
"created_at": "2012-05-23T08:00:58Z", "created_at": "2012-05-23T08:00:58Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "john@example.com",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
...@@ -230,6 +231,7 @@ Parameters: ...@@ -230,6 +231,7 @@ Parameters:
"is_admin": false, "is_admin": false,
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "john@example.com",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
...@@ -367,6 +369,7 @@ GET /user ...@@ -367,6 +369,7 @@ GET /user
"created_at": "2012-05-23T08:00:58Z", "created_at": "2012-05-23T08:00:58Z",
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "john@example.com",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
...@@ -415,6 +418,7 @@ GET /user ...@@ -415,6 +418,7 @@ GET /user
"is_admin": false, "is_admin": false,
"bio": null, "bio": null,
"location": null, "location": null,
"public_email": "john@example.com",
"skype": "", "skype": "",
"linkedin": "", "linkedin": "",
"twitter": "", "twitter": "",
......
...@@ -53,7 +53,7 @@ module API ...@@ -53,7 +53,7 @@ module API
class User < UserBasic class User < UserBasic
expose :created_at, if: ->(user, opts) { Ability.allowed?(opts[:current_user], :read_user_profile, user) } expose :created_at, if: ->(user, opts) { Ability.allowed?(opts[:current_user], :read_user_profile, user) }
expose :bio, :location, :skype, :linkedin, :twitter, :website_url, :organization expose :bio, :location, :public_email, :skype, :linkedin, :twitter, :website_url, :organization
end end
class UserActivity < Grape::Entity class UserActivity < Grape::Entity
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment