ZJ/nidobyte - Change SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC

refactor: Move User guard to the model The User model didn't have the FromRequest 'constructor' for the guard. This felt off. Now some Request knowledge leaks to the model, but still it seems better.

Created by zj on October 11, 2021

SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC

Dependencies

In channels

main

Change contents

Insertion in src/models/users.rs at line 55 [4.2044]

[4.3371]

    }
}
static COOKIE_USER_ID_KEY: &str = "user_id";
use rocket::http::{CookieJar, Status};
use rocket::request::{FromRequest, Outcome};
use rocket::Request;
#[rocket::async_trait]
impl<'r> FromRequest<'r> for User {
    type Error = ();
    async fn from_request(request: &'r Request<'_>) -> Outcome<User, ()> {
        let db: &State<Database> = match request.guard().await {
            Outcome::Success(db) => db,
            _ => return Outcome::Failure((Status::Unauthorized, ())),
        };
        let cookies = request.cookies();
        let some_id = match get_user_id_from_cookie(cookies) {
            Some(id) => id,
            None => return Outcome::Forward(()),
        };
        match User::find(db, some_id).await {
            Ok(u) => Outcome::Success(u),
            Err(_e) => Outcome::Forward(()), // TODO this is a failure
        }

Insertion in src/models/users.rs at line 86 [4.2044]

[4.3379]


fn get_user_id_from_cookie(jar: &CookieJar) -> Option<i32> {
    match jar.get_private(COOKIE_USER_ID_KEY) {
        Some(id) => Some(id.value().parse::<i32>().ok()?),
        None => None,
    }
}

Replacement in src/controllers/users.rs at line 3 [5.33]

B:BD[5.75] → [5.75:164]

    http::{Cookie, CookieJar, Status},
    request,
    request::{FromRequest, Outcome},

[5.75]

[5.164]

    http::{Cookie, CookieJar},

Replacement in src/controllers/users.rs at line 5 [5.33]
B:BD[5.197] → [5.197:224]
```
    Request, Route, State,
```
[5.197]
[5.224]
```
    Route, State,
```

Deletion in src/controllers/users.rs at line 11 [5.33]

B:BD[5.362] → [5.362:363]

B:BD[5.363] → [3.2738:2874]

∅:D[3.2874] → [5.437:518]

B:BD[5.437] → [5.437:518]

B:BD[5.518] → [2.98:368]

∅:D[2.368] → [5.735:868]

B:BD[5.735] → [5.735:868]

B:BD[5.868] → [2.369:418]

∅:D[2.418] → [5.941:952]

B:BD[5.941] → [5.941:952]


// TODO decide if this controller file is the place for this guard to be at?
// Feels like a constructor for a model, thus needs moving
#[rocket::async_trait]
impl<'r> FromRequest<'r> for User {
    type Error = ();
    async fn from_request(request: &'r Request<'_>) -> request::Outcome<User, ()> {
        let db: &State<Database> = match request.guard().await {
            Outcome::Success(db) => db,
            _ => return Outcome::Failure((Status::Unauthorized, ())),
        };
        let cookies = request.cookies();
        let some_id = match get_user_id_from_cookie(cookies) {
            Some(id) => id,
            None => return Outcome::Forward(()),
        };

Deletion in src/controllers/users.rs at line 12 [5.33]

B:BD[5.953] → [5.953:1041]

B:BD[5.1041] → [2.419:490]

∅:D[2.490] → [5.1110:1129]

B:BD[5.1110] → [5.1110:1129]

        match User::find(db, some_id).await {
            Ok(u) => Outcome::Success(u),
            Err(_e) => Outcome::Forward(()), // TODO this is a failure
        }
    }
}

Deletion in src/controllers/users.rs at line 110 [5.33]

B:BD[5.3958] → [5.3958:4157]

fn get_user_id_from_cookie(jar: &CookieJar) -> Option<i32> {
    match jar.get_private(COOKIE_USER_ID_KEY) {
        Some(id) => Some(id.value().parse::<i32>().ok()?),
        None => None,
    }
}