diff options
Diffstat (limited to 'plugins/VNLib.Plugins.Essentials.Accounts.Registration/src')
3 files changed, 11 insertions, 19 deletions
diff --git a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/Endpoints/RegistrationEntpoint.cs b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/Endpoints/RegistrationEntpoint.cs index 16114fe..1030c9b 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/Endpoints/RegistrationEntpoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/Endpoints/RegistrationEntpoint.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2023 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * Library: VNLib * Package: VNLib.Plugins.Essentials.Accounts.Registration @@ -220,7 +220,7 @@ namespace VNLib.Plugins.Essentials.Accounts.Registration.Endpoints Task delay = Task.Delay(200); //See if a user account already exists - using (IUser? user = await Users.GetUserFromEmailAsync(request.UserName!, entity.EventCancellation)) + using (IUser? user = await Users.GetUserFromUsernameAsync(request.UserName!, entity.EventCancellation)) { if (user != null) { diff --git a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/RegistrationContext.cs b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/RegistrationContext.cs index 3b50303..c19d163 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/RegistrationContext.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/RegistrationContext.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2023 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * Library: VNLib * Package: VNLib.Plugins.Essentials.Accounts.Registration @@ -30,7 +30,7 @@ using VNLib.Plugins.Essentials.Accounts.Registration.TokenRevocation; namespace VNLib.Plugins.Essentials.Accounts.Registration { - internal class RegistrationContext : TransactionalDbContext, IDbTableDefinition + internal class RegistrationContext : DBContextBase, IDbTableDefinition { public DbSet<RevokedToken> RevokedRegistrationTokens { get; set; } diff --git a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/TokenRevocation/RevokedTokenStore.cs b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/TokenRevocation/RevokedTokenStore.cs index 3a32db0..1a3e676 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/TokenRevocation/RevokedTokenStore.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/TokenRevocation/RevokedTokenStore.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2023 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * Library: VNLib * Package: VNLib.Plugins.Essentials.Accounts.Registration @@ -41,32 +41,30 @@ namespace VNLib.Plugins.Essentials.Accounts.Registration.TokenRevocation public async Task<bool> IsRevokedAsync(string token, CancellationToken cancellation) { await using RegistrationContext context = new (Options.Value); - await context.OpenTransactionAsync(cancellation); //Select any that match tokens bool any = await (from t in context.RevokedRegistrationTokens where t.Token == token - select t).AnyAsync(cancellation); + select t) + .AnyAsync(cancellation); - await context.CommitTransactionAsync(cancellation); + await context.SaveAndCloseAsync(true, cancellation); return any; } public async Task RevokeAsync(string token, CancellationToken cancellation) { await using RegistrationContext context = new (Options.Value); - await context.OpenTransactionAsync(cancellation); //Add to table - context.RevokedRegistrationTokens.Add(new RevokedToken() + context.RevokedRegistrationTokens.Add(new RevokedToken { Created = DateTime.UtcNow, Token = token }); //Save changes and commit transaction - await context.SaveChangesAsync(cancellation); - await context.CommitTransactionAsync(cancellation); + await context.SaveAndCloseAsync(true, cancellation); } /// <summary> @@ -80,21 +78,15 @@ namespace VNLib.Plugins.Essentials.Accounts.Registration.TokenRevocation DateTime expiredBefore = DateTime.UtcNow.Subtract(validFor); await using RegistrationContext context = new (Options.Value); - await context.OpenTransactionAsync(cancellation); //Select any that match tokens RevokedToken[] expired = await context.RevokedRegistrationTokens.Where(t => t.Created < expiredBefore) .Select(static t => t) .ToArrayAsync(cancellation); - context.RevokedRegistrationTokens.RemoveRange(expired); - ERRNO count =await context.SaveChangesAsync(cancellation); - - await context.CommitTransactionAsync(cancellation); - - return count; + return await context.SaveAndCloseAsync(true, cancellation); } } }
\ No newline at end of file |