Merge branch 'develop' of github.com:d4software/QueryTree into develop

Author: d4nt

Web/Controllers/TeamController.cs

@@ -200,7 +200,7 @@ public ActionResult Invite(PermissionViewModel viewModel)
             }
 
             var targettedUser = db.ApplicationUsers.AsEnumerable().FirstOrDefault(u => string.Compare(u.Email, viewModel.Email, true) == 0);
-            
+
             if (viewModel.IsOrganisationAdmin)
             {
                 db.OrganisationInvites.Add(new OrganisationInvite()

Web/Startup.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Hangfire;
 using Hangfire.SQLite;
 using Microsoft.AspNetCore.Builder;
@@ -15,6 +13,7 @@
 using QueryTree.Managers;
 using QueryTree.Services;
 using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.HttpOverrides;
 
 namespace QueryTree
 {
@@ -105,6 +104,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
                 app.UseExceptionHandler("/Home/Error");
             }
 
+            // Enable use behind a reverse proxy
+            app.UseForwardedHeaders(new ForwardedHeadersOptions
+            {
+                ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
+            });
+
             app.UseStaticFiles();
 
             app.UseAuthentication();