Browse Source

Update some code of `IPermissionIntegrationService`.

pull/17337/head
maliming 3 years ago
parent
commit
cb80e3230e
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 3
      modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/Integration/IPermissionIntegrationService.cs
  2. 3
      modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/Integration/PermissionGrantOutput.cs
  3. 9
      modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/Integration/PermissionIntegrationService.cs
  4. 4
      modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/ClientProxies/Volo/Abp/PermissionManagement/Integration/PermissionIntegrationClientProxy.Generated.cs
  5. 12
      modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/ClientProxies/permissionManagement-generate-proxy.json
  6. 5
      modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/Integration/PermissionIntegrationController.cs

3
modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/Integration/IPermissionIntegrationService.cs

@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
namespace Volo.Abp.PermissionManagement.Integration; namespace Volo.Abp.PermissionManagement.Integration;
@ -7,5 +8,5 @@ namespace Volo.Abp.PermissionManagement.Integration;
[IntegrationService] [IntegrationService]
public interface IPermissionIntegrationService : IApplicationService public interface IPermissionIntegrationService : IApplicationService
{ {
Task<List<PermissionGrantOutput> > IsGrantedAsync(List<PermissionGrantInput> input); Task<ListResultDto<PermissionGrantOutput>> IsGrantedAsync(List<PermissionGrantInput> input);
} }

3
modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/Integration/PermissionGrantOutput.cs

@ -1,11 +1,8 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Volo.Abp.PermissionManagement.Integration; namespace Volo.Abp.PermissionManagement.Integration;
public class PermissionGrantOutput public class PermissionGrantOutput
{ {
public Guid UserId { get; set; }
public Dictionary<string, bool> Permissions { get; set; } public Dictionary<string, bool> Permissions { get; set; }
} }

9
modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/Integration/PermissionIntegrationService.cs

@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
using Volo.Abp.Authorization.Permissions; using Volo.Abp.Authorization.Permissions;
@ -16,18 +17,18 @@ public class PermissionIntegrationService : ApplicationService, IPermissionInteg
PermissionManager = permissionManager; PermissionManager = permissionManager;
} }
public virtual async Task<List<PermissionGrantOutput>> IsGrantedAsync(List<PermissionGrantInput> input) public virtual async Task<ListResultDto<PermissionGrantOutput>> IsGrantedAsync(List<PermissionGrantInput> input)
{ {
var result = new List<PermissionGrantOutput>(); var result = new List<PermissionGrantOutput>();
foreach (var item in input) foreach (var item in input)
{ {
result.Add(new PermissionGrantOutput { result.Add(new PermissionGrantOutput
UserId = item.UserId, {
Permissions = (await PermissionManager.GetAsync(item.PermissionNames, UserPermissionValueProvider.ProviderName, item.UserId.ToString())).Result Permissions = (await PermissionManager.GetAsync(item.PermissionNames, UserPermissionValueProvider.ProviderName, item.UserId.ToString())).Result
.ToDictionary(x => x.Name, x => x.IsGranted) .ToDictionary(x => x.Name, x => x.IsGranted)
}); });
} }
return result; return new ListResultDto<PermissionGrantOutput>(result);
} }
} }

4
modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/ClientProxies/Volo/Abp/PermissionManagement/Integration/PermissionIntegrationClientProxy.Generated.cs

@ -18,9 +18,9 @@ namespace Volo.Abp.PermissionManagement.Integration;
[IntegrationService] [IntegrationService]
public partial class PermissionIntegrationClientProxy : ClientProxyBase<IPermissionIntegrationService>, IPermissionIntegrationService public partial class PermissionIntegrationClientProxy : ClientProxyBase<IPermissionIntegrationService>, IPermissionIntegrationService
{ {
public virtual async Task<List<PermissionGrantOutput>> IsGrantedAsync(List<PermissionGrantInput> input) public virtual async Task<ListResultDto<PermissionGrantOutput>> IsGrantedAsync(List<PermissionGrantInput> input)
{ {
return await RequestAsync<List<PermissionGrantOutput>>(nameof(IsGrantedAsync), new ClientProxyRequestTypeValue return await RequestAsync<ListResultDto<PermissionGrantOutput>>(nameof(IsGrantedAsync), new ClientProxyRequestTypeValue
{ {
{ typeof(List<PermissionGrantInput>), input } { typeof(List<PermissionGrantInput>), input }
}); });

12
modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi.Client/ClientProxies/permissionManagement-generate-proxy.json

@ -239,8 +239,8 @@
} }
], ],
"returnValue": { "returnValue": {
"type": "System.Collections.Generic.List<Volo.Abp.PermissionManagement.Integration.PermissionGrantOutput>", "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.PermissionManagement.Integration.PermissionGrantOutput>",
"typeSimple": "[Volo.Abp.PermissionManagement.Integration.PermissionGrantOutput]" "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.PermissionManagement.Integration.PermissionGrantOutput>"
} }
} }
] ]
@ -250,7 +250,7 @@
"IsGrantedAsyncByInput": { "IsGrantedAsyncByInput": {
"uniqueName": "IsGrantedAsyncByInput", "uniqueName": "IsGrantedAsyncByInput",
"name": "IsGrantedAsync", "name": "IsGrantedAsync",
"httpMethod": "POST", "httpMethod": "GET",
"url": "integration-api/permission-management/permissions/is-granted", "url": "integration-api/permission-management/permissions/is-granted",
"supportedVersions": [], "supportedVersions": [],
"parametersOnMethod": [ "parametersOnMethod": [
@ -273,13 +273,13 @@
"isOptional": false, "isOptional": false,
"defaultValue": null, "defaultValue": null,
"constraintTypes": null, "constraintTypes": null,
"bindingSourceId": "Body", "bindingSourceId": "ModelBinding",
"descriptorName": "" "descriptorName": ""
} }
], ],
"returnValue": { "returnValue": {
"type": "System.Collections.Generic.List<Volo.Abp.PermissionManagement.Integration.PermissionGrantOutput>", "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.PermissionManagement.Integration.PermissionGrantOutput>",
"typeSimple": "[Volo.Abp.PermissionManagement.Integration.PermissionGrantOutput]" "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.PermissionManagement.Integration.PermissionGrantOutput>"
}, },
"allowAnonymous": null, "allowAnonymous": null,
"implementFrom": "Volo.Abp.PermissionManagement.Integration.IPermissionIntegrationService" "implementFrom": "Volo.Abp.PermissionManagement.Integration.IPermissionIntegrationService"

5
modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/Integration/PermissionIntegrationController.cs

@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Volo.Abp.Application.Dtos;
using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc;
namespace Volo.Abp.PermissionManagement.Integration; namespace Volo.Abp.PermissionManagement.Integration;
@ -18,9 +19,9 @@ public class PermissionIntegrationController: AbpControllerBase, IPermissionInte
PermissionIntegrationService = permissionIntegrationService; PermissionIntegrationService = permissionIntegrationService;
} }
[HttpPost] [HttpGet]
[Route("is-granted")] [Route("is-granted")]
public virtual Task<List<PermissionGrantOutput>> IsGrantedAsync(List<PermissionGrantInput> input) public virtual Task<ListResultDto<PermissionGrantOutput>> IsGrantedAsync(List<PermissionGrantInput> input)
{ {
return PermissionIntegrationService.IsGrantedAsync(input); return PermissionIntegrationService.IsGrantedAsync(input);
} }

Loading…
Cancel
Save