minor tweaks

src/auth.rs

@@ -18,7 +18,7 @@ pub fn hash(plaintext: &String) -> Result<String> {
 }
 
 pub fn verify(plaintext: &String, hash: &String) -> Result<bool> {
-    let parsed_hash = PasswordHash::new(&hash).map_err(|err| anyhow!(err))?;
+    let parsed_hash = PasswordHash::new(hash).map_err(|err| anyhow!(err))?;
     Ok(Argon2::default()
         .verify_password(plaintext.as_bytes(), &parsed_hash)
         .is_ok())

src/main.rs

@@ -59,9 +59,6 @@ async fn main() -> Result<()> {
 
     let addr: SocketAddr = config.bind.parse()?;
     tracing::debug!("listening on {}", addr);
-    Server::bind(&addr)
+    Server::bind(&addr).serve(app.into_make_service()).await?;
-        .serve(app.into_make_service())
-        .await
-        .unwrap();
     Ok(())
 }

src/routes/admin.rs

@@ -19,18 +19,18 @@ pub async fn bootstrap(State(state): State<Arc<AppState>>) -> Result<Json<Value>
     .fetch_one(&state.database)
     .await?;
 
-    match empty {
+    if empty {
-        false => Err(AppError::ClientError {
+        return Err(AppError::ClientError {
             status: StatusCode::BAD_REQUEST,
             code: "already-setup".to_string(),
             message: "The instance was already bootstrapped".to_string(),
-        }),
+        });
-        true => {
+    }
-            //todo add user
-            let username = "admin";
-            let password = random();
 
-            sqlx::query!(
+    let username = "admin";
+    let password = random();
+
+    sqlx::query!(
                 r#"INSERT INTO users ( name, display_name, password, roles ) VALUES ( $1, $2, $3, $4 ) RETURNING id"#,
                 username,
                 "Administrator",
@@ -40,7 +40,5 @@ pub async fn bootstrap(State(state): State<Arc<AppState>>) -> Result<Json<Value>
             .fetch_one(&state.database)
             .await?;
 
-            Ok(Json(json!({"username": username, "password": password})))
+    Ok(Json(json!({"username": username, "password": password})))
-        }
-    }
 }