Renamed references to TrustRoot types from TrustRootUrl to just Trust…

…Root.

git-svn-id: https://dotnetopenid.googlecode.com/svn/trunk@278 01efa1a6-402a-0410-b0ae-47b76eba00f0

src/DotNetOpenId.Test/EndToEndTesting.cs

@@ -30,7 +30,7 @@ void parameterizedTest(Uri identityUrl, TrustRoot trustRoot, Uri returnTo,
 			// Test properties and defaults
 			Assert.AreEqual(AuthenticationRequestMode.Setup, request.Mode);
 			Assert.AreEqual(returnTo, request.ReturnToUrl);
-			Assert.AreEqual(trustRoot, request.TrustRootUrl);
+			Assert.AreEqual(trustRoot, request.TrustRoot);
 
 			request.Mode = requestMode;
 

src/DotNetOpenId/Consumer/AuthenticationRequest.cs

@@ -17,11 +17,11 @@ class AuthenticationRequest : IAuthenticationRequest {
 		ServiceEndpoint endpoint;
 
 		internal AuthenticationRequest(string token, Association assoc, ServiceEndpoint endpoint,
-			TrustRoot trustRootUrl, Uri returnToUrl) {
+			TrustRoot trustRoot, Uri returnToUrl) {
 			this.token = token;
 			this.assoc = assoc;
 			this.endpoint = endpoint;
-			TrustRootUrl = trustRootUrl;
+			TrustRoot = trustRoot;
 			ReturnToUrl = returnToUrl;
 
 			Mode = AuthenticationRequestMode.Setup;
@@ -42,7 +42,7 @@ internal AuthenticationRequest(string token, Association assoc, ServiceEndpoint
 		protected IDictionary<string, string> ReturnToArgs { get; private set; }
 
 		public AuthenticationRequestMode Mode { get; set; }
-		public TrustRoot TrustRootUrl { get; private set; }
+		public TrustRoot TrustRoot { get; private set; }
 		public Uri ReturnToUrl { get; private set; }
 		/// <summary>
 		/// Gets the URL the user agent should be redirected to to begin the 
@@ -59,7 +59,7 @@ public Uri RedirectToProviderUrl {
 					QueryStringArgs.Modes.checkid_immediate : QueryStringArgs.Modes.checkid_setup);
 				qsArgs.Add(QueryStringArgs.openid.identity, this.endpoint.ServerId.AbsoluteUri); //TODO: breaks the Law of Demeter
 				qsArgs.Add(QueryStringArgs.openid.return_to, returnToBuilder.ToString());
-				qsArgs.Add(QueryStringArgs.openid.trust_root, TrustRootUrl.ToString());
+				qsArgs.Add(QueryStringArgs.openid.trust_root, TrustRoot.ToString());
 
 				if (this.assoc != null)
 					qsArgs.Add(QueryStringArgs.openid.assoc_handle, this.assoc.Handle); // !!!!

src/DotNetOpenId/Consumer/GenericConsumer.cs

@@ -28,14 +28,14 @@ public GenericConsumer(IConsumerApplicationStore store)
 		}
 
 		public AuthenticationRequest Begin(ServiceEndpoint service_endpoint,
-			TrustRoot trustRootUrl, Uri returnToUrl)
+			TrustRoot trustRoot, Uri returnToUrl)
 		{
 			string token = new Token(service_endpoint).Serialize(store);
 
 			Association assoc = this.getAssociation(service_endpoint.ServerUrl);
 
 			AuthenticationRequest request = new AuthenticationRequest(token, assoc, service_endpoint,
-				trustRootUrl, returnToUrl);
+				trustRoot, returnToUrl);
 
 			return request;
 		}

src/DotNetOpenId/Consumer/IAuthenticationRequest.cs

@@ -52,6 +52,6 @@ public interface IAuthenticationRequest {
 		/// </summary>
 		Uri RedirectToProviderUrl { get; }
 		Uri ReturnToUrl { get; }
-		TrustRoot TrustRootUrl { get; }
+		TrustRoot TrustRoot { get; }
 	}
 }

src/DotNetOpenId/Consumer/OpenIdConsumer.cs

@@ -64,17 +64,17 @@ public OpenIdConsumer(NameValueCollection query, IConsumerApplicationStore store
 			}
 		}
 
-		public IAuthenticationRequest CreateRequest(Uri openIdUrl, TrustRoot trustRootUrl, Uri returnToUrl) {
+		public IAuthenticationRequest CreateRequest(Uri openIdUrl, TrustRoot trustRoot, Uri returnToUrl) {
 			ServiceEndpoint endpoint = manager.GetNextService(openIdUrl);
 			if (endpoint == null)
 				throw new OpenIdException("No openid endpoint found");
-			return prepareRequest(endpoint, trustRootUrl, returnToUrl);
+			return prepareRequest(endpoint, trustRoot, returnToUrl);
 		}
 
 		/// <remarks>
 		/// This method requires an ASP.NET HttpContext.
 		/// </remarks>
-		public IAuthenticationRequest CreateRequest(Uri openIdUrl, TrustRoot trustRootUrl) {
+		public IAuthenticationRequest CreateRequest(Uri openIdUrl, TrustRoot trustRoot) {
 			if (HttpContext.Current == null) throw new InvalidOperationException(Strings.CurrentHttpContextRequired);
 
 			// Build the return_to URL
@@ -91,7 +91,7 @@ public IAuthenticationRequest CreateRequest(Uri openIdUrl, TrustRoot trustRootUr
 			}
 			UriUtil.AppendQueryArgs(returnTo, returnToParams);
 
-			return CreateRequest(openIdUrl, trustRootUrl, returnTo.Uri);
+			return CreateRequest(openIdUrl, trustRoot, returnTo.Uri);
 		}
 
 		/// <remarks>
@@ -108,15 +108,15 @@ public IAuthenticationRequest CreateRequest(Uri openIdUrl) {
 		}
 
 		AuthenticationRequest prepareRequest(ServiceEndpoint endpoint,
-			TrustRoot trustRootUrl, Uri returnToUrl) {
+			TrustRoot trustRoot, Uri returnToUrl) {
 			// Throw an exception now if the trustroot and the return_to URLs don't match
 			// as required by the provider.  We could wait for the provider to test this and
 			// fail, but this will be faster and give us a better error message.
-			if (!trustRootUrl.Contains(returnToUrl))
+			if (!trustRoot.Contains(returnToUrl))
 				throw new OpenIdException(string.Format(CultureInfo.CurrentUICulture,
-					Strings.ReturnToNotUnderTrustRoot, returnToUrl, trustRootUrl));
+					Strings.ReturnToNotUnderTrustRoot, returnToUrl, trustRoot));
 
-			return consumer.Begin(endpoint, trustRootUrl, returnToUrl);
+			return consumer.Begin(endpoint, trustRoot, returnToUrl);
 		}
 
 		/// <summary>