From 5fbb9160f1d0c82aa5adac99b4cdf3e523444946 Mon Sep 17 00:00:00 2001 From: Ben Emamian Date: Tue, 21 Mar 2023 00:45:17 +1100 Subject: [PATCH] Code Cleanups --- Oqtane.Server/Controllers/PageController.cs | 14 +++++++------- Oqtane.Server/Controllers/UserController.cs | 12 ++++++------ .../OqtaneSiteAuthenticationBuilderExtensions.cs | 6 +++--- .../Infrastructure/Jobs/NotificationJob.cs | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index 6cd04054..d4cc1931 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -86,7 +86,7 @@ namespace Oqtane.Controllers { page = _pages.GetPage(id, int.Parse(userid)); } - if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User,PermissionNames.View, page.PermissionList)) + if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, page.PermissionList)) { page.Settings = _settings.GetSettings(EntityNames.Page, page.PageId) .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.PermissionList)) @@ -120,7 +120,7 @@ namespace Oqtane.Controllers return null; } } - + // POST api/ [HttpPost] [Authorize(Roles = RoleNames.Registered)] @@ -139,8 +139,8 @@ namespace Oqtane.Controllers new Permission(PermissionNames.Edit, RoleNames.Admin, true) }; } - - if (_userPermissions.IsAuthorized(User,PermissionNames.Edit, permissions)) + + if (_userPermissions.IsAuthorized(User, PermissionNames.Edit, permissions)) { page = _pages.AddPage(page); _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Create); @@ -284,7 +284,7 @@ namespace Oqtane.Controllers { var modulePermissions = _permissionRepository.GetPermissions(pageModule.Module.SiteId, EntityNames.Module, pageModule.Module.ModuleId).ToList(); // permissions added - foreach(Permission permission in added) + foreach (Permission permission in added) { if (!modulePermissions.Any(item => item.PermissionName == permission.PermissionName && item.RoleId == permission.RoleId && item.UserId == permission.UserId && item.IsAuthorized == permission.IsAuthorized)) @@ -319,7 +319,7 @@ namespace Oqtane.Controllers _logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Updated {Page}", page); } else - { + { _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Put Attempt {Page}", page); HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; page = null; @@ -345,7 +345,7 @@ namespace Oqtane.Controllers [Authorize(Roles = RoleNames.Registered)] public void Put(int siteid, int pageid, int? parentid) { - if (siteid == _alias.SiteId && siteid == _alias.SiteId && _pages.GetPage(pageid, false) != null && _userPermissions.IsAuthorized(User, siteid, EntityNames.Page, pageid, PermissionNames.Edit)) + if (siteid == _alias.SiteId && _pages.GetPage(pageid, false) != null && _userPermissions.IsAuthorized(User, siteid, EntityNames.Page, pageid, PermissionNames.Edit)) { int order = 1; List pages = _pages.GetPages(siteid).ToList(); diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index 01c7c61a..0090dd43 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -150,7 +150,7 @@ namespace Oqtane.Controllers User newUser = null; bool verified; - bool allowregistration; + bool allowregistration; if (_userPermissions.IsAuthorized(User, user.SiteId, EntityNames.User, -1, PermissionNames.Write, RoleNames.Admin)) { verified = true; @@ -330,11 +330,11 @@ namespace Oqtane.Controllers // delete user _users.DeleteUser(user.UserId); _syncManager.AddSyncEvent(_tenantManager.GetAlias().TenantId, EntityNames.User, user.UserId, SyncEventActions.Delete); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Deleted {UserId}", user.UserId); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Deleted {UserId}", user.UserId, result.ToString()); } else { - _logger.Log(LogLevel.Error, this, LogFunction.Delete, "Error Deleting User {UserId}", user.UserId, result.ToString()); + _logger.Log(LogLevel.Error, this, LogFunction.Delete, "Error Deleting User {UserId}", user.UserId); } } } @@ -466,7 +466,7 @@ namespace Oqtane.Controllers } return user; } - + // POST api//forgot [HttpPost("forgot")] public async Task Forgot([FromBody] User user) @@ -483,7 +483,7 @@ namespace Oqtane.Controllers "\n\nPlease note that the link is only valid for 24 hours so if you are unable to take action within that time period, you should initiate another password reset on the site." + "\n\nIf you did not request to reset your password you can safely ignore this message." + "\n\nThank You!"; - + var notification = new Notification(_tenantManager.GetAlias().SiteId, user, "User Password Reset", body); _notifications.AddNotification(notification); _logger.Log(LogLevel.Information, this, LogFunction.Security, "Password Reset Notification Sent For {Username}", user.Username); @@ -622,7 +622,7 @@ namespace Oqtane.Controllers [HttpGet("authenticate")] public User Authenticate() { - User user = new User { IsAuthenticated = User.Identity.IsAuthenticated, Username = "", UserId = -1, Roles = "" }; + User user = new User { IsAuthenticated = User.Identity.IsAuthenticated, Username = "", UserId = -1, Roles = "" }; if (user.IsAuthenticated) { user.Username = User.Identity.Name; diff --git a/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs b/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs index 529bf16e..f89d8bde 100644 --- a/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs +++ b/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs @@ -77,7 +77,7 @@ namespace Oqtane.Extensions { OnRedirectToIdentityProvider = context => { - foreach(var parameter in sitesettings.GetValue("ExternalLogin:Parameters", "").Split(",")) + foreach (var parameter in sitesettings.GetValue("ExternalLogin:Parameters", "").Split(",")) { context.ProtocolMessage.SetParameter(parameter.Split("=")[0], parameter.Split("=")[1]); } @@ -358,13 +358,13 @@ namespace Oqtane.Extensions else { identity.Label = ExternalLoginStatus.UserNotCreated; - _logger.Log(user.SiteId, LogLevel.Error, "ExternalLogin", Enums.LogFunction.Create, "Unable To Add User {Email}", email); + _logger.Log(alias.SiteId, LogLevel.Error, "ExternalLogin", Enums.LogFunction.Create, "Unable To Add User {Email}", email); } } else { identity.Label = ExternalLoginStatus.UserNotCreated; - _logger.Log(user.SiteId, LogLevel.Error, "ExternalLogin", Enums.LogFunction.Create, "Unable To Add Identity User {Email} {Error}", email, result.Errors.ToString()); + _logger.Log(alias.SiteId, LogLevel.Error, "ExternalLogin", Enums.LogFunction.Create, "Unable To Add Identity User {Email} {Error}", email, result.Errors.ToString()); } } else diff --git a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs index 13141b66..ea12ac21 100644 --- a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs +++ b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs @@ -138,7 +138,7 @@ namespace Oqtane.Infrastructure try { client.Send(mailMessage); - sent = sent++; + sent++; notification.IsDelivered = true; notification.DeliveredOn = DateTime.UtcNow; notificationRepository.UpdateNotification(notification);