Add Base controller class for Rest services.

dotnet/src/dotnetcore/GxClasses.Web/Middleware/GXRouting.cs

@@ -38,7 +38,7 @@ internal class GXRouting : IGXRouting
 		public static string UrlTemplateControllerWithParms;
 
 		//Azure Functions
-		public bool AzureRuntime;
+		public static bool AzureRuntime;
 		public AzureDeployFeature AzureDeploy = new AzureDeployFeature();
 		public static string AzureFunctionName;
 
@@ -382,7 +382,7 @@ public bool ServiceInPath(String path, out String actualPath)
 		private String FindPath(string innerPath, Dictionary<string,string > servicesPathUrl, bool startTxt)
 		{
 			string actualPath = String.Empty;
-			foreach (var subPath in from String subPath in servicesPathUrl.Keys									
+			foreach (string subPath in from String subPath in servicesPathUrl.Keys									
 									select subPath)
 			{
 				bool match = false;
@@ -525,48 +525,51 @@ public void ServicesGroupSetting()
 								string mapPathLower = mapPath.ToLower();
 								string mNameLower = m.Name.ToLower();
 								servicesPathUrl[mapPathLower]= mNameLower;
-								GXLogging.Debug(log, $"addServicesPathUrl key:{mapPathLower} value:{mNameLower}");
-								foreach (SingleMap sm in m.Mappings)
+								if (!RestAPIHelpers.ServiceAsController())
 								{
-									if (sm.Verb == null)
-										sm.Verb = "GET";
-									if (String.IsNullOrEmpty(sm.Path))
-										sm.Path = sm.Name;
-									else
+									GXLogging.Debug(log, $"addServicesPathUrl key:{mapPathLower} value:{mNameLower}");
+									foreach (SingleMap sm in m.Mappings)
 									{
-										sm.Path = Regex.Replace(sm.Path, "^/|/$", "");
-									}
-									if (sm.VariableAlias == null)
-										sm.VariableAlias = new Dictionary<string, string>();
-									else
-									{
-										Dictionary<string, string> vMap = new Dictionary<string, string>();
-										foreach (KeyValuePair<string, string> v in sm.VariableAlias)
+										if (sm.Verb == null)
+											sm.Verb = "GET";
+										if (String.IsNullOrEmpty(sm.Path))
+											sm.Path = sm.Name;
+										else
 										{
-											vMap.Add(v.Key.ToLower(), v.Value.ToLower());
+											sm.Path = Regex.Replace(sm.Path, "^/|/$", "");
 										}
-										sm.VariableAlias = vMap;
-									}
-									if (servicesMap.ContainsKey(mapPathLower))
-									{
-										if (!servicesMap[mapPathLower].ContainsKey(sm.Name.ToLower()))
+										if (sm.VariableAlias == null)
+											sm.VariableAlias = new Dictionary<string, string>();
+										else
+										{
+											Dictionary<string, string> vMap = new Dictionary<string, string>();
+											foreach (KeyValuePair<string, string> v in sm.VariableAlias)
+											{
+												vMap.Add(v.Key.ToLower(), v.Value.ToLower());
+											}
+											sm.VariableAlias = vMap;
+										}
+										if (servicesMap.ContainsKey(mapPathLower))
 										{
+											if (!servicesMap[mapPathLower].ContainsKey(sm.Name.ToLower()))
+											{
+												servicesValidPath[mapPathLower].Add(sm.Path.ToLower());
+
+												servicesMapData[mapPathLower].Add(Tuple.Create(sm.Path.ToLower(), sm.Verb.ToUpper()), sm.Name.ToLower());
+												servicesMap[mapPathLower].Add(sm.Name.ToLower(), sm);
+											}
+										}
+										else
+										{
+											servicesValidPath.Add(mapPathLower, new List<string>());
 											servicesValidPath[mapPathLower].Add(sm.Path.ToLower());
 
+											servicesMapData.Add(mapPathLower, new Dictionary<Tuple<string, string>, string>());
 											servicesMapData[mapPathLower].Add(Tuple.Create(sm.Path.ToLower(), sm.Verb.ToUpper()), sm.Name.ToLower());
+											servicesMap.Add(mapPathLower, new Dictionary<string, SingleMap>());
 											servicesMap[mapPathLower].Add(sm.Name.ToLower(), sm);
 										}
 									}
-									else
-									{
-										servicesValidPath.Add(mapPathLower, new List<string>());
-										servicesValidPath[mapPathLower].Add(sm.Path.ToLower());
-
-										servicesMapData.Add(mapPathLower, new Dictionary<Tuple<string, string>, string>());
-										servicesMapData[mapPathLower].Add(Tuple.Create(sm.Path.ToLower(), sm.Verb.ToUpper()), sm.Name.ToLower());
-										servicesMap.Add(mapPathLower, new Dictionary<string, SingleMap>());
-										servicesMap[mapPathLower].Add(sm.Name.ToLower(), sm);
-									}
 								}
 							}
 						}

dotnet/src/dotnetcore/GxNetCoreStartup/Startup.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -19,8 +20,9 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Rewrite;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
@@ -120,7 +122,15 @@ public static IApplicationBuilder MapWebSocketManager(this IApplicationBuilder a
 					.Map($"{basePath}/gxwebsocket.svc", (_app) => _app.UseMiddleware<Notifications.WebSocket.WebSocketManagerMiddleware>()); //Compatibility reasons. Remove in the future.
 		}
 	}
-
+	public class CustomBadRequestObjectResult : ObjectResult
+	{
+		public CustomBadRequestObjectResult(ActionContext context)
+			: base(HttpHelper.GetJsonError(StatusCodes.Status400BadRequest.ToString(), HttpHelper.StatusCodeToTitle(HttpStatusCode.BadRequest)))
+		{
+			StatusCode = StatusCodes.Status400BadRequest;
+		}
+	}
+
 	public class Startup
 	{
 		static IGXLogger log;
@@ -163,24 +173,10 @@ public void ConfigureServices(IServiceCollection services)
 		{
 			OpenTelemetryService.Setup(services);
 
-			services.AddControllers();
-			string controllers = Path.Combine(Startup.LocalPath, "bin", GX_CONTROLLERS);
-			IMvcBuilder mvcBuilder = services.AddMvc(option => option.EnableEndpointRouting = false);
-			try
-			{
-				if (Directory.Exists(controllers))
-				{
-					foreach (string controller in Directory.GetFiles(controllers))
-					{
-						Console.WriteLine($"Loading controller {controller}");
-						mvcBuilder.AddApplicationPart(Assembly.LoadFrom(controller)).AddControllersAsServices();
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				Console.Error.WriteLine("Error loading gxcontrollers " + ex.Message);
-			}
+			IMvcBuilder builder = services.AddMvc(option => option.EnableEndpointRouting = false);
+
+			RegisterControllerAssemblies(builder);
+
 			services.Configure<KestrelServerOptions>(options =>
 			{
 				options.AllowSynchronousIO = true;
@@ -269,6 +265,113 @@ public void ConfigureServices(IServiceCollection services)
 			DefineCorsPolicy(services);
 		}
 
+		private void RegisterControllerAssemblies(IMvcBuilder mvcBuilder)
+		{
+
+			if (RestAPIHelpers.ServiceAsController() && !string.IsNullOrEmpty(VirtualPath))
+			{
+				mvcBuilder.AddMvcOptions(options =>	options.Conventions.Add(new SetRoutePrefix(new RouteAttribute(VirtualPath))));
+			}
+
+			if (RestAPIHelpers.JsonSerializerCaseSensitive())
+			{
+				mvcBuilder.AddJsonOptions(options => options.JsonSerializerOptions.PropertyNameCaseInsensitive = false);
+			}
+			mvcBuilder.ConfigureApiBehaviorOptions(options =>
+			{
+				options.InvalidModelStateResponseFactory = context =>
+				{
+					return new CustomBadRequestObjectResult(context);
+				};
+			});
+
+			if (RestAPIHelpers.ServiceAsController())
+			{
+				RegisterRestServices(mvcBuilder);
+				RegisterApiServices(mvcBuilder, gxRouting);
+			}
+			RegisterNativeServices(mvcBuilder);
+
+		}
+
+		private void RegisterNativeServices(IMvcBuilder mvcBuilder)
+		{
+			try
+			{
+				string controllers = Path.Combine(Startup.LocalPath, "bin", GX_CONTROLLERS);
+
+				if (Directory.Exists(controllers))
+				{
+					foreach (string controller in Directory.GetFiles(controllers))
+					{
+						Console.WriteLine($"Loading controller {controller}");
+						mvcBuilder.AddApplicationPart(Assembly.LoadFrom(controller)).AddControllersAsServices();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Console.Error.WriteLine("Error loading gxcontrollers " + ex.Message);
+			}
+
+		}
+
+		private void RegisterRestServices(IMvcBuilder mvcBuilder)
+		{
+			HashSet<string> serviceAssemblies = new HashSet<string>();
+			foreach (string svcFile in gxRouting.svcFiles)
+			{
+				try
+				{
+					string[] controllerAssemblyQualifiedName = new string(File.ReadLines(svcFile).First().SkipWhile(c => c != '"')
+															   .Skip(1)
+															   .TakeWhile(c => c != '"')
+															   .ToArray()).Trim().Split(',');
+					string controllerAssemblyName = controllerAssemblyQualifiedName.Last();
+					if (!serviceAssemblies.Contains(controllerAssemblyName))
+					{
+						serviceAssemblies.Add(controllerAssemblyName);
+						string controllerAssemblyFile = Path.Combine(Startup.LocalPath, "bin", $"{controllerAssemblyName}.dll");
+
+						if (File.Exists(controllerAssemblyFile))
+						{
+							GXLogging.Info(log, "Registering rest: " + controllerAssemblyName);
+							mvcBuilder.AddApplicationPart(Assembly.LoadFrom(controllerAssemblyFile)).AddControllersAsServices();
+						}
+					}
+				}
+				catch (Exception ex)
+				{
+					GXLogging.Error(log, "Error registering rest service", ex);
+				}
+			}
+		}
+		private void RegisterApiServices(IMvcBuilder mvcBuilder, GXRouting gxRouting)
+		{
+			HashSet<string> serviceAssemblies = new HashSet<string>();
+			foreach (string grp in gxRouting.servicesPathUrl.Values)
+			{
+				try
+				{
+					string assemblyName = grp.Replace('\\', '.');
+					if (!serviceAssemblies.Contains(assemblyName))
+					{
+						serviceAssemblies.Add(assemblyName);
+						string controllerAssemblyFile = Path.Combine(Startup.LocalPath, "bin", $"{assemblyName}.dll");
+						if (File.Exists(controllerAssemblyFile))
+						{
+							GXLogging.Info(log, "Registering api: " + grp);
+							mvcBuilder.AddApplicationPart(Assembly.LoadFrom(controllerAssemblyFile)).AddControllersAsServices();
+						}
+					}
+				}
+				catch (Exception ex)
+				{
+					GXLogging.Error(log, "Error registering api", ex);
+				}
+			}
+		}
+
 		private void DefineCorsPolicy(IServiceCollection services)
 		{
 			if (Preferences.CorsEnabled)
@@ -431,10 +534,6 @@ public void Configure(IApplicationBuilder app, Microsoft.AspNetCore.Hosting.IHos
 				ContentTypeProvider = provider
 			});
 
-			foreach( string p in gxRouting.servicesPathUrl.Keys)
-			{
-				 servicesBase.Add( string.IsNullOrEmpty(VirtualPath) ? p : $"{VirtualPath}/{p}");
-			}
 			app.UseExceptionHandler(new ExceptionHandlerOptions
 			{
 				ExceptionHandler = new CustomExceptionHandlerMiddleware().Invoke,
@@ -449,21 +548,31 @@ public void Configure(IApplicationBuilder app, Microsoft.AspNetCore.Hosting.IHos
 				antiforgery = app.ApplicationServices.GetRequiredService<IAntiforgery>();
 				app.UseAntiforgeryTokens(apiBasePath);
 			}
-			app.UseMvc(routes =>
+			if (!RestAPIHelpers.ServiceAsController())
 			{
-				foreach (string serviceBasePath in servicesBase)
-				{			
-					string tmpPath = string.IsNullOrEmpty(apiBasePath) ? serviceBasePath : serviceBasePath.Replace(apiBasePath, string.Empty);
-					foreach (string sPath in gxRouting.servicesValidPath[tmpPath])
+				foreach (string p in gxRouting.servicesPathUrl.Keys)
+				{
+					servicesBase.Add(string.IsNullOrEmpty(VirtualPath) ? p : $"{VirtualPath}/{p}");
+				}
+				app.UseMvc(routes =>
+				{
+					foreach (string serviceBasePath in servicesBase)
 					{
-						string s = serviceBasePath + sPath;
-						routes.MapRoute($"{s}", new RequestDelegate(gxRouting.ProcessRestRequest));
+						string tmpPath = string.IsNullOrEmpty(apiBasePath) ? serviceBasePath : serviceBasePath.Replace(apiBasePath, string.Empty);
+						foreach (string sPath in gxRouting.servicesValidPath[tmpPath])
+						{
+							string s = serviceBasePath + sPath;
+							routes.MapRoute($"{s}", new RequestDelegate(gxRouting.ProcessRestRequest));
+						}
 					}
-				}
-				routes.MapRoute($"{restBasePath}{{*{UrlTemplateControllerWithParms}}}", new RequestDelegate(gxRouting.ProcessRestRequest));
+					routes.MapRoute($"{restBasePath}{{*{UrlTemplateControllerWithParms}}}", new RequestDelegate(gxRouting.ProcessRestRequest));
+				});
+			}
+			app.UseMvc(routes =>
+			{
 				routes.MapRoute("Default", VirtualPath, new { controller = "Home", action = "Index" });
 			});
-			
+
 			app.UseWebSockets();
 			string basePath = string.IsNullOrEmpty(VirtualPath) ? string.Empty : $"/{VirtualPath}";
 			Config.ScriptPath = string.IsNullOrEmpty(basePath) ? "/" : basePath;
@@ -618,4 +727,29 @@ public IActionResult Index()
 			return Redirect(defaultFiles[0]);
 		}
 	}
+	internal class SetRoutePrefix : IApplicationModelConvention
+	{
+		private readonly AttributeRouteModel _routePrefix ;
+		public SetRoutePrefix(IRouteTemplateProvider route)
+		{
+			_routePrefix = new AttributeRouteModel(route);
+		}
+		public void Apply(ApplicationModel application)
+		{
+			foreach (var controller in application.Controllers)
+			{
+				foreach (var selector in controller.Selectors)
+				{
+					if (selector.AttributeRouteModel != null)
+					{
+						selector.AttributeRouteModel = AttributeRouteModel.CombineAttributeRouteModel(_routePrefix, selector.AttributeRouteModel);
+					}
+					else
+					{
+						selector.AttributeRouteModel = _routePrefix;
+					}
+				}
+			}
+		}
+	}
 }