vw_small

commit db710bb93165e230d8a77a36a9432dcd1ffec8ad
parent 9824d94a1cc039d1e0ac62301abf0b6fbb148709
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Tue,  8 Dec 2020 15:31:25 +0100

Merge pull request #1245 from janost/user-last-login

Show last active it on admin users page
Diffstat:
M
src/api/admin.rs
 | 
5
+++++
M
src/db/models/device.rs
 | 
11
+++++++++++
M
src/db/models/user.rs
 | 
7
+++++++
M
src/static/templates/admin/users.hbs
 | 
2
++

4 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/api/admin.rs b/src/api/admin.rs
@@ -297,6 +297,11 @@ fn users_overview(_token: AdminToken, conn: DbConn) -> ApiResult<Html<String>> {
             usr["cipher_count"] = json!(Cipher::count_owned_by_user(&u.uuid, &conn));
             usr["attachment_count"] = json!(Attachment::count_by_user(&u.uuid, &conn));
             usr["attachment_size"] = json!(get_display_size(Attachment::size_by_user(&u.uuid, &conn) as i32));
+            usr["created_at"] = json!(&u.created_at.format("%Y-%m-%d %H:%M:%S").to_string());
+            usr["last_active"] = match u.last_active(&conn) {
+                Some(timestamp) => json!(timestamp.format("%Y-%m-%d %H:%M:%S").to_string()),
+                None => json!("Never")
+            };
             usr
     }).collect();
 
diff --git a/src/db/models/device.rs b/src/db/models/device.rs
@@ -178,4 +178,15 @@ impl Device {
                 .from_db()
         }}
     }
+
+    pub fn find_latest_active_by_user(user_uuid: &str, conn: &DbConn) -> Option<Self> {
+        db_run! { conn: {
+            devices::table
+                .filter(devices::user_uuid.eq(user_uuid))
+                .order(devices::updated_at.desc())
+                .first::<DeviceDb>(conn)
+                .ok()
+                .from_db()
+        }}
+    }
 }
diff --git a/src/db/models/user.rs b/src/db/models/user.rs
@@ -288,6 +288,13 @@ impl User {
             users::table.load::<UserDb>(conn).expect("Error loading users").from_db()
         }}
     }
+
+    pub fn last_active(&self, conn: &DbConn) -> Option<NaiveDateTime> {
+        match Device::find_latest_active_by_user(&self.uuid, conn) {
+            Some(device) => Some(device.updated_at),
+            None => None
+        }        
+    }
 }
 
 impl Invitation {
diff --git a/src/static/templates/admin/users.hbs b/src/static/templates/admin/users.hbs
@@ -21,6 +21,8 @@
                             <div class="float-left">
                                 <strong>{{Name}}</strong>
                                 <span class="d-block">{{Email}}</span>
+                                <span class="d-block">Created at: {{created_at}}</span>
+                                <span class="d-block">Last active: {{last_active}}</span>
                                 <span class="d-block">
                                     {{#if TwoFactorEnabled}}
                                         <span class="badge badge-success mr-2" title="2FA is enabled">2FA</span>