From b115a00ec8b0cb83527a9811663f56e16c88b50a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 24 Feb 2017 14:41:27 +0300 Subject: [PATCH] Renamed Identity Http Client project. --- Volo.Abp.sln | 14 +++++++------- src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs | 4 ++-- src/AbpDesk/AbpDesk.Web.Mvc/appsettings.json | 2 +- src/AbpDesk/AbpDesk.Web.Mvc/project.json | 4 ++-- .../Properties/AssemblyInfo.cs | 2 +- .../Volo.Abp.Identity.HttpApi.Client.xproj} | 0 .../Identity/AbpIdentityHttpApiClientModule.cs} | 5 ++--- .../Identity/AbpIdentityHttpApiClientOptions.cs} | 2 +- .../Volo/Abp/Identity/HttpApiUserAppService.cs} | 6 +++--- .../project.json | 0 10 files changed, 19 insertions(+), 20 deletions(-) rename src/{Volo.Abp.Identity.HttpProxy => Volo.Abp.Identity.HttpApi.Client}/Properties/AssemblyInfo.cs (92%) rename src/{Volo.Abp.Identity.HttpProxy/Volo.Abp.Identity.HttpProxy.xproj => Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.xproj} (100%) rename src/{Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/AbpIdentityHttpProxyModule.cs => Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/AbpIdentityHttpApiClientModule.cs} (57%) rename src/{Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/AbpIdentityHttpProxyOptions.cs => Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/AbpIdentityHttpApiClientOptions.cs} (64%) rename src/{Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/HttpProxyUserAppService.cs => Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpApiUserAppService.cs} (89%) rename src/{Volo.Abp.Identity.HttpProxy => Volo.Abp.Identity.HttpApi.Client}/project.json (100%) diff --git a/Volo.Abp.sln b/Volo.Abp.sln index ea76202af1..204bd1b52b 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -100,8 +100,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.HttpApi", EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.HttpApi.Host", "src\Volo.Abp.Identity.HttpApi.Host\Volo.Abp.Identity.HttpApi.Host.xproj", "{EB902D57-C047-4CDF-828B-FDC204AC7398}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.HttpProxy", "src\Volo.Abp.Identity.HttpProxy\Volo.Abp.Identity.HttpProxy.xproj", "{00B240B6-EC44-461A-9578-EF4F1BE9C688}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.Web", "src\Volo.Abp.Identity.Web\Volo.Abp.Identity.Web.xproj", "{17B14A48-5248-4F4C-A8E6-6926AA94EB7C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6D893E48-0739-401A-9AD1-286BCB6E5517}" @@ -109,6 +107,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6D893E48 build\build.ps1 = build\build.ps1 EndProjectSection EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.HttpApi.Client", "src\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.xproj", "{00B240B6-EC44-461A-9578-EF4F1BE9C688}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -247,14 +247,14 @@ Global {EB902D57-C047-4CDF-828B-FDC204AC7398}.Debug|Any CPU.Build.0 = Debug|Any CPU {EB902D57-C047-4CDF-828B-FDC204AC7398}.Release|Any CPU.ActiveCfg = Release|Any CPU {EB902D57-C047-4CDF-828B-FDC204AC7398}.Release|Any CPU.Build.0 = Release|Any CPU - {00B240B6-EC44-461A-9578-EF4F1BE9C688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00B240B6-EC44-461A-9578-EF4F1BE9C688}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00B240B6-EC44-461A-9578-EF4F1BE9C688}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00B240B6-EC44-461A-9578-EF4F1BE9C688}.Release|Any CPU.Build.0 = Release|Any CPU {17B14A48-5248-4F4C-A8E6-6926AA94EB7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {17B14A48-5248-4F4C-A8E6-6926AA94EB7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {17B14A48-5248-4F4C-A8E6-6926AA94EB7C}.Release|Any CPU.ActiveCfg = Release|Any CPU {17B14A48-5248-4F4C-A8E6-6926AA94EB7C}.Release|Any CPU.Build.0 = Release|Any CPU + {00B240B6-EC44-461A-9578-EF4F1BE9C688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {00B240B6-EC44-461A-9578-EF4F1BE9C688}.Debug|Any CPU.Build.0 = Debug|Any CPU + {00B240B6-EC44-461A-9578-EF4F1BE9C688}.Release|Any CPU.ActiveCfg = Release|Any CPU + {00B240B6-EC44-461A-9578-EF4F1BE9C688}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -301,8 +301,8 @@ Global {54592671-9CB6-48AE-9AE0-84CD016E87FF} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} {57FCA6CB-9D99-411E-8ABF-20ACFBD61D61} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} {EB902D57-C047-4CDF-828B-FDC204AC7398} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} - {00B240B6-EC44-461A-9578-EF4F1BE9C688} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} {17B14A48-5248-4F4C-A8E6-6926AA94EB7C} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} {6D893E48-0739-401A-9AD1-286BCB6E5517} = {CBCC288A-53C3-402F-99F7-E468738560F5} + {00B240B6-EC44-461A-9578-EF4F1BE9C688} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} EndGlobalSection EndGlobal diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs index 4e8bb2b92a..3e040c8914 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs @@ -21,7 +21,7 @@ namespace AbpDesk.Web.Mvc typeof(AbpAspNetCoreMvcUiBootstrapModule), typeof(AbpDeskApplicationModule), typeof(AbpDeskEntityFrameworkCoreModule), - typeof(AbpIdentityHttpProxyModule), + typeof(AbpIdentityHttpApiClientModule), typeof(AbpIdentityWebModule) )] public class AbpDeskWebMvcModule : AbpModule @@ -38,7 +38,7 @@ namespace AbpDesk.Web.Mvc options.MenuContributors.Add(new MainMenuContributor()); }); - services.Configure(configuration.GetSection("AbpIdentity:HttpProxy")); + services.Configure(configuration.GetSection("AbpIdentity:HttpApiClient")); services.AddMvc(); services.AddAssemblyOf(); diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/appsettings.json b/src/AbpDesk/AbpDesk.Web.Mvc/appsettings.json index 626f4317d8..0c77d0a506 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/appsettings.json +++ b/src/AbpDesk/AbpDesk.Web.Mvc/appsettings.json @@ -4,7 +4,7 @@ "AbpDeskMongoBlog": "mongodb://127.0.0.1:27017|AbpDeskBlog" }, "AbpIdentity": { - "HttpProxy": { + "HttpApiClient": { "ApiUrlBase": "http://localhost:63290/" } } diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/project.json b/src/AbpDesk/AbpDesk.Web.Mvc/project.json index 6d26233fb1..b115de1ed3 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/project.json +++ b/src/AbpDesk/AbpDesk.Web.Mvc/project.json @@ -26,9 +26,9 @@ "AbpDesk.Application": "1.0.0-*", "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap": "1.0.0-*", "Volo.Abp.AspNetCore.EmbeddedFiles": "1.0.0-*", - "Volo.Abp.Identity.HttpProxy": "1.0.0-*", "Volo.Abp.Identity.Web": "1.0.0-*", - "Volo.Abp.MongoDB": "1.0.0-*" + "Volo.Abp.MongoDB": "1.0.0-*", + "Volo.Abp.Identity.HttpApi.Client": "1.0.0-*" }, "tools": { diff --git a/src/Volo.Abp.Identity.HttpProxy/Properties/AssemblyInfo.cs b/src/Volo.Abp.Identity.HttpApi.Client/Properties/AssemblyInfo.cs similarity index 92% rename from src/Volo.Abp.Identity.HttpProxy/Properties/AssemblyInfo.cs rename to src/Volo.Abp.Identity.HttpApi.Client/Properties/AssemblyInfo.cs index 041f958cf5..1b6a52cbb4 100644 --- a/src/Volo.Abp.Identity.HttpProxy/Properties/AssemblyInfo.cs +++ b/src/Volo.Abp.Identity.HttpApi.Client/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; // associated with an assembly. [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Volo.Abp.Identity.HttpProxy")] +[assembly: AssemblyProduct("Volo.Abp.Identity.HttpApi.Client")] [assembly: AssemblyTrademark("")] // Setting ComVisible to false makes the types in this assembly not visible diff --git a/src/Volo.Abp.Identity.HttpProxy/Volo.Abp.Identity.HttpProxy.xproj b/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.xproj similarity index 100% rename from src/Volo.Abp.Identity.HttpProxy/Volo.Abp.Identity.HttpProxy.xproj rename to src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.xproj diff --git a/src/Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/AbpIdentityHttpProxyModule.cs b/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/AbpIdentityHttpApiClientModule.cs similarity index 57% rename from src/Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/AbpIdentityHttpProxyModule.cs rename to src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/AbpIdentityHttpApiClientModule.cs index b68f082dba..a9e9d088d0 100644 --- a/src/Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/AbpIdentityHttpProxyModule.cs +++ b/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/AbpIdentityHttpApiClientModule.cs @@ -3,13 +3,12 @@ using Volo.Abp.Modularity; namespace Volo.Abp.Identity { - //TODO: Rename to Volo.Abp.Identity.HttpApi.Client / AbpIdentityHttpApiClientModule [DependsOn(typeof(AbpIdentityApplicationContractsModule))] - public class AbpIdentityHttpProxyModule : AbpModule + public class AbpIdentityHttpApiClientModule : AbpModule { public override void ConfigureServices(IServiceCollection services) { - services.AddAssemblyOf(); + services.AddAssemblyOf(); } } } \ No newline at end of file diff --git a/src/Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/AbpIdentityHttpProxyOptions.cs b/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/AbpIdentityHttpApiClientOptions.cs similarity index 64% rename from src/Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/AbpIdentityHttpProxyOptions.cs rename to src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/AbpIdentityHttpApiClientOptions.cs index 15afa46653..3e22de3a45 100644 --- a/src/Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/AbpIdentityHttpProxyOptions.cs +++ b/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/AbpIdentityHttpApiClientOptions.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.Identity { - public class AbpIdentityHttpProxyOptions + public class AbpIdentityHttpApiClientOptions { public string ApiUrlBase { get; set; } } diff --git a/src/Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/HttpProxyUserAppService.cs b/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpApiUserAppService.cs similarity index 89% rename from src/Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/HttpProxyUserAppService.cs rename to src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpApiUserAppService.cs index d6b83a5e20..35ab3bfaf7 100644 --- a/src/Volo.Abp.Identity.HttpProxy/Volo/Abp/Identity/HttpProxyUserAppService.cs +++ b/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpApiUserAppService.cs @@ -8,11 +8,11 @@ using Volo.Abp.Application.Services.Dtos; namespace Volo.Abp.Identity { - public class HttpProxyUserAppService : IUserAppService + public class HttpApiUserAppService : IUserAppService { - private readonly AbpIdentityHttpProxyOptions _options; + private readonly AbpIdentityHttpApiClientOptions _options; - public HttpProxyUserAppService(IOptionsSnapshot options) + public HttpApiUserAppService(IOptionsSnapshot options) { _options = options.Value; } diff --git a/src/Volo.Abp.Identity.HttpProxy/project.json b/src/Volo.Abp.Identity.HttpApi.Client/project.json similarity index 100% rename from src/Volo.Abp.Identity.HttpProxy/project.json rename to src/Volo.Abp.Identity.HttpApi.Client/project.json