dandri/matrix-authentication-service
1
0
Fork 0
mirror of https://github.com/element-hq/matrix-authentication-service.git synced 2026-08-28 22:58:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add comments for the filters

Browse Source
This commit is contained in:
Olivier 'reivilibre
2025-10-22 14:22:10 +01:00
parent 54c025f333
commit 80feaffe16
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/storage-pg/src/personal/session.rs
+9
View File
@@ -377,6 +377,9 @@ impl PersonalSessionRepository for PgPersonalSessionRepository<'_> {
.value(PersonalSessions::RevokedAt, revoked_at)
.and_where(
Expr::col((PersonalSessions::Table, PersonalSessions::PersonalSessionId))
// Because filters apply to both the session and access token tables,
// Use a subquery to make it possible to use a JOIN
// onto the personal access token table.
.in_subquery(
Query::select()
.expr(Expr::col((
@@ -387,6 +390,7 @@ impl PersonalSessionRepository for PgPersonalSessionRepository<'_> {
.left_join(
PersonalAccessTokens::Table,
Cond::all()
// Match session ID
.add(
Expr::col((
PersonalSessions::Table,
@@ -397,6 +401,7 @@ impl PersonalSessionRepository for PgPersonalSessionRepository<'_> {
PersonalAccessTokens::PersonalSessionId,
))),
)
// Only choose the active access token for each session
.add(
Expr::col((
PersonalAccessTokens::Table,
@@ -495,6 +500,7 @@ impl PersonalSessionRepository for PgPersonalSessionRepository<'_> {
.left_join(
PersonalAccessTokens::Table,
Cond::all()
// Match session ID
.add(
Expr::col((PersonalSessions::Table, PersonalSessions::PersonalSessionId))
.eq(Expr::col((
@@ -502,6 +508,7 @@ impl PersonalSessionRepository for PgPersonalSessionRepository<'_> {
PersonalAccessTokens::PersonalSessionId,
))),
)
// Only choose the active access token for each session
.add(
Expr::col((PersonalAccessTokens::Table, PersonalAccessTokens::RevokedAt))
.is_null(),
@@ -539,6 +546,7 @@ impl PersonalSessionRepository for PgPersonalSessionRepository<'_> {
.left_join(
PersonalAccessTokens::Table,
Cond::all()
// Match session ID
.add(
Expr::col((PersonalSessions::Table, PersonalSessions::PersonalSessionId))
.eq(Expr::col((
@@ -546,6 +554,7 @@ impl PersonalSessionRepository for PgPersonalSessionRepository<'_> {
PersonalAccessTokens::PersonalSessionId,
))),
)
// Only choose the active access token for each session
.add(
Expr::col((PersonalAccessTokens::Table, PersonalAccessTokens::RevokedAt))
.is_null(),