Merge branch 'master' into dependabot/docker/nginx-1.17.2-alpine

brunobritodev · web-flow · commit ed1c0d87457b · 2019-07-30T06:29:56.000-03:00
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ![image](https://github.com/brunohbrito/JP-Project/blob/master/docs/images/logo.png?raw=true)
 
 [![Build status](https://ci.appveyor.com/api/projects/status/08v6mg6q439x16xt?svg=true)](https://ci.appveyor.com/project/brunohbrito/jp-project)
-[![Build Status](https://dev.azure.com/brunohbrito/JpProject/_apis/build/status/brunohbrito.JPProject.IdentityServer4.AdminUI?branchName=master)](https://dev.azure.com/brunohbrito/JpProject/_build/latest?definitionId=2&branchName=master)
+[![Build Status](https://dev.azure.com/brunohbrito/JpProject/_apis/build/status/JPProject%20CD%20Build?branchName=master)](https://dev.azure.com/brunohbrito/JpProject/_build/latest?definitionId=2&branchName=master)
 [![License](https://img.shields.io/github/license/brunohbrito/jp-project.svg)](LICENSE) [![Greenkeeper badge](https://badges.greenkeeper.io/brunohbrito/JPProject.IdentityServer4.AdminUI.svg)](https://greenkeeper.io/)
 ![DOCS](https://readthedocs.org/projects/jp-project/badge/?version=latest&style=flat)
 
diff --git a/azure-pipelines.pr.yml b/azure-pipelines.pr.yml
@@ -4,7 +4,6 @@
 # https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core
 
 trigger:
-- master
 - greenkeeper/*
 
 variables:
diff --git a/docs/images/stress/agreggatereport.JPG b/docs/images/stress/agreggatereport.JPG
diff --git a/docs/images/stress/before-azure.png b/docs/images/stress/before-azure.png
diff --git a/docs/images/stress/cpu.JPG b/docs/images/stress/cpu.JPG
diff --git a/docs/images/stress/during-blazemeter.png b/docs/images/stress/during-blazemeter.png
diff --git a/docs/images/stress/jmeterconfig.JPG b/docs/images/stress/jmeterconfig.JPG
diff --git a/docs/images/stress/timelinegraph.JPG b/docs/images/stress/timelinegraph.JPG
diff --git a/docs/index.rst b/docs/index.rst
@@ -60,6 +60,7 @@ There are several ways we can help you out.
    intro/contributing
    intro/code_of_conduct
    intro/contributors.md
+   intro/stress_test_results
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/intro/code_of_conduct.rst b/docs/intro/code_of_conduct.rst
@@ -50,18 +50,18 @@ threatening, offensive, or harmful.
 Scope
 -----
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
 
 Enforcement
 -----------
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
+reported by contacting the project team at bhdebrito@gmail.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
diff --git a/docs/intro/contributors.rst b/docs/intro/contributors.rst
@@ -0,0 +1,18 @@
+Contributors
+=============
+
+Below our lovely Contributors!
+
++------------------+
+| Contributors     |
++==================+
+| |brunobrito|     |
+|                  |
+| Bruno Brito💓    |
+|                  |
+| `🌍 Site`__      |
++------------------+
+
+.. |brunobrito| image:: https://avatars3.githubusercontent.com/u/7241156?v=4&s=460
+    :width: 118 px
+__ https://www.brunobrito.net.br/
diff --git a/docs/intro/stress_test_results.rst b/docs/intro/stress_test_results.rst
@@ -0,0 +1,56 @@
+Stress Tests Results
+====================
+
+The stress file was created with JMeter and executed in Blazemeter. The results was described below.
+
+
+Scenario
+--------
+
+The test scenario is described below
+
+Script Steps
+^^^^^^^^^^^^
+
+The steps of testing was:
+ 1. Load Login page
+ 2. Login
+ 3. Load Home page
+ 4. Load Logout page
+ 5. Logout
+ 6. Load login page
+
+Machine config:
+^^^^^^^^^^^^^^
+
+Azure B1, it's the most basic Machine of Azure.
+ * 100 ACU
+ * 1.75gb Memory
+
+The database was Azure SQL with 5 DTU's (most basic)
+
+Blaze Meter Results
+--------------------
+
+ * 50 v-Users
+ * 10 minutes
+
+During tests, average CPU utilization was 13,58% and Memory consumption was about 230mb.
+
+.. image:: ../images/stress/cpu.jpg
+
+.. image:: ../images/stress/during-blazemeter.png
+
+Timeline report
+^^^^^^^^^^^^^^^
+.. image:: ../images/stress/timelinegraph.jpg
+
+
+Aggregate report
+^^^^^^^^^^^^^^^^
+.. image:: ../images/stress/agreggatereport.JPG
+
+
+Result file
+^^^^^^^^^^^^
+Blazer meter `Results <https://a.blazemeter.com/app/executive-summary/index.html?master_id=20009165#/>`_
diff --git a/src/Backend/Jp.Application/AutoMapper/DomainToViewModelMappingProfile.cs b/src/Backend/Jp.Application/AutoMapper/DomainToViewModelMappingProfile.cs
@@ -5,20 +5,20 @@
 using Jp.Application.ViewModels.ApiResouceViewModels;
 using Jp.Application.ViewModels.ClientsViewModels;
 using Jp.Application.ViewModels.IdentityResourceViewModels;
+using Jp.Application.ViewModels.RoleViewModels;
 using Jp.Application.ViewModels.UserViewModels;
 using Jp.Domain.Core.Events;
 using Jp.Domain.Models;
 using System.Globalization;
 using System.Security.Claims;
-using Jp.Application.ViewModels.RoleViewModels;
 
 namespace Jp.Application.AutoMapper
 {
     public class DomainToViewModelMappingProfile : Profile
     {
         public DomainToViewModelMappingProfile()
         {
-            CreateMap<ApiResource, ApiResourceListViewModel>();
+            CreateMap<IdentityServer4.EntityFramework.Entities.ApiResource, ApiResourceListViewModel>();
             CreateMap<User, UserViewModel>(MemberList.Destination);//.ForMember(x => x.LockoutEnd, opt => opt.MapFrom(src => src.LockoutEnd != null ? src.LockoutEnd.Value.DateTime.ToShortDateString() : string.Empty));
             CreateMap<User, UserListViewModel>(MemberList.Destination);
 
@@ -34,7 +34,7 @@ public DomainToViewModelMappingProfile()
             CreateMap<Claim, ClaimViewModel>(MemberList.Destination);
             CreateMap<Role, RoleViewModel>(MemberList.Destination);
             CreateMap<UserLogin, UserLoginViewModel>(MemberList.Destination);
-            
+
         }
     }
 }
diff --git a/src/Backend/Jp.UserManagement/Controllers/ManagementController.cs b/src/Backend/Jp.UserManagement/Controllers/ManagementController.cs
@@ -41,7 +41,7 @@ public async Task<ActionResult<DefaultResponse<UserViewModel>>> UserData()
             return Response(user);
         }
 
-        [Route("update-profile"), HttpPost]
+        [Route("update-profile"), HttpPut]
         public async Task<ActionResult<DefaultResponse<bool>>> UpdateProfile([FromBody] UserViewModel model)
         {
             if (!ModelState.IsValid)
@@ -56,7 +56,7 @@ public async Task<ActionResult<DefaultResponse<bool>>> UpdateProfile([FromBody]
         }
 
 
-        [Route("update-profile-picture"), HttpPost]
+        [Route("update-profile-picture"), HttpPut]
         public async Task<ActionResult<DefaultResponse<bool>>> UpdateProfilePicture([FromBody] ProfilePictureViewModel model)
         {
             if (!ModelState.IsValid)
@@ -70,7 +70,7 @@ public async Task<ActionResult<DefaultResponse<bool>>> UpdateProfilePicture([Fro
             return Response(true);
         }
 
-        [Route("change-password"), HttpPost]
+        [Route("change-password"), HttpPut]
         public async Task<ActionResult<DefaultResponse<bool>>> ChangePassword([FromBody] ChangePasswordViewModel model)
         {
             if (!ModelState.IsValid)
diff --git a/src/Backend/Jp.UserManagement/Controllers/UserAdminController.cs b/src/Backend/Jp.UserManagement/Controllers/UserAdminController.cs
@@ -56,7 +56,7 @@ public async Task<ActionResult<DefaultResponse<UserViewModel>>> Details(string u
         }
 
 
-        [HttpPost, Route("update"), Authorize(Policy = "Admin")]
+        [HttpPut, Route("update"), Authorize(Policy = "Admin")]
         public async Task<ActionResult<DefaultResponse<bool>>> Update([FromBody] UserViewModel model)
         {
             if (!ModelState.IsValid)
diff --git a/src/Frontend/Jp.UI.SSO/Controllers/Account/AccountController.cs b/src/Frontend/Jp.UI.SSO/Controllers/Account/AccountController.cs
@@ -93,7 +93,6 @@ public IActionResult ForgotPassword()
         /// Handle postback from username/password login
         /// </summary>
         [HttpPost]
-        [ValidateAntiForgeryToken]
         public async Task<IActionResult> Login(LoginInputModel model, string button)
         {
             // the user clicked the "cancel" button
diff --git a/src/Frontend/Jp.UI.SSO/Controllers/Home/HomeController.cs b/src/Frontend/Jp.UI.SSO/Controllers/Home/HomeController.cs
@@ -16,6 +16,7 @@ public HomeController(IIdentityServerInteractionService interaction)
             _interaction = interaction;
         }
 
+        [ResponseCache(Location = ResponseCacheLocation.Client, NoStore = true)]
         public IActionResult Index()
         {
             return View();
diff --git a/src/Frontend/Jp.UI.SSO/Program.cs b/src/Frontend/Jp.UI.SSO/Program.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Jp.UI.SSO.Util;
 using Microsoft.ApplicationInsights.Extensibility;
diff --git a/src/Frontend/Jp.UI.SSO/Views/Account/Login.cshtml b/src/Frontend/Jp.UI.SSO/Views/Account/Login.cshtml
@@ -34,7 +34,7 @@
                                             <i class="icon-lock"></i>
                                         </span>
                                     </div>
-                                    <input type="password" class="form-control" placeholder="Password" value="@Configuration.GetSection("ApplicationSettings:DefaultPass").Value"  asp-for=Password autocomplete="off">
+                                    <input type="password" class="form-control" placeholder="Password" value="@Configuration.GetSection("ApplicationSettings:DefaultPass").Value" asp-for=Password autocomplete="off">
                                 </div>
                                 @if (Model.AllowRememberLogin)
                                 {
diff --git a/src/Frontend/Jp.UserManagement/src/app/management/user/account-management.service.ts b/src/Frontend/Jp.UserManagement/src/app/management/user/account-management.service.ts
@@ -17,19 +17,19 @@ export class AccountManagementService {
     }
 
     public update(user: User): Observable<DefaultResponse<boolean>> {
-        return this.http.post<DefaultResponse<boolean>>(environment.ResourceServer + "management/update-profile", user);
+        return this.http.put<DefaultResponse<boolean>>(environment.ResourceServer + "management/update-profile", user);
     }
 
     public updatePicture(image: ProfilePictureViewModel): Observable<DefaultResponse<boolean>> {
-        return this.http.post<DefaultResponse<boolean>>(environment.ResourceServer + "management/update-profile-picture", image);
+        return this.http.put<DefaultResponse<boolean>>(environment.ResourceServer + "management/update-profile-picture", image);
     }
 
     public addPassword(password: SetPassword): Observable<DefaultResponse<boolean>> {
         return this.http.post<DefaultResponse<boolean>>(environment.ResourceServer + "management/create-password", password);
     }
 
     public updatePassword(password: ChangePassword): Observable<DefaultResponse<boolean>> {
-        return this.http.post<DefaultResponse<boolean>>(environment.ResourceServer + "management/change-password", password);
+        return this.http.put<DefaultResponse<boolean>>(environment.ResourceServer + "management/change-password", password);
     }
 
     public deleteAccount(): Observable<DefaultResponse<boolean>> {
@@ -47,5 +47,4 @@ export class AccountManagementService {
     public getLogs(): Observable<DefaultResponse<EventHistoryData>> {
         return this.http.get<DefaultResponse<EventHistoryData>>(environment.ResourceServer + "management/logs");
     }
-
-}
+}
diff --git a/src/Frontend/Jp.UserManagement/src/web.config b/src/Frontend/Jp.UserManagement/src/web.config
@@ -1,4 +1,3 @@
-<!-- WEB Config for Argular APPS -->
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <system.web>
