logout

backend/src/routes/auth.rs

@@ -171,11 +171,13 @@ pub async fn logout(
     jar: Option<TypedHeader<Cookie>>,
 ) -> AppResult<(HeaderMap, StatusCode)> {
     let mut conn = state.db()?;
+    let now = Utc::now().naive_utc();
+    let mut rows_affected = 0;
+
     if let Some(cookies) = jar {
         if let Some(value) = cookies.get(REFRESH_COOKIE_NAME) {
             let hashed = hash_refresh_token(value);
-            let now = Utc::now().naive_utc();
-            let _ = diesel::update(
+            rows_affected = diesel::update(
                 refresh_dsl::refresh_tokens
                     .filter(refresh_dsl::token_hash.eq(hashed))
                     .filter(refresh_dsl::user_id.eq(user.user_id))
@@ -185,10 +187,24 @@ pub async fn logout(
                 refresh_dsl::revoked_at.eq(now),
                 refresh_dsl::updated_at.eq(now),
             ))
-            .execute(&mut conn);
+            .execute(&mut conn)
+            .unwrap_or(0);
         }
     }
 
+    if rows_affected == 0 {
+        let _ = diesel::update(
+            refresh_dsl::refresh_tokens
+                .filter(refresh_dsl::user_id.eq(user.user_id))
+                .filter(refresh_dsl::revoked_at.is_null()),
+        )
+        .set((
+            refresh_dsl::revoked_at.eq(now),
+            refresh_dsl::updated_at.eq(now),
+        ))
+        .execute(&mut conn);
+    }
+
     let mut headers = HeaderMap::new();
     headers.insert(SET_COOKIE, build_clear_refresh_cookie(&state));
     Ok((headers, StatusCode::NO_CONTENT))