WIP

Nathan Sobo created 3 years ago

Change summary

crates/collab/src/api.rs | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)

Detailed changes

crates/collab/src/api.rs

@@ -82,24 +82,22 @@ async fn create_user(
     Json(params): Json<CreateUserParams>,
     Extension(app): Extension<Arc<AppState>>,
 ) -> Result<Json<User>> {
-    let user = if let Some(invite_code) = params.invite_code {
-        let user_id = app
-            .db
+    let user_id = if let Some(invite_code) = params.invite_code {
+        app.db
             .redeem_invite_code(&invite_code, &params.github_login)
             .await?
     } else {
-        let user_id = app
-            .db
+        app.db
             .create_user(&params.github_login, params.admin)
-            .await?;
-
-        let user = app
-            .db
-            .get_user_by_id(user_id)
             .await?
-            .ok_or_else(|| anyhow!("couldn't find the user we just created"))?
     };
 
+    let user = app
+        .db
+        .get_user_by_id(user_id)
+        .await?
+        .ok_or_else(|| anyhow!("couldn't find the user we just created"))?;
+
     Ok(Json(user))
 }