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

auth improvements related to multi-tenancy

Browse Source
This commit is contained in:
Shaun Walker
2021-05-19 08:46:02 -04:00
parent 943adec3a0
commit 09537ab0e4
23 changed files with 235 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Oqtane.Server/Pages/Login.cshtml.cs
View File

@ -1,4 +1,4 @@
using System.Threading.Tasks;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
@ -21,20 +21,23 @@ namespace Oqtane.Pages
public async Task<IActionResult> OnPostAsync(string username, string password, bool remember, string returnurl)
{
bool validuser = false;
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(username);
if (identityuser != null)
if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password))
{
var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, password, false);
if (result.Succeeded)
bool validuser = false;
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(username);
if (identityuser != null)
{
validuser = true;
var result = await _identitySignInManager.CheckPasswordSignInAsync(identityuser, password, false);
if (result.Succeeded)
{
validuser = true;
}
}
}
if (validuser)
{
await _identitySignInManager.SignInAsync(identityuser, remember);
if (validuser)
{
await _identitySignInManager.SignInAsync(identityuser, remember);
}
}
if (returnurl == null)
@ -49,4 +52,4 @@ namespace Oqtane.Pages
return LocalRedirect(Url.Content("~" + returnurl));
}
}
}
}