fix delete passkey

nightly-labs · Sep 18, 2024 · 5fbf0a8 · 5fbf0a8
1 parent 555b7c5
commit 5fbf0a8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/sdk/packages/cloud/package.json b/sdk/packages/cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nightlylabs/nightly-cloud",
-  "version": "0.0.20",
+  "version": "0.0.24",
   "type": "module",
   "exports": {
     ".": {

diff --git a/sdk/packages/cloud/src/app.ts b/sdk/packages/cloud/src/app.ts
@@ -371,7 +371,7 @@ export class NightlyCloud {
   }
 
   deletePasskey = async (request: HttpDeletePasskeyRequest): Promise<void> => {
-    await this.sendPostJson('/reset_passkey_finish', EndpointType.Public, request)
+    await this.sendPostJson('/delete_passkey', EndpointType.Private, request)
   }
 
   addNewPasskeyStart = async (): Promise<HttpAddNewPasskeyStartResponse> => {

diff --git a/server/src/http/cloud/delete_passkey.rs b/server/src/http/cloud/delete_passkey.rs
@@ -29,7 +29,7 @@ pub async fn delete_passkey(
     State(sessions_cache): State<Arc<ApiSessionsCache>>,
     Extension(user_id): Extension<UserId>,
     Json(payload): Json<HttpDeletePasskeyRequest>,
-) -> Result<(), (StatusCode, String)> {
+) -> Result<Json<()>, (StatusCode, String)> {
     // Get cache data
     let sessions_key = SessionsCacheKey::Passkey2FA(user_id.clone()).to_string();
     let session_data = match sessions_cache.get(&sessions_key) {
@@ -64,10 +64,11 @@ pub async fn delete_passkey(
     let user_data = match db.get_user_by_user_id(&user_id).await {
         Ok(Some(user_data)) => user_data,
         Ok(None) => {
+            error!("User does not exists: user_id: {}", user_id);
             return Err((
                 StatusCode::BAD_REQUEST,
                 CloudApiErrors::UserDoesNotExist.to_string(),
-            ))
+            ));
         }
         Err(err) => {
             error!(
@@ -110,7 +111,7 @@ pub async fn delete_passkey(
     }
 
     // Update user passkeys in database
-    if let Err(err) = db.update_passkeys(&user_id, &passkeys).await {
+    if let Err(err) = db.update_passkeys(&user_data.email, &passkeys).await {
         error!(
             "Failed to update user passkeys: {:?}, user_id: {}",
             err, user_id
@@ -122,5 +123,5 @@ pub async fn delete_passkey(
         ));
     }
 
-    return Ok(());
+    return Ok(Json(()));
 }