Skip to content

Fix oauth setting revoke #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
augustuswm merged 3 commits into from
Mar 20, 2026
Merged

Fix oauth setting revoke #396

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7e60ef
Do not include deleted values to store outputs
augustuswm Mar 20, 2026
4b9aac9
Omit from magic link store similarly
augustuswm Mar 20, 2026
9c434b5
Fmt
augustuswm Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions v-model/src/storage/postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,12 +836,18 @@ impl OAuthClientStore for PostgresStore {
Vec::<OAuthClientRedirectUri>::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
Expand Down Expand Up @@ -1009,12 +1015,18 @@ 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 {
Expand Down
Loading