Merge pull request #4356 from sbwalker/dev

fix #4353 - add defensive logic when sending notifications and improve performance
oqtane · Jun 26, 2024 · 84b560e · 84b560e
2 parents 08213ae + 03f081f
commit 84b560e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs
@@ -203,19 +203,21 @@ private void SendNotification(Log log)
             }
             if (Enum.Parse<LogLevel>(log.Level) >= notifylevel)
             {
+                var subject = $"Site {log.Level} Notification";
+                string body = $"Log Message: {log.Message}";
+
                 var alias = _tenantManager.GetAlias();
-                foreach (var userrole in _userRoles.GetUserRoles(log.SiteId.Value))
+                if (alias != null)
                 {
-                    if (userrole.Role.Name == RoleNames.Host)
-                    {
-                        var subject = $"{alias.Name} Site {log.Level} Notification";
-                        var url = $"{_accessor.HttpContext.Request.Scheme}://{alias.Name}/admin/log?id={log.LogId}";
-                        string body = $"Log Message: {log.Message}<br /><br />Please visit {url} for more information";
-                        var notification = new Notification(log.SiteId.Value, userrole.User, subject, body);
-                        _notifications.AddNotification(notification);
-                    }
+                    subject = $"{alias.Name} Site {log.Level} Notification";
+                    body = $"Log Message: {log.Message}<br /><br />Please visit {alias.Protocol}://{alias.Name}/admin/log?id={log.LogId} for more information";
                 }
 
+                foreach (var userrole in _userRoles.GetUserRoles(RoleNames.Host, log.SiteId.Value))
+                {
+                    var notification = new Notification(log.SiteId.Value, userrole.User, subject, body);
+                    _notifications.AddNotification(notification);
+                }
             }
         }
     }

diff --git a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs
@@ -7,6 +7,7 @@ public interface IUserRoleRepository
     {
         IEnumerable<UserRole> GetUserRoles(int siteId);
         IEnumerable<UserRole> GetUserRoles(int userId, int siteId);
+        IEnumerable<UserRole> GetUserRoles(string roleName, int siteId);
         UserRole AddUserRole(UserRole userRole);
         UserRole UpdateUserRole(UserRole userRole);
         UserRole GetUserRole(int userRoleId);

diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs
@@ -23,16 +23,25 @@ public IEnumerable<UserRole> GetUserRoles(int siteId)
             return db.UserRole
                 .Include(item => item.Role) // eager load roles
                 .Include(item => item.User) // eager load users
-                .Where(item => item.Role.SiteId == siteId || item.Role.SiteId == null).ToList();
+                .Where(item => item.Role.SiteId == siteId || item.Role.SiteId == null || siteId == -1).ToList();
         }
 
         public IEnumerable<UserRole> GetUserRoles(int userId, int siteId)
         {
             using var db = _dbContextFactory.CreateDbContext();
-            return db.UserRole.Where(item => item.UserId == userId)
+            return db.UserRole
                 .Include(item => item.Role) // eager load roles
                 .Include(item => item.User) // eager load users
-                .Where(item => item.Role.SiteId == siteId || item.Role.SiteId == null || siteId == -1).ToList();
+                .Where(item => (item.Role.SiteId == siteId || item.Role.SiteId == null || siteId == -1) && item.UserId == userId).ToList();
+        }
+
+        public IEnumerable<UserRole> GetUserRoles(string roleName, int siteId)
+        {
+            using var db = _dbContextFactory.CreateDbContext();
+            return db.UserRole
+                .Include(item => item.Role) // eager load roles
+                .Include(item => item.User) // eager load users
+                .Where(item => (item.Role.SiteId == siteId || item.Role.SiteId == null || siteId == -1) && item.Role.Name == roleName).ToList();
         }
 
         public UserRole AddUserRole(UserRole userRole)

diff --git a/Oqtane.Shared/Models/Alias.cs b/Oqtane.Shared/Models/Alias.cs
@@ -68,10 +68,10 @@ public string SiteKey
         }
 
         /// <summary>
-        /// Protocol for the request from which the alias was resolved (ie. http:// or https:// )
+        /// Protocol for the request from which the alias was resolved (ie. http or https )
         /// </summary>
         [NotMapped]
-        public string Protocol { get; set; }
+        public string Protocol { get; set; } = "https"; // default value
 
         /// <summary>
         /// Base Url for static resources (note that this will only be set for remote clients)