Merge pull request dani-garcia#3951 from teicee/last-active

Adds LastActive on /admin/users API route
ayamsecure · Oct 28, 2023 · 424fd9e · 424fd9e
2 parents 3bda8cf + 5f69436
commit 424fd9e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/api/admin.rs b/src/api/admin.rs
@@ -325,6 +325,10 @@ async fn get_users_json(_token: AdminToken, mut conn: DbConn) -> Json<Value> {
         let mut usr = u.to_json(&mut conn).await;
         usr["UserEnabled"] = json!(u.enabled);
         usr["CreatedAt"] = json!(format_naive_datetime_local(&u.created_at, DT_FMT));
+        usr["LastActive"] = match u.last_active(&mut conn).await {
+            Some(dt) => json!(format_naive_datetime_local(&dt, DT_FMT)),
+            None => json!(None::<String>),
+        };
         users_json.push(usr);
     }