Pushed fixes down from commercial editions

Author: jgauffin

src/Server/Coderr.Server.Abstractions/Security/ClaimsExtensions.cs

@@ -48,6 +48,24 @@ public static int GetAccountId(this ClaimsPrincipal principal)
             throw ex;
         }
 
+        /// <summary>
+        ///     Get account id (<see cref="ClaimTypes.NameIdentifier" />).
+        /// </summary>
+        /// <param name="principal">principal to search in</param>
+        /// <returns>id</returns>
+        /// <exception cref="InvalidOperationException">Claim is not found in the identity/ies.</exception>
+        public static int FindAccountId(this ClaimsPrincipal principal)
+        {
+            var claim = principal.FindFirst(x => x.Type == ClaimTypes.NameIdentifier);
+            if (claim == null)
+                return 0;
+
+            if (int.TryParse(claim.Value, out var userId))
+                return userId;
+
+            return -1;
+        }
+
         /// <summary>
         ///     Get account id (<see cref="ClaimTypes.NameIdentifier" />).
         /// </summary>
@@ -148,7 +166,7 @@ public static bool IsSysAdmin(this IPrincipal principal)
         public static string ToFriendlyString(this IPrincipal principal)
         {
             var cc = principal as ClaimsPrincipal;
-            if (cc == null || !principal.Identity.IsAuthenticated)
+            if (cc == null || principal.Identity?.IsAuthenticated != true)
             {
                 return "Anonymous";
             }

src/Server/Coderr.Server.Abstractions/Security/IPrincipalAccessor.cs

@@ -8,5 +8,7 @@ namespace Coderr.Server.Abstractions.Security
     public interface IPrincipalAccessor
     {
         ClaimsPrincipal Principal { get; set; }
+
+        ClaimsPrincipal FindPrincipal();
     }
 }

src/Server/Coderr.Server.Api/Core/Accounts/Commands/RegisterAccount.cs

@@ -68,5 +68,14 @@ public void Activate(int accountId)
             ActivateDirectly = true;
             AccountId = accountId;
         }
+
+        /// <summary>
+        ///     Activate this account directly
+        /// </summary>
+        public void Activate()
+        {
+            ActivateDirectly = true;
+            AccountId = 0;
+        }
     }
 }

src/Server/Coderr.Server.Api/Core/Applications/ApplicationListItem.cs

@@ -15,11 +15,10 @@ public class ApplicationListItem
         /// <param name="name">name of the application</param>
         public ApplicationListItem(int id, string name)
         {
-            if (name == null) throw new ArgumentNullException("name");
             if (id <= 0) throw new ArgumentOutOfRangeException("id");
 
             Id = id;
-            Name = name;
+            Name = name ?? throw new ArgumentNullException("name");
         }
 
         /// <summary>
@@ -30,20 +29,30 @@ protected ApplicationListItem()
         }
 
         /// <summary>
-        ///     Id of the application (primary key)
+        ///     Group that this application belongs to.
         /// </summary>
-        public int Id { get; set; }
+        public int GroupId { get; set; }
 
         /// <summary>
-        ///     Application name as entered by the user.
+        ///     Name of the group
         /// </summary>
-        public string Name { get; set; }
+        public string GroupName { get; set; }
+
+        /// <summary>
+        ///     Id of the application (primary key)
+        /// </summary>
+        public int Id { get; set; }
 
         /// <summary>
         ///     User that requested this list is the admin of the specified application.
         /// </summary>
         public bool IsAdmin { get; set; }
 
+        /// <summary>
+        ///     Application name as entered by the user.
+        /// </summary>
+        public string Name { get; set; }
+
         /// <summary>
         ///     Number of full time developers.
         /// </summary>

src/Server/Coderr.Server.Api/Core/Incidents/Queries/FindIncidentsResultItem.cs

@@ -7,7 +7,6 @@ namespace Coderr.Server.Api.Core.Incidents.Queries
     /// </summary>
     public class FindIncidentsResultItem
     {
-
         /// <summary>
         ///     Creates new instance of <see cref="FindIncidentsResultItem" />.
         /// </summary>
@@ -72,7 +71,7 @@ protected FindIncidentsResultItem()
         /// <summary>
         ///     Incident name
         /// </summary>
-        public string Name { get; set; }
+        public string Name { set; get; }
 
         /// <summary>
         ///     Total number of received reports (increased even if the number of stored reports are at the limit)

src/Server/Coderr.Server.Api/Core/Incidents/Queries/GetCollection.cs

@@ -22,12 +22,12 @@ protected GetCollection()
         /// <summary>
         /// Collection name like "ErrorProperties" or "HttpRequest".
         /// </summary>
-        public string CollectionName { get; }
+        public string CollectionName { get; private set; }
 
         /// <summary>
         /// Incident that the collection belongs to.
         /// </summary>
-        public int IncidentId { get; }
+        public int IncidentId { get; private set; }
 
         /// <summary>
         /// Collection limit.

src/Server/Coderr.Server.App/Core/Accounts/AccountService.cs

@@ -162,6 +162,16 @@ public async Task<ClaimsIdentity> Login(string userName, string password)
             return identity;
         }
 
+        public async Task<Account> CreateAsync(string userName, string email)
+        {
+            var password = Guid.NewGuid().ToString("N").Substring(0, 10);
+            var account = new Account(userName, password);
+            account.Activate();
+            account.SetVerifiedEmail(email);
+            await _repository.CreateAsync(account);
+            await _messageBus.SendAsync(new AccountRegistered(account.Id, userName));
+            return account;
+        }
 
         /// <summary>
         ///     Accepts and deletes the invitation. Sends an event which is picked up by the application domain (which transforms

src/Server/Coderr.Server.App/Core/Accounts/IAccountService.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Coderr.Server.Api.Core.Accounts.Events;
 using Coderr.Server.Api.Core.Accounts.Requests;
+using Coderr.Server.Domain.Core.Account;
 
 namespace Coderr.Server.App.Core.Accounts
 {
@@ -61,5 +62,11 @@ public interface IAccountService
         ///     Task which will contain the reply once completed.
         /// </returns>
         Task<ClaimsIdentity> Login(string userName, string password);
+
+        /// <summary>
+        /// Create a new account for the given userName
+        /// </summary>
+        /// <param name="userName"></param>
+        Task<Account> CreateAsync(string userName, string email);
     }
 }

src/Server/Coderr.Server.App/Core/ApiKeys/ApiKey.cs

@@ -73,6 +73,9 @@ public void Add(int applicationId)
             if (applicationId <= 0) throw new ArgumentOutOfRangeException("applicationId");
 
             _claims.Add(new Claim(CoderrClaims.Application, applicationId.ToString(), ClaimValueTypes.Integer32));
+
+            // Api clients typically are allowed to manage everything. Let's do that!
+            _claims.Add(new Claim(CoderrClaims.ApplicationAdmin, applicationId.ToString(), ClaimValueTypes.Integer32));
         }
 
         /// <summary>

src/Server/Coderr.Server.App/Core/Incidents/Commands/CloseIncidentHandler.cs

@@ -50,7 +50,7 @@ public async Task HandleAsync(IMessageContext context, CloseIncident command)
                 !string.IsNullOrEmpty(command.NotificationText))
             {
                 var emails = await _feedbackRepository.GetEmailAddressesAsync(command.IncidentId);
-                if (emails.Any())
+                if (emails.Distinct().Any())
                 {
                     var emailMessage = new EmailMessage(emails)
                     {