controllers::util: Move return statements into the condition branches

Author: Turbo87

src/controllers/util.rs

@@ -62,11 +62,14 @@ 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, token_id) = if let Some(id) = user_id_from_session {
+    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)
+        return Ok(AuthenticatedUser {
+            user,
+            token_id: None,
+        });
     } else {
         // Otherwise, look for an `Authorization` header on the request
         let maybe_authorization = req
@@ -86,14 +89,15 @@ fn authenticate_user(req: &dyn RequestExt) -> AppResult<AuthenticatedUser> {
             let user = User::find(&conn, token.user_id)
                 .chain_error(|| internal("user_id from token not found in database"))?;
 
-            (user, Some(token.id))
+            return Ok(AuthenticatedUser {
+                user,
+                token_id: Some(token.id),
+            });
         } else {
             // Unable to authenticate the user
             return Err(internal("no cookie session or auth header found")).chain_error(forbidden);
         }
-    };
-
-    Ok(AuthenticatedUser { user, token_id })
+    }
 }
 
 impl<'a> UserAuthenticationExt for dyn RequestExt + 'a {