Make the last activity timestamp and IP available through the API

crates/data-model/src/compat/session.rs

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::net::IpAddr;
+
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 use ulid::Ulid;
@@ -80,6 +82,8 @@ pub struct CompatSession {
     pub device: Device,
     pub created_at: DateTime<Utc>,
     pub is_synapse_admin: bool,
+    pub last_active_at: Option<DateTime<Utc>>,
+    pub last_active_ip: Option<IpAddr>,
 }
 
 impl std::ops::Deref for CompatSession {

crates/data-model/src/oauth2/session.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::net::IpAddr;
 use chrono::{DateTime, Utc};
 use oauth2_types::scope::Scope;
 use serde::Serialize;
@@ -73,6 +74,8 @@ pub struct Session {
     pub user_session_id: Option<Ulid>,
     pub client_id: Ulid,
     pub scope: Scope,
+    pub last_active_at: Option<DateTime<Utc>>,
+    pub last_active_ip: Option<IpAddr>,
 }
 
 impl std::ops::Deref for Session {

crates/data-model/src/users.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::ops::Deref;
+use std::{net::IpAddr, ops::Deref};
 
 use chrono::{DateTime, Duration, Utc};
 use rand::{Rng, SeedableRng};
@@ -81,6 +81,8 @@ pub struct BrowserSession {
     pub created_at: DateTime<Utc>,
     pub finished_at: Option<DateTime<Utc>>,
     pub user_agent: Option<String>,
+    pub last_active_at: Option<DateTime<Utc>>,
+    pub last_active_ip: Option<IpAddr>,
 }
 
 impl BrowserSession {
@@ -101,6 +103,8 @@ impl BrowserSession {
                 created_at: now,
                 finished_at: None,
                 user_agent: Some("Mozilla/5.0".to_owned()),
+                last_active_at: Some(now),
+                last_active_ip: None,
             })
             .collect()
     }