Skip to content

Optimize token revocation process in EntityFramework stores #2360

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
merged 2 commits into from
Jul 5, 2025
Merged

Optimize token revocation process in EntityFramework stores #2360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38ec7a0
Optimize token revocation process in EntityFramework stores
syntaximus Jul 4, 2025
64770e2
Split where conditions onto separate lines
syntaximus Jul 5, 2025
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
3 changes: 3 additions & 0 deletions src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkTokenStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,7 @@ public virtual async ValueTask<long> RevokeByApplicationIdAsync(string identifie
.Include(token => token.Application)
.Include(token => token.Authorization)
where token.Application!.Id!.Equals(key)
where token.Status != Statuses.Revoked
select token).ToListAsync(cancellationToken))
{
token.Status = Statuses.Revoked;
Expand Down Expand Up @@ -802,6 +803,7 @@ public virtual async ValueTask<long> RevokeByAuthorizationIdAsync(string identif
.Include(token => token.Application)
.Include(token => token.Authorization)
where token.Authorization!.Id!.Equals(key)
where token.Status != Statuses.Revoked
select token).ToListAsync(cancellationToken))
{
token.Status = Statuses.Revoked;
Expand Down Expand Up @@ -851,6 +853,7 @@ public virtual async ValueTask<long> RevokeBySubjectAsync(string subject, Cancel
.Include(token => token.Application)
.Include(token => token.Authorization)
where token.Subject == subject
where token.Status != Statuses.Revoked
select token).ToListAsync(cancellationToken))
{
token.Status = Statuses.Revoked;
Expand Down
6 changes: 6 additions & 0 deletions src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreTokenStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,7 @@ public virtual async ValueTask<long> RevokeByApplicationIdAsync(string identifie
return await (
from token in context.Set<TToken>()
where token.Application!.Id!.Equals(key)
where token.Status != Statuses.Revoked
select token).ExecuteUpdateAsync(entity => entity.SetProperty(
token => token.Status, Statuses.Revoked), cancellationToken);

Expand All @@ -882,6 +883,7 @@ from token in context.Set<TToken>()
.AsTracking()
join application in context.Set<TApplication>().AsTracking() on token.Application!.Id equals application.Id
where application.Id!.Equals(key)
where token.Status != Statuses.Revoked
select token).ToListAsync(cancellationToken))
{
token.Status = Statuses.Revoked;
Expand Down Expand Up @@ -930,6 +932,7 @@ public virtual async ValueTask<long> RevokeByAuthorizationIdAsync(string identif
return await (
from token in context.Set<TToken>()
where token.Authorization!.Id!.Equals(key)
where token.Status != Statuses.Revoked
select token).ExecuteUpdateAsync(entity => entity.SetProperty(
token => token.Status, Statuses.Revoked), cancellationToken);

Expand All @@ -953,6 +956,7 @@ from token in context.Set<TToken>()
.AsTracking()
join authorization in context.Set<TAuthorization>().AsTracking() on token.Authorization!.Id equals authorization.Id
where authorization.Id!.Equals(key)
where token.Status != Statuses.Revoked
select token).ToListAsync(cancellationToken))
{
token.Status = Statuses.Revoked;
Expand Down Expand Up @@ -1000,6 +1004,7 @@ public virtual async ValueTask<long> RevokeBySubjectAsync(string subject, Cancel
return await (
from token in context.Set<TToken>()
where token.Subject == subject
where token.Status != Statuses.Revoked
select token).ExecuteUpdateAsync(entity => entity.SetProperty(
token => token.Status, Statuses.Revoked), cancellationToken);

Expand All @@ -1016,6 +1021,7 @@ from token in context.Set<TToken>()
.Include(token => token.Authorization)
.AsTracking()
where token.Subject == subject
where token.Status != Statuses.Revoked
select token).ToListAsync(cancellationToken))
{
token.Status = Statuses.Revoked;
Expand Down