From e7e60ef37c6596015c0881a3ebef6e0c8284ab71 Mon Sep 17 00:00:00 2001 From: augustuswm Date: Fri, 20 Mar 2026 12:36:35 -0500 Subject: [PATCH 1/3] Do not include deleted values to store outputs --- v-model/src/storage/postgres.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/v-model/src/storage/postgres.rs b/v-model/src/storage/postgres.rs index 5b1bbce..2c1e88d 100644 --- a/v-model/src/storage/postgres.rs +++ b/v-model/src/storage/postgres.rs @@ -836,12 +836,18 @@ impl OAuthClientStore for PostgresStore { Vec::::new(), )); + // Only include secrets that have not been deleted if let Some(secret) = secret { - value.1.push(secret.into()); + if secret.deleted_at.is_none() { + value.1.push(secret.into()); + } } + // Only include redirect URIs that have not been deleted if let Some(redirect) = redirect { - value.2.push(redirect.into()); + if redirect.deleted_at.is_none() { + value.2.push(redirect.into()); + } } clients From 4b9aac96f43790d82072eb278919a088c2844b5e Mon Sep 17 00:00:00 2001 From: augustuswm Date: Fri, 20 Mar 2026 12:39:32 -0500 Subject: [PATCH 2/3] Omit from magic link store similarly --- v-model/src/storage/postgres.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/v-model/src/storage/postgres.rs b/v-model/src/storage/postgres.rs index 2c1e88d..1fecf3a 100644 --- a/v-model/src/storage/postgres.rs +++ b/v-model/src/storage/postgres.rs @@ -1015,12 +1015,16 @@ impl MagicLinkStore for PostgresStore { ); } + // Deleted secrets are not included in the results if let Some(signature) = signature { - query = query.filter(magic_link_client_secret::secret_signature.eq_any(signature)); + query = query.filter(magic_link_client_secret::secret_signature.eq_any(signature)) + .filter(magic_link_client_secret::deleted_at.is_null()); } + // Deleted redirect URIs are not included in the results if let Some(redirect_uri) = redirect_uri { - query = query.filter(magic_link_client_redirect_uri::redirect_uri.eq_any(redirect_uri)); + query = query.filter(magic_link_client_redirect_uri::redirect_uri.eq_any(redirect_uri)) + .filter(magic_link_client_redirect_uri::deleted_at.is_null()); } if !deleted { From 9c434b5b1e56e9d91f8a92e832f04d1e659e0c74 Mon Sep 17 00:00:00 2001 From: augustuswm Date: Fri, 20 Mar 2026 12:57:21 -0500 Subject: [PATCH 3/3] Fmt --- v-model/src/storage/postgres.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/v-model/src/storage/postgres.rs b/v-model/src/storage/postgres.rs index 1fecf3a..4aea777 100644 --- a/v-model/src/storage/postgres.rs +++ b/v-model/src/storage/postgres.rs @@ -1017,13 +1017,15 @@ impl MagicLinkStore for PostgresStore { // Deleted secrets are not included in the results if let Some(signature) = signature { - query = query.filter(magic_link_client_secret::secret_signature.eq_any(signature)) + query = query + .filter(magic_link_client_secret::secret_signature.eq_any(signature)) .filter(magic_link_client_secret::deleted_at.is_null()); } // Deleted redirect URIs are not included in the results if let Some(redirect_uri) = redirect_uri { - query = query.filter(magic_link_client_redirect_uri::redirect_uri.eq_any(redirect_uri)) + query = query + .filter(magic_link_client_redirect_uri::redirect_uri.eq_any(redirect_uri)) .filter(magic_link_client_redirect_uri::deleted_at.is_null()); }