More fixes
This commit is contained in:
parent
c2adee1188
commit
e71bb730e5
@ -8,7 +8,7 @@ pub struct Params {
|
|||||||
pub async fn delete(
|
pub async fn delete(
|
||||||
State(state): State<AppState>,
|
State(state): State<AppState>,
|
||||||
claims: Claims,
|
claims: Claims,
|
||||||
Json(params): Json<Params>,
|
Query(params): Query<Params>,
|
||||||
) -> GeneralResult<()> {
|
) -> GeneralResult<()> {
|
||||||
let root = db::folder::get_root(claims.user_id, &state.pool)
|
let root = db::folder::get_root(claims.user_id, &state.pool)
|
||||||
.await
|
.await
|
||||||
|
@ -18,8 +18,8 @@ pub async fn get(
|
|||||||
.await
|
.await
|
||||||
.can_manage_guard()?;
|
.can_manage_guard()?;
|
||||||
|
|
||||||
let permissions = db::permissions::get_all_for_folder(params.folder_id, &pool)
|
db::permissions::get_all_for_folder(params.folder_id, &pool)
|
||||||
.await
|
.await
|
||||||
.handle_internal("Error getting permissions")?;
|
.handle_internal("Error getting permissions")
|
||||||
Ok(Json(permissions))
|
.map(Json)
|
||||||
}
|
}
|
||||||
|
@ -6,8 +6,8 @@ pub async fn get_top_level(
|
|||||||
State(pool): State<Pool>,
|
State(pool): State<Pool>,
|
||||||
claims: Claims,
|
claims: Claims,
|
||||||
) -> GeneralResult<Json<Vec<FolderWithoutParentId>>> {
|
) -> GeneralResult<Json<Vec<FolderWithoutParentId>>> {
|
||||||
let folders = db::permissions::get_top_level_permitted_folders(claims.user_id, &pool)
|
db::permissions::get_top_level_permitted_folders(claims.user_id, &pool)
|
||||||
.await
|
.await
|
||||||
.handle_internal("Error reading from the database")?;
|
.handle_internal("Error reading from the database")
|
||||||
Ok(Json(folders))
|
.map(Json)
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ use crate::prelude::*;
|
|||||||
|
|
||||||
#[derive(Deserialize, Debug, Validate)]
|
#[derive(Deserialize, Debug, Validate)]
|
||||||
pub struct Params {
|
pub struct Params {
|
||||||
#[validate(email)]
|
#[validate(length(min = 3, max = 10))]
|
||||||
username: String,
|
username: String,
|
||||||
#[validate(email)]
|
#[validate(email)]
|
||||||
email: String,
|
email: String,
|
||||||
|
Reference in New Issue
Block a user