bug fixes

brunobritodev · brunobritodev · commit 4b990829a64e · 2019-06-24T12:53:47.000-03:00
csp adjustments
diff --git a/src/Backend/Jp.Application/AutoMapper/ViewModelToDomainMappingProfile.cs b/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)));
diff --git a/src/Backend/Jp.Application/Interfaces/IApiResourceAppService.cs b/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);
diff --git a/src/Backend/Jp.Application/Services/ApiResourceAppService.cs b/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);
diff --git a/src/Backend/Jp.Application/ViewModels/ApiResouceViewModels/UpdateApiResourceViewModel.cs b/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; }
+    }
+}
diff --git a/src/Backend/Jp.Domain/CommandHandlers/ApiResourceCommandHandler.cs b/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);
diff --git a/src/Backend/Jp.Domain/Commands/ApiResource/ApiResourceCommand.cs b/src/Backend/Jp.Domain/Commands/ApiResource/ApiResourceCommand.cs
@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
-using IdentityServer4.EntityFramework.Entities;
 using Jp.Domain.Core.Commands;
 
 namespace Jp.Domain.Commands.ApiResource
 {
     public abstract class ApiResourceCommand : Command
     {
+        public string OldResourceName { get; protected set; }
         public IdentityServer4.Models.ApiResource Resource { get; protected set; }
 
 
diff --git a/src/Backend/Jp.Domain/Commands/ApiResource/UpdateApiResourceCommand.cs b/src/Backend/Jp.Domain/Commands/ApiResource/UpdateApiResourceCommand.cs
@@ -5,8 +5,9 @@ namespace Jp.Domain.Commands.ApiResource
     public class UpdateApiResourceCommand : ApiResourceCommand
     {
 
-        public UpdateApiResourceCommand(IdentityServer4.Models.ApiResource resource)
+        public UpdateApiResourceCommand(IdentityServer4.Models.ApiResource resource, string oldResourceName)
         {
+            OldResourceName = oldResourceName;
             Resource = resource;
         }
 
diff --git a/src/Backend/Jp.UserManagement/Controllers/ApiResourceController.cs b/src/Backend/Jp.UserManagement/Controllers/ApiResourceController.cs
@@ -54,7 +54,7 @@ public async Task<ActionResult<DefaultResponse<bool>>> Save([FromBody] ApiResour
         }
 
         [HttpPut, Route("update"), Authorize(Policy = "Admin")]
-        public async Task<ActionResult<DefaultResponse<bool>>> Update([FromBody] ApiResource model)
+        public async Task<ActionResult<DefaultResponse<bool>>> Update([FromBody] UpdateApiResourceViewModel model)
         {
             if (!ModelState.IsValid)
             {
diff --git a/src/Frontend/Jp.AdminUI/src/app/panel/api-resources/edit/api-resource-edit.component.ts b/src/Frontend/Jp.AdminUI/src/app/panel/api-resources/edit/api-resource-edit.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from "@angular/core";
 import { TranslatorService } from "@core/translator/translator.service";
-import { flatMap } from "rxjs/operators";
+import { flatMap, tap } from "rxjs/operators";
 import { ActivatedRoute, Router } from "@angular/router";
 import { ToasterConfig, ToasterService } from "angular2-toaster";
 import { DefaultResponse } from "@shared/viewModel/default-response.model";
@@ -25,6 +25,7 @@ export class ApiResourceEditComponent implements OnInit {
         showCloseButton: true
     });
     public showButtonLoading: boolean;
+    public resourceId: string;
     standardClaims: string[];
 
     constructor(
@@ -35,7 +36,7 @@ export class ApiResourceEditComponent implements OnInit {
         public toasterService: ToasterService) { }
 
     public ngOnInit() {
-        this.route.params.pipe(flatMap(p => this.apiResourceService.getApiResourceDetails(p["name"]))).subscribe(result => this.model = result.data);
+        this.route.params.pipe(tap(p => this.resourceId = p["name"])).pipe(flatMap(p => this.apiResourceService.getApiResourceDetails(p["name"]))).subscribe(result => this.model = result.data);
         this.errors = [];
         this.showButtonLoading = false;
         this.standardClaims = StandardClaims.claims;
@@ -45,7 +46,7 @@ export class ApiResourceEditComponent implements OnInit {
         this.showButtonLoading = true;
         this.errors = [];
         try {
-
+            this.model.oldApiResourceId = this.resourceId;
             this.apiResourceService.update(this.model).subscribe(
                 registerResult => {
                     if (registerResult.data) {
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/viewModel/api-resource.model.ts b/src/Frontend/Jp.AdminUI/src/app/shared/viewModel/api-resource.model.ts
@@ -12,6 +12,7 @@ export class ApiResource {
     displayName: string;
     description: string;
     userClaims: string[];
+    oldApiResourceId: string;
 }
 
 
diff --git a/src/Frontend/Jp.UI.SSO/Configuration/SecurityHeadersConfiguration.cs b/src/Frontend/Jp.UI.SSO/Configuration/SecurityHeadersConfiguration.cs
@@ -16,22 +16,25 @@ public static void UseSecurityHeaders(this IApplicationBuilder app, IHostingEnvi
 
             app.UseXXssProtection(options => options.EnabledWithBlockMode());
             app.UseXContentTypeOptions();
-            app.UseXfo(options => options.SameOrigin());
+            //app.UseXfo(options => options.Deny());
             app.UseReferrerPolicy(options => options.NoReferrer());
 
             app.UseCsp(options =>
             {
                 options.DefaultSources(o => o.Self());
                 options.ObjectSources(o => o.None());
-                options.FrameAncestors(o => o.None());
                 options.Sandbox(directive => directive.AllowForms().AllowSameOrigin().AllowScripts());
                 options.BaseUris(configuration => configuration.Self());
                 options.FrameSources(o => o.Self()
                     // this custom source can be removed in your build
                     .CustomSources("https://ghbtns.com"));
 
                 if (env.IsProduction())
+                {
                     options.UpgradeInsecureRequests();
+                    // You can set your custom domains here
+                    // options.FrameAncestors(o => o.CustomSources());
+                }
                 options.ImageSources(a =>
                 {
                     a.Self();
diff --git a/tests/JpProject.Domain.Tests/ApiResourceTests/ApiResourcsCommandHandlerTests.cs b/tests/JpProject.Domain.Tests/ApiResourceTests/ApiResourcsCommandHandlerTests.cs
@@ -1,14 +1,14 @@
 ﻿using Bogus;
 using IdentityServer4.EntityFramework.Entities;
 using Jp.Domain.CommandHandlers;
+using Jp.Domain.Commands.ApiResource;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Core.Notifications;
 using Jp.Domain.Interfaces;
 using JpProject.Domain.Tests.ApiResourceTests.Fakers;
 using Moq;
 using System.Threading;
 using System.Threading.Tasks;
-using Jp.Domain.Commands.ApiResource;
 using Xunit;
 
 namespace JpProject.Domain.Tests.ApiResourceTests
@@ -90,8 +90,8 @@ public async Task ShouldNotUpdateResourceWhenItDoesntExist()
         [Fact]
         public async Task ShouldNotUpdateResourceWhenNameIsntProvided()
         {
-            var command = new UpdateApiResourceCommand(new IdentityServer4.Models.ApiResource());
-            
+            var command = ResourceCommandFaker.GenerateUpdateApiResourceCommand().Generate();
+            command.Resource.Name = null;
 
             var result = await _commandHandler.Handle(command, _tokenSource.Token);
 
@@ -103,15 +103,16 @@ public async Task ShouldNotUpdateResourceWhenNameIsntProvided()
         [Fact]
         public async Task ShouldUpdateResource()
         {
-            var command = ResourceCommandFaker.GenerateUpdateApiResourceCommand().Generate();
-            _apiResourceRepository.Setup(s => s.GetResource(It.Is<string>(q => q == command.Resource.Name))).ReturnsAsync(EntityResourceFaker.GenerateResource().Generate());
+            var oldResourceName = "old-resource-name";
+            var command = ResourceCommandFaker.GenerateUpdateApiResourceCommand(oldResourceName: oldResourceName).Generate();
+            _apiResourceRepository.Setup(s => s.GetResource(It.Is<string>(q => q == oldResourceName))).ReturnsAsync(EntityResourceFaker.GenerateResource().Generate());
             _apiResourceRepository.Setup(s => s.UpdateWithChildrens(It.Is<ApiResource>(i => i.Name == command.Resource.Name))).Returns(Task.CompletedTask);
             _uow.Setup(s => s.Commit()).Returns(true);
 
             var result = await _commandHandler.Handle(command, _tokenSource.Token);
 
             _apiResourceRepository.Verify(s => s.UpdateWithChildrens(It.IsAny<ApiResource>()), Times.Once);
-            _apiResourceRepository.Verify(s => s.GetResource(It.Is<string>(q => q == command.Resource.Name)), Times.Once);
+            _apiResourceRepository.Verify(s => s.GetResource(It.Is<string>(q => q == oldResourceName)), Times.Once);
 
             Assert.True(result);
         }
@@ -156,7 +157,7 @@ public async Task ShouldRemoveResource()
 
             var result = await _commandHandler.Handle(command, _tokenSource.Token);
 
-            _apiResourceRepository.Verify(s => s.GetResource(It.Is<string>(q => q == command.Resource.Name)),Times.Once);
+            _apiResourceRepository.Verify(s => s.GetResource(It.Is<string>(q => q == command.Resource.Name)), Times.Once);
             _apiResourceRepository.Verify(s => s.Remove(It.IsAny<int>()), Times.Once);
 
             Assert.True(result);
diff --git a/tests/JpProject.Domain.Tests/ApiResourceTests/Fakers/ApiResourceFaker.cs b/tests/JpProject.Domain.Tests/ApiResourceTests/Fakers/ApiResourceFaker.cs
@@ -1,6 +1,6 @@
-﻿using System.Linq;
-using Bogus;
+﻿using Bogus;
 using IdentityServer4.Models;
+using System.Linq;
 
 namespace JpProject.Domain.Tests.ApiResourceTests.Fakers
 {
diff --git a/tests/JpProject.Domain.Tests/ApiResourceTests/Fakers/ResourceCommandFaker.cs b/tests/JpProject.Domain.Tests/ApiResourceTests/Fakers/ResourceCommandFaker.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using Bogus;
-using IdentityServer4.Models;
+﻿using Bogus;
 using Jp.Domain.Commands.ApiResource;
 
 namespace JpProject.Domain.Tests.ApiResourceTests.Fakers
@@ -16,10 +12,10 @@ public static Faker<RegisterApiResourceCommand> GenerateRegisterApiResourceComma
             );
 
         }
-        public static Faker<UpdateApiResourceCommand> GenerateUpdateApiResourceCommand()
+        public static Faker<UpdateApiResourceCommand> GenerateUpdateApiResourceCommand(string oldResourceName = null)
         {
             return new Faker<UpdateApiResourceCommand>().CustomInstantiator(faker =>
-                new UpdateApiResourceCommand(ApiResourceFaker.GenerateApiResource().Generate())
+                new UpdateApiResourceCommand(ApiResourceFaker.GenerateApiResource().Generate(), oldResourceName ?? faker.Internet.DomainName())
             );
 
         }
diff --git a/tests/JpProject.Domain.Tests/ClientTests/ClientCommandHandlerTests.cs b/tests/JpProject.Domain.Tests/ClientTests/ClientCommandHandlerTests.cs
@@ -175,13 +175,18 @@ public async Task ShouldNotAcceptNegativeDeviceCodeLifetime()
         [Fact]
         public async Task ShouldUpdateClient()
         {
-            var command = ClientCommandFaker.GenerateUpdateClientCommand().Generate();
+            var oldClientId = "my-old-client-name";
+            var command = ClientCommandFaker.GenerateUpdateClientCommand(oldClientId: oldClientId).Generate();
             _clientRepository.Setup(s => s.UpdateWithChildrens(It.Is<Client>(a => a.ClientId == command.Client.ClientId))).Returns(Task.CompletedTask);
-            _clientRepository.Setup(s => s.GetClient(It.Is<string>(a => a == command.OldClientId))).ReturnsAsync(EntityClientFaker.GenerateClient().Generate());
+            _clientRepository.Setup(s => s.GetClient(It.Is<string>(a => a == oldClientId))).ReturnsAsync(EntityClientFaker.GenerateClient().Generate());
             _uow.Setup(s => s.Commit()).Returns(true);
 
             var result = await _commandHandler.Handle(command, _tokenSource.Token);
 
+
+            _clientRepository.Verify(s => s.UpdateWithChildrens(It.IsAny<Client>()), Times.Once);
+            _clientRepository.Verify(s => s.GetClient(It.Is<string>(q => q == oldClientId)), Times.Once);
+
             Assert.True(result);
         }
 
@@ -202,7 +207,6 @@ public async Task ShouldRemoveClient()
         public async Task ShouldNotRemoveSecretWhenClientDoesntExist()
         {
             var command = ClientCommandFaker.GenerateRemoveClientSecretCommand().Generate();
-            //_clientRepository.Setup(s => s.GetClient(It.Is<string>(a => a == command.ClientId))).ReturnsAsync(null);
 
             var result = await _commandHandler.Handle(command, _tokenSource.Token);
 
diff --git a/tests/JpProject.Domain.Tests/ClientTests/Fakers/ClientCommandFaker.cs b/tests/JpProject.Domain.Tests/ClientTests/Fakers/ClientCommandFaker.cs
@@ -32,7 +32,8 @@ public static Faker<UpdateClientCommand> GenerateUpdateClientCommand(
             int? accessTokenLifetime = null,
             int? authorizationCodeLifetime = null,
             int? slidingRefreshTokenLifetime = null,
-            int? deviceCodeLifetime = null)
+            int? deviceCodeLifetime = null,
+            string oldClientId = null)
         {
             return new Faker<UpdateClientCommand>().CustomInstantiator(f =>
                 new UpdateClientCommand(
@@ -42,8 +43,7 @@ public static Faker<UpdateClientCommand> GenerateUpdateClientCommand(
                                                 authorizationCodeLifetime,
                         slidingRefreshTokenLifetime,
                         deviceCodeLifetime).Generate(),
-                    f.Company.CompanyName()
-                ));
+                    oldClientId ?? f.Internet.DomainName()));
 
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using IdentityServer4.EntityFramework.Entities;`
`4`	`1`	`using Jp.Domain.Core.Commands;`
`5`	`2`
`6`	`3`	`namespace Jp.Domain.Commands.ApiResource`
`7`	`4`	`{`
`8`	`5`	`public abstract class ApiResourceCommand : Command`
`9`	`6`	`{`
	`7`	`+ public string OldResourceName { get; protected set; }`
`10`	`8`	`public IdentityServer4.Models.ApiResource Resource { get; protected set; }`
`11`	`9`
`12`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,9 @@ namespace Jp.Domain.Commands.ApiResource`
`5`	`5`	`public class UpdateApiResourceCommand : ApiResourceCommand`
`6`	`6`	`{`
`7`	`7`
`8`		`- public UpdateApiResourceCommand(IdentityServer4.Models.ApiResource resource)`
	`8`	`+ public UpdateApiResourceCommand(IdentityServer4.Models.ApiResource resource, string oldResourceName)`
`9`	`9`	`{`
	`10`	`+ OldResourceName = oldResourceName;`
`10`	`11`	`Resource = resource;`
`11`	`12`	`}`
`12`	`13`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public async Task<ActionResult<DefaultResponse<bool>>> Save([FromBody] ApiResour`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`[HttpPut, Route("update"), Authorize(Policy = "Admin")]`
`57`		`- public async Task<ActionResult<DefaultResponse<bool>>> Update([FromBody] ApiResource model)`
	`57`	`+ public async Task<ActionResult<DefaultResponse<bool>>> Update([FromBody] UpdateApiResourceViewModel model)`
`58`	`58`	`{`
`59`	`59`	`if (!ModelState.IsValid)`
`60`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ export class ApiResource {`
`12`	`12`	`displayName: string;`
`13`	`13`	`description: string;`
`14`	`14`	`userClaims: string[];`
	`15`	`+ oldApiResourceId: string;`
`15`	`16`	`}`
`16`	`17`
`17`	`18`