Cherry pick branch 'genexuslabs:fix/cookie-secure' into beta

Author: claudiamurialdo

dotnet/src/dotnetcore/GxNetCoreStartup/Startup.cs

@@ -22,6 +22,7 @@
 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.ModelBinding;
@@ -258,7 +259,10 @@ public void ConfigureServices(IServiceCollection services)
 			{
 				options.IdleTimeout = TimeSpan.FromMinutes(Preferences.SessionTimeout);
 				options.Cookie.HttpOnly = true;
-				options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest;
+				if (Preferences.HttpProtocolSecure()) 
+					options.Cookie.SecurePolicy = CookieSecurePolicy.Always;
+				else
+					options.Cookie.SecurePolicy = CookieSecurePolicy.SameAsRequest;
 				options.Cookie.IsEssential = true;
 				string sessionCookieName = GxWebSession.GetSessionCookieName(VirtualPath);
 				if (!string.IsNullOrEmpty(sessionCookieName))
@@ -560,6 +564,10 @@ public void Configure(IApplicationBuilder app, Microsoft.AspNetCore.Hosting.IHos
 					provider.Mappings[mapping.Key] = mapping.Value;
 				}
 			}
+			app.UseForwardedHeaders(new ForwardedHeadersOptions
+			{
+				ForwardedHeaders = ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedFor
+			});
 			if (GXUtil.CompressResponse())
 			{
 				app.UseResponseCompression();