{"header":{"message":"refactor: Move User guard to the model\n\nThe User model didn't have the FromRequest 'constructor' for the guard. This felt\noff. Now some Request knowledge leaks to the model, but still it seems better.\n","description":null,"timestamp":"2021-10-11T10:03:01.587292Z","authors":[{}]},"hash":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC","authors":[{"login":"zj","key":"HJTTxR4pkDDL4TSRKMxQ3hWM2wopn7HM1y1hFeYKuzA2"}],"deps":{"hashes":[["SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC","refactor: Move User guard to the model\n\nThe User model didn't have the FromRequest 'constructor' for the guard. This felt\noff. Now some Request knowledge leaks to the model, but still it seems better.\n"],["AA",null],["Y52KSJEFIX7KIL3MWH65WKHKXIX34T3VUSBVH2SBJ4ZJHM767J4AC","rocket: User sign up guard forwards over failures\n\nWhen no user can be found, the User implementation of FromRequest was failing,\nwhich is a mistake. This meant that no other routes were tried and thus assigning\npolicies to routes failed. This changes fixes that by forwarding instead. To be\nfrank, this is over forwarding, and can still be improved on.\n"],["Z63HIZPS4WOEDXVLOLVIHNZI2IMXCFCFBIHHM65EQ7SGJRX6BVCAC","testing: Move tests to specific directory\n\nTests I didn't really write until today, as I mostly didn't really know how to\nset it up. This is now partially mitigated, just by forcing myself to do it.\n\nThere's a few problems still in the code; the database is shared with the dev\napplication for instance. Though as a start I'll take it.\n"],["RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC","routes: Move user routes to controllers module\n\nThe last routes to move, the src directory now only has a main.rs file and\ndirectories.\n"],["E4OBIIUBGNDXK577XK573TLN4DYLS32GJGXY6J7TOWFHESTEZZNAC","templates: Fix navigation mocks\n\nCleans up the directory structure for templates and fixes the navigation bugs in\nthe applications too. \n\nIncludes a context! macro which is lifted from upstream, but is currently\nunreleased. When rocket_dyn_templates is updates, it could be DRY'ed out.\n"],["TWIZ7QV4GCTQK743IKZSOJCIAEX62GZHFIYGOIFCFGIBOGPSY2WAC","db: Add interface to add a project\n\nRight now a project has a name, and an owner which is hardcoded\nto 1. This is because basically I'm speedrunning to implement push/pull\nof Pijul and then revisit to add depth to features and tests.\n\nModel code is now split into files properly too.\n"]],"deps":["Y52KSJEFIX7KIL3MWH65WKHKXIX34T3VUSBVH2SBJ4ZJHM767J4AC","Z63HIZPS4WOEDXVLOLVIHNZI2IMXCFCFBIHHM65EQ7SGJRX6BVCAC"],"known":["RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC","E4OBIIUBGNDXK577XK573TLN4DYLS32GJGXY6J7TOWFHESTEZZNAC"]},"hunks":[{"Edit":{"inode":{"change":7,"pos":2044},"path":"src/models/users.rs","line":55,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":3371}],"down_context":[{"change":7,"pos":3371}],"flag":"BLOCK","start":0,"end":866,"inode":{"change":7,"pos":2044}}},"contents":[{"Add":{"text":" }","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:5"}},{"Add":{"text":"}","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:7"}},{"Add":{"text":"","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:8"}},{"Add":{"text":"static COOKIE_USER_ID_KEY: &str = \"user_id\";","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:53"}},{"Add":{"text":"","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:54"}},{"Add":{"text":"use rocket::http::{CookieJar, Status};","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:93"}},{"Add":{"text":"use rocket::request::{FromRequest, Outcome};","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:138"}},{"Add":{"text":"use rocket::Request;","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:159"}},{"Add":{"text":"","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:160"}},{"Add":{"text":"#[rocket::async_trait]","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:183"}},{"Add":{"text":"impl<'r> FromRequest<'r> for User {","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:219"}},{"Add":{"text":" type Error = ();","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:240"}},{"Add":{"text":"","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:241"}},{"Add":{"text":" async fn from_request(request: &'r Request<'_>) -> Outcome {","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:316"}},{"Add":{"text":" let db: &State = match request.guard().await {","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:381"}},{"Add":{"text":" Outcome::Success(db) => db,","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:421"}},{"Add":{"text":" _ => return Outcome::Failure((Status::Unauthorized, ())),","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:491"}},{"Add":{"text":" };","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:502"}},{"Add":{"text":" let cookies = request.cookies();","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:543"}},{"Add":{"text":"","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:544"}},{"Add":{"text":" let some_id = match get_user_id_from_cookie(cookies) {","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:607"}},{"Add":{"text":" Some(id) => id,","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:635"}},{"Add":{"text":" None => return Outcome::Forward(()),","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:684"}},{"Add":{"text":" };","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:695"}},{"Add":{"text":"","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:696"}},{"Add":{"text":" match User::find(db, some_id).await {","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:742"}},{"Add":{"text":" Ok(u) => Outcome::Success(u),","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:784"}},{"Add":{"text":" Err(_e) => Outcome::Forward(()), // TODO this is a failure","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:855"}},{"Add":{"text":" }","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:865"}}]}},{"Edit":{"inode":{"change":7,"pos":2044},"path":"src/models/users.rs","line":86,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":3379}],"down_context":[],"flag":"BLOCK","start":867,"end":1066,"inode":{"change":7,"pos":2044}}},"contents":[{"Add":{"text":"","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:867"}},{"Add":{"text":"fn get_user_id_from_cookie(jar: &CookieJar) -> Option {","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:928"}},{"Add":{"text":" match jar.get_private(COOKIE_USER_ID_KEY) {","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:976"}},{"Add":{"text":" Some(id) => Some(id.value().parse::().ok()?),","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:1035"}},{"Add":{"text":" None => None,","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:1057"}},{"Add":{"text":" }","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:1063"}},{"Add":{"text":"}","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:1065"}}]}},{"Replacement":{"inode":{"change":4,"pos":33},"path":"src/controllers/users.rs","line":3,"ins":{"up_context":[{"change":4,"pos":75}],"down_context":[{"change":4,"pos":164}],"flag":"BLOCK","start":1067,"end":1098,"inode":{"change":4,"pos":33}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":75},"to":{"change":4,"start":75,"end":164},"introduced_by":4}],"inode":{"change":4,"pos":33}},"ins_contents":[{"Add":{"text":" http::{Cookie, CookieJar},","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:1097"}}],"del_contents":[{"Del":{"text":" http::{Cookie, CookieJar, Status},","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:113"}},{"Del":{"text":" request,","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:126"}},{"Del":{"text":" request::{FromRequest, Outcome},","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:163"}}]}},{"Replacement":{"inode":{"change":4,"pos":33},"path":"src/controllers/users.rs","line":5,"ins":{"up_context":[{"change":4,"pos":197}],"down_context":[{"change":4,"pos":224}],"flag":"BLOCK","start":1099,"end":1117,"inode":{"change":4,"pos":33}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":197},"to":{"change":4,"start":197,"end":224},"introduced_by":4}],"inode":{"change":4,"pos":33}},"ins_contents":[{"Add":{"text":" Route, State,","pos":"SZIYDOFDBT2H224T5Y6WGL6TFIKOMKGPS7T3NCGVFN7EQOLIHA6AC:1116"}}],"del_contents":[{"Del":{"text":" Request, Route, State,","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:223"}}]}},{"Edit":{"inode":{"change":4,"pos":33},"path":"src/controllers/users.rs","line":11,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":362},"to":{"change":4,"start":362,"end":363},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":363},"to":{"change":3,"start":2738,"end":2874},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2874},"to":{"change":4,"start":437,"end":518},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":437},"to":{"change":4,"start":437,"end":518},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":518},"to":{"change":2,"start":98,"end":368},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":368},"to":{"change":4,"start":735,"end":868},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":735},"to":{"change":4,"start":735,"end":868},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":868},"to":{"change":2,"start":369,"end":418},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":418},"to":{"change":4,"start":941,"end":952},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":941},"to":{"change":4,"start":941,"end":952},"introduced_by":4}],"inode":{"change":4,"pos":33}}},"contents":[{"Del":{"text":"","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:362"}},{"Del":{"text":"// TODO decide if this controller file is the place for this guard to be at?","pos":"Z63HIZPS4WOEDXVLOLVIHNZI2IMXCFCFBIHHM65EQ7SGJRX6BVCAC:2814"}},{"Del":{"text":"// Feels like a constructor for a model, thus needs moving","pos":"Z63HIZPS4WOEDXVLOLVIHNZI2IMXCFCFBIHHM65EQ7SGJRX6BVCAC:2873"}},{"Del":{"text":"#[rocket::async_trait]","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:459"}},{"Del":{"text":"impl<'r> FromRequest<'r> for User {","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:495"}},{"Del":{"text":" type Error = ();","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:516"}},{"Del":{"text":"","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:517"}},{"Del":{"text":" async fn from_request(request: &'r Request<'_>) -> request::Outcome {","pos":"Y52KSJEFIX7KIL3MWH65WKHKXIX34T3VUSBVH2SBJ4ZJHM767J4AC:181"}},{"Del":{"text":" let db: &State = match request.guard().await {","pos":"Y52KSJEFIX7KIL3MWH65WKHKXIX34T3VUSBVH2SBJ4ZJHM767J4AC:246"}},{"Del":{"text":" Outcome::Success(db) => db,","pos":"Y52KSJEFIX7KIL3MWH65WKHKXIX34T3VUSBVH2SBJ4ZJHM767J4AC:286"}},{"Del":{"text":" _ => return Outcome::Failure((Status::Unauthorized, ())),","pos":"Y52KSJEFIX7KIL3MWH65WKHKXIX34T3VUSBVH2SBJ4ZJHM767J4AC:356"}},{"Del":{"text":" };","pos":"Y52KSJEFIX7KIL3MWH65WKHKXIX34T3VUSBVH2SBJ4ZJHM767J4AC:367"}},{"Del":{"text":" let cookies = request.cookies();","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:775"}},{"Del":{"text":"","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:776"}},{"Del":{"text":" let some_id = match get_user_id_from_cookie(cookies) {","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:839"}},{"Del":{"text":" Some(id) => id,","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:867"}},{"Del":{"text":" None => return Outcome::Forward(()),","pos":"Y52KSJEFIX7KIL3MWH65WKHKXIX34T3VUSBVH2SBJ4ZJHM767J4AC:417"}},{"Del":{"text":" };","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:951"}}]}},{"Edit":{"inode":{"change":4,"pos":33},"path":"src/controllers/users.rs","line":12,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":953},"to":{"change":4,"start":953,"end":1041},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1041},"to":{"change":2,"start":419,"end":490},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":490},"to":{"change":4,"start":1110,"end":1129},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1110},"to":{"change":4,"start":1110,"end":1129},"introduced_by":4}],"inode":{"change":4,"pos":33}}},"contents":[{"Del":{"text":" match User::find(db, some_id).await {","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:998"}},{"Del":{"text":" Ok(u) => Outcome::Success(u),","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:1040"}},{"Del":{"text":" Err(_e) => Outcome::Forward(()), // TODO this is a failure","pos":"Y52KSJEFIX7KIL3MWH65WKHKXIX34T3VUSBVH2SBJ4ZJHM767J4AC:489"}},{"Del":{"text":" }","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:1119"}},{"Del":{"text":" }","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:1125"}},{"Del":{"text":"}","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:1127"}},{"Del":{"text":"","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:1128"}}]}},{"Edit":{"inode":{"change":4,"pos":33},"path":"src/controllers/users.rs","line":110,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3958},"to":{"change":4,"start":3958,"end":4157},"introduced_by":4}],"inode":{"change":4,"pos":33}}},"contents":[{"Del":{"text":"fn get_user_id_from_cookie(jar: &CookieJar) -> Option {","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:4018"}},{"Del":{"text":" match jar.get_private(COOKIE_USER_ID_KEY) {","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:4066"}},{"Del":{"text":" Some(id) => Some(id.value().parse::().ok()?),","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:4125"}},{"Del":{"text":" None => None,","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:4147"}},{"Del":{"text":" }","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:4153"}},{"Del":{"text":"}","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:4155"}},{"Del":{"text":"","pos":"RJ75MX6YMJSXYKW2YK6ZJNG2SQMPCPKICMESMC4ZD4EB2SCVJ2KAC:4156"}}]}}],"owner":"zj","repo":"nidobyte","token":"et/z12sY5KEwSwpTdz/lxR+EEfSD15tXuxo8mvJIOGE=","login":null}

…

Dependencies

Change contents

Review