Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 8 insertions, 34 deletions

diff --git a/src/DotNetOpenId/RelyingParty/DirectRequest.cs b/src/DotNetOpenId/RelyingParty/DirectRequest.cs
index 9b9d732..2d0cc05 100644
--- a/src/DotNetOpenId/RelyingParty/DirectRequest.cs
+++ b/src/DotNetOpenId/RelyingParty/DirectRequest.cs
@@ -9,9 +9,11 @@ using System.IO;
 namespace DotNetOpenId.RelyingParty {

 	[DebuggerDisplay("OpenId: {Protocol.Version}")]

 	abstract class DirectRequest {

-		protected DirectRequest(ServiceEndpoint provider, IDictionary<string, string> args) {

+		protected DirectRequest(OpenIdRelyingParty relyingParty, ServiceEndpoint provider, IDictionary<string, string> args) {

+			if (relyingParty == null) throw new ArgumentNullException("relyingParty");

 			if (provider == null) throw new ArgumentNullException("provider");

 			if (args == null) throw new ArgumentNullException("args");

+			RelyingParty = relyingParty;

 			Provider = provider;

 			Args = args;

 			if (Protocol.QueryDeclaredNamespaceVersion != null &&

@@ -20,41 +22,13 @@ namespace DotNetOpenId.RelyingParty {
 		}

 		protected ServiceEndpoint Provider { get; private set; }

 		protected Protocol Protocol { get { return Provider.Protocol; } }

-		protected IDictionary<string, string> Args { get; private set; }

+		protected internal IDictionary<string, string> Args { get; private set; }

+		protected OpenIdRelyingParty RelyingParty { get; private set; }

 

 		protected IDictionary<string, string> GetResponse() {

-			byte[] body = ProtocolMessages.Http.GetBytes(Args);

-			UntrustedWebResponse resp = null;

-			IDictionary<string, string> args = null;

-			try {

-				resp = UntrustedWebRequest.Request(Provider.ProviderEndpoint, body);

-				// If an internal server error occurred, there won't be any KV-form stream

-				// to read in.  So instead, preserve whatever error the server did send back

-				// and throw it in the exception.

-				if (resp.StatusCode == HttpStatusCode.InternalServerError) {

-					string errorStream = new StreamReader(resp.ResponseStream).ReadToEnd();

-					throw new OpenIdException(string.Format(CultureInfo.CurrentCulture,

-						Strings.ProviderRespondedWithError, errorStream));

-				}

-				args = ProtocolMessages.KeyValueForm.GetDictionary(resp.ResponseStream);

-			} catch (ArgumentException e) {

-				throw new OpenIdException("Failure decoding Key-Value Form response from provider.", e);

-			} catch (WebException e) {

-				throw new OpenIdException("Failure while connecting to provider.", e);

-			}

-			// All error codes are supposed to be returned with 400, but

-			// some (like myopenid.com) sometimes send errors as 200's.

-			if (resp.StatusCode == HttpStatusCode.BadRequest ||

-				Util.GetOptionalArg(args, Protocol.openidnp.mode) == Protocol.Args.Mode.error) {

-				throw new OpenIdException(string.Format(CultureInfo.CurrentCulture,

-					Strings.ProviderRespondedWithError, 

-					Util.GetOptionalArg(args, Protocol.openidnp.error)), args);

-			} else if (resp.StatusCode == HttpStatusCode.OK) {

-				return args;

-			} else {

-				throw new OpenIdException(string.Format(CultureInfo.CurrentCulture,

-					Strings.ProviderRespondedWithUnrecognizedHTTPStatusCode, resp.StatusCode));

-			}

+			Logger.DebugFormat("Sending direct message to {0}: {1}{2}", Provider.ProviderEndpoint,

+				Environment.NewLine, Util.ToString(Args));

+			return RelyingParty.DirectMessageChannel.SendDirectMessageAndGetResponse(Provider, Args);

 		}

 	}

 }