HttpRequestInfo ctors are now internal, and publicly we have static

factory methods that return HttpRequestBase instances.

3 files changed, 22 insertions, 6 deletions

diff --git a/src/DotNetOpenAuth.Core/Messaging/HttpRequestInfo.cs b/src/DotNetOpenAuth.Core/Messaging/HttpRequestInfo.cs
index 24ca616..fc86728 100644
--- a/src/DotNetOpenAuth.Core/Messaging/HttpRequestInfo.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/HttpRequestInfo.cs
@@ -38,7 +38,7 @@ namespace DotNetOpenAuth.Messaging {
 
 		private readonly NameValueCollection serverVariables;
 
-		public HttpRequestInfo(HttpRequestMessageProperty request, Uri requestUri) {
+		internal HttpRequestInfo(HttpRequestMessageProperty request, Uri requestUri) {
 			Requires.NotNull(request, "request");
 			Requires.NotNull(requestUri, "requestUri");
 
@@ -51,7 +51,7 @@ namespace DotNetOpenAuth.Messaging {
 			Reporting.RecordRequestStatistics(this);
 		}
 
-		public HttpRequestInfo(string httpMethod, Uri requestUri, NameValueCollection form = null, NameValueCollection headers = null) {
+		internal HttpRequestInfo(string httpMethod, Uri requestUri, NameValueCollection form = null, NameValueCollection headers = null) {
 			Requires.NotNullOrEmpty(httpMethod, "httpMethod");
 			Requires.NotNull(requestUri, "requestUri");
 
@@ -67,7 +67,7 @@ namespace DotNetOpenAuth.Messaging {
 		/// Initializes a new instance of the <see cref="HttpRequestInfo"/> class.
 		/// </summary>
 		/// <param name="listenerRequest">Details on the incoming HTTP request.</param>
-		public HttpRequestInfo(HttpListenerRequest listenerRequest) {
+		internal HttpRequestInfo(HttpListenerRequest listenerRequest) {
 			Requires.NotNull(listenerRequest, "listenerRequest");
 
 			this.httpMethod = listenerRequest.HttpMethod;
@@ -80,7 +80,7 @@ namespace DotNetOpenAuth.Messaging {
 			Reporting.RecordRequestStatistics(this);
 		}
 
-		public HttpRequestInfo(string httpMethod, Uri requestUri, NameValueCollection headers, Stream inputStream) {
+		internal HttpRequestInfo(string httpMethod, Uri requestUri, NameValueCollection headers, Stream inputStream) {
 			Requires.NotNullOrEmpty(httpMethod, "httpMethod");
 			Requires.NotNull(requestUri, "requestUri");
 
@@ -122,6 +122,22 @@ namespace DotNetOpenAuth.Messaging {
 			get { return this.serverVariables; }
 		}
 
+		public static HttpRequestBase Create(HttpRequestMessageProperty request, Uri requestUri) {
+			return new HttpRequestInfo(request, requestUri);
+		}
+
+		public static HttpRequestBase Create(HttpListenerRequest listenerRequest) {
+			return new HttpRequestInfo(listenerRequest);
+		}
+
+		public static HttpRequestBase Create(string httpMethod, Uri requestUri, NameValueCollection form = null, NameValueCollection headers = null) {
+			return new HttpRequestInfo(httpMethod, requestUri, form, headers);
+		}
+
+		public static HttpRequestBase Create(string httpMethod, Uri requestUri, NameValueCollection headers, Stream inputStream) {
+			return new HttpRequestInfo(httpMethod, requestUri, headers, inputStream);
+		}
+
 		private static NameValueCollection ParseFormData(string httpMethod, NameValueCollection headers, Stream inputStream) {
 			Requires.NotNullOrEmpty(httpMethod, "httpMethod");
 			Requires.NotNull(headers, "headers");
diff --git a/src/DotNetOpenAuth.OpenId/OpenId/Association.cs b/src/DotNetOpenAuth.OpenId/OpenId/Association.cs
index 700b24e..764f4fa 100644
--- a/src/DotNetOpenAuth.OpenId/OpenId/Association.cs
+++ b/src/DotNetOpenAuth.OpenId/OpenId/Association.cs
@@ -222,7 +222,7 @@ namespace DotNetOpenAuth.OpenId {
 
 			if (a.Handle != this.Handle ||
 				a.Issued != this.Issued ||
-				!MessagingUtilities.Equals(a.TotalLifeLength, this.TotalLifeLength, TimeSpan.FromSeconds(1))) {
+				!MessagingUtilities.Equals(a.TotalLifeLength, this.TotalLifeLength, TimeSpan.FromSeconds(2))) {
 				return false;
 			}
 
diff --git a/src/DotNetOpenAuth.Test/Mocks/CoordinatingHttpRequestInfo.cs b/src/DotNetOpenAuth.Test/Mocks/CoordinatingHttpRequestInfo.cs
index 1917ce6..0bbf756 100644
--- a/src/DotNetOpenAuth.Test/Mocks/CoordinatingHttpRequestInfo.cs
+++ b/src/DotNetOpenAuth.Test/Mocks/CoordinatingHttpRequestInfo.cs
@@ -69,7 +69,7 @@ namespace DotNetOpenAuth.Test.Mocks {
 		internal IDirectedProtocolMessage Message {
 			get {
 				if (this.message == null && this.messageData != null) {
-					var message = messageFactory.GetNewRequestMessage(recipient, this.messageData);
+					var message = this.messageFactory.GetNewRequestMessage(recipient, this.messageData);
 					if (message != null) {
 						this.channel.MessageDescriptions.GetAccessor(message).Deserialize(this.messageData);
 						this.message = message;