Save last login timestamp for users and show it on admin page

migrations/mysql/2020-11-30-003510_add_last_login_users/up.sql

@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN last_login DATETIME DEFAULT NULL;

migrations/postgresql/2020-11-30-003510_add_last_login_users/up.sql

@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN last_login TIMESTAMP DEFAULT NULL;

migrations/sqlite/2020-11-30-003510_add_last_login_users/up.sql

@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN last_login DATETIME DEFAULT NULL;

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_login"] = match &u.last_login {
+                Some(val) => json!(val.format("%Y-%m-%d %H:%M:%S").to_string()),
+                None => json!("Never")
+            };            
             usr
     }).collect();
 

src/api/identity.rs

@@ -171,6 +171,12 @@ fn _password_login(data: ConnectData, conn: DbConn, ip: &ClientIp) -> JsonResult
         result["TwoFactorToken"] = Value::String(token);
     }
 
+    let mut user = user;
+    user.last_login = Some(now.naive_utc());
+    if let Err(e) = user.save(&conn) {
+        error!("Error updating user: {:#?}", e);
+    }
+
     info!("User {} logged in successfully. IP: {}", username, ip.ip);
     Ok(Json(result))
 }

src/db/models/user.rs

@@ -15,6 +15,7 @@ db_object! {
         pub updated_at: NaiveDateTime,
         pub verified_at: Option<NaiveDateTime>,
         pub last_verifying_at: Option<NaiveDateTime>,
+        pub last_login: Option<NaiveDateTime>,
         pub login_verify_count: i32,
 
         pub email: String,
@@ -74,6 +75,7 @@ impl User {
             updated_at: now,
             verified_at: None,
             last_verifying_at: None,
+            last_login: None,
             login_verify_count: 0,
             name: email.clone(),
             email,

src/db/schemas/mysql/schema.rs

@@ -120,6 +120,7 @@ table! {
         updated_at -> Datetime,
         verified_at -> Nullable<Datetime>,
         last_verifying_at -> Nullable<Datetime>,
+        last_login -> Nullable<Datetime>,
         login_verify_count -> Integer,
         email -> Text,
         email_new -> Nullable<Text>,

src/db/schemas/postgresql/schema.rs

@@ -120,6 +120,7 @@ table! {
         updated_at -> Timestamp,
         verified_at -> Nullable<Timestamp>,
         last_verifying_at -> Nullable<Timestamp>,
+        last_login -> Nullable<Timestamp>,
         login_verify_count -> Integer,
         email -> Text,
         email_new -> Nullable<Text>,

src/db/schemas/sqlite/schema.rs

@@ -120,6 +120,7 @@ table! {
         updated_at -> Timestamp,
         verified_at -> Nullable<Timestamp>,
         last_verifying_at -> Nullable<Timestamp>,
+        last_login -> Nullable<Timestamp>,
         login_verify_count -> Integer,
         email -> Text,
         email_new -> Nullable<Text>,

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 login: {{last_login}}</span>
                                 <span class="d-block">
                                     {{#if TwoFactorEnabled}}
                                         <span class="badge badge-success mr-2" title="2FA is enabled">2FA</span>