small changes

# Conflicts:
#	src/Backend/Jp.Infra.CrossCutting.Database/DbSettingsConfig.cs
#	src/Backend/Jp.UserManagement/Jp.Management.csproj
#	src/Backend/Jp.UserManagement/appsettings.json
#	src/Frontend/Jp.UI.SSO/Controllers/Account/LegacyController.cs
#	src/Frontend/Jp.UI.SSO/appsettings.json

Author: brunobritodev

src/Backend/Jp.Application/Services/UserManagerAppService.cs

@@ -7,12 +7,12 @@
 using Jp.Domain.Commands.User;
 using Jp.Domain.Commands.UserManagement;
 using Jp.Domain.Core.Bus;
+using Jp.Domain.Core.ViewModels;
 using Jp.Domain.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Jp.Domain.Core.ViewModels;
 
 namespace Jp.Application.Services
 {

src/Backend/Jp.Application/ViewModels/UserViewModels/UserViewModel.cs

@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.ComponentModel.DataAnnotations;
 
 namespace Jp.Application.ViewModels.UserViewModels
@@ -27,6 +28,8 @@ public class UserViewModel
         public string Company { get; set; }
         public string Bio { get; set; }
         public string JobTitle { get; set; }
+
+        [JsonIgnore]
         public Guid Id { get; set; }
         public bool EmailConfirmed { get; set; }
         public bool PhoneNumberConfirmed { get; set; }

src/Backend/Jp.Domain.Core/StringUtils/StringExtensions.cs

@@ -0,0 +1,14 @@
+using System.Text.RegularExpressions;
+
+namespace Jp.Domain.Core.StringUtils
+{
+    public static class StringExtensions
+    {
+        public static bool IsEmail(this string username)
+        {
+            // Return true if strIn is in valid e-mail format.
+            return Regex.IsMatch(username, @"^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$");
+        }
+
+    }
+}

src/Backend/Jp.Domain/CommandHandlers/UserCommandHandler.cs

@@ -77,7 +77,7 @@ public async Task<bool> Handle(RegisterNewUserWithoutPassCommand request, Cancel
             if (!request.IsValid())
             {
                 NotifyValidationErrors(request);
-                return false; ;
+                return false; 
             }
 
             var user = new User(
@@ -142,7 +142,7 @@ public async Task<bool> Handle(SendResetLinkCommand request, CancellationToken c
             if (!request.IsValid())
             {
                 NotifyValidationErrors(request);
-                return false; ;
+                return false; 
             }
 
             var emailSent = await _userService.SendResetLink(request.Email, request.Username);
@@ -160,7 +160,7 @@ public async Task<bool> Handle(ResetPasswordCommand request, CancellationToken c
             if (!request.IsValid())
             {
                 NotifyValidationErrors(request);
-                return false; ;
+                return false; 
             }
 
             var emailSent = await _userService.ResetPassword(request);
@@ -178,7 +178,7 @@ public async Task<bool> Handle(ConfirmEmailCommand request, CancellationToken ca
             if (!request.IsValid())
             {
                 NotifyValidationErrors(request);
-                return false; ;
+                return false; 
             }
 
             var result = await _userService.ConfirmEmailAsync(request.Email, request.Code);
@@ -195,7 +195,7 @@ public async Task<bool> Handle(AddLoginCommand request, CancellationToken cancel
             if (!request.IsValid())
             {
                 NotifyValidationErrors(request);
-                return false; ;
+                return false; 
             }
 
             var result = await _userService.AddLoginAsync(request.Email, request.Provider, request.ProviderId);

src/Backend/Jp.Infra.CrossCutting.Database/DbSettingsConfig.cs

@@ -38,8 +38,8 @@ public static void AddIdentityConfiguration(this IServiceCollection services, IC
                     options.ClaimsIdentity.UserIdClaimType = JwtClaimTypes.Name;
                     options.SignIn.RequireConfirmedAccount = true;
                     options.User.RequireUniqueEmail = true;
-
-                    // NIST Password best practices: https://pages.nist.gov/800-63-3/sp800-63b.html#appA
+					
+					// NIST Password best practices: https://pages.nist.gov/800-63-3/sp800-63b.html#appA
                     options.Lockout.MaxFailedAccessAttempts = 10;
                     options.Password.RequiredLength = 8;
                     options.Password.RequireDigit = false;
@@ -50,6 +50,8 @@ public static void AddIdentityConfiguration(this IServiceCollection services, IC
                     options.Password.RequiredUniqueChars = 0;
 
                 })
+
+                    
                 .AddEntityFrameworkStores<ApplicationIdentityContext>();
         }
 

src/Backend/Jp.Infra.CrossCutting.Tools/StringUtils/StringExtensions.cs

@@ -0,0 +1,14 @@
+using System.Text.RegularExpressions;
+
+namespace Jp.Infra.CrossCutting.Tools.StringUtils
+{
+    public static class StringExtensions
+    {
+        public static bool IsEmail(this string username)
+        {
+            // Return true if strIn is in valid e-mail format.
+            return Regex.IsMatch(username, @"^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$");
+        }
+
+    }
+}

src/Backend/Jp.UserManagement/Controllers/UserAdminController.cs

@@ -5,15 +5,16 @@
 using Jp.Application.ViewModels.UserViewModels;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Core.Notifications;
+using Jp.Domain.Core.ViewModels;
 using Jp.Domain.Interfaces;
 using Jp.Infra.CrossCutting.Tools.Model;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.JsonPatch;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
-using Jp.Domain.Core.ViewModels;
 
 namespace Jp.Management.Controllers
 {
@@ -22,17 +23,19 @@ public class UserAdminController : ApiController
     {
         private readonly IUserManageAppService _userManageAppService;
         private readonly ISystemUser _user;
+        private readonly IUserAppService _userAppService;
 
         public UserAdminController(
             INotificationHandler<DomainNotification> notifications,
             IMediatorHandler mediator,
             IUserManageAppService userManageAppService,
             ISystemUser user,
-            IRoleManagerAppService roleManagerAppService) : base(notifications, mediator)
+            IUserAppService userAppService) : base(notifications, mediator)
         {
 
             _userManageAppService = userManageAppService;
             _user = user;
+            _userAppService = userAppService;
         }
 
         /// <summary>
@@ -56,15 +59,18 @@ public async Task<ActionResult<DefaultResponse<UserViewModel>>> Details(string u
         }
 
 
-        [HttpPut, Route("update"), Authorize(Policy = "Admin")]
-        public async Task<ActionResult<DefaultResponse<bool>>> Update([FromBody] UserViewModel model)
+        [HttpPatch, Route("{username}/update"), Authorize(Policy = "Admin")]
+        public async Task<ActionResult<DefaultResponse<bool>>> Update(string username, [FromBody] JsonPatchDocument<UserViewModel> model)
         {
             if (!ModelState.IsValid)
             {
                 NotifyModelStateErrors();
                 return ModelStateErrorResponseError();
             }
-            await _userManageAppService.UpdateUser(model);
+
+            var actualUser = await _userAppService.FindByNameAsync(username);
+            model.ApplyTo(actualUser);
+            await _userManageAppService.UpdateUser(actualUser);
             return Response(true);
         }
 

src/Backend/Jp.UserManagement/Jp.Management.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.5" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.0.1-dev-00116" />
+	<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="3.0.0" />
     <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.0.4" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />

src/Frontend/Jp.AdminUI/src/app/shared/services/user.service.ts

@@ -39,8 +39,12 @@ export class UserService {
 
         return this.http.put<DefaultResponse<boolean>>(environment.ResourceServer + "UserAdmin/update", updateCommand);
     }
-    public save(model: UserProfile): Observable<DefaultResponse<boolean>> {
+    
+    public patch(updateCommand: UserProfile): Observable<DefaultResponse<boolean>> {
+        return this.http.patch<DefaultResponse<boolean>>(environment.ResourceServer + "UserAdmin/update", updateCommand);
+    }
 
+    public save(model: UserProfile): Observable<DefaultResponse<boolean>> {
         return this.http.post<DefaultResponse<boolean>>(environment.ResourceServer + "User/register", model);
     }
 

src/Frontend/Jp.UI.SSO/Models/LoginInputModel.cs

@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
+using Jp.Infra.CrossCutting.Tools.StringUtils;
 using System.ComponentModel.DataAnnotations;
-using System.Text.RegularExpressions;
 
 namespace Jp.UI.SSO.Models
 {
@@ -19,7 +19,7 @@ public class LoginInputModel
         public bool IsUsernameEmail()
         {
             // Return true if strIn is in valid e-mail format.
-            return Regex.IsMatch(Username, @"^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$");
+            return Username.IsEmail();
         }
     }
 }