Corrects "Add condition for User moderation and Email confirmation upon registration OrchardCMS#17611" (OrchardCMS#17650)

Author: gvkries

src/OrchardCore.Modules/OrchardCore.Users/Handlers/EmailConfirmationRegistrationFormEvents.cs

@@ -29,6 +29,7 @@ public override async Task RegisteringAsync(UserRegisteringContext context)
             return;
         }
 
+        context.CancelSignIn = true;
         await _userEmailConfirmationService.SendEmailConfirmationAsync(context.User);
     }
 }

src/OrchardCore.Modules/OrchardCore.Users/Handlers/UserModerationRegistrationFormEvents.cs

@@ -16,7 +16,8 @@ public UserModerationRegistrationFormEvents(IOptions<RegistrationOptions> regist
     public override Task RegisteringAsync(UserRegisteringContext context)
     {
         if (context.User is User user &&
-            !(_registrationOptions.UsersAreModerated && !user.IsEnabled))
+            _registrationOptions.UsersAreModerated &&
+            !user.IsEnabled)
         {
             context.CancelSignIn = true;
         }

src/OrchardCore/OrchardCore.Users.Core/Services/UserService.cs

@@ -361,7 +361,7 @@ public async Task<IUser> RegisterAsync(RegisterUserForm model, Action<string, st
 
         await _registrationFormEvents.InvokeAsync((e, ctx) => e.RegisteringAsync(ctx), context, _logger);
 
-        if (!context.CancelSignIn && !_registrationOptions.UsersAreModerated && !_registrationOptions.UsersMustValidateEmail)
+        if (!context.CancelSignIn)
         {
             await _signInManager.SignInAsync(user, isPersistent: false);
         }