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

optimizations and fixes

Browse Source
This commit is contained in:
Shaun Walker
2020-03-11 14:39:49 -04:00
parent 2436f74830
commit fe98084324
23 changed files with 159 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Server/Controllers/FileController.cs
View File

@ -312,8 +312,8 @@ namespace Oqtane.Controllers
fileparts = Directory.GetFiles(folder, "*" + token + "*");
foreach (string filepart in fileparts)
{
DateTime createddate = System.IO.File.GetCreationTime(filepart);
if (createddate < DateTime.Now.AddHours(-2))
DateTime createddate = System.IO.File.GetCreationTime(filepart).ToUniversalTime();
if (createddate < DateTime.UtcNow.AddHours(-2))
{
System.IO.File.Delete(filepart);
}

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

@ -224,7 +224,7 @@ namespace Oqtane.Controllers
{
version = new ApplicationVersion();
version.Version = Constants.Version;
version.CreatedOn = DateTime.Now;
version.CreatedOn = DateTime.UtcNow;
db.ApplicationVersion.Add(version);
db.SaveChanges();
}

26
Oqtane.Server/Controllers/PageController.cs
View File

@ -7,6 +7,7 @@ using Oqtane.Shared;
using System.Linq;
using Oqtane.Infrastructure;
using Oqtane.Security;
using System.Net;
namespace Oqtane.Controllers
{
@ -70,6 +71,31 @@ namespace Oqtane.Controllers
}
}
// GET api/<controller>/path/x?path=y
[HttpGet("path/{siteid}")]
public Page Get(string path, int siteid)
{
Page page = _pages.GetPage(WebUtility.UrlDecode(path), siteid);
if (page != null)
{
if (_userPermissions.IsAuthorized(User, "View", page.Permissions))
{
return page;
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Page {Page}", page);
HttpContext.Response.StatusCode = 401;
return null;
}
}
else
{
HttpContext.Response.StatusCode = 404;
return null;
}
}
// POST api/<controller>
[HttpPost]
[Authorize(Roles = Constants.RegisteredRole)]

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

@ -111,7 +111,7 @@ namespace Oqtane.Controllers
string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/login?name=" + User.Username + "&token=" + WebUtility.UrlEncode(token);
notification.Body = "Dear " + User.DisplayName + ",\n\nIn Order To Complete The Registration Of Your User Account Please Click The Link Displayed Below:\n\n" + url + "\n\nThank You!";
notification.ParentId = null;
notification.CreatedOn = DateTime.Now;
notification.CreatedOn = DateTime.UtcNow;
notification.IsDelivered = false;
notification.DeliveredOn = null;
_notifications.AddNotification(notification);
@ -240,10 +240,9 @@ namespace Oqtane.Controllers
if (identityuser.EmailConfirmed)
{
user.IsAuthenticated = true;
user.LastLoginOn = DateTime.Now;
user.LastLoginOn = DateTime.UtcNow;
user.LastIPAddress = HttpContext.Connection.RemoteIpAddress.ToString();
_users.UpdateUser(user);
_syncManager.AddSyncEvent("User", user.UserId);
_logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Successful {Username}", User.Username);
if (SetCookie)
{
@ -272,7 +271,6 @@ namespace Oqtane.Controllers
public async Task Logout([FromBody] User User)
{
await HttpContext.SignOutAsync(IdentityConstants.ApplicationScheme);
_syncManager.AddSyncEvent("User", User.UserId);
_logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout {Username}", User.Username);
}
@ -324,7 +322,7 @@ namespace Oqtane.Controllers
string url = HttpContext.Request.Scheme + "://" + _tenants.GetAlias().Name + "/reset?name=" + User.Username + "&token=" + WebUtility.UrlEncode(token);
notification.Body = "Dear " + User.DisplayName + ",\n\nPlease Click The Link Displayed Below To Reset Your Password:\n\n" + url + "\n\nThank You!";
notification.ParentId = null;
notification.CreatedOn = DateTime.Now;
notification.CreatedOn = DateTime.UtcNow;
notification.IsDelivered = false;
notification.DeliveredOn = null;
_notifications.AddNotification(notification);

10
Oqtane.Server/Controllers/UserRoleController.cs
View File

@ -12,11 +12,13 @@ namespace Oqtane.Controllers
public class UserRoleController : Controller
{
private readonly IUserRoleRepository _userRoles;
private readonly ISyncManager _syncManager;
private readonly ILogManager _logger;
public UserRoleController(IUserRoleRepository userRoles, ILogManager logger)
public UserRoleController(IUserRoleRepository userRoles, ISyncManager syncManager, ILogManager logger)
{
_userRoles = userRoles;
_syncManager = syncManager;
_logger = logger;
}
@ -44,6 +46,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid)
{
UserRole = _userRoles.AddUserRole(UserRole);
_syncManager.AddSyncEvent("User", UserRole.UserId);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", UserRole);
}
return UserRole;
@ -57,6 +60,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid)
{
UserRole = _userRoles.UpdateUserRole(UserRole);
_syncManager.AddSyncEvent("User", UserRole.UserId);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "User Role Updated {UserRole}", UserRole);
}
return UserRole;
@ -67,8 +71,10 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.AdminRole)]
public void Delete(int id)
{
UserRole userRole = _userRoles.GetUserRole(id);
_userRoles.DeleteUserRole(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRoleId}", id);
_syncManager.AddSyncEvent("User", userRole.UserId);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole);
}
}
}

12
Oqtane.Server/Infrastructure/Jobs/HostedServiceBase.cs
View File

@ -50,19 +50,19 @@ namespace Oqtane.Infrastructure
}
else
{
Job.NextExecution = DateTime.Now;
Job.NextExecution = DateTime.UtcNow;
}
}
// determine if the job should be run
if (Job.NextExecution <= DateTime.Now && (Job.EndDate == null || Job.EndDate >= DateTime.Now))
if (Job.NextExecution <= DateTime.UtcNow && (Job.EndDate == null || Job.EndDate >= DateTime.UtcNow))
{
IJobLogRepository JobLogs = scope.ServiceProvider.GetRequiredService<IJobLogRepository>();
// create a job log entry
JobLog log = new JobLog();
log.JobId = Job.JobId;
log.StartDate = DateTime.Now;
log.StartDate = DateTime.UtcNow;
log.FinishDate = null;
log.Succeeded = false;
log.Notes = "";
@ -85,7 +85,7 @@ namespace Oqtane.Infrastructure
}
// update the job log
log.FinishDate = DateTime.Now;
log.FinishDate = DateTime.UtcNow;
JobLogs.UpdateJobLog(log);
// update the job
@ -132,9 +132,9 @@ namespace Oqtane.Infrastructure
NextExecution = NextExecution.AddMonths(Interval);
break;
}
if (NextExecution < DateTime.Now)
if (NextExecution < DateTime.UtcNow)
{
NextExecution = DateTime.Now;
NextExecution = DateTime.UtcNow;
}
return NextExecution;
}

2
Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
View File

@ -95,7 +95,7 @@ namespace Oqtane.Infrastructure
client.Send(mailMessage);
sent = sent++;
notification.IsDelivered = true;
notification.DeliveredOn = DateTime.Now;
notification.DeliveredOn = DateTime.UtcNow;
Notifications.UpdateNotification(notification);
}
catch (Exception ex)

2
Oqtane.Server/Repository/Context/MasterDBContext.cs
View File

@ -30,7 +30,7 @@ namespace Oqtane.Repository
{
username = _accessor.HttpContext.User.Identity.Name;
}
DateTime date = DateTime.Now;
DateTime date = DateTime.UtcNow;
var created = ChangeTracker.Entries()
.Where(x => x.State == EntityState.Added);

1
Oqtane.Server/Repository/Interfaces/IPageRepository.cs
View File

@ -10,6 +10,7 @@ namespace Oqtane.Repository
Page UpdatePage(Page Page);
Page GetPage(int PageId);
Page GetPage(int PageId, int UserId);
Page GetPage(string Path, int SiteId);
void DeletePage(int PageId);
}
}

28
Oqtane.Server/Repository/ModuleDefinitionRepository.cs
View File

@ -53,39 +53,43 @@ namespace Oqtane.Repository
{
List<ModuleDefinition> ModuleDefinitions;
// get run-time module definitions
ModuleDefinitions = _cache.GetOrCreate("moduledefinitions", entry =>
{
entry.SlidingExpiration = TimeSpan.FromMinutes(30);
return LoadModuleDefinitionsFromAssemblies();
});
// sync module definitions with database
List<ModuleDefinition> moduledefs = _db.ModuleDefinition.ToList();
// get module defintion permissions for site
List<Permission> permissions = _permissions.GetPermissions(SiteId, "ModuleDefinition").ToList();
// get module definitions in database
List<ModuleDefinition> moduledefs = _db.ModuleDefinition.ToList();
// sync run-time module definitions with database
foreach (ModuleDefinition moduledefinition in ModuleDefinitions)
{
ModuleDefinition moduledef = moduledefs.Where(item => item.ModuleDefinitionName == moduledefinition.ModuleDefinitionName).FirstOrDefault();
if (moduledef == null)
{
// new module definition
moduledef = new ModuleDefinition { ModuleDefinitionName = moduledefinition.ModuleDefinitionName };
_db.ModuleDefinition.Add(moduledef);
_db.SaveChanges();
if (moduledefinition.Permissions != "")
{
_permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
foreach(Permission permission in _permissions.GetPermissions("ModuleDefinition", moduledef.ModuleDefinitionId))
{
permissions.Add(permission);
}
}
_permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
}
else
{
moduledefs.Remove(moduledef); // remove module definition from list
// existing module definition
if (permissions.Count == 0)
{
_permissions.UpdatePermissions(SiteId, "ModuleDefinition", moduledef.ModuleDefinitionId, moduledefinition.Permissions);
}
// remove module definition from list
moduledefs.Remove(moduledef);
}
moduledefinition.ModuleDefinitionId = moduledef.ModuleDefinitionId;
moduledefinition.SiteId = SiteId;
moduledefinition.Permissions = _permissions.EncodePermissions(moduledefinition.ModuleDefinitionId, permissions);
moduledefinition.CreatedBy = moduledef.CreatedBy;
moduledefinition.CreatedOn = moduledef.CreatedOn;
moduledefinition.ModifiedBy = moduledef.ModifiedBy;

11
Oqtane.Server/Repository/PageRepository.cs
View File

@ -75,6 +75,17 @@ namespace Oqtane.Repository
return page;
}
public Page GetPage(string Path, int SiteId)
{
Page page = _db.Page.Where(item => item.Path == Path && item.SiteId == SiteId).FirstOrDefault();
if (page != null)
{
IEnumerable<Permission> permissions = _permissions.GetPermissions("Page", page.PageId).ToList();
page.Permissions = _permissions.EncodePermissions(page.PageId, permissions);
}
return page;
}
public void DeletePage(int PageId)
{
Page Page = _db.Page.Find(PageId);