cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feat/share-folder-browsing

Browse Source 
# Conflicts:
#	static/js/views/public/publicShare.js
This commit is contained in:
abnvle
2026-05-10 20:46:29 +02:00
parent ec55e7ec55 52f4a865a9
commit e8399443e9
51 changed files with 554 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/infrastructure/repositories/pg/favorites_pg_repository.rs
+9 -1
View File
@@ -33,10 +33,17 @@ impl FavoritesRepositoryPort for FavoritesPgRepository {
f.size AS "item_size",
f.mime_type AS "item_mime_type",
COALESCE(f.folder_id::TEXT, fld.parent_id::TEXT) AS "parent_id",
COALESCE(f.updated_at, fld.updated_at) AS "modified_at"
COALESCE(f.updated_at, fld.updated_at) AS "modified_at",
CASE
WHEN uf.item_type = 'folder' THEN fld.path
WHEN uf.item_type = 'file' THEN COALESCE(pfld.path || '/' || f.name, f.name)
ELSE NULL
END AS "item_path"
FROM auth.user_favorites uf
LEFT JOIN storage.files f ON uf.item_type = 'file'
AND f.id = uf.item_id::UUID
LEFT JOIN storage.folders pfld ON uf.item_type = 'file'
AND pfld.id = f.folder_id
LEFT JOIN storage.folders fld ON uf.item_type = 'folder'
AND fld.id = uf.item_id::UUID
WHERE uf.user_id = $1
@@ -70,6 +77,7 @@ impl FavoritesRepositoryPort for FavoritesPgRepository {
item_mime_type: row.try_get("item_mime_type").ok(),
parent_id: row.try_get("parent_id").ok(),
modified_at: row.try_get("modified_at").ok(),
item_path: row.try_get("item_path").ok(),
// Temporary defaults; with_display_fields() computes the real values
icon_class: String::new(),
icon_special_class: String::new(),
src/infrastructure/repositories/pg/recent_items_pg_repository.rs
+9 -1
View File
@@ -31,10 +31,17 @@ impl RecentItemsRepositoryPort for RecentItemsPgRepository {
COALESCE(f.name, fld.name) AS "item_name",
f.size AS "item_size",
f.mime_type AS "item_mime_type",
COALESCE(f.folder_id::TEXT, fld.parent_id::TEXT) AS "parent_id"
COALESCE(f.folder_id::TEXT, fld.parent_id::TEXT) AS "parent_id",
CASE
WHEN ur.item_type = 'folder' THEN fld.path
WHEN ur.item_type = 'file' THEN COALESCE(pfld.path || '/' || f.name, f.name)
ELSE NULL
END AS "item_path"
FROM auth.user_recent_files ur
LEFT JOIN storage.files f ON ur.item_type = 'file'
AND f.id = ur.item_id::UUID
LEFT JOIN storage.folders pfld ON ur.item_type = 'file'
AND pfld.id = f.folder_id
LEFT JOIN storage.folders fld ON ur.item_type = 'folder'
AND fld.id = ur.item_id::UUID
WHERE ur.user_id = $1
@@ -68,6 +75,7 @@ impl RecentItemsRepositoryPort for RecentItemsPgRepository {
item_size: row.try_get("item_size").ok(),
item_mime_type: row.try_get("item_mime_type").ok(),
parent_id: row.try_get("parent_id").ok(),
item_path: row.try_get("item_path").ok(),
// Temporary defaults; with_display_fields() computes the real values
icon_class: String::new(),
icon_special_class: String::new(),
src/infrastructure/repositories/pg/session_pg_repository.rs
+49 -13
View File
@@ -51,10 +51,10 @@ impl SessionRepository for SessionPgRepository {
sqlx::query(
r#"
INSERT INTO auth.sessions (
id, user_id, refresh_token, expires_at,
ip_address, user_agent, created_at, revoked
id, user_id, refresh_token, expires_at,
ip_address, user_agent, created_at, revoked, family_id
) VALUES (
$1, $2, $3, $4, $5, $6, $7, $8
$1, $2, $3, $4, $5, $6, $7, $8, $9
)
"#,
)
@@ -66,6 +66,7 @@ impl SessionRepository for SessionPgRepository {
.bind(session_clone.user_agent())
.bind(session_clone.created_at())
.bind(session_clone.is_revoked())
.bind(session_clone.family_id())
.execute(&mut **tx)
.await
.map_err(Self::map_sqlx_error)?;
@@ -108,9 +109,9 @@ impl SessionRepository for SessionPgRepository {
async fn get_session_by_id(&self, id: Uuid) -> SessionRepositoryResult<Session> {
let row = sqlx::query(
r#"
SELECT
id, user_id, refresh_token, expires_at,
ip_address, user_agent, created_at, revoked
SELECT
id, user_id, refresh_token, expires_at,
ip_address, user_agent, created_at, revoked, family_id
FROM auth.sessions
WHERE id = $1
"#,
@@ -129,19 +130,21 @@ impl SessionRepository for SessionPgRepository {
row.get("user_agent"),
row.get("created_at"),
row.get("revoked"),
row.get("family_id"),
))
}
/// Gets a session by refresh token
/// Gets a session by refresh token — returns revoked sessions too so the
/// application layer can distinguish "not found" from "replayed revoked token".
async fn get_session_by_refresh_token(
&self,
refresh_token: &str,
) -> SessionRepositoryResult<Session> {
let row = sqlx::query(
r#"
SELECT
id, user_id, refresh_token, expires_at,
ip_address, user_agent, created_at, revoked
SELECT
id, user_id, refresh_token, expires_at,
ip_address, user_agent, created_at, revoked, family_id
FROM auth.sessions
WHERE refresh_token = $1
"#,
@@ -160,6 +163,7 @@ impl SessionRepository for SessionPgRepository {
row.get("user_agent"),
row.get("created_at"),
row.get("revoked"),
row.get("family_id"),
))
}
@@ -170,9 +174,9 @@ impl SessionRepository for SessionPgRepository {
) -> SessionRepositoryResult<Vec<Session>> {
let rows = sqlx::query(
r#"
SELECT
id, user_id, refresh_token, expires_at,
ip_address, user_agent, created_at, revoked
SELECT
id, user_id, refresh_token, expires_at,
ip_address, user_agent, created_at, revoked, family_id
FROM auth.sessions
WHERE user_id = $1
ORDER BY created_at DESC
@@ -195,6 +199,7 @@ impl SessionRepository for SessionPgRepository {
row.get("user_agent"),
row.get("created_at"),
row.get("revoked"),
row.get("family_id"),
)
})
.collect();
@@ -270,6 +275,31 @@ impl SessionRepository for SessionPgRepository {
.await
}
/// Revokes all sessions in a token family (theft response)
async fn revoke_session_family(&self, family_id: Uuid) -> SessionRepositoryResult<u64> {
let result = sqlx::query(
r#"
UPDATE auth.sessions
SET revoked = true
WHERE family_id = $1 AND revoked = false
"#,
)
.bind(family_id)
.execute(&*self.pool)
.await
.map_err(Self::map_sqlx_error)?;
let affected = result.rows_affected();
if affected > 0 {
tracing::warn!(
"Token reuse detected: revoked {} session(s) in family {}",
affected,
family_id
);
}
Ok(affected)
}
/// Deletes expired sessions
async fn delete_expired_sessions(&self) -> SessionRepositoryResult<u64> {
let now = Utc::now();
@@ -317,4 +347,10 @@ impl SessionStoragePort for SessionPgRepository {
.await
.map_err(DomainError::from)
}
async fn revoke_session_family(&self, family_id: Uuid) -> Result<u64, DomainError> {
SessionRepository::revoke_session_family(self, family_id)
.await
.map_err(DomainError::from)
}
}