From 96995bc06806a5f83f80637aa69c32a395e2fc41 Mon Sep 17 00:00:00 2001
From: realaravinth <realaravinth@batsense.net>
Date: Wed, 11 May 2022 20:11:02 +0530
Subject: [PATCH] feat: migrate get password to use db_* interface

---
 src/api/v1/account/delete.rs | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/api/v1/account/delete.rs b/src/api/v1/account/delete.rs
index fafb9480..7213b03f 100644
--- a/src/api/v1/account/delete.rs
+++ b/src/api/v1/account/delete.rs
@@ -32,30 +32,17 @@ pub async fn delete_account(
     data: AppData,
 ) -> ServiceResult<impl Responder> {
     use argon2_creds::Config;
-    use sqlx::Error::RowNotFound;
 
     let username = id.identity().unwrap();
 
-    let rec = sqlx::query_as!(
-        Password,
-        r#"SELECT password  FROM mcaptcha_users WHERE name = ($1)"#,
-        &username,
-    )
-    .fetch_one(&data.db)
-    .await;
+    let hash = data.dblib.get_password(&db_core::Login::Username(&username)).await?;
 
-    match rec {
-        Ok(s) => {
-            if Config::verify(&s.password, &payload.password)? {
-                runners::delete_user(&username, &data).await?;
-                id.forget();
-                Ok(HttpResponse::Ok())
-            } else {
-                Err(ServiceError::WrongPassword)
-            }
-        }
-        Err(RowNotFound) => Err(ServiceError::AccountNotFound),
-        Err(_) => Err(ServiceError::InternalServerError),
+    if Config::verify(&hash.hash, &payload.password)? {
+        runners::delete_user(&username, &data).await?;
+        id.forget();
+        Ok(HttpResponse::Ok())
+    } else {
+        Err(ServiceError::WrongPassword)
     }
 }