Merge pull request #58 from syskill/misc-fixes

Misc fixes
Dynalon · Jan 2, 2017 · de698f9 · de698f9
2 parents c2e18b5 + 3a16791
commit de698f9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/Rainy/Main.cs b/Rainy/Main.cs
@@ -227,7 +227,8 @@ private static void ComposeObjectGraph(Funq.Container container)
 					return handler;
 				});
 */
-				AddDummyUserIfRequired (container);
+				if (config.Development == true)
+					AddDummyUserIfRequired (container);
 			}
 
 		}

diff --git a/Rainy/WebService/ApiService.cs b/Rainy/WebService/ApiService.cs
@@ -40,8 +40,7 @@ public object Get (ApiRequest request)
 
 			Logger.Debug ("ApiRequest received");
 			var response = new DTO.ApiResponse ();
-			var baseUri = ((HttpListenerRequest)this.Request.OriginalRequest).Url;
-			string baseUrl = baseUri.Scheme + "://" + baseUri.Authority + "/";
+			string baseUrl = ((HttpListenerRequest)this.Request.OriginalRequest).GetBaseUrl ();
 
 			// should only be set if authenticated
 			response.UserRef = new DTO.ContentRef () {

diff --git a/Rainy/WebService/Common.cs b/Rainy/WebService/Common.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Linq;
 using DevDefined.OAuth.Storage.Basic;
 using Rainy.Db;
 using ServiceStack;
@@ -188,4 +189,21 @@ protected IUser requestingUser {
 			}
 		}
 	}
+
+
+	public static class BaseUrlMapper
+	{
+		public static string GetBaseUrl (this HttpListenerRequest request)
+		{
+			string scheme =
+				request.Headers.AllKeys.Contains ("X-Forwarded-Proto") ?
+				request.Headers["X-Forwarded-Proto"] :
+				request.Url.Scheme;
+			string authority =
+				request.Headers.AllKeys.Contains ("X-Forwarded-Host") ?
+				request.Headers["X-Forwarded-Host"] :
+				request.Url.Authority;
+			return scheme + "://" + authority + "/";
+		}
+	}
 }
diff --git a/Rainy/WebService/UserService.cs b/Rainy/WebService/UserService.cs
@@ -21,8 +21,7 @@ public UserService (IDataBackend backend, IDbConnectionFactory factory) : base (
 		public object Get (UserRequest request)
 		{
 			var u = new DTO.UserResponse ();
-			var baseUri = ((HttpListenerRequest)this.Request.OriginalRequest).Url;
-			string baseUrl = baseUri.Scheme + "://" + baseUri.Authority + "/";
+			string baseUrl = ((HttpListenerRequest)this.Request.OriginalRequest).GetBaseUrl ();
 
 			u.Username = request.Username;
 			u.Firstname = "Not";