Merge branch 'master' into dev

# Conflicts:
#	src/Backend/Jp.Domain/Validations/Client/ClientValidations.cs
#	src/Frontend/Jp.AdminUI/src/app/shared/layout/header/header.component.ts
#	src/Frontend/Jp.UI.SSO/jpProject_sso_log.txt
#	tests/JpProject.Domain.Tests/ClientTests/ClientCommandHandlerTests.cs
#	tests/JpProject.Domain.Tests/ClientTests/Fakers/EntityClientFaker.cs

Author: brunobritodev

src/Backend/Jp.Domain/Validations/Client/ClientValidations.cs

@@ -21,7 +21,6 @@ protected void ValidateGrantType()
         private bool ValidateGrantCombination(ICollection<string> grantTypes, string message)
         {
 
-
             // would allow response_type downgrade attack from code to token
             if (DisallowGrantTypeCombination(GrantType.Implicit, GrantType.AuthorizationCode, grantTypes))
             {

src/Frontend/Jp.AdminUI/src/app/shared/layout/header/header.component.ts

@@ -9,7 +9,6 @@ import { MenuService } from "@core/menu/menu.service";
 import { Router } from "@angular/router";
 import { environment } from "@env/environment";
 
-
 @Component({
     selector: "app-header",
     templateUrl: "./header.component.html",

src/Frontend/Jp.UI.SSO/jpProject_sso_log.txt

@@ -17219,6 +17219,7 @@ Error Number:2714,State:6,Class:16
 2019-03-29 03:33:41.664 -03:00 [INF] Invoking IdentityServer endpoint: IdentityServer4.Endpoints.DiscoveryKeyEndpoint for /.well-known/openid-configuration/jwks
 2019-03-29 03:33:41.670 -03:00 [DBG] Start key discovery request
 2019-03-29 03:33:54.575 -03:00 [INF] Removing 0 grants
+<<<<<<< HEAD
 2019-03-30 00:30:38.774 -03:00 [INF] SigninCredentialExtension keyType is Temporary
 2019-03-30 00:30:39.000 -03:00 [INF] SigninCredentialExtension added
 2019-03-30 00:30:43.548 -03:00 [INF] Starting IdentityServer4 version 2.4.0.0
@@ -17237,3 +17238,5 @@ Error Number:2714,State:6,Class:16
 2019-03-30 00:30:54.006 -03:00 [DBG] Error Url: /home/error
 2019-03-30 00:30:54.008 -03:00 [DBG] Error Id Parameter: errorId
 2019-03-30 00:30:58.872 -03:00 [INF] Removing 0 grants
+=======
+>>>>>>> remotes/origin/master

tests/JpProject.Domain.Tests/ClientTests/ClientCommandHandlerTests.cs

@@ -428,6 +428,5 @@ public async Task ShouldSaveClaim()
             Assert.False(result);
         }
 
-
     }
 }

tests/JpProject.Domain.Tests/ClientTests/Fakers/ClientFaker.cs

@@ -51,7 +51,6 @@ public static Faker<Client> GenerateClient(
                 .RuleFor(c => c.PairWiseSubjectSalt, f => f.Lorem.Word())
                 .RuleFor(c => c.UserCodeType, f => f.Lorem.Word())
                 .RuleFor(c => c.AllowedCorsOrigins, f => Enumerable.Range(1, f.Random.Int(1, 3)).Select(x => f.PickRandom(f.Internet.Url())).ToList())
-
                 .RuleFor(c => c.IdentityTokenLifetime, f => identityTokenLifetime ?? f.Random.Int(0))
                 .RuleFor(c => c.AccessTokenLifetime, f => accessTokenLifetime ?? f.Random.Int(0))
                 .RuleFor(c => c.AuthorizationCodeLifetime, f => authorizationCodeLifetime ?? f.Random.Int(0))

tests/JpProject.Domain.Tests/ClientTests/Fakers/EntityClientFaker.cs

@@ -41,25 +41,20 @@ public static Faker<ClientIdPRestriction> GenerateClientIdPRestriction()
                 .RuleFor(c => c.Provider, f => f.PickRandom(IdentityHelpers.Providers))
                 .RuleFor(c => c.ClientId, f => f.Random.Int(0));
 
-
-
         }
         public static Faker<ClientScope> GenerateClientScope()
         {
             return new Faker<ClientScope>()
                 .RuleFor(c => c.Id, f => f.Random.Int(0))
                 .RuleFor(c => c.Scope, f => f.PickRandom(IdentityHelpers.Scopes))
                 .RuleFor(c => c.ClientId, f => f.Random.Int(0));
-
-
         }
         public static Faker<ClientPostLogoutRedirectUri> GenerateClientPostLogoutRedirectUri()
         {
             return new Faker<ClientPostLogoutRedirectUri>()
                 .RuleFor(c => c.Id, f => f.Random.Int(0))
                 .RuleFor(c => c.PostLogoutRedirectUri, f => f.Internet.Url())
                 .RuleFor(c => c.ClientId, f => f.Random.Int(0));
-
         }
 
         public static Faker<ClientRedirectUri> GenerateClientRedirectUri()
@@ -142,6 +137,7 @@ public static Faker<Client> GenerateClient(
                 .RuleFor(c => c.IdentityProviderRestrictions, f => GenerateClientIdPRestriction().Generate(f.Random.Int(0, 1)))
                 .RuleFor(c => c.AllowedCorsOrigins, f => GenerateClientCorsOrigin().Generate(f.Random.Int(0, 2)))
                 .RuleFor(c => c.Properties, f => GenerateClientProperty().Generate(clientProperties ?? f.Random.Int(0, 2)));
+
         }
     }
 }