grants

Author: brunobritodev

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

@@ -15,7 +15,6 @@ public class DomainToViewModelMappingProfile : Profile
     {
         public DomainToViewModelMappingProfile()
         {
-CreateMap<PersistedGrant, PersistedGrantViewModel>();
             CreateMap<ApiResource, ApiResourceListViewModel>();
             CreateMap<User, UserViewModel>().ForMember(a => a.Password, o => o.Ignore()).ForMember(a => a.ConfirmPassword, o => o.Ignore());
             CreateMap<StoredEvent, EventHistoryData>().ConstructUsing(a => new EventHistoryData() { Action = a.MessageType, Id = a.Id.ToString(), Details = a.Data, When = a.Timestamp.ToString(CultureInfo.InvariantCulture), Who = a.User });

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

@@ -2,12 +2,13 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
+using IdentityServer4.Models;
 using Jp.Application.ViewModels;
 
 namespace Jp.Application.Interfaces
 {
     public interface IPersistedGrantAppService: IDisposable
     {
-        Task<IEnumerable<PersistedGrantViewModel>> GetPersistedGrants();
+        Task<IEnumerable<PersistedGrant>> GetPersistedGrants();
     }
 }

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

@@ -1,12 +1,13 @@
 using AutoMapper;
 using Jp.Application.Interfaces;
-using Jp.Application.ViewModels;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using IdentityServer4.EntityFramework.Mappers;
+using IdentityServer4.Models;
 
 namespace Jp.Application.Services
 {
@@ -28,10 +29,10 @@ public PersistedGrantAppService(IMapper mapper,
             _persistedGrantRepository = persistedGrantRepository;
         }
 
-        public async Task<IEnumerable<PersistedGrantViewModel>> GetPersistedGrants()
+        public async Task<IEnumerable<PersistedGrant>> GetPersistedGrants()
         {
             var resultado = await _persistedGrantRepository.GetGrants();
-            return resultado.Select(s => _mapper.Map<PersistedGrantViewModel>(s));
+            return resultado.Select(s => s.ToModel());
         }
         public void Dispose()
         {

src/Backend/Jp.Application/ViewModels/PersistedGrantViewModel.cs

@@ -31,7 +31,7 @@ public PersistedGrants(
 
 
         [HttpGet, Route("list")]
-        public async Task<ActionResult<DefaultResponse<IEnumerable<PersistedGrantViewModel>>>> List()
+        public async Task<ActionResult<DefaultResponse<IEnumerable<PersistedGrant>>>> List()
         {
             var irs = await _persistedGrantAppService.GetPersistedGrants();
             return Response(irs);

src/Backend/Jp.UserManagement/Controllers/PersistedGrants.cs

@@ -1,7 +1,7 @@
 <div class="content-heading">
     <div>
-        🔑 {{ 'general.persisted-grant' | translate }}
-        <small><b> {{ 'persistedGrant.description' | translate }}.</b></small>
+        🔑 {{ 'general.persisted-grants' | translate }}
+        <small><b> {{ 'persistedGrant.description' | translate }}</b></small>
     </div>
 </div>
 
@@ -10,19 +10,15 @@
 <div class="container-fluid" *ngIf="persistedGrants">
     <div class="col-xl-12 col-md-12 col-lg-12">
         <div class="card">
-            <div class="card-header">
-                <a class="btn btn-outline-primary mb-3" [routerLink]="[ '/identity-resource/add' ]"><i class="fa fa-plus-circle"></i>
-                    {{ 'persistedGrant.new-grant' | translate }}</a>
-            </div>
 
             <div class="card-body">
                 <div class="table-responsive">
                     <table class="table table-striped">
                         <thead>
                             <tr>
                                 <th></th>
-                                <th> {{ "persistedGrant.list.name" | translate }}</th>
-                                <th> {{"persistedGrant.list.description" | translate }} </th>
+                                <th> {{ 'persistedGrant.list.clientId' | translate }}</th>
+                                <th> {{ 'persistedGrant.list.type' | translate }} </th>
                                 <th></th>
 
                             </tr>
@@ -34,11 +30,11 @@
                                         placement="top" [tooltip]="'general.edit' | translate"><i class="fa fa-edit"></i></a>
                                     &nbsp;
                                 </th>
-                                <td>{{grant.name}}</td>
-                                <td>{{grant.description}}</td>
+                                <td>{{grant.clientId}}</td>
+                                <td>{{grant.type}}</td>
                                 <td>
                                     <button class="btn btn-danger btn-xs" placement="top" [tooltip]="'general.remove' | translate"
-                                        (click)="remove(grant.name)"><i class="fa fa-times"></i></button>
+                                        (click)="remove(grant.key)"><i class="fa fa-times"></i></button>
                                 </td>
                             </tr>
                         </tbody>

src/Frontend/Jp.AdminUI/src/app/panel/persisted-grants/list/persisted-grants-list.component.html

@@ -28,7 +28,7 @@ export class PersistedGrantListComponent implements OnInit {
     }
 
     public remove(name: string) {
-        this.translator.translate.get('persisttedGrant.remove').subscribe(m => {
+        this.translator.translate.get('persistedGrant.remove').subscribe(m => {
             swal({
                 title: m['title'],
                 text: m["text"],

src/Frontend/Jp.AdminUI/src/app/panel/persisted-grants/list/persisted-grants-list.component.ts

@@ -1,3 +1,57 @@
 export class PersistedGrant {
+    /// <summary>
+    /// Gets or sets the key.
+    /// </summary>
+    /// <value>
+    /// The key.
+    /// </value>
+    public key: string;
 
+    /// <summary>
+    /// Gets the type.
+    /// </summary>
+    /// <value>
+    /// The type.
+    /// </value>
+    public type: string;
+
+    /// <summary>
+    /// Gets the subject identifier.
+    /// </summary>
+    /// <value>
+    /// The subject identifier.
+    /// </value>
+    public subjectId: string;
+
+    /// <summary>
+    /// Gets the client identifier.
+    /// </summary>
+    /// <value>
+    /// The client identifier.
+    /// </value>
+    public clientId: string;
+
+    /// <summary>
+    /// Gets or sets the creation time.
+    /// </summary>
+    /// <value>
+    /// The creation time.
+    /// </value>
+    public creationTime: string;
+
+    /// <summary>
+    /// Gets or sets the expiration.
+    /// </summary>
+    /// <value>
+    /// The expiration.
+    /// </value>
+    public expiration: string;
+
+    /// <summary>
+    /// Gets or sets the data.
+    /// </summary>
+    /// <value>
+    /// The data.
+    /// </value>
+    public data: string;
 }

src/Frontend/Jp.AdminUI/src/app/shared/viewModel/persisted-grants.model.ts

@@ -268,10 +268,11 @@
         "expiration": "Expiration",
         "expiration-tooltip": "Set expiration"
     },
-    "persisted-grants": {
+    "persistedGrant": {
+        "description": "",
         "list": {
-            "name": "Name",
-            "description": "Description"
+            "clientId": "Client",
+            "type": "Type"
         }
     },
     "toasterMessages": {
@@ -291,7 +292,6 @@
         "api-resource": "Protected Resources",
         "persisted-grants": "Persisted Grants",
         "users": "Users",
-        "roles": "Roles",
-        "persisted-grant": ""
+        "roles": "Roles"
     }
 }