Data extensions updates

1 files changed, 13 insertions, 23 deletions

diff --git a/Libs/VNLib.Plugins.Essentials.Oauth/src/Tokens/TokenStore.cs b/Libs/VNLib.Plugins.Essentials.Oauth/src/Tokens/TokenStore.cs
index f160a79..7b07f46 100644
--- a/Libs/VNLib.Plugins.Essentials.Oauth/src/Tokens/TokenStore.cs
+++ b/Libs/VNLib.Plugins.Essentials.Oauth/src/Tokens/TokenStore.cs
@@ -92,20 +92,11 @@ namespace VNLib.Plugins.Essentials.Oauth.Tokens
                 Created = now,
                 LastModified = now,
             };
+
             //Add token to store
-            ctx.OAuthTokens.Add(newToken);
-            //commit changes
-            ERRNO result = await ctx.SaveChangesAsync(cancellation);
-            if (result)
-            {
-                //End transaction
-                await ctx.CommitTransactionAsync(cancellation);
-            }
-            else
-            {
-                await ctx.RollbackTransctionAsync(cancellation);
-            }
-            return result;
+            ctx.Add(newToken);
+
+            return await ctx.SaveAndCloseAsync(true, cancellation);
         }
 
         /// <summary>
@@ -128,11 +119,11 @@ namespace VNLib.Plugins.Essentials.Oauth.Tokens
                 return;
             }
             //delete token
-            ctx.OAuthTokens.Remove(at);
+            ctx.Remove(at);
             //Save changes
-            await ctx.SaveChangesAsync(cancellation);
-            await ctx.CommitTransactionAsync(cancellation);
+            await ctx.SaveAndCloseAsync(true, cancellation);
         }
+
         /// <summary>
         /// Removes all token entires that were created before the specified time
         /// </summary>
@@ -150,12 +141,12 @@ namespace VNLib.Plugins.Essentials.Oauth.Tokens
                                     .ToArrayAsync(cancellation);
            
             //delete token
-            ctx.OAuthTokens.RemoveRange(at);
+            ctx.RemoveRange(at);
             //Save changes
-            int count = await ctx.SaveChangesAsync(cancellation);
-            await ctx.CommitTransactionAsync(cancellation);
+            await ctx.SaveAndCloseAsync(true, cancellation);
             return at;
         }       
+
         ///<inheritdoc/>
         public async Task RevokeTokensAsync(IReadOnlyCollection<string> tokens, CancellationToken cancellation = default)
         {
@@ -170,9 +161,9 @@ namespace VNLib.Plugins.Essentials.Oauth.Tokens
             //delete token
             ctx.OAuthTokens.RemoveRange(at);
             //Save changes
-            await ctx.SaveChangesAsync(cancellation);
-            await ctx.CommitTransactionAsync(cancellation);
+            await ctx.SaveAndCloseAsync(true, cancellation);
         }
+
         ///<inheritdoc/>
         async Task ITokenManager.RevokeTokensForAppAsync(string appId, CancellationToken cancellation)
         {
@@ -190,8 +181,7 @@ namespace VNLib.Plugins.Essentials.Oauth.Tokens
                 t.Created = DateTime.MinValue;
             }
             //Save changes
-            await ctx.SaveChangesAsync(cancellation);
-            await ctx.CommitTransactionAsync(cancellation);
+            await ctx.SaveAndCloseAsync(true, cancellation);
         }
     }
 }