Browse Source

Allow to change controller name in url.

pull/116/head
Halil İbrahim Kalkan 9 years ago
parent
commit
7578e244e6
  1. BIN
      src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll
  2. 2
      src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAppServiceControllerFeatureProvider.cs
  3. 37
      src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAppServiceConvention.cs
  4. 15
      src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpControllerAssemblySetting.cs
  5. 6
      src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpControllerAssemblySettingBuilder.cs
  6. 24
      src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/UrlControllerNameNormalizerContext.cs
  7. 1
      src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj
  8. 8
      src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/AbpIdentityHttpApiModule.cs

BIN
src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll

Binary file not shown.

2
src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAppServiceControllerFeatureProvider.cs

@ -35,7 +35,7 @@ namespace Volo.Abp.AspNetCore.Mvc
//TODO: Move this to a lazy loaded field for efficiency. //TODO: Move this to a lazy loaded field for efficiency.
var configuration = _application.ServiceProvider.GetRequiredService<IOptions<AbpAspNetCoreMvcOptions>>().Value.AppServiceControllers.ControllerAssemblySettings.GetSettingOrNull(type); var configuration = _application.ServiceProvider.GetRequiredService<IOptions<AbpAspNetCoreMvcOptions>>().Value.AppServiceControllers.ControllerAssemblySettings.GetSettingOrNull(type);
return configuration != null && configuration.TypePredicate(type); return configuration != null && (configuration.TypePredicate == null || configuration.TypePredicate(type));
} }
} }
} }

37
src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAppServiceConvention.cs

@ -40,7 +40,7 @@ namespace Volo.Abp.AspNetCore.Mvc
if (IsRemoteService(controllerType)) if (IsRemoteService(controllerType))
{ {
controller.ControllerName = controller.ControllerName.RemovePostFix(ApplicationService.CommonPostfixes); controller.ControllerName = controller.ControllerName.RemovePostFix(ApplicationService.CommonPostfixes);
configuration?.ControllerModelConfigurer(controller); configuration?.ControllerModelConfigurer?.Invoke(controller);
//ConfigureArea(controller, configuration); //ConfigureArea(controller, configuration);
ConfigureRemoteService(controller, configuration); ConfigureRemoteService(controller, configuration);
} }
@ -192,7 +192,7 @@ namespace Volo.Abp.AspNetCore.Mvc
} }
else else
{ {
NormalizeSelectorRoutes(rootPath, controllerName, action); NormalizeSelectorRoutes(rootPath, controllerName, action, configuration);
} }
} }
@ -202,7 +202,7 @@ namespace Volo.Abp.AspNetCore.Mvc
var abpServiceSelectorModel = new SelectorModel var abpServiceSelectorModel = new SelectorModel
{ {
AttributeRouteModel = CreateAbpServiceAttributeRouteModel(rootPath, controllerName, action, httpMethod), AttributeRouteModel = CreateAbpServiceAttributeRouteModel(rootPath, controllerName, action, httpMethod, configuration),
ActionConstraints = { new HttpMethodActionConstraint(new[] { httpMethod }) } ActionConstraints = { new HttpMethodActionConstraint(new[] { httpMethod }) }
}; };
@ -214,14 +214,14 @@ namespace Volo.Abp.AspNetCore.Mvc
return HttpMethodHelper.GetConventionalVerbForMethodName(action.ActionName); return HttpMethodHelper.GetConventionalVerbForMethodName(action.ActionName);
} }
protected virtual void NormalizeSelectorRoutes(string rootPath, string controllerName, ActionModel action) protected virtual void NormalizeSelectorRoutes(string rootPath, string controllerName, ActionModel action, AbpControllerAssemblySetting configuration)
{ {
foreach (var selector in action.Selectors) foreach (var selector in action.Selectors)
{ {
var httpMethod = selector.ActionConstraints.OfType<HttpMethodActionConstraint>().FirstOrDefault()?.HttpMethods?.FirstOrDefault(); var httpMethod = selector.ActionConstraints.OfType<HttpMethodActionConstraint>().FirstOrDefault()?.HttpMethods?.FirstOrDefault();
if (selector.AttributeRouteModel == null) if (selector.AttributeRouteModel == null)
{ {
selector.AttributeRouteModel = CreateAbpServiceAttributeRouteModel(rootPath, controllerName, action, httpMethod); selector.AttributeRouteModel = CreateAbpServiceAttributeRouteModel(rootPath, controllerName, action, httpMethod, configuration);
} }
} }
} }
@ -238,18 +238,20 @@ namespace Volo.Abp.AspNetCore.Mvc
return _options.AppServiceControllers.ControllerAssemblySettings.GetSettingOrNull(controllerType); return _options.AppServiceControllers.ControllerAssemblySettings.GetSettingOrNull(controllerType);
} }
protected virtual AttributeRouteModel CreateAbpServiceAttributeRouteModel(string rootPath, string controllerName, ActionModel action, string httpMethod) protected virtual AttributeRouteModel CreateAbpServiceAttributeRouteModel(string rootPath, string controllerName, ActionModel action, string httpMethod, AbpControllerAssemblySetting configuration)
{ {
return new AttributeRouteModel( return new AttributeRouteModel(
new RouteAttribute( new RouteAttribute(
CalculateRouteTemplate(rootPath, controllerName, action, httpMethod) CalculateRouteTemplate(rootPath, controllerName, action, httpMethod, configuration)
) )
); );
} }
protected virtual string CalculateRouteTemplate(string rootPath, string controllerName, ActionModel action, string httpMethod) protected virtual string CalculateRouteTemplate(string rootPath, string controllerName, ActionModel action, string httpMethod, AbpControllerAssemblySetting configuration)
{ {
var url = $"api/{rootPath}/{controllerName.ToCamelCase()}"; var controllerNameInUrl = NormalizeUrlControllerName(rootPath, controllerName, action, httpMethod, configuration);
var url = $"api/{rootPath}/{controllerNameInUrl.ToCamelCase()}";
//Add {id} path if needed //Add {id} path if needed
if (action.Parameters.Any(p => p.ParameterName == "id")) if (action.Parameters.Any(p => p.ParameterName == "id"))
@ -286,6 +288,23 @@ namespace Volo.Abp.AspNetCore.Mvc
return context.ActionNameInUrl; return context.ActionNameInUrl;
} }
protected virtual string NormalizeUrlControllerName(string rootPath, string controllerName, ActionModel action, string httpMethod, [CanBeNull] AbpControllerAssemblySetting configuration)
{
if(configuration?.UrlControllerNameNormalizer == null)
{
return controllerName;
}
return configuration.UrlControllerNameNormalizer(
new UrlControllerNameNormalizerContext(
rootPath,
controllerName,
action,
httpMethod
)
);
}
protected virtual void RemoveEmptySelectors(IList<SelectorModel> selectors) protected virtual void RemoveEmptySelectors(IList<SelectorModel> selectors)
{ {
selectors selectors

15
src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpControllerAssemblySetting.cs

@ -1,26 +1,33 @@
using System; using System;
using System.Reflection; using System.Reflection;
using JetBrains.Annotations;
using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.ApplicationModels;
namespace Volo.Abp.AspNetCore.Mvc namespace Volo.Abp.AspNetCore.Mvc
{ {
public class AbpControllerAssemblySetting public class AbpControllerAssemblySetting
{ {
[NotNull]
public Assembly Assembly { get; } public Assembly Assembly { get; }
[NotNull]
public string RootPath { get; } public string RootPath { get; }
[CanBeNull]
public Func<Type, bool> TypePredicate { get; set; } public Func<Type, bool> TypePredicate { get; set; }
[CanBeNull]
public Action<ControllerModel> ControllerModelConfigurer { get; set; } public Action<ControllerModel> ControllerModelConfigurer { get; set; }
public AbpControllerAssemblySetting(Assembly assembly, string rootPath) [CanBeNull]
public Func<UrlControllerNameNormalizerContext, string> UrlControllerNameNormalizer { get; set; }
public AbpControllerAssemblySetting([NotNull] Assembly assembly, [NotNull] string rootPath)
{ {
Check.NotNull(assembly, rootPath);
Assembly = assembly; Assembly = assembly;
RootPath = rootPath; RootPath = rootPath;
TypePredicate = type => true;
ControllerModelConfigurer = controller => { };
} }
} }
} }

6
src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpControllerAssemblySettingBuilder.cs

@ -23,5 +23,11 @@ namespace Volo.Abp.AspNetCore.Mvc
_setting.ControllerModelConfigurer = configurer; _setting.ControllerModelConfigurer = configurer;
return this; return this;
} }
public AbpControllerAssemblySettingBuilder NormalizeControllerNameInUrl(Func<UrlControllerNameNormalizerContext, string> normalizer)
{
_setting.UrlControllerNameNormalizer = normalizer;
return this;
}
} }
} }

24
src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/UrlControllerNameNormalizerContext.cs

@ -0,0 +1,24 @@
using Microsoft.AspNetCore.Mvc.ApplicationModels;
namespace Volo.Abp.AspNetCore.Mvc
{
//TODO: Re-consider properties of this class.
public class UrlControllerNameNormalizerContext
{
public string RootPath { get; }
public string ControllerName { get; }
public ActionModel Action { get; }
public string HttpMethod { get; }
public UrlControllerNameNormalizerContext(string rootPath, string controllerName, ActionModel action, string httpMethod)
{
RootPath = rootPath;
ControllerName = controllerName;
Action = action;
HttpMethod = httpMethod;
}
}
}

1
src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj

@ -39,6 +39,7 @@
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" /> <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" /> <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="2.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/AbpIdentityHttpApiModule.cs

@ -1,4 +1,5 @@
using Microsoft.Extensions.DependencyInjection; using System;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
@ -13,7 +14,10 @@ namespace Volo.Abp.Identity
services.Configure<AbpAspNetCoreMvcOptions>(options => services.Configure<AbpAspNetCoreMvcOptions>(options =>
{ {
options.AppServiceControllers.CreateFor(typeof(AbpIdentityApplicationModule).Assembly, "identity"); options
.AppServiceControllers
.CreateFor(typeof(AbpIdentityApplicationModule).Assembly, "identity")
.NormalizeControllerNameInUrl(context => context.ControllerName.RemovePreFix("Identity"));
}); });
} }
} }

Loading…
Cancel
Save