Merge pull request #173 from Jemereny/develop

walbertus · web-flow · commit 6fa54d283200 · 2019-10-18T10:53:28.000+07:00
Added id to be returned in user get request
diff --git a/api_blueprint/user.apib b/api_blueprint/user.apib
@@ -135,6 +135,7 @@ Get user data with email, uid or username
 
             {
                 "email": "bar@test.com",
+                "id": null,
                 "uid": null,
                 "name": "foo",
                 "active": true,
diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb
@@ -15,7 +15,7 @@ def create
   def show
     if @user.present?
       user_attrs = %w(
-        email uid name active admin home_dir shell public_key user_login_id
+        email id uid name active admin home_dir shell public_key user_login_id
         product_name
       )
       data = @user.attributes.select { |k, _v| user_attrs.include?(k) }

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ Get user data with email, uid or username`
`135`	`135`
`136`	`136`	`{`
`137`	`137`	`"email": "bar@test.com",`
	`138`	`+ "id": null,`
`138`	`139`	`"uid": null,`
`139`	`140`	`"name": "foo",`
`140`	`141`	`"active": true,`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ def create`
`15`	`15`	`def show`
`16`	`16`	`if @user.present?`
`17`	`17`	`user_attrs = %w(`
`18`		`- email uid name active admin home_dir shell public_key user_login_id`
	`18`	`+ email id uid name active admin home_dir shell public_key user_login_id`
`19`	`19`	`product_name`
`20`	`20`	`)`
`21`	`21`	`data = @user.attributes.select { \|k, _v\| user_attrs.include?(k) }`