Merge remote-tracking branch 'remotes/tepm/master'

# Conflicts:
#	README.md
#	src/Backend/Jp.Domain/CommandHandlers/ClientCommandHandler.cs
#	src/Backend/Jp.UserManagement/Controllers/ClientController.cs
#	src/Backend/Jp.UserManagement/jpProject_sso_log.txt
#	src/Frontend/Jp.AdminUI/src/app/core/interceptors/auth.interceptor.ts
#	src/Frontend/Jp.UI.SSO/Configuration/SecurityHeadersConfiguration.cs
#	src/Frontend/Jp.UI.SSO/jpProject_sso_log.txt

Author: brunobritodev

.dockerignore

@@ -2,7 +2,7 @@
 .env
 .git
 .gitignore
-.vs/
+**/.vs/
 .vscode
 */bin
 */obj

CHANGELOG.md

@@ -1,3 +1,73 @@
+## v1.1.0
+
+* Now you can run through a docker! ❤️
+    * Unfortunately you need to change hosts for it. Because Authority URL. I can't do anything to face it. It's security feature from OAuth2 to keep same Authority name for each Token.
+
+
+* Update of main Context, JpProject
+* Removed previous components from MySql.Migrations and Sql.Migrations. Unified in same project.
+
+* Client Page:
+    * Changed Claims button to be under Token - Following Docs from [IdentityServer4](https://identityserver4.readthedocs.io/en/latest/reference/client.html#token)
+    * Included Device Flow options
+
+Updates:
+* @angular/cli to 7.3.6
+* @angular/core to 7.2.10 (ng update @angular/core, then it updated other dep's)|
+    * @angular/language-service @ "7.2.10" (was "6.0.0")...
+    * @angular/compiler-cli @ "7.2.10" (was "6.0.0")...
+    * @angular/animations @ "7.2.10" (was "6.0.0")...
+    * @angular/compiler @ "7.2.10" (was "6.0.0")...
+    * @angular/common @ "7.2.10" (was "6.0.0")...
+    * @angular/core @ "7.2.10" (was "6.0.0")...
+    * @angular/http @ "7.2.10" (was "6.0.0")...
+    * @angular/forms @ "7.2.10" (was "6.0.0")...
+    * @angular/platform-browser-dynamic @ "7.2.10" (was "6.0.0")...
+    * @angular/platform-browser @ "7.2.10" (was "6.0.0")...
+    * @angular/router @ "7.2.10" (was "6.0.0")...
+    * zone.js @ "0.8.29" (was "0.8.26")...
+    * rxjs @ "6.4.0" (was "6.0.0")...
+    * typescript @ "3.2.4" (was "2.7.2")
+
+Updated components from UI:
+
+|dependency|old version| new version|
+|----------|-----------|------------|
+|@agm/core| 1.0.0-beta.2|  →   1.0.0-beta.5|
+|@ng-bootstrap/ng-bootstrap |^3.2.2| → ^4.1.0|
+|@ngx-translate/core| 10.0.1| → 11.0.1|
+|@ngx-translate/http-loader| 3.0.1| → 4.0.0|
+|@swimlane/ngx-datatable| 12.0.0| → 14.0.0|
+|ag-grid| 17.1.1| → 18.1.2|
+|ag-grid-angular| 17.1.0| → 20.2.0|
+|angular-oauth2-oidc |^4.0.2| → ^5.0.2|
+|angular-tree-component| 7.0.1| → 8.3.0|
+|bootstrap| 4.1.1| → 4.3.1|
+|chart.js| 2.7.2| → 2.8.0|
+|codemirror| 5.37.0| → 5.45.0|
+|enhanced-resolve| 3.3.0| → 4.1.0|
+|fullcalendar| 3.9.0| → 3.10.0|
+|lodash| 4.17.10| → 4.17.11|
+|modernizr| 3.6.0| → 3.7.1|
+|moment| 2.22.1| → 2.24.0|
+|ng2-charts| 1.6.0| → 2.0.4|
+|ng2-material-dropdown| 0.9.5| → 0.10.1|
+|ngx-chips |^1.9.8| → ^2.0.0-beta.0|
+|ngx-color-picker| 6.0.0| → 7.4.0|
+|ngx-infinite-scroll| 0.8.4| → 7.1.0|
+|popper.js| 1.14.3| → 1.14.7|
+|screenfull| 3.3.2| → 4.1.0|
+|summernote| 0.8.10| → 0.8.11|
+|sweetalert| 1.1.3| → 2.1.2|
+|ts-helpers| 1.1.1| **removed**|
+|web-animations-js| 2.2.1| → 2.3.1|
+|zone.js| 0.8.29| → 0.9.0|
+|@angular-devkit/build-angular| 0.6.1| → 0.13.6|
+|@types/lodash| 4.14.108| → 4.14.123|
+|codelyzer| 4.2.1| → 5.0.0-beta.2|
+|ts-node| 5.0.1| → 8.0.3|
+|tslint| 5.9.1| → 5.14.0|
+
 ## v1.0.0
 
 - First release

README.md

@@ -5,24 +5,41 @@
 [![License](https://img.shields.io/github/license/brunohbrito/jp-project.svg)](LICENSE)
 ![DOCS](https://readthedocs.org/projects/jp-project/badge/?version=latest&style=flat)
 
-Jp Project is a Open Source Admin UI for IdentityServer4. 
+Jp Project is a Open Source UI Administration Panel for IdentityServer4. 
+
+
+## Admin UI
+<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/jp-adminui.gif"  width="480" />
+
+## Login page
+<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/login.JPG?raw=true" width="480" />
+
+## Consent page
+<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/consent-page.JPG?raw=true" width="480" />
+
+## Profile 
+<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/jp-usermanagement.gif" width="480" />
+
 
 # We are online at Azure. 
 
+<img align="right" width="100px" src="https://www.developpez.net/forums/attachments/p289604d1/a/a/a" />
+
 Check it now at [Jp Project](https://jpproject.azurewebsites.net/admin-ui/).
 
 You can check also [SSO](https://jpproject.azurewebsites.net/sso/) and [User Management](https://jpproject.azurewebsites.net/user-management/)
 
+
 _New users are readonly_
 
-<img align="right" width="100px" src="https://www.developpez.net/forums/attachments/p289604d1/a/a/a" />
+
 Written in ASP.NET Core and Angular 6.
 The main goal of project is to be a Management Ecosystem for IdentityServer4. Helping Startup's and Organization to Speed Up the Setup of User Management. Helping teams and entrepreneurs to achieve the company's primary purpose: Maximize shareholder value.
 
-# Features
+# How it was written
 - Angular 6
 - Rich UI interface
-- ASP.NET Core 2.1
+- ASP.NET Core 2.2
 - ASP.NET MVC Core 
 - ASP.NET WebApi Core
 - ASP.NET Identity Core
@@ -60,19 +77,7 @@ Jp Project is built against ASP.NET Core 2.1.
 
 Wait for ng to complete his proccess then go to http://localhost:5000!
 
-# Screen Shots.
 
-## Admin UI
-<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/admin-home.jpg?raw=true" width="480" />
-
-## Login page
-<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/login.JPG?raw=true" width="480" />
-
-## Consent page
-<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/consent-page.JPG?raw=true" width="480" />
-
-## Profile 
-<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/profile.JPG?raw=true" width="480" />
 
 Any doubts? Go to docs
 
@@ -104,4 +109,4 @@ There are several ways we can help you out.
 
 Code coverage
 
-Thinking about create separated repo's for each part of solution.
+Thinking about create separated repo's for each part of solution.

docs/images/jp-adminui.gif

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="7.0.1" />
+    <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
     <PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
   </ItemGroup>

docs/images/jp-usermanagement.gif

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="mediatr" Version="4.1.0" />
-    <PackageReference Include="FluentValidation" Version="8.0.0" />
+    <PackageReference Include="FluentValidation" Version="8.1.3" />
   </ItemGroup>
 
 </Project>

src/Backend/Jp.Application/Jp.Application.csproj

@@ -12,7 +12,6 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using IdentityServer4;
 
 namespace Jp.Domain.CommandHandlers
 {
@@ -78,8 +77,7 @@ public async Task Handle(UpdateClientCommand request, CancellationToken cancella
                 return;
             }
 
-            // Businness logic here
-            var savedClient = await _clientRepository.GetClient(request.OldClientId);
+            var savedClient = await _clientRepository.GetClient(request.Client.ClientId);
             if (savedClient == null)
             {
                 await Bus.RaiseEvent(new DomainNotification("1", "Client not found"));
@@ -292,9 +290,7 @@ public async Task Handle(SaveClientCommand request, CancellationToken cancellati
                 return;
             }
 
-            PrepareClientTypeForNewClient(request);
-            var client = request.Client.ToEntity();
-            client.Description = request.Description;
+            var client = request.ToEntity();
 
             _clientRepository.Add(client);
 
@@ -304,33 +300,7 @@ public async Task Handle(SaveClientCommand request, CancellationToken cancellati
             }
         }
 
-        private void PrepareClientTypeForNewClient(SaveClientCommand command)
-        {
-            switch (command.ClientType)
-            {
-                case ClientType.Empty:
-                    break;
-                case ClientType.WebImplicit:
-                    command.Client.AllowedGrantTypes = GrantTypes.Implicit;
-                    command.Client.AllowAccessTokensViaBrowser = true;
-                    break;
-                case ClientType.WebHybrid:
-                    command.Client.AllowedGrantTypes = GrantTypes.Hybrid;
-                    break;
-                case ClientType.Spa:
-                    command.Client.AllowedGrantTypes = GrantTypes.Implicit;
-                    command.Client.AllowAccessTokensViaBrowser = true;
-                    break;
-                case ClientType.Native:
-                    command.Client.AllowedGrantTypes = GrantTypes.Hybrid;
-                    break;
-                case ClientType.Machine:
-                    command.Client.AllowedGrantTypes = GrantTypes.ResourceOwnerPasswordAndClientCredentials;
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-        }
+       
 
         public async Task Handle(CopyClientCommand request, CancellationToken cancellationToken)
         {

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

@@ -7,6 +7,7 @@ public enum ClientType
         WebHybrid = 2,
         Spa = 3,
         Native = 4,
-        Machine = 5
+        Machine = 5,
+        Device=6
     }
 }

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

@@ -1,10 +1,12 @@
+using IdentityServer4.EntityFramework.Mappers;
+using IdentityServer4.Models;
 using Jp.Domain.Validations.Client;
+using System;
 
 namespace Jp.Domain.Commands.Client
 {
     public class SaveClientCommand : ClientCommand
     {
-        public string Description { get; }
         public ClientType ClientType { get; }
 
         public SaveClientCommand(string clientId, string name, string clientUri, string logoUri, string description, ClientType clientType)
@@ -15,14 +17,87 @@ public SaveClientCommand(string clientId, string name, string clientUri, string
                 ClientName = name,
                 ClientUri = clientUri,
                 LogoUri = logoUri,
+                Description = description,
             };
-            Description = description;
             ClientType = clientType;
         }
+
+        public IdentityServer4.EntityFramework.Entities.Client ToEntity()
+        {
+            PrepareClientTypeForNewClient();
+            return Client.ToEntity();
+        }
+
+        private void PrepareClientTypeForNewClient()
+        {
+            switch (ClientType)
+            {
+                case ClientType.Empty:
+                    break;
+                case ClientType.Device:
+                    ConfigureDevice();
+                    break;
+                case ClientType.WebImplicit:
+                    ConfigureWebImplicit();
+
+                    break;
+                case ClientType.WebHybrid:
+                    ConfigureWebHybrid();
+                    break;
+                case ClientType.Spa:
+                    ConfigureSpa();
+                    break;
+                case ClientType.Native:
+                    ConfigureNative();
+
+                    break;
+                case ClientType.Machine:
+                    ConfigureMachine();
+
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
         public override bool IsValid()
         {
             ValidationResult = new SaveClientCommandValidation().Validate(this);
             return ValidationResult.IsValid;
         }
+
+        private void ConfigureDevice()
+        {
+            Client.AllowedGrantTypes = GrantTypes.DeviceFlow;
+            Client.RequireClientSecret = false;
+            Client.AllowOfflineAccess = true;
+        }
+
+        private void ConfigureWebImplicit()
+        {
+            Client.AllowedGrantTypes = GrantTypes.Implicit;
+            Client.AllowAccessTokensViaBrowser = true;
+        }
+
+        private void ConfigureWebHybrid()
+        {
+            Client.AllowedGrantTypes = GrantTypes.Hybrid;
+        }
+
+        private void ConfigureSpa()
+        {
+            Client.AllowedGrantTypes = GrantTypes.Implicit;
+            Client.AllowAccessTokensViaBrowser = true;
+        }
+
+        private void ConfigureNative()
+        {
+            Client.AllowedGrantTypes = GrantTypes.Hybrid;
+        }
+
+        private void ConfigureMachine()
+        {
+            Client.AllowedGrantTypes = GrantTypes.ResourceOwnerPasswordAndClientCredentials;
+        }
     }
 }