controllers::util: Move User::find() calls into the condition branches

This allows us to give more precise error messages and enables further simplification

Author: Turbo87

src/controllers/util.rs

@@ -62,8 +62,11 @@ fn authenticate_user(req: &dyn RequestExt) -> AppResult<AuthenticatedUser> {
     let session = req.session();
     let user_id_from_session = session.get("user_id").and_then(|s| s.parse::<i32>().ok());
 
-    let (user_id, token_id) = if let Some(id) = user_id_from_session {
-        (id, None)
+    let (user, token_id) = if let Some(id) = user_id_from_session {
+        let user = User::find(&conn, id)
+            .chain_error(|| internal("user_id from cookie not found in database"))?;
+
+        (user, None)
     } else {
         // Otherwise, look for an `Authorization` header on the request
         let maybe_authorization = req
@@ -80,16 +83,16 @@ fn authenticate_user(req: &dyn RequestExt) -> AppResult<AuthenticatedUser> {
                 }
             })?;
 
-            (token.user_id, Some(token.id))
+            let user = User::find(&conn, token.user_id)
+                .chain_error(|| internal("user_id from token not found in database"))?;
+
+            (user, Some(token.id))
         } else {
             // Unable to authenticate the user
             return Err(internal("no cookie session or auth header found")).chain_error(forbidden);
         }
     };
 
-    let user = User::find(&conn, user_id)
-        .chain_error(|| internal("user_id from cookie or token not found in database"))?;
-
     Ok(AuthenticatedUser { user, token_id })
 }
 

src/tests/authentication.rs

@@ -8,7 +8,7 @@ static URL: &str = "/api/v1/me/updates";
 static MUST_LOGIN: &[u8] =
     b"{\"errors\":[{\"detail\":\"must be logged in to perform that action\"}]}";
 static INTERNAL_ERROR_NO_USER: &str =
-    "user_id from cookie or token not found in database caused by NotFound";
+    "user_id from cookie not found in database caused by NotFound";
 
 fn call(app: &TestApp, mut request: MockRequest) -> HandlerResult {
     app.as_middleware().call(&mut request)