From 5d0660dea5e20d1bda06ea9b06b04bbac36b0db9 Mon Sep 17 00:00:00 2001 From: vnugent Date: Sat, 8 Apr 2023 16:43:26 -0400 Subject: Extensions update --- .../src/Endpoints/RegistrationEntpoint.cs | 2 +- plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs | 2 +- .../VNLib.Plugins.Essentials.Accounts/src/Endpoints/LoginEndpoint.cs | 3 ++- plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/MFAEndpoint.cs | 2 +- .../src/Endpoints/PasswordResetEndpoint.cs | 2 +- plugins/VNLib.Plugins.Essentials.SocialOauth/src/OauthClientConfig.cs | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) (limited to 'plugins') 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 b593456..83c1528 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/Endpoints/RegistrationEntpoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/Endpoints/RegistrationEntpoint.cs @@ -88,7 +88,7 @@ namespace VNLib.Plugins.Essentials.Accounts.Registration.Endpoints //Init reg jwt validator RegJwtValdidator = GetJwtValidator(); - Passwords = plugin.GetPasswords(); + Passwords = plugin.GetOrCreateSingleton(); Users = plugin.GetOrCreateSingleton(); RevokedTokens = new(plugin.GetContextOptions()); Emails = plugin.GetOrCreateSingleton(); diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs b/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs index e2304c0..8055d26 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs @@ -122,7 +122,7 @@ namespace VNLib.Plugins.Essentials.Accounts try { IUserManager Users = this.GetOrCreateSingleton(); - IPasswordHashingProvider Passwords = this.GetPasswords(); + IPasswordHashingProvider Passwords = this.GetOrCreateSingleton(); //get args as a list List args = cmd.Split(' ').ToList(); diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/LoginEndpoint.cs b/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/LoginEndpoint.cs index 062ed93..26a853a 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/LoginEndpoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/LoginEndpoint.cs @@ -44,6 +44,7 @@ using VNLib.Plugins.Extensions.Loading; using VNLib.Plugins.Extensions.Loading.Users; using static VNLib.Plugins.Essentials.Statics; + namespace VNLib.Plugins.Essentials.Accounts.Endpoints { @@ -73,7 +74,7 @@ namespace VNLib.Plugins.Essentials.Accounts.Endpoints InitPathAndLog(path, pbase.Log); - Passwords = pbase.GetPasswords(); + Passwords = pbase.GetOrCreateSingleton(); Users = pbase.GetOrCreateSingleton(); MultiFactor = pbase.GetConfigElement(); } diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/MFAEndpoint.cs b/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/MFAEndpoint.cs index 45097b8..087ad2c 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/MFAEndpoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/MFAEndpoint.cs @@ -59,7 +59,7 @@ namespace VNLib.Plugins.Essentials.Accounts.Endpoints Users = pbase.GetOrCreateSingleton(); MultiFactor = pbase.GetConfigElement(); - Passwords = pbase.GetPasswords(); + Passwords = pbase.GetOrCreateSingleton(); } private class TOTPUpdateMessage diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/PasswordResetEndpoint.cs b/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/PasswordResetEndpoint.cs index c561b69..10eff17 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/PasswordResetEndpoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/PasswordResetEndpoint.cs @@ -71,7 +71,7 @@ namespace VNLib.Plugins.Essentials.Accounts.Endpoints InitPathAndLog(path, pbase.Log); Users = pbase.GetOrCreateSingleton(); - Passwords = pbase.GetPasswords(); + Passwords = pbase.GetOrCreateSingleton(); ResetMessValidator = GetMessageValidator(); mFAConfig = pbase.GetConfigElement(); } diff --git a/plugins/VNLib.Plugins.Essentials.SocialOauth/src/OauthClientConfig.cs b/plugins/VNLib.Plugins.Essentials.SocialOauth/src/OauthClientConfig.cs index 5b0d8ed..b7e94a2 100644 --- a/plugins/VNLib.Plugins.Essentials.SocialOauth/src/OauthClientConfig.cs +++ b/plugins/VNLib.Plugins.Essentials.SocialOauth/src/OauthClientConfig.cs @@ -66,7 +66,7 @@ namespace VNLib.Plugins.Essentials.SocialOauth InitClaimValidFor = config["claim_valid_for_sec"].GetTimeSpan(TimeParseType.Seconds); Users = plugin.GetOrCreateSingleton(); - Passwords = plugin.GetPasswords(); + Passwords = plugin.GetOrCreateSingleton(); } public async Task ConfigureServiceAsync(PluginBase plugin) -- cgit