diff options
5 files changed, 13 insertions, 10 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 2172760..16114fe 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/Endpoints/RegistrationEntpoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/Endpoints/RegistrationEntpoint.cs @@ -87,7 +87,7 @@ namespace VNLib.Plugins.Essentials.Accounts.Registration.Endpoints Users = plugin.GetOrCreateSingleton<UserManager>(); Emails = plugin.GetOrCreateSingleton<TEmailConfig>(); - RevokedTokens = new(plugin.GetContextOptions()); + RevokedTokens = new(plugin.GetContextOptionsAsync()); //Begin the async op to get the signature key from the vault RegSignatureKey = plugin.GetSecretAsync("reg_sig_key") 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 4383a85..3a32db0 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/TokenRevocation/RevokedTokenStore.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/TokenRevocation/RevokedTokenStore.cs @@ -25,21 +25,22 @@ using Microsoft.EntityFrameworkCore; using VNLib.Utils; +using VNLib.Plugins.Extensions.Loading; namespace VNLib.Plugins.Essentials.Accounts.Registration.TokenRevocation { internal class RevokedTokenStore { - private readonly DbContextOptions Options; + private readonly IAsyncLazy<DbContextOptions> Options; - public RevokedTokenStore(DbContextOptions options) + public RevokedTokenStore(IAsyncLazy<DbContextOptions> options) { Options = options; } public async Task<bool> IsRevokedAsync(string token, CancellationToken cancellation) { - await using RegistrationContext context = new (Options); + await using RegistrationContext context = new (Options.Value); await context.OpenTransactionAsync(cancellation); //Select any that match tokens @@ -53,7 +54,7 @@ namespace VNLib.Plugins.Essentials.Accounts.Registration.TokenRevocation public async Task RevokeAsync(string token, CancellationToken cancellation) { - await using RegistrationContext context = new (Options); + await using RegistrationContext context = new (Options.Value); await context.OpenTransactionAsync(cancellation); //Add to table @@ -78,7 +79,7 @@ namespace VNLib.Plugins.Essentials.Accounts.Registration.TokenRevocation { DateTime expiredBefore = DateTime.UtcNow.Subtract(validFor); - await using RegistrationContext context = new (Options); + await using RegistrationContext context = new (Options.Value); await context.OpenTransactionAsync(cancellation); //Select any that match tokens diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs b/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs index d524902..d875def 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs @@ -29,6 +29,7 @@ using System.ComponentModel.Design; using FluentValidation.Results; using VNLib.Utils; +using VNLib.Utils.Memory; using VNLib.Utils.Logging; using VNLib.Plugins.Attributes; using VNLib.Plugins.Essentials.Users; @@ -39,7 +40,6 @@ using VNLib.Plugins.Essentials.Accounts.SecurityProvider; using VNLib.Plugins.Extensions.Loading; using VNLib.Plugins.Extensions.Loading.Users; using VNLib.Plugins.Extensions.Loading.Routing; -using VNLib.Utils.Memory; namespace VNLib.Plugins.Essentials.Accounts { diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/VNLib.Plugins.Essentials.Accounts.csproj b/plugins/VNLib.Plugins.Essentials.Accounts/src/VNLib.Plugins.Essentials.Accounts.csproj index d9fcd08..9a85502 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts/src/VNLib.Plugins.Essentials.Accounts.csproj +++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/VNLib.Plugins.Essentials.Accounts.csproj @@ -7,6 +7,7 @@ <AssemblyName>Essentials.Accounts</AssemblyName> <AnalysisLevel>latest-all</AnalysisLevel> <NeutralLanguage>en-US</NeutralLanguage> + <GenerateDocumentationFile>true</GenerateDocumentationFile> <!--Enable dynamic loading--> <EnableDynamicLoading>true</EnableDynamicLoading> </PropertyGroup> diff --git a/plugins/VNLib.Plugins.Essentials.Content.Routing/src/Model/DbRouteStore.cs b/plugins/VNLib.Plugins.Essentials.Content.Routing/src/Model/DbRouteStore.cs index b90ee65..b7f64e2 100644 --- a/plugins/VNLib.Plugins.Essentials.Content.Routing/src/Model/DbRouteStore.cs +++ b/plugins/VNLib.Plugins.Essentials.Content.Routing/src/Model/DbRouteStore.cs @@ -31,6 +31,7 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using VNLib.Plugins.Extensions.Data; +using VNLib.Plugins.Extensions.Loading; using VNLib.Plugins.Extensions.Loading.Sql; using VNLib.Plugins.Extensions.Data.Abstractions; using VNLib.Plugins.Extensions.Data.Extensions; @@ -39,14 +40,14 @@ namespace VNLib.Plugins.Essentials.Content.Routing.Model { internal sealed class DbRouteStore : DbStore<Route>, IRouteStore { - private readonly DbContextOptions Options; + private readonly IAsyncLazy<DbContextOptions> Options; public override IDbQueryLookup<Route> QueryTable { get; } = new DbQueries(); public DbRouteStore(PluginBase plugin) { //Load the db context options - Options = plugin.GetContextOptions(); + Options = plugin.GetContextOptionsAsync(); } ///<inheritdoc/> @@ -60,7 +61,7 @@ namespace VNLib.Plugins.Essentials.Content.Routing.Model public override string GetNewRecordId() => Guid.NewGuid().ToString("N"); ///<inheritdoc/> - public override IDbContextHandle GetNewContext() => new RoutingContext(Options); + public override IDbContextHandle GetNewContext() => new RoutingContext(Options.Value); ///<inheritdoc/> public override void OnRecordUpdate(Route newRecord, Route currentRecord) |