user_sessions

backend/tests/auth_flow.rs

@@ -9,9 +9,9 @@ use papercrate::auth::passkeys::{
     PasskeyLoginFinishPayload, PasskeyLoginStartPayload, PasskeyRegistrationFinishPayload,
     RegistrationChallengeResponse,
 };
-use papercrate::models::{NewRefreshToken, NewUserMembership, TenantStatus, UserPasskey};
+use papercrate::models::{NewUserMembership, NewUserSession, TenantStatus, UserPasskey};
 use papercrate::openapi::schemas::PasskeySummary;
-use papercrate::schema::{refresh_tokens, tenants, user_memberships, users};
+use papercrate::schema::{tenants, user_memberships, user_sessions, users};
 use rand::rngs::OsRng;
 use rand::RngCore;
 use serde::Deserialize;
@@ -598,21 +598,21 @@ async fn login_with_session(
             .generate_token(user.id, tenant.id, &user.username)
             .map_err(|err| anyhow!(err))?;
 
-        let refresh_value = generate_refresh_token();
-        let refresh_hash = hash_refresh_token(&refresh_value);
+        let session_value = generate_session_token();
+        let session_hash = hash_session_token(&session_value);
         let refresh_expires_at = now + ChronoDuration::days(state.config.refresh_token_expiry_days);
 
-        let new_refresh = NewRefreshToken {
+        let new_session = NewUserSession {
             id: Uuid::new_v4(),
             user_id: user.id,
-            token_hash: refresh_hash,
+            token_hash: session_hash,
             issued_at: now.naive_utc(),
             expires_at: refresh_expires_at.naive_utc(),
             tenant_id: tenant.id,
         };
 
-        diesel::insert_into(refresh_tokens::table)
-            .values(&new_refresh)
+        diesel::insert_into(user_sessions::table)
+            .values(&new_session)
             .execute(conn)?;
 
         let login = LoginResponse {
@@ -623,7 +623,7 @@ async fn login_with_session(
             },
         };
 
-        let cookie = format!("refresh_token={refresh_value}");
+        let cookie = format!("refresh_token={session_value}");
         Ok((login, cookie))
     })
     .await
@@ -643,13 +643,13 @@ fn extract_refresh_cookie(headers: &axum::http::HeaderMap) -> Result<String> {
     Ok(cookie)
 }
 
-fn generate_refresh_token() -> String {
+fn generate_session_token() -> String {
     let mut bytes = [0u8; 32];
     OsRng.fill_bytes(&mut bytes);
     hex::encode(bytes)
 }
 
-fn hash_refresh_token(value: &str) -> String {
+fn hash_session_token(value: &str) -> String {
     let mut hasher = Sha256::new();
     hasher.update(value.as_bytes());
     hex::encode(hasher.finalize())

backend/tests/common/mod.rs

@@ -20,11 +20,11 @@ use papercrate::auth::jwt::JwtService;
 use papercrate::config::AppConfig;
 use papercrate::db::{self, PgPool};
 use papercrate::models::{
-    Job, NewRefreshToken, NewUser, NewUserMembership, NewUserPasskey, Tenant, TenantStatus, User,
+    Job, NewUser, NewUserMembership, NewUserPasskey, NewUserSession, Tenant, TenantStatus, User,
     UserMembership,
 };
 use papercrate::routes;
-use papercrate::schema::refresh_tokens::dsl as refresh_dsl;
+use papercrate::schema::user_sessions::dsl as session_dsl;
 use papercrate::state::AppState;
 use papercrate::storage::ObjectStorage;
 use rand::rngs::OsRng;
@@ -359,25 +359,25 @@ impl TestApp {
                 .generate_token(user.id, tenant.id, &user.username)
                 .map_err(|err| anyhow!(err))?;
 
-            let refresh_value = generate_refresh_token();
-            let refresh_hash = hash_refresh_token(&refresh_value);
+            let session_value = generate_session_token();
+            let session_hash = hash_session_token(&session_value);
             let refresh_expires_at =
                 now + ChronoDuration::days(state.config.refresh_token_expiry_days);
 
-            let new_refresh = NewRefreshToken {
+            let new_session = NewUserSession {
                 id: Uuid::new_v4(),
                 user_id: user.id,
-                token_hash: refresh_hash,
+                token_hash: session_hash,
                 issued_at: now.naive_utc(),
                 expires_at: refresh_expires_at.naive_utc(),
                 tenant_id: tenant.id,
             };
 
-            diesel::insert_into(refresh_dsl::refresh_tokens)
-                .values(&new_refresh)
+            diesel::insert_into(session_dsl::user_sessions)
+                .values(&new_session)
                 .execute(conn)?;
 
-            let cookie = format!("refresh_token={refresh_value}");
+            let cookie = format!("refresh_token={session_value}");
             Ok((access_token, cookie, tenant.id))
         })
         .await
@@ -787,7 +787,7 @@ fn truncate_all(conn: &mut PgConnection) -> Result<()> {
             tenant.documents, \
             tenant.folders, \
             shared.jobs, \
-            tenant.refresh_tokens, \
+            tenant.user_sessions, \
             tenant.tags, \
             tenant.api_tokens, \
             shared.webauthn_challenges, \
@@ -802,13 +802,13 @@ fn truncate_all(conn: &mut PgConnection) -> Result<()> {
     Ok(())
 }
 
-fn generate_refresh_token() -> String {
+fn generate_session_token() -> String {
     let mut bytes = [0u8; 32];
     OsRng.fill_bytes(&mut bytes);
     hex::encode(bytes)
 }
 
-fn hash_refresh_token(value: &str) -> String {
+fn hash_session_token(value: &str) -> String {
     let mut hasher = Sha256::new();
     hasher.update(value.as_bytes());
     hex::encode(hasher.finalize())