Corrected #17

Author: jgauffin

src/Server/Coderr.Server.Api/Core/Users/Commands/UpdatePersonalSettings.cs

@@ -7,6 +7,16 @@ namespace codeRR.Server.Api.Core.Users.Commands
     /// </summary>
     public class UpdatePersonalSettings : Command
     {
+        /// <summary>
+        ///     Change email address
+        /// </summary>
+        /// <remarks>
+        ///     <para>
+        ///         Do not required additional verification, we trust the user once it has an activated account.
+        ///     </para>
+        /// </remarks>
+        public string EmailAddress { get; set; }
+
         /// <summary>
         ///     First name (if specified)
         /// </summary>

src/Server/Coderr.Server.Api/Core/Users/Queries/GetUserSettingsResult.cs

@@ -10,6 +10,11 @@ namespace codeRR.Server.Api.Core.Users.Queries
     /// </remarks>
     public class GetUserSettingsResult
     {
+        /// <summary>
+        ///     From the user account, always specified.
+        /// </summary>
+        public string EmailAddress { get; set; }
+
         /// <summary>
         ///     First name (optional)
         /// </summary>
@@ -21,7 +26,7 @@ public class GetUserSettingsResult
         public string LastName { get; set; }
 
         /// <summary>
-        ///     Cell phone number (otional, but required for text notifications).
+        ///     Cell phone number (optional, but required for text notifications).
         /// </summary>
         public string MobileNumber { get; set; }
 

src/Server/Coderr.Server.App/Core/Users/WebApi/GetUserSettingsHandler.cs

@@ -31,6 +31,7 @@ public async Task<GetUserSettingsResult> ExecuteAsync(GetUserSettings query)
                 FirstName = user.FirstName,
                 LastName = user.LastName,
                 MobileNumber = user.MobileNumber,
+                EmailAddress = user.EmailAddress,
                 Notifications = new NotificationSettings
                 {
                     NotifyOnReOpenedIncident = settings.ReopenedIncident.ConvertEnum<NotificationState>(),

src/Server/Coderr.Server.App/Core/Users/WebApi/UpdatePersonalSettingsHandler.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using codeRR.Server.Api.Core.Users.Commands;
+using codeRR.Server.App.Core.Accounts;
 using DotNetCqs;
 using Griffin.Container;
 
@@ -13,16 +14,18 @@ namespace codeRR.Server.App.Core.Users.WebApi
     public class UpdatePersonalSettingsHandler : ICommandHandler<UpdatePersonalSettings>
     {
         private readonly IUserRepository _userRepository;
+        private readonly IAccountRepository _accountRepository;
 
         /// <summary>
         ///     Creates a new instance of <see cref="UpdatePersonalSettingsHandler" />.
         /// </summary>
         /// <param name="userRepository">repos</param>
+        /// <param name="accountRepository">Used to change email</param>
         /// <exception cref="ArgumentNullException">userRepository</exception>
-        public UpdatePersonalSettingsHandler(IUserRepository userRepository)
+        public UpdatePersonalSettingsHandler(IUserRepository userRepository, IAccountRepository accountRepository)
         {
-            if (userRepository == null) throw new ArgumentNullException("userRepository");
-            _userRepository = userRepository;
+            _userRepository = userRepository ?? throw new ArgumentNullException(nameof(userRepository));
+            _accountRepository = accountRepository ?? throw new ArgumentNullException(nameof(accountRepository));
         }
 
         /// <summary>
@@ -34,13 +37,24 @@ public UpdatePersonalSettingsHandler(IUserRepository userRepository)
         /// </returns>
         public async Task ExecuteAsync(UpdatePersonalSettings command)
         {
-            if (command == null) throw new ArgumentNullException("command");
+            if (command == null) throw new ArgumentNullException(nameof(command));
 
             var user = await _userRepository.GetUserAsync(command.UserId);
             user.FirstName = command.FirstName;
             user.LastName = command.LastName;
             user.MobileNumber = command.MobileNumber;
+
+            if (command.EmailAddress != null)
+                user.EmailAddress = command.EmailAddress;
+
             await _userRepository.UpdateAsync(user);
+
+            if (command.EmailAddress == null)
+                return;
+
+            var account = await _accountRepository.GetByIdAsync(user.AccountId);
+            account.SetVerifiedEmail(command.EmailAddress);
+            await _accountRepository.UpdateAsync(account);
         }
     }
 }

src/Server/Coderr.Server.SqlServer/Analysis/AnalyticsRepository.cs

@@ -78,8 +78,8 @@ public void CreateIncident(IncidentBeingAnalyzed incident)
             using (var cmd = _unitOfWork.CreateCommand())
             {
                 cmd.CommandText =
-                    "INSERT INTO Incidents (ReportHashCode, ApplicationId, CreatedAtUtc, HashCodeIdentifier, ReportCount, UpdatedAtUtc, Description, FullName, IsReOpened)" +
-                    " VALUES (@ReportHashCode, @ApplicationId, @CreatedAtUtc, @HashCodeIdentifier, @ReportCount, @UpdatedAtUtc, @Description, @FullName, 0);select SCOPE_IDENTITY();";
+                    "INSERT INTO Incidents (ReportHashCode, ApplicationId, CreatedAtUtc, HashCodeIdentifier, StackTrace, ReportCount, UpdatedAtUtc, Description, FullName, IsReOpened)" +
+                    " VALUES (@ReportHashCode, @ApplicationId, @CreatedAtUtc, @HashCodeIdentifier, @StackTrace, @ReportCount, @UpdatedAtUtc, @Description, @FullName, 0);select SCOPE_IDENTITY();";
                 cmd.AddParameter("Id", incident.Id);
                 cmd.AddParameter("ReportHashCode", incident.ReportHashCode);
                 cmd.AddParameter("ApplicationId", incident.ApplicationId);

src/Server/Coderr.Server.Web/Scripts/Models/AllModels.js.map

@@ -420,6 +420,7 @@ module codeRR.Core.Users.Queries {
 
     export class GetUserSettingsResult {
         public static TYPE_NAME: string = 'GetUserSettingsResult';
+        public EmailAddress: string;
         public FirstName: string;
         public LastName: string;
         public MobileNumber: string;
@@ -442,6 +443,7 @@ module codeRR.Core.Users.Commands {
 
     export class UpdatePersonalSettings {
         public static TYPE_NAME: string = 'UpdatePersonalSettings';
+        public EmailAddress: string;
         public FirstName: string;
         public LastName: string;
         public MobileNumber: string;

src/Server/Coderr.Server.Web/Scripts/Models/AllModels.ts

@@ -46,6 +46,7 @@ module codeRR.User {
             cmd.FirstName = dto.FirstName;
             cmd.LastName = dto.LastName;
             cmd.MobileNumber = dto.MobileNumber;
+            cmd.EmailAddress = dto.EmailAddress;
             CqsClient.command(cmd);
             humane.log("Settings have been saved.");
         }