Merge pull request #34 from brunohbrito/dev

PostgreSql + Bug Fixes

Author: brunobritodev

api.dockerfile

@@ -6,16 +6,18 @@ EXPOSE 5003
 FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /src
 COPY ["src/Backend/Jp.UserManagement/Jp.Management.csproj", "Backend/Jp.UserManagement/"]
-COPY ["src/Backend/Jp.Infra.Migrations.Sql/Jp.Infra.Migrations.Sql.csproj", "Backend/Jp.Infra.Migrations.Sql/"]
-COPY ["src/Backend/Jp.Infra.Data/Jp.Infra.Data.csproj", "Backend/Jp.Infra.Data/"]
+COPY ["src/Backend/Jp.Application/Jp.Application.csproj", "Backend/Jp.Application/"]
 COPY ["src/Backend/Jp.Domain.Core/Jp.Domain.Core.csproj", "Backend/Jp.Domain.Core/"]
 COPY ["src/Backend/Jp.Domain/Jp.Domain.csproj", "Backend/Jp.Domain/"]
+COPY ["src/Backend/Jp.Infra.Data/Jp.Infra.Data.csproj", "Backend/Jp.Infra.Data/"]
+COPY ["src/Backend/Jp.Infra.Data.MySql/Jp.Infra.Data.MySql.csproj", "Backend/Jp.Infra.Data.MySql/"]
+COPY ["src/Backend/Jp.Infra.Data.Sql/Jp.Infra.Data.Sql.csproj", "Backend/Jp.Infra.Data.Sql/"]
+COPY ["src/Backend/Jp.Infra.Data.PostgreSQL/Jp.Infra.Data.PostgreSQL.csproj", "Backend/Jp.Infra.Data.PostgreSQL/"]
 COPY ["src/Backend/Jp.Infra.CrossCutting.Bus/Jp.Infra.CrossCutting.Bus.csproj", "Backend/Jp.Infra.CrossCutting.Bus/"]
+COPY ["src/Backend/Jp.Infra.CrossCutting.Database/Jp.Infra.CrossCutting.Database.csproj", "Backend/Jp.Infra.CrossCutting.Database/"]
 COPY ["src/Backend/Jp.Infra.CrossCutting.Identity/Jp.Infra.CrossCutting.Identity.csproj", "Backend/Jp.Infra.CrossCutting.Identity/"]
-COPY ["src/Backend/Jp.Application/Jp.Application.csproj", "Backend/Jp.Application/"]
 COPY ["src/Backend/Jp.Infra.CrossCutting.IoC/Jp.Infra.CrossCutting.IoC.csproj", "Backend/Jp.Infra.CrossCutting.IoC/"]
 COPY ["src/Backend/Jp.Infra.CrossCutting.Tools/Jp.Infra.CrossCutting.Tools.csproj", "Backend/Jp.Infra.CrossCutting.Tools/"]
-COPY ["src/Backend/Jp.Infra.Migrations.MySql/Jp.Infra.Migrations.MySql.csproj", "Backend/Jp.Infra.Migrations.MySql/"]
 
 RUN dotnet restore "Backend/Jp.UserManagement/Jp.Management.csproj"
 COPY src/. .

db.json

@@ -0,0 +1,9 @@
+{
+	"notifications": [
+		{ "icon": "text-info fas fa-kiwi-bird", "title": "Session", "description": "2019-05 UI Session improvements" },
+		{ "icon": "text-warning fab fa-docker", "title": "Docker", "description": "2019-04 Docker Ready" },
+		{ "icon": "text-info fas fa-code-branch", "title": "NET Core 2.2", "description": "2019-03 Updated to ASP.NET Core 2.2" },
+		{ "icon": "text-success fas fa-id-card", "title": "ID4", "description": "2019-03 IdentityServer4 2.4 Components" },
+		{ "icon": "text-danger fas fa-rocket", "title": "Launch", "description": "2018-10 first release" }
+	]
+}

docker-compose.yml

@@ -9,6 +9,8 @@ services:
       image: mysql
       command: --default-authentication-plugin=mysql_native_password
       restart: always
+      expose: 
+        - "3306"
       environment:
           MYSQL_ROOT_PASSWORD: root
           MYSQL_USER: jp

src/Backend/Jp.Application/AutoMapper/ViewModelToDomainMappingProfile.cs

@@ -51,7 +51,7 @@ public ViewModelToDomainMappingProfile()
             CreateMap<SaveUserRoleViewModel, SaveUserRoleCommand>().ConstructUsing(c => new SaveUserRoleCommand(c.Username, c.Role));
             CreateMap<RemoveUserLoginViewModel, RemoveUserLoginCommand>().ConstructUsing(c => new RemoveUserLoginCommand(c.Username, c.LoginProvider, c.ProviderKey));
             CreateMap<AdminChangePasswordViewodel, AdminChangePasswordCommand>().ConstructUsing(c => new AdminChangePasswordCommand(c.Password, c.ConfirmPassword, c.Username));
-            
+
             /*
              * Client commands
              */
@@ -65,19 +65,19 @@ public ViewModelToDomainMappingProfile()
             CreateMap<RemoveClientViewModel, RemoveClientCommand>().ConstructUsing(c => new RemoveClientCommand(c.ClientId));
             CreateMap<CopyClientViewModel, CopyClientCommand>().ConstructUsing(c => new CopyClientCommand(c.ClientId));
             CreateMap<SaveClientViewModel, SaveClientCommand>().ConstructUsing(c => new SaveClientCommand(c.ClientId, c.ClientName, c.ClientUri, c.LogoUri, c.Description, c.ClientType));
-            
+
             /*
              * Identity Resource commands
              */
             CreateMap<IdentityResource, RegisterIdentityResourceCommand>().ConstructUsing(c => new RegisterIdentityResourceCommand(c));
-            CreateMap<IdentityResourceViewModel, UpdateIdentityResourceCommand>().ConstructUsing(c => new UpdateIdentityResourceCommand(c,c.OldName));
+            CreateMap<IdentityResourceViewModel, UpdateIdentityResourceCommand>().ConstructUsing(c => new UpdateIdentityResourceCommand(c, c.OldName));
             CreateMap<RemoveIdentityResourceViewModel, RemoveIdentityResourceCommand>().ConstructUsing(c => new RemoveIdentityResourceCommand(c.Name));
 
             /*
              * Api Resource commands
              */
             CreateMap<ApiResource, RegisterApiResourceCommand>().ConstructUsing(c => new RegisterApiResourceCommand(c));
-            CreateMap<ApiResource, UpdateApiResourceCommand>().ConstructUsing(c => new UpdateApiResourceCommand(c));
+            CreateMap<UpdateApiResourceViewModel, UpdateApiResourceCommand>().ConstructUsing(c => new UpdateApiResourceCommand(c, c.OldApiResourceId));
             CreateMap<RemoveApiResourceViewModel, RemoveApiResourceCommand>().ConstructUsing(c => new RemoveApiResourceCommand(c.Name));
 
             CreateMap<SaveApiSecretViewModel, SaveApiSecretCommand>().ConstructUsing(c => new SaveApiSecretCommand(c.ResourceName, c.Description, c.Value, c.Type, c.Expiration, (int)c.Hash.GetValueOrDefault(HashType.Sha256)));

src/Backend/Jp.Application/Interfaces/IApiResourceAppService.cs

@@ -1,7 +1,6 @@
 using IdentityServer4.Models;
 using Jp.Application.ViewModels;
 using Jp.Application.ViewModels.ApiResouceViewModels;
-using Jp.Application.ViewModels.IdentityResourceViewModels;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -13,7 +12,7 @@ public interface IApiResourceAppService : IDisposable
         Task<IEnumerable<ApiResourceListViewModel>> GetApiResources();
         Task<ApiResource> GetDetails(string name);
         Task Save(ApiResource model);
-        Task Update(ApiResource model);
+        Task Update(UpdateApiResourceViewModel model);
         Task Remove(RemoveApiResourceViewModel model);
         Task<IEnumerable<SecretViewModel>> GetSecrets(string name);
         Task RemoveSecret(RemoveApiSecretViewModel model);

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

@@ -4,7 +4,6 @@
 using Jp.Application.Interfaces;
 using Jp.Application.ViewModels;
 using Jp.Application.ViewModels.ApiResouceViewModels;
-using Jp.Application.ViewModels.IdentityResourceViewModels;
 using Jp.Domain.Commands.ApiResource;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Interfaces;
@@ -57,7 +56,7 @@ public Task Save(ApiResource model)
             return Bus.SendCommand(command);
         }
 
-        public Task Update(ApiResource model)
+        public Task Update(UpdateApiResourceViewModel model)
         {
             var command = _mapper.Map<UpdateApiResourceCommand>(model);
             return Bus.SendCommand(command);

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

@@ -5,7 +5,6 @@
 using Jp.Domain.Commands.User;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Interfaces;
-using Jp.Domain.Models;
 using System;
 using System.Threading.Tasks;
 

src/Backend/Jp.Application/ViewModels/ApiResouceViewModels/UpdateApiResourceViewModel.cs

@@ -0,0 +1,9 @@
+using IdentityServer4.Models;
+
+namespace Jp.Application.ViewModels.ApiResouceViewModels
+{
+    public class UpdateApiResourceViewModel : ApiResource
+    {
+        public string OldApiResourceId { get; set; }
+    }
+}

src/Backend/Jp.Domain.Core/Jp.Domain.Core.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="mediatr" Version="6.0.0" />
-    <PackageReference Include="FluentValidation" Version="8.2.0" />
+    <PackageReference Include="mediatr" Version="7.0.0" />
+    <PackageReference Include="FluentValidation" Version="8.4.0" />
   </ItemGroup>
 
 </Project>

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

@@ -73,7 +73,7 @@ public async Task<bool> Handle(UpdateApiResourceCommand request, CancellationTok
                 return false;
             }
 
-            var savedClient = await _apiResourceRepository.GetResource(request.Resource.Name);
+            var savedClient = await _apiResourceRepository.GetResource(request.OldResourceName);
             if (savedClient == null)
             {
                 await Bus.RaiseEvent(new DomainNotification("1", "Resource not found"));
@@ -237,7 +237,7 @@ public async Task<bool> Handle(SaveApiScopeCommand request, CancellationToken ca
                 Emphasize = request.Emphasize,
                 Name = request.Name,
                 ShowInDiscoveryDocument = request.ShowInDiscoveryDocument,
-                UserClaims =  request.UserClaims.Select(s => new ApiScopeClaim(){ Type = s}).ToList(),
+                UserClaims = request.UserClaims.Select(s => new ApiScopeClaim() { Type = s }).ToList(),
             };
 
             _apiScopeRepository.Add(secret);