cotugno/vaultwarden
2
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-16 02:18:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #207 from mprasil/continuation_token

Browse Source 
Add continuation token when we return object list
This commit is contained in:
Daniel García 2018-10-01 19:31:11 +02:00 committed by GitHub
commit 77ff9c91c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/core/ciphers.rs
View File

@ -57,6 +57,7 @@ fn get_ciphers(headers: Headers, conn: DbConn) -> JsonResult {
Ok(Json(json!({ Ok(Json(json!({
"Data": ciphers_json, "Data": ciphers_json,
"Object": "list", "Object": "list",
"ContinuationToken": null
}))) })))
} }

1
src/api/core/folders.rs
View File

@ -16,6 +16,7 @@ fn get_folders(headers: Headers, conn: DbConn) -> JsonResult {
Ok(Json(json!({ Ok(Json(json!({
"Data": folders_json, "Data": folders_json,
"Object": "list", "Object": "list",
"ContinuationToken": null,
}))) })))
} }

13
src/api/core/organizations.rs
View File

@ -141,7 +141,8 @@ fn get_user_collections(headers: Headers, conn: DbConn) -> JsonResult {
.iter() .iter()
.map(Collection::to_json) .map(Collection::to_json)
.collect::<Value>(), .collect::<Value>(),
"Object": "list" "Object": "list",
"ContinuationToken": null,
}))) })))
} }
@ -153,7 +154,8 @@ fn get_org_collections(org_id: String, _headers: AdminHeaders, conn: DbConn) ->
.iter() .iter()
.map(Collection::to_json) .map(Collection::to_json)
.collect::<Value>(), .collect::<Value>(),
"Object": "list" "Object": "list",
"ContinuationToken": null,
}))) })))
} }
@ -294,7 +296,8 @@ fn get_collection_users(org_id: String, coll_id: String, _headers: AdminHeaders,
Ok(Json(json!({ Ok(Json(json!({
"Data": user_list, "Data": user_list,
"Object": "list" "Object": "list",
"ContinuationToken": null,
}))) })))
} }
@ -312,6 +315,7 @@ fn get_org_details(data: OrgIdData, headers: Headers, conn: DbConn) -> JsonResul
Ok(Json(json!({ Ok(Json(json!({
"Data": ciphers_json, "Data": ciphers_json,
"Object": "list", "Object": "list",
"ContinuationToken": null,
}))) })))
} }
@ -327,7 +331,8 @@ fn get_org_users(org_id: String, headers: AdminHeaders, conn: DbConn) -> JsonRes
Ok(Json(json!({ Ok(Json(json!({
"Data": users_json, "Data": users_json,
"Object": "list" "Object": "list",
"ContinuationToken": null,
}))) })))
} }

3
src/api/core/two_factor.rs
View File

@ -19,7 +19,8 @@ fn get_twofactor(headers: Headers, conn: DbConn) -> JsonResult {
Ok(Json(json!({ Ok(Json(json!({
"Data": twofactors_json, "Data": twofactors_json,
"Object": "list" "Object": "list",
"ContinuationToken": null,
}))) })))
} }