From 418cbc9d3d76e65ae6c9bd3bde6fc0e4a1d0ca33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Sat, 10 Feb 2018 19:14:46 +0100
Subject: [PATCH] Introduce OpenIddictAuthorizationManager.PruneInvalidAsync()
 and OpenIddictTokenManager.PruneInvalidAsync()

---
 .../OpenIddictAuthorizationManager.cs         | 43 +++++++++++++++++++
 .../Managers/OpenIddictTokenManager.cs        | 43 +++++++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/src/OpenIddict.Core/Managers/OpenIddictAuthorizationManager.cs b/src/OpenIddict.Core/Managers/OpenIddictAuthorizationManager.cs
index 18be7633..71a2bf68 100644
--- a/src/OpenIddict.Core/Managers/OpenIddictAuthorizationManager.cs
+++ b/src/OpenIddict.Core/Managers/OpenIddictAuthorizationManager.cs
@@ -531,6 +531,49 @@ namespace OpenIddict.Core
             return Store.ListInvalidAsync(count, offset, cancellationToken);
         }
 
+        /// <summary>
+        /// Removes the ad-hoc authorizations that are marked as invalid or have no valid token attached.
+        /// </summary>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+        /// <returns>
+        /// A <see cref="Task"/> that can be used to monitor the asynchronous operation.
+        /// </returns>
+        public virtual async Task PruneInvalidAsync(CancellationToken cancellationToken = default)
+        {
+            ImmutableArray<TAuthorization> authorizations;
+
+            do
+            {
+                // Note: don't use an offset here, as the elements returned by this method
+                // are progressively removed from the database immediately after calling it.
+                authorizations = await ListInvalidAsync(100, 0, cancellationToken);
+
+                foreach (var authorization in authorizations)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    try
+                    {
+                        await DeleteAsync(authorization, cancellationToken);
+
+                        Logger.LogDebug("The authorization {AuthorizationId} was successfully removed from the database.",
+                            await GetIdAsync(authorization, cancellationToken));
+                    }
+
+                    catch (Exception exception)
+                    {
+                        Logger.LogDebug(exception,
+                            "An error occurred while removing the authorization {AuthorizationId} from the database.",
+                            await GetIdAsync(authorization, cancellationToken));
+                    }
+                }
+
+                cancellationToken.ThrowIfCancellationRequested();
+            }
+
+            while (!authorizations.IsDefaultOrEmpty);
+        }
+
         /// <summary>
         /// Revokes an authorization.
         /// </summary>
diff --git a/src/OpenIddict.Core/Managers/OpenIddictTokenManager.cs b/src/OpenIddict.Core/Managers/OpenIddictTokenManager.cs
index 36b3ae80..f0a52317 100644
--- a/src/OpenIddict.Core/Managers/OpenIddictTokenManager.cs
+++ b/src/OpenIddict.Core/Managers/OpenIddictTokenManager.cs
@@ -623,6 +623,49 @@ namespace OpenIddict.Core
             }
         }
 
+        /// <summary>
+        /// Removes the tokens that are marked as expired or invalid.
+        /// </summary>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/> that can be used to abort the operation.</param>
+        /// <returns>
+        /// A <see cref="Task"/> that can be used to monitor the asynchronous operation.
+        /// </returns>
+        public virtual async Task PruneInvalidAsync(CancellationToken cancellationToken = default)
+        {
+            ImmutableArray<TToken> tokens;
+
+            do
+            {
+                // Note: don't use an offset here, as the elements returned by this method
+                // are progressively removed from the database immediately after calling it.
+                tokens = await ListInvalidAsync(100, 0, cancellationToken);
+
+                foreach (var token in tokens)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    try
+                    {
+                        await DeleteAsync(token, cancellationToken);
+
+                        Logger.LogDebug("The token {TokenId} was successfully removed from the database.",
+                            await GetIdAsync(token, cancellationToken));
+                    }
+
+                    catch (Exception exception)
+                    {
+                        Logger.LogDebug(exception,
+                            "An error occurred while removing the token {TokenId} from the database.",
+                            await GetIdAsync(token, cancellationToken));
+                    }
+                }
+
+                cancellationToken.ThrowIfCancellationRequested();
+            }
+
+            while (!tokens.IsDefaultOrEmpty);
+        }
+
         /// <summary>
         /// Redeems a token.
         /// </summary>