pastes: don't 404 when user does not exist

Signed-off-by: ATechnoHazard <amolele@gmail.com>
This commit is contained in:
Amogh Lele 2020-09-26 19:59:32 +05:30
parent b661b7ea8d
commit ac2028d373
No known key found for this signature in database
GPG Key ID: F475143EDEDEBA3C
2 changed files with 17 additions and 5 deletions

View File

@ -8,10 +8,11 @@ use serde_json::Value;
use crate::api::catchers::{forbidden, internal_server_error, not_found, unprocessable_entity}; use crate::api::catchers::{forbidden, internal_server_error, not_found, unprocessable_entity};
use crate::api::guards::db::DbConn; use crate::api::guards::db::DbConn;
use crate::core::paste::{entity::Paste, service::{create_paste, fetch_paste, update_paste};}; use crate::core::paste::{entity::Paste, service::{create_paste, fetch_paste, update_paste}};
use crate::core::users::service::{create_or_fetch_user, fetch_user}; use crate::core::users::service::{create_or_fetch_user, fetch_user};
use crate::utils::phonetic_key; use crate::utils::phonetic_key;
use crate::utils::users::get_session_id; use crate::utils::users::get_session_id;
use crate::core::users::entity::User;
#[post("/", data = "<paste>")] #[post("/", data = "<paste>")]
fn create(mut paste: Json<Paste>, conn: DbConn, mut ck: Cookies) -> Custom<Json<Value>> { fn create(mut paste: Json<Paste>, conn: DbConn, mut ck: Cookies) -> Custom<Json<Value>> {
@ -53,10 +54,10 @@ fn fetch(id: String, conn: DbConn, mut ck: Cookies) -> Custom<Json<Value>> {
let user = match r_user { let user = match r_user {
Ok(user) => user, Ok(user) => user,
Err(e) => { Err(e) => {
return match e.downcast_ref::<Error>() { match e.downcast_ref::<Error>() {
Some(Error::NotFound) => not_found(), Some(Error::NotFound) => User::new(),
_ => internal_server_error(), _ => return internal_server_error(),
}; }
} }
}; };

View File

@ -8,3 +8,14 @@ pub struct User {
pub password: Option<String>, pub password: Option<String>,
pub activated: Option<bool>, pub activated: Option<bool>,
} }
impl User {
pub fn new() -> Self {
User {
id: "".to_string(),
username: None,
password: None,
activated: None,
}
}
}