Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #4578 from sbwalker/dev

Browse Source 
fix issue adding existing user to a new site
This commit is contained in:
Shaun Walker
2024-08-29 17:53:27 -04:00
committed by GitHub
parent 7e849a2e95 9620c5a98f
commit ff5dbec579
4 changed files with 35 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Server/Controllers/UserController.cs
View File

@ -147,11 +147,13 @@ namespace Oqtane.Controllers
if (_userPermissions.IsAuthorized(User, user.SiteId, EntityNames.User, -1, PermissionNames.Write, RoleNames.Admin))
{
user.EmailConfirmed = true;
user.IsAuthenticated = true;
allowregistration = true;
}
else
{
user.EmailConfirmed = false;
user.IsAuthenticated = false;
allowregistration = _sites.GetSite(user.SiteId).AllowRegistration;
}

15
Oqtane.Server/Managers/UserManager.cs
View File

@ -12,6 +12,7 @@ using Oqtane.Enums;
using Oqtane.Infrastructure;
using Oqtane.Models;
using Oqtane.Repository;
using Oqtane.Security;
using Oqtane.Shared;
namespace Oqtane.Managers
@ -145,13 +146,17 @@ namespace Oqtane.Managers
}
else
{
var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, user.Password, false);
succeeded = result.Succeeded;
if (!succeeded)
succeeded = true;
if (!user.IsAuthenticated)
{
errors = "Password Not Valid For User";
var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, user.Password, false);
succeeded = result.Succeeded;
if (!succeeded)
{
errors = "Password Not Valid For User";
}
user.EmailConfirmed = succeeded;
}
user.EmailConfirmed = succeeded;
}
if (succeeded)