More fixes for URL rewriting handling.

See Google Code Issue 86.

src/DotNetOpenId/Provider/IdentityEndpoint.cs

@@ -77,7 +77,7 @@ protected override void Render(HtmlTextWriter writer) {
 				writer.WriteBeginTag("link");
 				writer.WriteAttribute("rel", Protocol.HtmlDiscoveryProviderKey);
 				writer.WriteAttribute("href",
-					new Uri(Page.Request.Url, Page.ResolveUrl(ProviderEndpointUrl)).AbsoluteUri);
+					new Uri(Util.GetRequestUrlFromContext(), Page.ResolveUrl(ProviderEndpointUrl)).AbsoluteUri);
 				writer.Write(">");
 				writer.WriteEndTag("link");
 				writer.WriteLine();
@@ -86,7 +86,7 @@ protected override void Render(HtmlTextWriter writer) {
 				writer.WriteBeginTag("link");
 				writer.WriteAttribute("rel", Protocol.HtmlDiscoveryLocalIdKey);
 				writer.WriteAttribute("href",
-					new Uri(Page.Request.Url, Page.ResolveUrl(ProviderLocalIdentifier)).AbsoluteUri);
+					new Uri(Util.GetRequestUrlFromContext(), Page.ResolveUrl(ProviderLocalIdentifier)).AbsoluteUri);
 				writer.Write(">");
 				writer.WriteEndTag("link");
 				writer.WriteLine();

src/DotNetOpenId/Provider/OpenIdProvider.cs

@@ -179,7 +179,7 @@ static Uri getProviderEndpointFromContext() {
 			HttpContext context = HttpContext.Current;
 			if (context == null)
 				throw new InvalidOperationException(Strings.HttpContextRequiredForThisOverload);
-			UriBuilder builder = new UriBuilder(HttpContext.Current.Request.Url);
+			UriBuilder builder = new UriBuilder(Util.GetRequestUrlFromContext());
 			builder.Query = null;
 			builder.Fragment = null;
 			return builder.Uri;

src/DotNetOpenId/RelyingParty/OpenIdMobileTextBox.cs

@@ -382,7 +382,7 @@ void addProfileArgs(IAuthenticationRequest request)
 				Language = RequestLanguage,
 				TimeZone = RequestTimeZone,
 				PolicyUrl = string.IsNullOrEmpty(PolicyUrl) ?
-					null : new Uri(Page.Request.Url, Page.ResolveUrl(PolicyUrl)),
+					null : new Uri(Util.GetRequestUrlFromContext(), Page.ResolveUrl(PolicyUrl)),
 			});
 		}
 

src/DotNetOpenId/RelyingParty/OpenIdRelyingParty.cs

@@ -89,9 +89,7 @@ public IAuthenticationRequest CreateRequest(Identifier userSuppliedIdentifier, R
 			if (HttpContext.Current == null) throw new InvalidOperationException(Strings.CurrentHttpContextRequired);
 
 			// Build the return_to URL
-			UriBuilder returnTo = new UriBuilder(HttpContext.Current.Request.Url);
-			// Support cookieless sessions by adding the special path if appropriate.
-			returnTo.Path = HttpContext.Current.Response.ApplyAppPathModifier(returnTo.Path);
+			UriBuilder returnTo = new UriBuilder(Util.GetRequestUrlFromContext());
 			// Trim off any parameters with an "openid." prefix, and a few known others
 			// to avoid carrying state from a prior login attempt.
 			returnTo.Query = string.Empty;
@@ -119,7 +117,7 @@ public IAuthenticationRequest CreateRequest(Identifier userSuppliedIdentifier) {
 			if (HttpContext.Current == null) throw new InvalidOperationException(Strings.CurrentHttpContextRequired);
 
 			// Build the realm URL
-			UriBuilder realmUrl = new UriBuilder(HttpContext.Current.Request.Url);
+			UriBuilder realmUrl = new UriBuilder(Util.GetRequestUrlFromContext());
 			realmUrl.Path = HttpContext.Current.Request.ApplicationPath;
 			realmUrl.Query = null;
 			realmUrl.Fragment = null;

src/DotNetOpenId/RelyingParty/OpenIdTextBox.cs

@@ -653,7 +653,7 @@ void addProfileArgs(IAuthenticationRequest request)
 				Language = RequestLanguage,
 				TimeZone = RequestTimeZone,
 				PolicyUrl = string.IsNullOrEmpty(PolicyUrl) ?
-					null : new Uri(Page.Request.Url, Page.ResolveUrl(PolicyUrl)),
+					null : new Uri(Util.GetRequestUrlFromContext(), Page.ResolveUrl(PolicyUrl)),
 			});
 		}
 
@@ -675,7 +675,7 @@ UriBuilder getResolvedRealm(string realm)
 				});
 
 			UriBuilder fullyQualifiedRealm = new UriBuilder(
-				new Uri(Page.Request.Url, Page.ResolveUrl(realmNoWildcard)));
+				new Uri(Util.GetRequestUrlFromContext(), Page.ResolveUrl(realmNoWildcard)));
 
 			if (foundWildcard)
 			{

src/DotNetOpenId/Util.cs

@@ -116,6 +116,10 @@ public static IDictionary<string, string> GetQueryFromContext() {
 				HttpContext.Current.Request.QueryString : HttpContext.Current.Request.Form;
 			return NameValueCollectionToDictionary(query);
 		}
+		/// <summary>
+		/// Gets the original request URL, as seen from the browser before any URL rewrites on the server if any.
+		/// Cookieless session directory (if applicable) is also included.
+		/// </summary>
 		internal static Uri GetRequestUrlFromContext() {
 			HttpContext context = HttpContext.Current;
 			if (context == null) throw new InvalidOperationException(Strings.CurrentHttpContextRequired);

src/DotNetOpenId/XrdsPublisher.cs

@@ -135,13 +135,13 @@ protected override void Render(HtmlTextWriter writer) {
 			if (Enabled && Visible && !string.IsNullOrEmpty(XrdsUrl)) {
 				if ((XrdsAdvertisement & XrdsUrlLocations.HttpHeader) != 0) {
 					Page.Response.AddHeader(Yadis.Yadis.HeaderName,
-						new Uri(Page.Request.Url, Page.Response.ApplyAppPathModifier(XrdsUrl)).AbsoluteUri);
+						new Uri(Util.GetRequestUrlFromContext(), Page.Response.ApplyAppPathModifier(XrdsUrl)).AbsoluteUri);
 				}
 				if ((XrdsAdvertisement & XrdsUrlLocations.HtmlMeta) != 0) {
 					writer.WriteBeginTag("meta");
 					writer.WriteAttribute("http-equiv", Yadis.Yadis.HeaderName);
 					writer.WriteAttribute("content",
-						new Uri(Page.Request.Url, Page.Response.ApplyAppPathModifier(XrdsUrl)).AbsoluteUri);
+						new Uri(Util.GetRequestUrlFromContext(), Page.Response.ApplyAppPathModifier(XrdsUrl)).AbsoluteUri);
 					writer.Write("/>");
 					writer.WriteLine();
 				}