From 12b221a888267cf3747f3bd56302ec3beee74807 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 21 Oct 2026 11:38:10 +0800 Subject: [PATCH 1/4] Bind primitive body parameters in client proxy controllers --- framework/Volo.Abp.slnx | 1 + .../AbpHttpClientProxyServiceConvention.cs | 28 +++++ .../Volo.Abp.Http.Client.Web.Tests.abppkg | 3 + .../Volo.Abp.Http.Client.Web.Tests.csproj | 22 ++++ ...pHttpClientProxyServiceConvention_Tests.cs | 31 ++++++ .../Client/Web/AbpHttpClientWebTestBase.cs | 8 ++ .../Client/Web/AbpHttpClientWebTestModule.cs | 34 ++++++ .../ClientProxyTestAppServiceClientProxy.cs | 18 ++++ .../Client/Web/IClientProxyTestAppService.cs | 11 ++ .../Volo/Abp/Http/Client/Web/Program.cs | 10 ++ .../Web/client-proxy-test-generate-proxy.json | 102 ++++++++++++++++++ 11 files changed, 268 insertions(+) create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.abppkg create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.csproj create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestBase.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/Program.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json diff --git a/framework/Volo.Abp.slnx b/framework/Volo.Abp.slnx index 526bfebe0d..edc7c3783d 100644 --- a/framework/Volo.Abp.slnx +++ b/framework/Volo.Abp.slnx @@ -230,6 +230,7 @@ + diff --git a/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs b/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs index 004669eeb2..a069aa1056 100644 --- a/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs +++ b/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs @@ -15,6 +15,7 @@ using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Client.ClientProxying; using Volo.Abp.Http.Client.StaticProxying; using Volo.Abp.Http.Modeling; +using Volo.Abp.Http.ProxyScripting.Generators; using Volo.Abp.Reflection; namespace Volo.Abp.Http.Client.Web.Conventions; @@ -73,10 +74,37 @@ public class AbpHttpClientProxyServiceConvention : AbpServiceConvention ConfigureClientProxySelector(controller); ConfigureClientProxyApiExplorer(controller); + ConfigureClientProxyParameters(controller); ConfigureParameters(controller); } } + protected virtual void ConfigureClientProxyParameters(ControllerModel controller) + { + foreach (var action in controller.Actions) + { + var actionApiDescriptionModel = FindActionApiDescriptionModel(controller, action); + if (actionApiDescriptionModel == null) + { + continue; + } + + foreach (var prm in action.Parameters) + { + if (prm.BindingInfo != null) + { + continue; + } + + // Clients send the parameter where the remote action reads it, so a primitive [FromBody] parameter has to be read from the body here too. + if (actionApiDescriptionModel.Parameters.Any(x => x.NameOnMethod == prm.ParameterName && x.BindingSourceId == ParameterBindingSources.Body)) + { + prm.BindingInfo = BindingInfo.GetBindingInfo(new[] { new FromBodyAttribute() }); + } + } + } + } + protected override void ConfigureParameters(ControllerModel controller) { foreach (var action in controller.Actions) diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.abppkg b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.abppkg new file mode 100644 index 0000000000..a686451fbc --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.abppkg @@ -0,0 +1,3 @@ +{ + "role": "lib.test" +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.csproj b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.csproj new file mode 100644 index 0000000000..fb085db20e --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.csproj @@ -0,0 +1,22 @@ + + + + + + net10.0 + Volo.Abp.Http.Client.Web.Tests + Volo.Abp.Http.Client.Web.Tests + + + + + + + + + + + + + + diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs new file mode 100644 index 0000000000..d4f147f28f --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs @@ -0,0 +1,31 @@ +using System.Net; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using Shouldly; +using Xunit; + +namespace Volo.Abp.Http.Client.Web; + +public class AbpHttpClientProxyServiceConvention_Tests : AbpHttpClientWebTestBase +{ + [Fact] + public async Task Should_Read_Primitive_Body_Parameter_From_Request_Body() + { + var response = await Client.PostAsync( + "/api/client-proxy-test/from-body", + new StringContent("\"Server=localhost;Database=Test\"", Encoding.UTF8, "application/json")); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync()).ShouldBe("Server=localhost;Database=Test"); + } + + [Fact] + public async Task Should_Keep_Reading_Other_Primitive_Parameters_From_Query_String() + { + var response = await Client.PostAsync("/api/client-proxy-test/from-query?value=test", null); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync()).ShouldBe("test"); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestBase.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestBase.cs new file mode 100644 index 0000000000..7ec8ca7f19 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestBase.cs @@ -0,0 +1,8 @@ +using Volo.Abp.AspNetCore; + +namespace Volo.Abp.Http.Client.Web; + +public abstract class AbpHttpClientWebTestBase : AbpAspNetCoreTestBase +{ + +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs new file mode 100644 index 0000000000..5ade2901ab --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs @@ -0,0 +1,34 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.AspNetCore.TestBase; +using Volo.Abp.Autofac; +using Volo.Abp.Modularity; +using Volo.Abp.VirtualFileSystem; + +namespace Volo.Abp.Http.Client.Web; + +[DependsOn( + typeof(AbpHttpClientWebModule), + typeof(AbpAspNetCoreTestBaseModule), + typeof(AbpAutofacModule) +)] +public class AbpHttpClientWebTestModule : AbpModule +{ + public override void ConfigureServices(ServiceConfigurationContext context) + { + context.Services.AddStaticHttpClientProxies(typeof(AbpHttpClientWebTestModule).Assembly); + + Configure(options => + { + options.FileSets.AddEmbedded(); + }); + } + + public override void OnApplicationInitialization(ApplicationInitializationContext context) + { + var app = context.GetApplicationBuilder(); + + app.UseRouting(); + app.UseConfiguredEndpoints(); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs new file mode 100644 index 0000000000..d91f9f1de1 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs @@ -0,0 +1,18 @@ +using System.Threading.Tasks; +using Volo.Abp.Http.Client.ClientProxying; + +namespace Volo.Abp.Http.Client.Web; + +// Returns the received value instead of calling a remote service, so the tests can see what the proxy controller bound. +public class ClientProxyTestAppServiceClientProxy : ClientProxyBase, IClientProxyTestAppService +{ + public virtual Task GetFromBodyAsync(string value) + { + return Task.FromResult(value); + } + + public virtual Task GetFromQueryAsync(string value) + { + return Task.FromResult(value); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs new file mode 100644 index 0000000000..03c9d5a3d3 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs @@ -0,0 +1,11 @@ +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace Volo.Abp.Http.Client.Web; + +public interface IClientProxyTestAppService : IApplicationService +{ + Task GetFromBodyAsync(string value); + + Task GetFromQueryAsync(string value); +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/Program.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/Program.cs new file mode 100644 index 0000000000..a4a2006805 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/Program.cs @@ -0,0 +1,10 @@ +using Microsoft.AspNetCore.Builder; +using Volo.Abp.AspNetCore.TestBase; +using Volo.Abp.Http.Client.Web; + +var builder = WebApplication.CreateBuilder(); +await builder.RunAbpModuleAsync(); + +public partial class Program +{ +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json new file mode 100644 index 0000000000..7b19bba494 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json @@ -0,0 +1,102 @@ +{ + "modules": { + "clientProxyTest": { + "rootPath": "clientProxyTest", + "remoteServiceName": "Default", + "controllers": { + "Volo.Abp.Http.Client.Web.ClientProxyTestController": { + "controllerName": "ClientProxyTest", + "controllerGroupName": "ClientProxyTest", + "isRemoteService": true, + "isIntegrationService": false, + "apiVersion": null, + "type": "Volo.Abp.Http.Client.Web.ClientProxyTestController", + "interfaces": [ + { + "type": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService", + "name": "IClientProxyTestAppService", + "methods": [] + } + ], + "actions": { + "GetFromBodyAsyncByValue": { + "uniqueName": "GetFromBodyAsyncByValue", + "name": "GetFromBodyAsync", + "httpMethod": "POST", + "url": "api/client-proxy-test/from-body", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "value", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "value", + "name": "value", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "GetFromQueryAsyncByValue": { + "uniqueName": "GetFromQueryAsyncByValue", + "name": "GetFromQueryAsync", + "httpMethod": "POST", + "url": "api/client-proxy-test/from-query", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "value", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "value", + "name": "value", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + } + } + } + } + } + }, + "types": {} +} From 77065047e754f82a9dfa0c9b954e2cfc7243f648 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 21 Oct 2026 12:58:11 +0800 Subject: [PATCH 2/4] Add tests for AbpHttpClientProxyServiceConvention --- ...pHttpClientProxyServiceConvention_Tests.cs | 189 ++++++++ .../Client/Web/AbpHttpClientWebTestModule.cs | 6 + ...entProxyDuplicatedAppServiceClientProxy.cs | 12 + .../Web/ClientProxyDuplicatedController.cs | 15 + ...ntProxyNoGroupNameAppServiceClientProxy.cs | 12 + .../ClientProxyTestAppServiceClientProxy.cs | 58 ++- .../Http/Client/Web/ClientProxyTestInput.cs | 8 + .../Client/Web/ClientProxyTestQueryInput.cs | 8 + .../Web/IClientProxyDuplicatedAppService.cs | 9 + .../Web/IClientProxyNoGroupNameAppService.cs | 9 + .../Client/Web/IClientProxyTestAppService.cs | 22 + .../Web/client-proxy-test-generate-proxy.json | 459 ++++++++++++++++++ 12 files changed, 806 insertions(+), 1 deletion(-) create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedAppServiceClientProxy.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedController.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyNoGroupNameAppServiceClientProxy.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestInput.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestQueryInput.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDuplicatedAppService.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyNoGroupNameAppService.cs diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs index d4f147f28f..d76efe0954 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs @@ -1,7 +1,13 @@ +using System; +using System.Linq; using System.Net; using System.Net.Http; using System.Text; using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc.ActionConstraints; +using Microsoft.AspNetCore.Mvc.ApiExplorer; +using Microsoft.AspNetCore.Mvc.Controllers; +using Microsoft.AspNetCore.Mvc.Infrastructure; using Shouldly; using Xunit; @@ -20,6 +26,17 @@ public class AbpHttpClientProxyServiceConvention_Tests : AbpHttpClientWebTestBas (await response.Content.ReadAsStringAsync()).ShouldBe("Server=localhost;Database=Test"); } + [Fact] + public async Task Should_Read_Non_String_Primitive_Body_Parameter_From_Request_Body() + { + var response = await Client.PostAsync( + "/api/client-proxy-test/number-from-body", + new StringContent("42", Encoding.UTF8, "application/json")); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync()).ShouldBe("42"); + } + [Fact] public async Task Should_Keep_Reading_Other_Primitive_Parameters_From_Query_String() { @@ -28,4 +45,176 @@ public class AbpHttpClientProxyServiceConvention_Tests : AbpHttpClientWebTestBas response.StatusCode.ShouldBe(HttpStatusCode.OK); (await response.Content.ReadAsStringAsync()).ShouldBe("test"); } + + [Fact] + public async Task Should_Read_Primitive_Parameters_From_Query_String_In_Get_Actions() + { + var guid = Guid.NewGuid(); + + var response = await Client.GetAsync($"/api/client-proxy-test/query-parameters?number=42&flag=true&guid={guid}"); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync()).ShouldBe($"42:True:{guid}"); + } + + [Fact] + public async Task Should_Keep_Explicit_Binding_Attribute() + { + var response = await Client.PostAsync("/api/client-proxy-test/from-explicit-query?value=test", null); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync()).ShouldBe("test"); + } + + [Fact] + public async Task Should_Read_Complex_Parameter_From_Request_Body() + { + var response = await Client.PostAsync( + "/api/client-proxy-test", + new StringContent("{\"name\":\"test\",\"value\":42}", Encoding.UTF8, "application/json")); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync()).ShouldBe("test:42"); + } + + [Fact] + public async Task Should_Read_Id_From_Route_And_Complex_Parameter_From_Request_Body() + { + var id = Guid.NewGuid(); + + var response = await Client.PutAsync( + $"/api/client-proxy-test/{id}", + new StringContent("{\"name\":\"test\",\"value\":42}", Encoding.UTF8, "application/json")); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync()).ShouldBe($"{id}:test:42"); + } + + [Fact] + public async Task Should_Read_Complex_Parameter_From_Query_String_In_Get_Actions() + { + var response = await Client.GetAsync("/api/client-proxy-test?Name=test&Value=42"); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync()).ShouldBe("test:42"); + } + + [Fact] + public async Task Should_Read_Binding_From_Query_Types_From_Query_String() + { + var response = await Client.PostAsync("/api/client-proxy-test/by-query-type?Name=test&Value=42", null); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync()).ShouldBe("test:42"); + } + + [Fact] + public async Task Should_Read_Remote_Stream_Content_From_Form() + { + using var content = new MultipartFormDataContent(); + content.Add(new StringContent("file content"), "file", "test.txt"); + + var response = await Client.PostAsync("/api/client-proxy-test/upload", content); + + response.StatusCode.ShouldBe(HttpStatusCode.OK); + (await response.Content.ReadAsStringAsync()).ShouldBe("test.txt:file content"); + } + + [Fact] + public async Task Should_Use_Url_And_Http_Method_Of_Remote_Action() + { + var action = GetProxyAction(nameof(IClientProxyTestAppService.GetFromBodyAsync)); + + action.AttributeRouteInfo.ShouldNotBeNull(); + action.AttributeRouteInfo.Template.ShouldBe("api/client-proxy-test/from-body"); + action.ActionConstraints.ShouldNotBeNull(); + action.ActionConstraints.OfType().Single().HttpMethods.ShouldBe(new[] { "POST" }); + + var response = await Client.GetAsync("/api/client-proxy-test/from-body"); + response.StatusCode.ShouldBe(HttpStatusCode.MethodNotAllowed); + } + + [Fact] + public void Should_Use_Controller_Group_Name_As_Controller_Name() + { + var action = GetProxyAction(nameof(IClientProxyTestAppService.GetFromBodyAsync)); + + action.ControllerName.ShouldBe("ClientProxyTest"); + } + + [Fact] + public async Task Should_Remove_ClientProxy_Postfix_From_Controller_Name_Without_Controller_Group_Name() + { + var action = GetProxyAction(nameof(IClientProxyNoGroupNameAppService.GetAsync)); + + action.ControllerName.ShouldBe("ClientProxyNoGroupNameAppService"); + (await Client.GetStringAsync("/api/client-proxy-no-group-name")).ShouldBe("no-group-name"); + } + + [Fact] + public void Should_Use_Root_Path_As_Area() + { + var action = GetProxyAction(nameof(IClientProxyTestAppService.GetFromBodyAsync)); + + action.RouteValues["area"].ShouldBe("clientProxyTest"); + } + + [Fact] + public void Should_Not_Expose_Action_Not_In_Api_Description() + { + GetActions() + .Any(x => x.ControllerTypeInfo.AsType() == typeof(ClientProxyTestAppServiceClientProxy) && + x.MethodInfo.Name == nameof(IClientProxyTestAppService.GetNotDescribedAsync)) + .ShouldBeFalse(); + } + + [Fact] + public async Task Should_Remove_Client_Proxy_Controller_If_Another_Controller_Implements_The_Same_Service() + { + GetActions() + .Any(x => x.ControllerTypeInfo.AsType() == typeof(ClientProxyDuplicatedAppServiceClientProxy)) + .ShouldBeFalse(); + + (await Client.GetStringAsync("/api/client-proxy-duplicated")).ShouldBe("controller"); + (await Client.GetAsync("/api/client-proxy-duplicated-proxy")).StatusCode.ShouldBe(HttpStatusCode.NotFound); + } + + [Fact] + public void Should_Add_Client_Proxy_Actions_To_Api_Explorer() + { + var apiDescriptions = GetApiDescriptions("ClientProxyTest"); + + apiDescriptions.ShouldContain(x => x.RelativePath == "api/client-proxy-test/from-body" && x.HttpMethod == "POST"); + apiDescriptions.ShouldContain(x => x.RelativePath == "api/client-proxy-test/{id}" && x.HttpMethod == "PUT"); + } + + [Fact] + public async Task Should_Hide_Action_With_Disabled_Metadata_From_Api_Explorer() + { + GetApiDescriptions("ClientProxyTest").ShouldNotContain(x => x.RelativePath == "api/client-proxy-test/hidden"); + + (await Client.GetStringAsync("/api/client-proxy-test/hidden")).ShouldBe("hidden"); + } + + private ControllerActionDescriptor[] GetActions() + { + return GetRequiredService() + .ActionDescriptors.Items + .OfType() + .ToArray(); + } + + private ControllerActionDescriptor GetProxyAction(string methodName) + { + return GetActions().Single(x => x.ControllerTypeInfo.AsType() == typeof(TClientProxy) && x.MethodInfo.Name == methodName); + } + + private ApiDescription[] GetApiDescriptions(string groupName) + { + return GetRequiredService() + .ApiDescriptionGroups.Items + .Where(x => x.GroupName == groupName) + .SelectMany(x => x.Items) + .ToArray(); + } } diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs index 5ade2901ab..a146fb735d 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.TestBase; using Volo.Abp.Autofac; +using Volo.Abp.Http.Client.StaticProxying; using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; @@ -18,6 +19,11 @@ public class AbpHttpClientWebTestModule : AbpModule { context.Services.AddStaticHttpClientProxies(typeof(AbpHttpClientWebTestModule).Assembly); + Configure(options => + { + options.BindingFromQueryTypes.Add(typeof(ClientProxyTestQueryInput)); + }); + Configure(options => { options.FileSets.AddEmbedded(); diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedAppServiceClientProxy.cs new file mode 100644 index 0000000000..7d6040f47e --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedAppServiceClientProxy.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; +using Volo.Abp.Http.Client.ClientProxying; + +namespace Volo.Abp.Http.Client.Web; + +public class ClientProxyDuplicatedAppServiceClientProxy : ClientProxyBase, IClientProxyDuplicatedAppService +{ + public virtual Task GetAsync() + { + return Task.FromResult("proxy"); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedController.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedController.cs new file mode 100644 index 0000000000..c8c2a072ec --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedController.cs @@ -0,0 +1,15 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; + +namespace Volo.Abp.Http.Client.Web; + +[Route("api/client-proxy-duplicated")] +public class ClientProxyDuplicatedController : AbpControllerBase, IClientProxyDuplicatedAppService +{ + [HttpGet] + public virtual Task GetAsync() + { + return Task.FromResult("controller"); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyNoGroupNameAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyNoGroupNameAppServiceClientProxy.cs new file mode 100644 index 0000000000..33f27ab60e --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyNoGroupNameAppServiceClientProxy.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; +using Volo.Abp.Http.Client.ClientProxying; + +namespace Volo.Abp.Http.Client.Web; + +public class ClientProxyNoGroupNameAppServiceClientProxy : ClientProxyBase, IClientProxyNoGroupNameAppService +{ + public virtual Task GetAsync() + { + return Task.FromResult("no-group-name"); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs index d91f9f1de1..c61ba139b8 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs @@ -1,9 +1,13 @@ +using System; +using System.IO; using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.Content; using Volo.Abp.Http.Client.ClientProxying; namespace Volo.Abp.Http.Client.Web; -// Returns the received value instead of calling a remote service, so the tests can see what the proxy controller bound. +// Returns the received values instead of calling a remote service, so the tests can see what the proxy controller bound. public class ClientProxyTestAppServiceClientProxy : ClientProxyBase, IClientProxyTestAppService { public virtual Task GetFromBodyAsync(string value) @@ -15,4 +19,56 @@ public class ClientProxyTestAppServiceClientProxy : ClientProxyBase GetNumberFromBodyAsync(int value) + { + return Task.FromResult(value); + } + + public virtual Task GetFromExplicitQueryAsync([FromQuery] string value) + { + return Task.FromResult(value); + } + + public virtual Task GetQueryParametersAsync(int number, bool flag, Guid guid) + { + return Task.FromResult($"{number}:{flag}:{guid}"); + } + + public virtual Task CreateAsync(ClientProxyTestInput input) + { + return Task.FromResult($"{input.Name}:{input.Value}"); + } + + public virtual Task UpdateAsync(Guid id, ClientProxyTestInput input) + { + return Task.FromResult($"{id}:{input.Name}:{input.Value}"); + } + + public virtual Task GetListAsync(ClientProxyTestInput input) + { + return Task.FromResult($"{input.Name}:{input.Value}"); + } + + public virtual Task GetByQueryTypeAsync(ClientProxyTestQueryInput input) + { + return Task.FromResult($"{input.Name}:{input.Value}"); + } + + public virtual async Task UploadAsync(IRemoteStreamContent file) + { + using var reader = new StreamReader(file.GetStream()); + return $"{file.FileName}:{await reader.ReadToEndAsync()}"; + } + + [RemoteService(IsMetadataEnabled = false)] + public virtual Task GetHiddenAsync() + { + return Task.FromResult("hidden"); + } + + public virtual Task GetNotDescribedAsync() + { + return Task.FromResult("not-described"); + } } diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestInput.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestInput.cs new file mode 100644 index 0000000000..11f6fb5d11 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestInput.cs @@ -0,0 +1,8 @@ +namespace Volo.Abp.Http.Client.Web; + +public class ClientProxyTestInput +{ + public string Name { get; set; } + + public int Value { get; set; } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestQueryInput.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestQueryInput.cs new file mode 100644 index 0000000000..89ac36b0d1 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestQueryInput.cs @@ -0,0 +1,8 @@ +namespace Volo.Abp.Http.Client.Web; + +public class ClientProxyTestQueryInput +{ + public string Name { get; set; } + + public int Value { get; set; } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDuplicatedAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDuplicatedAppService.cs new file mode 100644 index 0000000000..be920793e1 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDuplicatedAppService.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace Volo.Abp.Http.Client.Web; + +public interface IClientProxyDuplicatedAppService : IApplicationService +{ + Task GetAsync(); +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyNoGroupNameAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyNoGroupNameAppService.cs new file mode 100644 index 0000000000..86093d2e58 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyNoGroupNameAppService.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace Volo.Abp.Http.Client.Web; + +public interface IClientProxyNoGroupNameAppService : IApplicationService +{ + Task GetAsync(); +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs index 03c9d5a3d3..8d8ec3f388 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs @@ -1,5 +1,7 @@ +using System; using System.Threading.Tasks; using Volo.Abp.Application.Services; +using Volo.Abp.Content; namespace Volo.Abp.Http.Client.Web; @@ -8,4 +10,24 @@ public interface IClientProxyTestAppService : IApplicationService Task GetFromBodyAsync(string value); Task GetFromQueryAsync(string value); + + Task GetNumberFromBodyAsync(int value); + + Task GetFromExplicitQueryAsync(string value); + + Task GetQueryParametersAsync(int number, bool flag, Guid guid); + + Task CreateAsync(ClientProxyTestInput input); + + Task UpdateAsync(Guid id, ClientProxyTestInput input); + + Task GetListAsync(ClientProxyTestInput input); + + Task GetByQueryTypeAsync(ClientProxyTestQueryInput input); + + Task UploadAsync(IRemoteStreamContent file); + + Task GetHiddenAsync(); + + Task GetNotDescribedAsync(); } diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json index 7b19bba494..0330fe5181 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json @@ -92,6 +92,465 @@ }, "allowAnonymous": null, "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "GetNumberFromBodyAsyncByValue": { + "uniqueName": "GetNumberFromBodyAsyncByValue", + "name": "GetNumberFromBodyAsync", + "httpMethod": "POST", + "url": "api/client-proxy-test/number-from-body", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "value", + "typeAsString": "System.Int32, System.Private.CoreLib", + "type": "System.Int32", + "typeSimple": "number", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "value", + "name": "value", + "jsonName": null, + "type": "System.Int32", + "typeSimple": "number", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "GetFromExplicitQueryAsyncByValue": { + "uniqueName": "GetFromExplicitQueryAsyncByValue", + "name": "GetFromExplicitQueryAsync", + "httpMethod": "POST", + "url": "api/client-proxy-test/from-explicit-query", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "value", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "value", + "name": "value", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "GetQueryParametersAsyncByNumberAndFlagAndGuid": { + "uniqueName": "GetQueryParametersAsyncByNumberAndFlagAndGuid", + "name": "GetQueryParametersAsync", + "httpMethod": "GET", + "url": "api/client-proxy-test/query-parameters", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "number", + "typeAsString": "System.Int32, System.Private.CoreLib", + "type": "System.Int32", + "typeSimple": "number", + "isOptional": false, + "defaultValue": null + }, + { + "name": "flag", + "typeAsString": "System.Boolean, System.Private.CoreLib", + "type": "System.Boolean", + "typeSimple": "boolean", + "isOptional": false, + "defaultValue": null + }, + { + "name": "guid", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "number", + "name": "number", + "jsonName": null, + "type": "System.Int32", + "typeSimple": "number", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "" + }, + { + "nameOnMethod": "flag", + "name": "flag", + "jsonName": null, + "type": "System.Boolean", + "typeSimple": "boolean", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "" + }, + { + "nameOnMethod": "guid", + "name": "guid", + "jsonName": null, + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "CreateAsyncByInput": { + "uniqueName": "CreateAsyncByInput", + "name": "CreateAsync", + "httpMethod": "POST", + "url": "api/client-proxy-test", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "input", + "typeAsString": "Volo.Abp.Http.Client.Web.ClientProxyTestInput, Volo.Abp.Http.Client.Web.Tests", + "type": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "UpdateAsyncByIdAndInput": { + "uniqueName": "UpdateAsyncByIdAndInput", + "name": "UpdateAsync", + "httpMethod": "PUT", + "url": "api/client-proxy-test/{id}", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "input", + "typeAsString": "Volo.Abp.Http.Client.Web.ClientProxyTestInput, Volo.Abp.Http.Client.Web.Tests", + "type": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "id", + "name": "id", + "jsonName": null, + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Path", + "descriptorName": "" + }, + { + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "GetListAsyncByInput": { + "uniqueName": "GetListAsyncByInput", + "name": "GetListAsync", + "httpMethod": "GET", + "url": "api/client-proxy-test", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "input", + "typeAsString": "Volo.Abp.Http.Client.Web.ClientProxyTestInput, Volo.Abp.Http.Client.Web.Tests", + "type": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "input", + "name": "Name", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" + }, + { + "nameOnMethod": "input", + "name": "Value", + "jsonName": null, + "type": "System.Int32", + "typeSimple": "number", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "GetByQueryTypeAsyncByInput": { + "uniqueName": "GetByQueryTypeAsyncByInput", + "name": "GetByQueryTypeAsync", + "httpMethod": "POST", + "url": "api/client-proxy-test/by-query-type", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "input", + "typeAsString": "Volo.Abp.Http.Client.Web.ClientProxyTestQueryInput, Volo.Abp.Http.Client.Web.Tests", + "type": "Volo.Abp.Http.Client.Web.ClientProxyTestQueryInput", + "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestQueryInput", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "input", + "name": "Name", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Query", + "descriptorName": "input" + }, + { + "nameOnMethod": "input", + "name": "Value", + "jsonName": null, + "type": "System.Int32", + "typeSimple": "number", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Query", + "descriptorName": "input" + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "UploadAsyncByFile": { + "uniqueName": "UploadAsyncByFile", + "name": "UploadAsync", + "httpMethod": "POST", + "url": "api/client-proxy-test/upload", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "file", + "typeAsString": "Volo.Abp.Content.IRemoteStreamContent, Volo.Abp.Core", + "type": "Volo.Abp.Content.IRemoteStreamContent", + "typeSimple": "Volo.Abp.Content.IRemoteStreamContent", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "file", + "name": "file", + "jsonName": null, + "type": "Volo.Abp.Content.IRemoteStreamContent", + "typeSimple": "Volo.Abp.Content.IRemoteStreamContent", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "FormFile", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "GetHiddenAsync": { + "uniqueName": "GetHiddenAsync", + "name": "GetHiddenAsync", + "httpMethod": "GET", + "url": "api/client-proxy-test/hidden", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + } + } + }, + "Volo.Abp.Http.Client.Web.ClientProxyNoGroupNameController": { + "controllerName": "ClientProxyNoGroupName", + "controllerGroupName": "", + "isRemoteService": true, + "isIntegrationService": false, + "apiVersion": null, + "type": "Volo.Abp.Http.Client.Web.ClientProxyNoGroupNameController", + "interfaces": [ + { + "type": "Volo.Abp.Http.Client.Web.IClientProxyNoGroupNameAppService", + "name": "IClientProxyNoGroupNameAppService", + "methods": [] + } + ], + "actions": { + "GetAsync": { + "uniqueName": "GetAsync", + "name": "GetAsync", + "httpMethod": "GET", + "url": "api/client-proxy-no-group-name", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyNoGroupNameAppService" + } + } + }, + "Volo.Abp.Http.Client.Web.ClientProxyDuplicatedController": { + "controllerName": "ClientProxyDuplicated", + "controllerGroupName": "ClientProxyDuplicated", + "isRemoteService": true, + "isIntegrationService": false, + "apiVersion": null, + "type": "Volo.Abp.Http.Client.Web.ClientProxyDuplicatedController", + "interfaces": [ + { + "type": "Volo.Abp.Http.Client.Web.IClientProxyDuplicatedAppService", + "name": "IClientProxyDuplicatedAppService", + "methods": [] + } + ], + "actions": { + "GetAsync": { + "uniqueName": "GetAsync", + "name": "GetAsync", + "httpMethod": "GET", + "url": "api/client-proxy-duplicated-proxy", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyDuplicatedAppService" } } } From e92096deeb30ed4b5273f8d1ecf4dd164855a287 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 21 Oct 2026 13:49:07 +0800 Subject: [PATCH 3/4] Do not expose unrouted client proxy actions through conventional routes --- .../AbpHttpClientProxyServiceConvention.cs | 22 ++- ...pHttpClientProxyServiceConvention_Tests.cs | 76 ++++++++- ...oxyControllerRouteAppServiceClientProxy.cs | 16 ++ ...roxyDisabledActionAppServiceClientProxy.cs | 13 ++ ...lientProxyDisabledAppServiceClientProxy.cs | 20 +++ ...xyMetadataDisabledAppServiceClientProxy.cs | 13 ++ .../ClientProxyTestAppServiceClientProxy.cs | 58 +++++++ .../IClientProxyControllerRouteAppService.cs | 9 + .../IClientProxyDisabledActionAppService.cs | 9 + .../Web/IClientProxyDisabledAppService.cs | 11 ++ .../IClientProxyMetadataDisabledAppService.cs | 9 + .../Client/Web/IClientProxyTestAppService.cs | 18 ++ .../Web/client-proxy-test-generate-proxy.json | 158 ++++++++++++++++++ 13 files changed, 423 insertions(+), 9 deletions(-) create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyControllerRouteAppServiceClientProxy.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledActionAppServiceClientProxy.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledAppServiceClientProxy.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyMetadataDisabledAppServiceClientProxy.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyControllerRouteAppService.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledActionAppService.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledAppService.cs create mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyMetadataDisabledAppService.cs diff --git a/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs b/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs index a069aa1056..5d930c9de0 100644 --- a/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs +++ b/framework/src/Volo.Abp.Http.Client.Web/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention.cs @@ -73,6 +73,7 @@ public class AbpHttpClientProxyServiceConvention : AbpServiceConvention } ConfigureClientProxySelector(controller); + RemoveConventionalSelectors(controller); ConfigureClientProxyApiExplorer(controller); ConfigureClientProxyParameters(controller); ConfigureParameters(controller); @@ -229,6 +230,22 @@ public class AbpHttpClientProxyServiceConvention : AbpServiceConvention } } + protected virtual void RemoveConventionalSelectors(ControllerModel controller) + { + if (controller.Selectors.Any(selector => selector.AttributeRouteModel != null)) + { + return; + } + + foreach (var action in controller.Actions) + { + action.Selectors + .Where(selector => selector.AttributeRouteModel == null) + .ToList() + .ForEach(selector => action.Selectors.Remove(selector)); + } + } + protected virtual void ConfigureClientProxyApiExplorer(ControllerModel controller) { if (ControllerWithAttributeRoute.Contains(controller)) @@ -246,10 +263,7 @@ public class AbpHttpClientProxyServiceConvention : AbpServiceConvention foreach (var action in controller.Actions) { - if (ActionWithAttributeRoute.Contains(action)) - { - ConfigureApiExplorer(action); - } + ConfigureApiExplorer(action); } } diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs index d76efe0954..c52a68a2bd 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs @@ -159,13 +159,74 @@ public class AbpHttpClientProxyServiceConvention_Tests : AbpHttpClientWebTestBas action.RouteValues["area"].ShouldBe("clientProxyTest"); } + [Theory] + [InlineData(nameof(IClientProxyTestAppService.GetNotDescribedAsync))] + [InlineData(nameof(IClientProxyTestAppService.GetNotDescribedWithRemoteServiceAsync))] + [InlineData(nameof(IClientProxyTestAppService.GetNotDescribedWithVerbAsync))] + [InlineData(nameof(IClientProxyTestAppService.GetNotDescribedHiddenAsync))] + [InlineData(nameof(IClientProxyTestAppService.GetNotDescribedIgnoredAsync))] + [InlineData(nameof(IClientProxyTestAppService.GetDisabledAsync))] + [InlineData(nameof(IClientProxyTestAppService.GetDisabledWithVerbAsync))] + public async Task Should_Not_Expose_Action_Without_Route(string methodName) + { + FindProxyAction(methodName).ShouldBeNull(); + + var response = await Client.GetAsync($"/clientProxyTest/ClientProxyTest/{methodName.RemovePostFix("Async")}"); + response.StatusCode.ShouldBe(HttpStatusCode.NotFound); + } + [Fact] - public void Should_Not_Expose_Action_Not_In_Api_Description() + public async Task Should_Not_Expose_Action_Without_Route_When_Controller_Has_No_Other_Route() { - GetActions() - .Any(x => x.ControllerTypeInfo.AsType() == typeof(ClientProxyTestAppServiceClientProxy) && - x.MethodInfo.Name == nameof(IClientProxyTestAppService.GetNotDescribedAsync)) - .ShouldBeFalse(); + FindProxyAction(nameof(IClientProxyDisabledActionAppService.GetAsync)).ShouldBeNull(); + + (await Client.GetAsync("/clientProxyTest/ClientProxyDisabledAction/Get")).StatusCode.ShouldBe(HttpStatusCode.NotFound); + (await Client.GetAsync("/api/client-proxy-disabled-action")).StatusCode.ShouldBe(HttpStatusCode.NotFound); + } + + [Fact] + public async Task Should_Not_Expose_Actions_Of_Disabled_Client_Proxy_Without_Explicit_Route() + { + FindProxyAction(nameof(IClientProxyDisabledAppService.GetAsync)).ShouldBeNull(); + + (await Client.GetAsync("/clientProxyTest/ClientProxyDisabled/Get")).StatusCode.ShouldBe(HttpStatusCode.NotFound); + (await Client.GetAsync("/api/client-proxy-disabled")).StatusCode.ShouldBe(HttpStatusCode.NotFound); + (await Client.GetStringAsync("/api/client-proxy-disabled/with-route")).ShouldBe("disabled-with-route"); + } + + [Theory] + [InlineData(nameof(IClientProxyTestAppService.GetDisabledWithRouteAsync), "api/client-proxy-test/disabled-with-route", false)] + [InlineData(nameof(IClientProxyTestAppService.GetNotDescribedWithRouteAsync), "api/client-proxy-test/not-described-with-route", true)] + public async Task Should_Keep_Explicit_Action_Route(string methodName, string url, bool visibleInApiExplorer) + { + GetProxyAction(methodName).AttributeRouteInfo.Template.ShouldBe(url); + + (await Client.GetAsync($"/{url}")).StatusCode.ShouldBe(HttpStatusCode.OK); + GetApiDescriptions("ClientProxyTest").Any(x => x.RelativePath == url).ShouldBe(visibleInApiExplorer); + } + + [Fact] + public async Task Should_Keep_Only_Explicit_Route_Of_Action_With_Multiple_Selectors() + { + var action = GetProxyAction(nameof(IClientProxyTestAppService.GetDisabledWithVerbAndRouteAsync)); + action.AttributeRouteInfo.Template.ShouldBe("api/client-proxy-test/disabled-with-verb-and-route"); + + (await Client.PostAsync("/api/client-proxy-test/disabled-with-verb-and-route", null)).StatusCode.ShouldBe(HttpStatusCode.OK); + (await Client.GetAsync("/clientProxyTest/ClientProxyTest/GetDisabledWithVerbAndRoute")).StatusCode.ShouldBe(HttpStatusCode.NotFound); + } + + [Fact] + public async Task Should_Keep_Explicit_Controller_Route() + { + (await Client.GetStringAsync("/api/client-proxy-controller-route")).ShouldBe("controller-route"); + (await Client.GetAsync("/api/client-proxy-controller-route-json")).StatusCode.ShouldBe(HttpStatusCode.NotFound); + } + + [Fact] + public async Task Should_Hide_Client_Proxy_With_Disabled_Metadata_From_Api_Explorer() + { + (await Client.GetStringAsync("/api/client-proxy-metadata-disabled")).ShouldBe("metadata-disabled"); + GetApiDescriptions("ClientProxyMetadataDisabled").ShouldBeEmpty(); } [Fact] @@ -209,6 +270,11 @@ public class AbpHttpClientProxyServiceConvention_Tests : AbpHttpClientWebTestBas return GetActions().Single(x => x.ControllerTypeInfo.AsType() == typeof(TClientProxy) && x.MethodInfo.Name == methodName); } + private ControllerActionDescriptor FindProxyAction(string methodName) + { + return GetActions().SingleOrDefault(x => x.ControllerTypeInfo.AsType() == typeof(TClientProxy) && x.MethodInfo.Name == methodName); + } + private ApiDescription[] GetApiDescriptions(string groupName) { return GetRequiredService() diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyControllerRouteAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyControllerRouteAppServiceClientProxy.cs new file mode 100644 index 0000000000..91cd5a8896 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyControllerRouteAppServiceClientProxy.cs @@ -0,0 +1,16 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.Http.Client.ClientProxying; + +namespace Volo.Abp.Http.Client.Web; + +[Route("api/client-proxy-controller-route")] +public class ClientProxyControllerRouteAppServiceClientProxy : ClientProxyBase, IClientProxyControllerRouteAppService +{ + [RemoteService(false)] + [HttpGet] + public virtual Task GetAsync() + { + return Task.FromResult("controller-route"); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledActionAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledActionAppServiceClientProxy.cs new file mode 100644 index 0000000000..f8a94ac3a3 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledActionAppServiceClientProxy.cs @@ -0,0 +1,13 @@ +using System.Threading.Tasks; +using Volo.Abp.Http.Client.ClientProxying; + +namespace Volo.Abp.Http.Client.Web; + +public class ClientProxyDisabledActionAppServiceClientProxy : ClientProxyBase, IClientProxyDisabledActionAppService +{ + [RemoteService(false)] + public virtual Task GetAsync() + { + return Task.FromResult("disabled-action"); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledAppServiceClientProxy.cs new file mode 100644 index 0000000000..084dfb1b8d --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledAppServiceClientProxy.cs @@ -0,0 +1,20 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.Http.Client.ClientProxying; + +namespace Volo.Abp.Http.Client.Web; + +[RemoteService(false)] +public class ClientProxyDisabledAppServiceClientProxy : ClientProxyBase, IClientProxyDisabledAppService +{ + public virtual Task GetAsync() + { + return Task.FromResult("disabled"); + } + + [HttpGet("api/client-proxy-disabled/with-route")] + public virtual Task GetWithRouteAsync() + { + return Task.FromResult("disabled-with-route"); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyMetadataDisabledAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyMetadataDisabledAppServiceClientProxy.cs new file mode 100644 index 0000000000..6918f74c41 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyMetadataDisabledAppServiceClientProxy.cs @@ -0,0 +1,13 @@ +using System.Threading.Tasks; +using Volo.Abp.Http.Client.ClientProxying; + +namespace Volo.Abp.Http.Client.Web; + +[RemoteService(IsMetadataEnabled = false)] +public class ClientProxyMetadataDisabledAppServiceClientProxy : ClientProxyBase, IClientProxyMetadataDisabledAppService +{ + public virtual Task GetAsync() + { + return Task.FromResult("metadata-disabled"); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs index c61ba139b8..aec0383e74 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs @@ -71,4 +71,62 @@ public class ClientProxyTestAppServiceClientProxy : ClientProxyBase GetDisabledAsync() + { + return Task.FromResult("disabled"); + } + + [RemoteService(false)] + [HttpGet] + public virtual Task GetDisabledWithVerbAsync() + { + return Task.FromResult("disabled-with-verb"); + } + + [RemoteService] + public virtual Task GetNotDescribedWithRemoteServiceAsync() + { + return Task.FromResult("not-described-with-remote-service"); + } + + [HttpGet] + public virtual Task GetNotDescribedWithVerbAsync() + { + return Task.FromResult("not-described-with-verb"); + } + + [RemoteService(IsMetadataEnabled = false)] + public virtual Task GetNotDescribedHiddenAsync() + { + return Task.FromResult("not-described-hidden"); + } + + [ApiExplorerSettings(IgnoreApi = true)] + public virtual Task GetNotDescribedIgnoredAsync() + { + return Task.FromResult("not-described-ignored"); + } + + [RemoteService(false)] + [HttpGet("api/client-proxy-test/disabled-with-route")] + public virtual Task GetDisabledWithRouteAsync() + { + return Task.FromResult("disabled-with-route"); + } + + [HttpGet("api/client-proxy-test/not-described-with-route")] + public virtual Task GetNotDescribedWithRouteAsync() + { + return Task.FromResult("not-described-with-route"); + } + + [RemoteService(false)] + [HttpGet] + [HttpPost("api/client-proxy-test/disabled-with-verb-and-route")] + public virtual Task GetDisabledWithVerbAndRouteAsync() + { + return Task.FromResult("disabled-with-verb-and-route"); + } } diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyControllerRouteAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyControllerRouteAppService.cs new file mode 100644 index 0000000000..8bd2cb42e5 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyControllerRouteAppService.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace Volo.Abp.Http.Client.Web; + +public interface IClientProxyControllerRouteAppService : IApplicationService +{ + Task GetAsync(); +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledActionAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledActionAppService.cs new file mode 100644 index 0000000000..116713c175 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledActionAppService.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace Volo.Abp.Http.Client.Web; + +public interface IClientProxyDisabledActionAppService : IApplicationService +{ + Task GetAsync(); +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledAppService.cs new file mode 100644 index 0000000000..b7a2fa60e4 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledAppService.cs @@ -0,0 +1,11 @@ +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace Volo.Abp.Http.Client.Web; + +public interface IClientProxyDisabledAppService : IApplicationService +{ + Task GetAsync(); + + Task GetWithRouteAsync(); +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyMetadataDisabledAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyMetadataDisabledAppService.cs new file mode 100644 index 0000000000..6e425aac58 --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyMetadataDisabledAppService.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace Volo.Abp.Http.Client.Web; + +public interface IClientProxyMetadataDisabledAppService : IApplicationService +{ + Task GetAsync(); +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs index 8d8ec3f388..19cc397786 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs @@ -30,4 +30,22 @@ public interface IClientProxyTestAppService : IApplicationService Task GetHiddenAsync(); Task GetNotDescribedAsync(); + + Task GetDisabledAsync(); + + Task GetDisabledWithVerbAsync(); + + Task GetNotDescribedWithRemoteServiceAsync(); + + Task GetNotDescribedWithVerbAsync(); + + Task GetNotDescribedHiddenAsync(); + + Task GetNotDescribedIgnoredAsync(); + + Task GetDisabledWithRouteAsync(); + + Task GetNotDescribedWithRouteAsync(); + + Task GetDisabledWithVerbAndRouteAsync(); } diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json index 0330fe5181..4a00cb8975 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json @@ -487,6 +487,36 @@ }, "allowAnonymous": null, "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "GetDisabledAsync": { + "uniqueName": "GetDisabledAsync", + "name": "GetDisabledAsync", + "httpMethod": "GET", + "url": "api/client-proxy-test/disabled", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + }, + "GetDisabledWithVerbAsync": { + "uniqueName": "GetDisabledWithVerbAsync", + "name": "GetDisabledWithVerbAsync", + "httpMethod": "GET", + "url": "api/client-proxy-test/disabled-with-verb", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" } } }, @@ -553,6 +583,134 @@ "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyDuplicatedAppService" } } + }, + "Volo.Abp.Http.Client.Web.ClientProxyDisabledController": { + "controllerName": "ClientProxyDisabled", + "controllerGroupName": "ClientProxyDisabled", + "isRemoteService": true, + "isIntegrationService": false, + "apiVersion": null, + "type": "Volo.Abp.Http.Client.Web.ClientProxyDisabledController", + "interfaces": [ + { + "type": "Volo.Abp.Http.Client.Web.IClientProxyDisabledAppService", + "name": "IClientProxyDisabledAppService", + "methods": [] + } + ], + "actions": { + "GetAsync": { + "uniqueName": "GetAsync", + "name": "GetAsync", + "httpMethod": "GET", + "url": "api/client-proxy-disabled", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyDisabledAppService" + } + } + }, + "Volo.Abp.Http.Client.Web.ClientProxyDisabledActionController": { + "controllerName": "ClientProxyDisabledAction", + "controllerGroupName": "ClientProxyDisabledAction", + "isRemoteService": true, + "isIntegrationService": false, + "apiVersion": null, + "type": "Volo.Abp.Http.Client.Web.ClientProxyDisabledActionController", + "interfaces": [ + { + "type": "Volo.Abp.Http.Client.Web.IClientProxyDisabledActionAppService", + "name": "IClientProxyDisabledActionAppService", + "methods": [] + } + ], + "actions": { + "GetAsync": { + "uniqueName": "GetAsync", + "name": "GetAsync", + "httpMethod": "GET", + "url": "api/client-proxy-disabled-action", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyDisabledActionAppService" + } + } + }, + "Volo.Abp.Http.Client.Web.ClientProxyMetadataDisabledController": { + "controllerName": "ClientProxyMetadataDisabled", + "controllerGroupName": "ClientProxyMetadataDisabled", + "isRemoteService": true, + "isIntegrationService": false, + "apiVersion": null, + "type": "Volo.Abp.Http.Client.Web.ClientProxyMetadataDisabledController", + "interfaces": [ + { + "type": "Volo.Abp.Http.Client.Web.IClientProxyMetadataDisabledAppService", + "name": "IClientProxyMetadataDisabledAppService", + "methods": [] + } + ], + "actions": { + "GetAsync": { + "uniqueName": "GetAsync", + "name": "GetAsync", + "httpMethod": "GET", + "url": "api/client-proxy-metadata-disabled", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyMetadataDisabledAppService" + } + } + }, + "Volo.Abp.Http.Client.Web.ClientProxyControllerRouteController": { + "controllerName": "ClientProxyControllerRoute", + "controllerGroupName": "ClientProxyControllerRoute", + "isRemoteService": true, + "isIntegrationService": false, + "apiVersion": null, + "type": "Volo.Abp.Http.Client.Web.ClientProxyControllerRouteController", + "interfaces": [ + { + "type": "Volo.Abp.Http.Client.Web.IClientProxyControllerRouteAppService", + "name": "IClientProxyControllerRouteAppService", + "methods": [] + } + ], + "actions": { + "GetAsync": { + "uniqueName": "GetAsync", + "name": "GetAsync", + "httpMethod": "GET", + "url": "api/client-proxy-controller-route-json", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "System.String", + "typeSimple": "string" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyControllerRouteAppService" + } + } } } } From bdbc0ef92529b0342184122f42b016f5750b50dc Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 21 Oct 2026 14:13:30 +0800 Subject: [PATCH 4/4] Move client proxy convention tests to the Conventions folder --- .../Volo.Abp.Http.Client.Web.Tests.csproj | 2 +- .../Client/Web/AbpHttpClientWebTestModule.cs | 1 + ...oxyControllerRouteAppServiceClientProxy.cs | 16 - ...roxyDisabledActionAppServiceClientProxy.cs | 13 - ...lientProxyDisabledAppServiceClientProxy.cs | 20 -- ...entProxyDuplicatedAppServiceClientProxy.cs | 12 - .../Web/ClientProxyDuplicatedController.cs | 15 - ...xyMetadataDisabledAppServiceClientProxy.cs | 13 - ...ntProxyNoGroupNameAppServiceClientProxy.cs | 12 - .../ClientProxyTestAppServiceClientProxy.cs | 132 -------- .../Http/Client/Web/ClientProxyTestInput.cs | 8 - .../Client/Web/ClientProxyTestQueryInput.cs | 8 - ...pHttpClientProxyServiceConvention_Tests.cs | 293 +++++++++++++++++- .../client-proxy-test-generate-proxy.json | 112 +++---- .../IClientProxyControllerRouteAppService.cs | 9 - .../IClientProxyDisabledActionAppService.cs | 9 - .../Web/IClientProxyDisabledAppService.cs | 11 - .../Web/IClientProxyDuplicatedAppService.cs | 9 - .../IClientProxyMetadataDisabledAppService.cs | 9 - .../Web/IClientProxyNoGroupNameAppService.cs | 9 - .../Client/Web/IClientProxyTestAppService.cs | 51 --- 21 files changed, 350 insertions(+), 414 deletions(-) delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyControllerRouteAppServiceClientProxy.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledActionAppServiceClientProxy.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledAppServiceClientProxy.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedAppServiceClientProxy.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedController.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyMetadataDisabledAppServiceClientProxy.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyNoGroupNameAppServiceClientProxy.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestInput.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestQueryInput.cs rename framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/{ => Conventions}/AbpHttpClientProxyServiceConvention_Tests.cs (60%) rename framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/{ => Conventions}/client-proxy-test-generate-proxy.json (81%) delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyControllerRouteAppService.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledActionAppService.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledAppService.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDuplicatedAppService.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyMetadataDisabledAppService.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyNoGroupNameAppService.cs delete mode 100644 framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.csproj b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.csproj index fb085db20e..893bcebc63 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.csproj +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo.Abp.Http.Client.Web.Tests.csproj @@ -16,7 +16,7 @@ - + diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs index a146fb735d..ca2f404b0c 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientWebTestModule.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.TestBase; using Volo.Abp.Autofac; using Volo.Abp.Http.Client.StaticProxying; +using Volo.Abp.Http.Client.Web.Conventions; using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyControllerRouteAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyControllerRouteAppServiceClientProxy.cs deleted file mode 100644 index 91cd5a8896..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyControllerRouteAppServiceClientProxy.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.Http.Client.ClientProxying; - -namespace Volo.Abp.Http.Client.Web; - -[Route("api/client-proxy-controller-route")] -public class ClientProxyControllerRouteAppServiceClientProxy : ClientProxyBase, IClientProxyControllerRouteAppService -{ - [RemoteService(false)] - [HttpGet] - public virtual Task GetAsync() - { - return Task.FromResult("controller-route"); - } -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledActionAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledActionAppServiceClientProxy.cs deleted file mode 100644 index f8a94ac3a3..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledActionAppServiceClientProxy.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Http.Client.ClientProxying; - -namespace Volo.Abp.Http.Client.Web; - -public class ClientProxyDisabledActionAppServiceClientProxy : ClientProxyBase, IClientProxyDisabledActionAppService -{ - [RemoteService(false)] - public virtual Task GetAsync() - { - return Task.FromResult("disabled-action"); - } -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledAppServiceClientProxy.cs deleted file mode 100644 index 084dfb1b8d..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDisabledAppServiceClientProxy.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.Http.Client.ClientProxying; - -namespace Volo.Abp.Http.Client.Web; - -[RemoteService(false)] -public class ClientProxyDisabledAppServiceClientProxy : ClientProxyBase, IClientProxyDisabledAppService -{ - public virtual Task GetAsync() - { - return Task.FromResult("disabled"); - } - - [HttpGet("api/client-proxy-disabled/with-route")] - public virtual Task GetWithRouteAsync() - { - return Task.FromResult("disabled-with-route"); - } -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedAppServiceClientProxy.cs deleted file mode 100644 index 7d6040f47e..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedAppServiceClientProxy.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Http.Client.ClientProxying; - -namespace Volo.Abp.Http.Client.Web; - -public class ClientProxyDuplicatedAppServiceClientProxy : ClientProxyBase, IClientProxyDuplicatedAppService -{ - public virtual Task GetAsync() - { - return Task.FromResult("proxy"); - } -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedController.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedController.cs deleted file mode 100644 index c8c2a072ec..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyDuplicatedController.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.AspNetCore.Mvc; - -namespace Volo.Abp.Http.Client.Web; - -[Route("api/client-proxy-duplicated")] -public class ClientProxyDuplicatedController : AbpControllerBase, IClientProxyDuplicatedAppService -{ - [HttpGet] - public virtual Task GetAsync() - { - return Task.FromResult("controller"); - } -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyMetadataDisabledAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyMetadataDisabledAppServiceClientProxy.cs deleted file mode 100644 index 6918f74c41..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyMetadataDisabledAppServiceClientProxy.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Http.Client.ClientProxying; - -namespace Volo.Abp.Http.Client.Web; - -[RemoteService(IsMetadataEnabled = false)] -public class ClientProxyMetadataDisabledAppServiceClientProxy : ClientProxyBase, IClientProxyMetadataDisabledAppService -{ - public virtual Task GetAsync() - { - return Task.FromResult("metadata-disabled"); - } -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyNoGroupNameAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyNoGroupNameAppServiceClientProxy.cs deleted file mode 100644 index 33f27ab60e..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyNoGroupNameAppServiceClientProxy.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Http.Client.ClientProxying; - -namespace Volo.Abp.Http.Client.Web; - -public class ClientProxyNoGroupNameAppServiceClientProxy : ClientProxyBase, IClientProxyNoGroupNameAppService -{ - public virtual Task GetAsync() - { - return Task.FromResult("no-group-name"); - } -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs deleted file mode 100644 index aec0383e74..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestAppServiceClientProxy.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System; -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.Content; -using Volo.Abp.Http.Client.ClientProxying; - -namespace Volo.Abp.Http.Client.Web; - -// Returns the received values instead of calling a remote service, so the tests can see what the proxy controller bound. -public class ClientProxyTestAppServiceClientProxy : ClientProxyBase, IClientProxyTestAppService -{ - public virtual Task GetFromBodyAsync(string value) - { - return Task.FromResult(value); - } - - public virtual Task GetFromQueryAsync(string value) - { - return Task.FromResult(value); - } - - public virtual Task GetNumberFromBodyAsync(int value) - { - return Task.FromResult(value); - } - - public virtual Task GetFromExplicitQueryAsync([FromQuery] string value) - { - return Task.FromResult(value); - } - - public virtual Task GetQueryParametersAsync(int number, bool flag, Guid guid) - { - return Task.FromResult($"{number}:{flag}:{guid}"); - } - - public virtual Task CreateAsync(ClientProxyTestInput input) - { - return Task.FromResult($"{input.Name}:{input.Value}"); - } - - public virtual Task UpdateAsync(Guid id, ClientProxyTestInput input) - { - return Task.FromResult($"{id}:{input.Name}:{input.Value}"); - } - - public virtual Task GetListAsync(ClientProxyTestInput input) - { - return Task.FromResult($"{input.Name}:{input.Value}"); - } - - public virtual Task GetByQueryTypeAsync(ClientProxyTestQueryInput input) - { - return Task.FromResult($"{input.Name}:{input.Value}"); - } - - public virtual async Task UploadAsync(IRemoteStreamContent file) - { - using var reader = new StreamReader(file.GetStream()); - return $"{file.FileName}:{await reader.ReadToEndAsync()}"; - } - - [RemoteService(IsMetadataEnabled = false)] - public virtual Task GetHiddenAsync() - { - return Task.FromResult("hidden"); - } - - public virtual Task GetNotDescribedAsync() - { - return Task.FromResult("not-described"); - } - - [RemoteService(false)] - public virtual Task GetDisabledAsync() - { - return Task.FromResult("disabled"); - } - - [RemoteService(false)] - [HttpGet] - public virtual Task GetDisabledWithVerbAsync() - { - return Task.FromResult("disabled-with-verb"); - } - - [RemoteService] - public virtual Task GetNotDescribedWithRemoteServiceAsync() - { - return Task.FromResult("not-described-with-remote-service"); - } - - [HttpGet] - public virtual Task GetNotDescribedWithVerbAsync() - { - return Task.FromResult("not-described-with-verb"); - } - - [RemoteService(IsMetadataEnabled = false)] - public virtual Task GetNotDescribedHiddenAsync() - { - return Task.FromResult("not-described-hidden"); - } - - [ApiExplorerSettings(IgnoreApi = true)] - public virtual Task GetNotDescribedIgnoredAsync() - { - return Task.FromResult("not-described-ignored"); - } - - [RemoteService(false)] - [HttpGet("api/client-proxy-test/disabled-with-route")] - public virtual Task GetDisabledWithRouteAsync() - { - return Task.FromResult("disabled-with-route"); - } - - [HttpGet("api/client-proxy-test/not-described-with-route")] - public virtual Task GetNotDescribedWithRouteAsync() - { - return Task.FromResult("not-described-with-route"); - } - - [RemoteService(false)] - [HttpGet] - [HttpPost("api/client-proxy-test/disabled-with-verb-and-route")] - public virtual Task GetDisabledWithVerbAndRouteAsync() - { - return Task.FromResult("disabled-with-verb-and-route"); - } -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestInput.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestInput.cs deleted file mode 100644 index 11f6fb5d11..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestInput.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Volo.Abp.Http.Client.Web; - -public class ClientProxyTestInput -{ - public string Name { get; set; } - - public int Value { get; set; } -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestQueryInput.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestQueryInput.cs deleted file mode 100644 index 89ac36b0d1..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/ClientProxyTestQueryInput.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Volo.Abp.Http.Client.Web; - -public class ClientProxyTestQueryInput -{ - public string Name { get; set; } - - public int Value { get; set; } -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention_Tests.cs similarity index 60% rename from framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs rename to framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention_Tests.cs index c52a68a2bd..84fba21065 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/AbpHttpClientProxyServiceConvention_Tests.cs +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/Conventions/AbpHttpClientProxyServiceConvention_Tests.cs @@ -1,17 +1,23 @@ using System; +using System.IO; using System.Linq; using System.Net; using System.Net.Http; using System.Text; using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ActionConstraints; using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Infrastructure; using Shouldly; +using Volo.Abp.Application.Services; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Content; +using Volo.Abp.Http.Client.ClientProxying; using Xunit; -namespace Volo.Abp.Http.Client.Web; +namespace Volo.Abp.Http.Client.Web.Conventions; public class AbpHttpClientProxyServiceConvention_Tests : AbpHttpClientWebTestBase { @@ -284,3 +290,288 @@ public class AbpHttpClientProxyServiceConvention_Tests : AbpHttpClientWebTestBas .ToArray(); } } + +public interface IClientProxyTestAppService : IApplicationService +{ + Task GetFromBodyAsync(string value); + + Task GetFromQueryAsync(string value); + + Task GetNumberFromBodyAsync(int value); + + Task GetFromExplicitQueryAsync(string value); + + Task GetQueryParametersAsync(int number, bool flag, Guid guid); + + Task CreateAsync(ClientProxyTestInput input); + + Task UpdateAsync(Guid id, ClientProxyTestInput input); + + Task GetListAsync(ClientProxyTestInput input); + + Task GetByQueryTypeAsync(ClientProxyTestQueryInput input); + + Task UploadAsync(IRemoteStreamContent file); + + Task GetHiddenAsync(); + + Task GetNotDescribedAsync(); + + Task GetDisabledAsync(); + + Task GetDisabledWithVerbAsync(); + + Task GetNotDescribedWithRemoteServiceAsync(); + + Task GetNotDescribedWithVerbAsync(); + + Task GetNotDescribedHiddenAsync(); + + Task GetNotDescribedIgnoredAsync(); + + Task GetDisabledWithRouteAsync(); + + Task GetNotDescribedWithRouteAsync(); + + Task GetDisabledWithVerbAndRouteAsync(); +} + +// Returns the received values instead of calling a remote service, so the tests can see what the proxy controller bound. +public class ClientProxyTestAppServiceClientProxy : ClientProxyBase, IClientProxyTestAppService +{ + public virtual Task GetFromBodyAsync(string value) + { + return Task.FromResult(value); + } + + public virtual Task GetFromQueryAsync(string value) + { + return Task.FromResult(value); + } + + public virtual Task GetNumberFromBodyAsync(int value) + { + return Task.FromResult(value); + } + + public virtual Task GetFromExplicitQueryAsync([FromQuery] string value) + { + return Task.FromResult(value); + } + + public virtual Task GetQueryParametersAsync(int number, bool flag, Guid guid) + { + return Task.FromResult($"{number}:{flag}:{guid}"); + } + + public virtual Task CreateAsync(ClientProxyTestInput input) + { + return Task.FromResult($"{input.Name}:{input.Value}"); + } + + public virtual Task UpdateAsync(Guid id, ClientProxyTestInput input) + { + return Task.FromResult($"{id}:{input.Name}:{input.Value}"); + } + + public virtual Task GetListAsync(ClientProxyTestInput input) + { + return Task.FromResult($"{input.Name}:{input.Value}"); + } + + public virtual Task GetByQueryTypeAsync(ClientProxyTestQueryInput input) + { + return Task.FromResult($"{input.Name}:{input.Value}"); + } + + public virtual async Task UploadAsync(IRemoteStreamContent file) + { + using var reader = new StreamReader(file.GetStream()); + return $"{file.FileName}:{await reader.ReadToEndAsync()}"; + } + + [RemoteService(IsMetadataEnabled = false)] + public virtual Task GetHiddenAsync() + { + return Task.FromResult("hidden"); + } + + public virtual Task GetNotDescribedAsync() + { + return Task.FromResult("not-described"); + } + + [RemoteService(false)] + public virtual Task GetDisabledAsync() + { + return Task.FromResult("disabled"); + } + + [RemoteService(false)] + [HttpGet] + public virtual Task GetDisabledWithVerbAsync() + { + return Task.FromResult("disabled-with-verb"); + } + + [RemoteService] + public virtual Task GetNotDescribedWithRemoteServiceAsync() + { + return Task.FromResult("not-described-with-remote-service"); + } + + [HttpGet] + public virtual Task GetNotDescribedWithVerbAsync() + { + return Task.FromResult("not-described-with-verb"); + } + + [RemoteService(IsMetadataEnabled = false)] + public virtual Task GetNotDescribedHiddenAsync() + { + return Task.FromResult("not-described-hidden"); + } + + [ApiExplorerSettings(IgnoreApi = true)] + public virtual Task GetNotDescribedIgnoredAsync() + { + return Task.FromResult("not-described-ignored"); + } + + [RemoteService(false)] + [HttpGet("api/client-proxy-test/disabled-with-route")] + public virtual Task GetDisabledWithRouteAsync() + { + return Task.FromResult("disabled-with-route"); + } + + [HttpGet("api/client-proxy-test/not-described-with-route")] + public virtual Task GetNotDescribedWithRouteAsync() + { + return Task.FromResult("not-described-with-route"); + } + + [RemoteService(false)] + [HttpGet] + [HttpPost("api/client-proxy-test/disabled-with-verb-and-route")] + public virtual Task GetDisabledWithVerbAndRouteAsync() + { + return Task.FromResult("disabled-with-verb-and-route"); + } +} + +public class ClientProxyTestInput +{ + public string Name { get; set; } + + public int Value { get; set; } +} + +public class ClientProxyTestQueryInput +{ + public string Name { get; set; } + + public int Value { get; set; } +} + +public interface IClientProxyNoGroupNameAppService : IApplicationService +{ + Task GetAsync(); +} + +public class ClientProxyNoGroupNameAppServiceClientProxy : ClientProxyBase, IClientProxyNoGroupNameAppService +{ + public virtual Task GetAsync() + { + return Task.FromResult("no-group-name"); + } +} + +public interface IClientProxyDuplicatedAppService : IApplicationService +{ + Task GetAsync(); +} + +public class ClientProxyDuplicatedAppServiceClientProxy : ClientProxyBase, IClientProxyDuplicatedAppService +{ + public virtual Task GetAsync() + { + return Task.FromResult("proxy"); + } +} + +[Route("api/client-proxy-duplicated")] +public class ClientProxyDuplicatedController : AbpControllerBase, IClientProxyDuplicatedAppService +{ + [HttpGet] + public virtual Task GetAsync() + { + return Task.FromResult("controller"); + } +} + +public interface IClientProxyDisabledAppService : IApplicationService +{ + Task GetAsync(); + + Task GetWithRouteAsync(); +} + +[RemoteService(false)] +public class ClientProxyDisabledAppServiceClientProxy : ClientProxyBase, IClientProxyDisabledAppService +{ + public virtual Task GetAsync() + { + return Task.FromResult("disabled"); + } + + [HttpGet("api/client-proxy-disabled/with-route")] + public virtual Task GetWithRouteAsync() + { + return Task.FromResult("disabled-with-route"); + } +} + +public interface IClientProxyDisabledActionAppService : IApplicationService +{ + Task GetAsync(); +} + +public class ClientProxyDisabledActionAppServiceClientProxy : ClientProxyBase, IClientProxyDisabledActionAppService +{ + [RemoteService(false)] + public virtual Task GetAsync() + { + return Task.FromResult("disabled-action"); + } +} + +public interface IClientProxyMetadataDisabledAppService : IApplicationService +{ + Task GetAsync(); +} + +[RemoteService(IsMetadataEnabled = false)] +public class ClientProxyMetadataDisabledAppServiceClientProxy : ClientProxyBase, IClientProxyMetadataDisabledAppService +{ + public virtual Task GetAsync() + { + return Task.FromResult("metadata-disabled"); + } +} + +public interface IClientProxyControllerRouteAppService : IApplicationService +{ + Task GetAsync(); +} + +[Route("api/client-proxy-controller-route")] +public class ClientProxyControllerRouteAppServiceClientProxy : ClientProxyBase, IClientProxyControllerRouteAppService +{ + [RemoteService(false)] + [HttpGet] + public virtual Task GetAsync() + { + return Task.FromResult("controller-route"); + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/Conventions/client-proxy-test-generate-proxy.json similarity index 81% rename from framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json rename to framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/Conventions/client-proxy-test-generate-proxy.json index 4a00cb8975..ed5057b876 100644 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/client-proxy-test-generate-proxy.json +++ b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/Conventions/client-proxy-test-generate-proxy.json @@ -4,16 +4,16 @@ "rootPath": "clientProxyTest", "remoteServiceName": "Default", "controllers": { - "Volo.Abp.Http.Client.Web.ClientProxyTestController": { + "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestController": { "controllerName": "ClientProxyTest", "controllerGroupName": "ClientProxyTest", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.Abp.Http.Client.Web.ClientProxyTestController", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestController", "interfaces": [ { - "type": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService", + "type": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService", "name": "IClientProxyTestAppService", "methods": [] } @@ -54,7 +54,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "GetFromQueryAsyncByValue": { "uniqueName": "GetFromQueryAsyncByValue", @@ -91,7 +91,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "GetNumberFromBodyAsyncByValue": { "uniqueName": "GetNumberFromBodyAsyncByValue", @@ -128,7 +128,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "GetFromExplicitQueryAsyncByValue": { "uniqueName": "GetFromExplicitQueryAsyncByValue", @@ -165,7 +165,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "GetQueryParametersAsyncByNumberAndFlagAndGuid": { "uniqueName": "GetQueryParametersAsyncByNumberAndFlagAndGuid", @@ -242,7 +242,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "CreateAsyncByInput": { "uniqueName": "CreateAsyncByInput", @@ -253,9 +253,9 @@ "parametersOnMethod": [ { "name": "input", - "typeAsString": "Volo.Abp.Http.Client.Web.ClientProxyTestInput, Volo.Abp.Http.Client.Web.Tests", - "type": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", - "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "typeAsString": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput, Volo.Abp.Http.Client.Web.Tests", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput", + "typeSimple": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput", "isOptional": false, "defaultValue": null } @@ -265,8 +265,8 @@ "nameOnMethod": "input", "name": "input", "jsonName": null, - "type": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", - "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput", + "typeSimple": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput", "isOptional": false, "defaultValue": null, "constraintTypes": null, @@ -279,7 +279,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "UpdateAsyncByIdAndInput": { "uniqueName": "UpdateAsyncByIdAndInput", @@ -298,9 +298,9 @@ }, { "name": "input", - "typeAsString": "Volo.Abp.Http.Client.Web.ClientProxyTestInput, Volo.Abp.Http.Client.Web.Tests", - "type": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", - "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "typeAsString": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput, Volo.Abp.Http.Client.Web.Tests", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput", + "typeSimple": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput", "isOptional": false, "defaultValue": null } @@ -322,8 +322,8 @@ "nameOnMethod": "input", "name": "input", "jsonName": null, - "type": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", - "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput", + "typeSimple": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput", "isOptional": false, "defaultValue": null, "constraintTypes": null, @@ -336,7 +336,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "GetListAsyncByInput": { "uniqueName": "GetListAsyncByInput", @@ -347,9 +347,9 @@ "parametersOnMethod": [ { "name": "input", - "typeAsString": "Volo.Abp.Http.Client.Web.ClientProxyTestInput, Volo.Abp.Http.Client.Web.Tests", - "type": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", - "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestInput", + "typeAsString": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput, Volo.Abp.Http.Client.Web.Tests", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput", + "typeSimple": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestInput", "isOptional": false, "defaultValue": null } @@ -385,7 +385,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "GetByQueryTypeAsyncByInput": { "uniqueName": "GetByQueryTypeAsyncByInput", @@ -396,9 +396,9 @@ "parametersOnMethod": [ { "name": "input", - "typeAsString": "Volo.Abp.Http.Client.Web.ClientProxyTestQueryInput, Volo.Abp.Http.Client.Web.Tests", - "type": "Volo.Abp.Http.Client.Web.ClientProxyTestQueryInput", - "typeSimple": "Volo.Abp.Http.Client.Web.ClientProxyTestQueryInput", + "typeAsString": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestQueryInput, Volo.Abp.Http.Client.Web.Tests", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestQueryInput", + "typeSimple": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyTestQueryInput", "isOptional": false, "defaultValue": null } @@ -434,7 +434,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "UploadAsyncByFile": { "uniqueName": "UploadAsyncByFile", @@ -471,7 +471,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "GetHiddenAsync": { "uniqueName": "GetHiddenAsync", @@ -486,7 +486,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "GetDisabledAsync": { "uniqueName": "GetDisabledAsync", @@ -501,7 +501,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" }, "GetDisabledWithVerbAsync": { "uniqueName": "GetDisabledWithVerbAsync", @@ -516,20 +516,20 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyTestAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyTestAppService" } } }, - "Volo.Abp.Http.Client.Web.ClientProxyNoGroupNameController": { + "Volo.Abp.Http.Client.Web.Conventions.ClientProxyNoGroupNameController": { "controllerName": "ClientProxyNoGroupName", "controllerGroupName": "", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.Abp.Http.Client.Web.ClientProxyNoGroupNameController", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyNoGroupNameController", "interfaces": [ { - "type": "Volo.Abp.Http.Client.Web.IClientProxyNoGroupNameAppService", + "type": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyNoGroupNameAppService", "name": "IClientProxyNoGroupNameAppService", "methods": [] } @@ -548,20 +548,20 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyNoGroupNameAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyNoGroupNameAppService" } } }, - "Volo.Abp.Http.Client.Web.ClientProxyDuplicatedController": { + "Volo.Abp.Http.Client.Web.Conventions.ClientProxyDuplicatedController": { "controllerName": "ClientProxyDuplicated", "controllerGroupName": "ClientProxyDuplicated", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.Abp.Http.Client.Web.ClientProxyDuplicatedController", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyDuplicatedController", "interfaces": [ { - "type": "Volo.Abp.Http.Client.Web.IClientProxyDuplicatedAppService", + "type": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyDuplicatedAppService", "name": "IClientProxyDuplicatedAppService", "methods": [] } @@ -580,20 +580,20 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyDuplicatedAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyDuplicatedAppService" } } }, - "Volo.Abp.Http.Client.Web.ClientProxyDisabledController": { + "Volo.Abp.Http.Client.Web.Conventions.ClientProxyDisabledController": { "controllerName": "ClientProxyDisabled", "controllerGroupName": "ClientProxyDisabled", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.Abp.Http.Client.Web.ClientProxyDisabledController", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyDisabledController", "interfaces": [ { - "type": "Volo.Abp.Http.Client.Web.IClientProxyDisabledAppService", + "type": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyDisabledAppService", "name": "IClientProxyDisabledAppService", "methods": [] } @@ -612,20 +612,20 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyDisabledAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyDisabledAppService" } } }, - "Volo.Abp.Http.Client.Web.ClientProxyDisabledActionController": { + "Volo.Abp.Http.Client.Web.Conventions.ClientProxyDisabledActionController": { "controllerName": "ClientProxyDisabledAction", "controllerGroupName": "ClientProxyDisabledAction", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.Abp.Http.Client.Web.ClientProxyDisabledActionController", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyDisabledActionController", "interfaces": [ { - "type": "Volo.Abp.Http.Client.Web.IClientProxyDisabledActionAppService", + "type": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyDisabledActionAppService", "name": "IClientProxyDisabledActionAppService", "methods": [] } @@ -644,20 +644,20 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyDisabledActionAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyDisabledActionAppService" } } }, - "Volo.Abp.Http.Client.Web.ClientProxyMetadataDisabledController": { + "Volo.Abp.Http.Client.Web.Conventions.ClientProxyMetadataDisabledController": { "controllerName": "ClientProxyMetadataDisabled", "controllerGroupName": "ClientProxyMetadataDisabled", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.Abp.Http.Client.Web.ClientProxyMetadataDisabledController", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyMetadataDisabledController", "interfaces": [ { - "type": "Volo.Abp.Http.Client.Web.IClientProxyMetadataDisabledAppService", + "type": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyMetadataDisabledAppService", "name": "IClientProxyMetadataDisabledAppService", "methods": [] } @@ -676,20 +676,20 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyMetadataDisabledAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyMetadataDisabledAppService" } } }, - "Volo.Abp.Http.Client.Web.ClientProxyControllerRouteController": { + "Volo.Abp.Http.Client.Web.Conventions.ClientProxyControllerRouteController": { "controllerName": "ClientProxyControllerRoute", "controllerGroupName": "ClientProxyControllerRoute", "isRemoteService": true, "isIntegrationService": false, "apiVersion": null, - "type": "Volo.Abp.Http.Client.Web.ClientProxyControllerRouteController", + "type": "Volo.Abp.Http.Client.Web.Conventions.ClientProxyControllerRouteController", "interfaces": [ { - "type": "Volo.Abp.Http.Client.Web.IClientProxyControllerRouteAppService", + "type": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyControllerRouteAppService", "name": "IClientProxyControllerRouteAppService", "methods": [] } @@ -708,7 +708,7 @@ "typeSimple": "string" }, "allowAnonymous": null, - "implementFrom": "Volo.Abp.Http.Client.Web.IClientProxyControllerRouteAppService" + "implementFrom": "Volo.Abp.Http.Client.Web.Conventions.IClientProxyControllerRouteAppService" } } } diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyControllerRouteAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyControllerRouteAppService.cs deleted file mode 100644 index 8bd2cb42e5..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyControllerRouteAppService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace Volo.Abp.Http.Client.Web; - -public interface IClientProxyControllerRouteAppService : IApplicationService -{ - Task GetAsync(); -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledActionAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledActionAppService.cs deleted file mode 100644 index 116713c175..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledActionAppService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace Volo.Abp.Http.Client.Web; - -public interface IClientProxyDisabledActionAppService : IApplicationService -{ - Task GetAsync(); -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledAppService.cs deleted file mode 100644 index b7a2fa60e4..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDisabledAppService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace Volo.Abp.Http.Client.Web; - -public interface IClientProxyDisabledAppService : IApplicationService -{ - Task GetAsync(); - - Task GetWithRouteAsync(); -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDuplicatedAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDuplicatedAppService.cs deleted file mode 100644 index be920793e1..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyDuplicatedAppService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace Volo.Abp.Http.Client.Web; - -public interface IClientProxyDuplicatedAppService : IApplicationService -{ - Task GetAsync(); -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyMetadataDisabledAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyMetadataDisabledAppService.cs deleted file mode 100644 index 6e425aac58..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyMetadataDisabledAppService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace Volo.Abp.Http.Client.Web; - -public interface IClientProxyMetadataDisabledAppService : IApplicationService -{ - Task GetAsync(); -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyNoGroupNameAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyNoGroupNameAppService.cs deleted file mode 100644 index 86093d2e58..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyNoGroupNameAppService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace Volo.Abp.Http.Client.Web; - -public interface IClientProxyNoGroupNameAppService : IApplicationService -{ - Task GetAsync(); -} diff --git a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs b/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs deleted file mode 100644 index 19cc397786..0000000000 --- a/framework/test/Volo.Abp.Http.Client.Web.Tests/Volo/Abp/Http/Client/Web/IClientProxyTestAppService.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Threading.Tasks; -using Volo.Abp.Application.Services; -using Volo.Abp.Content; - -namespace Volo.Abp.Http.Client.Web; - -public interface IClientProxyTestAppService : IApplicationService -{ - Task GetFromBodyAsync(string value); - - Task GetFromQueryAsync(string value); - - Task GetNumberFromBodyAsync(int value); - - Task GetFromExplicitQueryAsync(string value); - - Task GetQueryParametersAsync(int number, bool flag, Guid guid); - - Task CreateAsync(ClientProxyTestInput input); - - Task UpdateAsync(Guid id, ClientProxyTestInput input); - - Task GetListAsync(ClientProxyTestInput input); - - Task GetByQueryTypeAsync(ClientProxyTestQueryInput input); - - Task UploadAsync(IRemoteStreamContent file); - - Task GetHiddenAsync(); - - Task GetNotDescribedAsync(); - - Task GetDisabledAsync(); - - Task GetDisabledWithVerbAsync(); - - Task GetNotDescribedWithRemoteServiceAsync(); - - Task GetNotDescribedWithVerbAsync(); - - Task GetNotDescribedHiddenAsync(); - - Task GetNotDescribedIgnoredAsync(); - - Task GetDisabledWithRouteAsync(); - - Task GetNotDescribedWithRouteAsync(); - - Task GetDisabledWithVerbAndRouteAsync(); -}