vw_small

commit 928ad6c1d82d6f2c9c81b87898e28ae60146ca8e
parent 9d027b96d84c25ffef3e3494f69ad655fd3f36f5
Author: Stephen White <swhite@corefiling.com>
Date:   Fri, 25 Jan 2019 14:18:06 +0000

Fix the list of users with access to a collection to display correctly.
https://github.com/dani-garcia/bitwarden_rs/issues/364

Diffstat:
M
src/api/core/organizations.rs
 | 
6
+-----
M
src/db/models/organization.rs
 | 
10
++--------

2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
@@ -375,11 +375,7 @@ fn get_collection_users(org_id: String, coll_id: String, _headers: AdminHeaders,
         })
         .collect();
 
-    Ok(Json(json!({
-        "Data": user_list,
-        "Object": "list",
-        "ContinuationToken": null,
-    })))
+    Ok(Json(json!(user_list)))
 }
 
 #[derive(FromForm)]
diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs
@@ -296,14 +296,8 @@ impl UserOrganization {
         let user = User::find_by_uuid(&self.user_uuid, conn).unwrap();
 
         json!({
-            "OrganizationUserId": self.uuid,
-            "AccessAll": self.access_all,
-            "Name": user.name,
-            "Email": user.email,
-            "Type": self.type_,
-            "Status": self.status,
-            "ReadOnly": read_only,
-            "Object": "collectionUser",
+            "Id": self.uuid,
+            "ReadOnly": read_only
         })
     }