From 7f3067b8fc4416d46af9b8b005a18a71770c98fe Mon Sep 17 00:00:00 2001 From: vnugent Date: Wed, 21 Feb 2024 21:44:56 -0500 Subject: user-creation api update, and fix user-privilege missing update --- .../src/Endpoints/RegistrationEntpoint.cs | 2 +- plugins/VNLib.Plugins.Essentials.Accounts/src/AccountValidations.cs | 4 +--- plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs | 2 +- .../VNLib.Plugins.Essentials.Accounts/src/Endpoints/LoginEndpoint.cs | 2 +- plugins/VNLib.Plugins.Essentials.Auth.Social/src/SocialOauthBase.cs | 3 ++- 5 files changed, 6 insertions(+), 7 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 1030c9b..51cba14 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/Endpoints/RegistrationEntpoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts.Registration/src/Endpoints/RegistrationEntpoint.cs @@ -163,7 +163,7 @@ namespace VNLib.Plugins.Essentials.Accounts.Registration.Endpoints { UserCreationRequest creation = new() { - EmailAddress = emailAddress, + Username = emailAddress, InitialStatus = UserStatus.Active, Password = request.GetPassPrivString(), }; diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountValidations.cs b/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountValidations.cs index 972bd36..459f7da 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountValidations.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountValidations.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2022 Vaughn Nugent +* Copyright (c) 2024 Vaughn Nugent * * Library: VNLib * Package: VNLib.Plugins.Essentials.Accounts @@ -26,8 +26,6 @@ using FluentValidation; using VNLib.Plugins.Extensions.Validation; -#nullable enable - namespace VNLib.Plugins.Essentials.Accounts { public static class AccountValidations diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs b/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs index bd191a1..318f3ce 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/AccountsEntryPoint.cs @@ -175,7 +175,7 @@ Commands: //Create the user creation request UserCreationRequest creation = new() { - EmailAddress = username, + Username = username, InitialStatus = UserStatus.Active, Privileges = privLevel, Password = PrivateString.ToPrivateString(password, false) diff --git a/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/LoginEndpoint.cs b/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/LoginEndpoint.cs index 57fd64c..6e3653e 100644 --- a/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/LoginEndpoint.cs +++ b/plugins/VNLib.Plugins.Essentials.Accounts/src/Endpoints/LoginEndpoint.cs @@ -193,7 +193,7 @@ namespace VNLib.Plugins.Essentials.Accounts.Endpoints ERRNO valResult = await Users.ValidatePasswordAsync(user, login.Password!, PassValidateFlags.None, cancellation); //Valid results are greater than 0; - return valResult > 0; + return valResult == UserPassValResult.Success; } private bool LoginUser(HttpEntity entity, LoginMessage loginMessage, IUser user, MfaUpgradeWebm webm) diff --git a/plugins/VNLib.Plugins.Essentials.Auth.Social/src/SocialOauthBase.cs b/plugins/VNLib.Plugins.Essentials.Auth.Social/src/SocialOauthBase.cs index 131cb7b..91bf147 100644 --- a/plugins/VNLib.Plugins.Essentials.Auth.Social/src/SocialOauthBase.cs +++ b/plugins/VNLib.Plugins.Essentials.Auth.Social/src/SocialOauthBase.cs @@ -457,8 +457,9 @@ namespace VNLib.Plugins.Essentials.Auth.Social //Create the new user account UserCreationRequest creation = new() { - EmailAddress = userAccount.EmailAddress!, + Username = userAccount.EmailAddress!, InitialStatus = UserStatus.Active, + Privileges = AccountUtil.MINIMUM_LEVEL }; try -- cgit