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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Shaun Walker
2020-04-26 13:27:16 -04:00
committed by GitHub
parent f0043f53ee 6d93fcfc1c
commit df3afb1e21
83 changed files with 1461 additions and 4096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,14 +93,14 @@ namespace Oqtane.Controllers
bool verified;
bool allowregistration;
if (user.Username == Constants.HostUser)
if (user.Username == Constants.HostUser || User.IsInRole(Constants.AdminRole))
{
verified = true;
allowregistration = true;
}
else
{
verified = User.IsInRole(Constants.AdminRole); // only users created by administrators are verified
{
verified = false;
allowregistration = _sites.GetSite(user.SiteId).AllowRegistration;
}
@ -308,7 +308,7 @@ namespace Oqtane.Controllers
public async Task Logout([FromBody] User user)
{
await HttpContext.SignOutAsync(IdentityConstants.ApplicationScheme);
_logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout {Username}", user.Username);
_logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout {Username}", (user != null) ? user.Username : "");
}
// POST api/<controller>/verify