diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOAuth/DotNetOAuth.csproj | 1 | ||||
| -rw-r--r-- | src/DotNetOAuth/Messaging/Channel.cs | 60 | ||||
| -rw-r--r-- | src/DotNetOAuth/Messaging/IMessageTypeProvider.cs | 16 | ||||
| -rw-r--r-- | src/DotNetOAuth/Messaging/MessagingStrings.Designer.cs | 9 | ||||
| -rw-r--r-- | src/DotNetOAuth/Messaging/MessagingStrings.resx | 3 | ||||
| -rw-r--r-- | src/DotNetOAuth/Messaging/MessagingUtilities.cs | 21 |
6 files changed, 106 insertions, 4 deletions
diff --git a/src/DotNetOAuth/DotNetOAuth.csproj b/src/DotNetOAuth/DotNetOAuth.csproj index 77fdd50..ee0e7e3 100644 --- a/src/DotNetOAuth/DotNetOAuth.csproj +++ b/src/DotNetOAuth/DotNetOAuth.csproj @@ -71,6 +71,7 @@ <Compile Include="Messaging\DictionaryXmlWriter.cs" />
<Compile Include="Messaging\Channel.cs" />
<Compile Include="Messaging\IDirectedProtocolMessage.cs" />
+ <Compile Include="Messaging\IMessageTypeProvider.cs" />
<Compile Include="Messaging\MessagingStrings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
diff --git a/src/DotNetOAuth/Messaging/Channel.cs b/src/DotNetOAuth/Messaging/Channel.cs index c50a90f..246a14e 100644 --- a/src/DotNetOAuth/Messaging/Channel.cs +++ b/src/DotNetOAuth/Messaging/Channel.cs @@ -6,12 +6,33 @@ namespace DotNetOAuth.Messaging {
using System;
+ using System.Collections.Generic;
+ using System.IO;
+ using System.Net;
using System.Text;
+ using System.Web;
/// <summary>
/// Manages sending direct messages to a remote party and receiving responses.
/// </summary>
internal class Channel {
+ IMessageTypeProvider messageTypeProvider;
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Channel"/> class.
+ /// </summary>
+ /// <param name="messageTypeProvider">
+ /// A class prepared to analyze incoming messages and indicate what concrete
+ /// message types can deserialize from it.
+ /// </param>
+ internal Channel(IMessageTypeProvider messageTypeProvider) {
+ if (messageTypeProvider == null) {
+ throw new ArgumentNullException("messageTypeProvider");
+ }
+
+ this.messageTypeProvider = messageTypeProvider;
+ }
+
/// <summary>
/// Gets or sets the message that came in as a request, if any.
/// </summary>
@@ -35,20 +56,41 @@ namespace DotNetOAuth.Messaging { throw new ArgumentNullException("request");
}
+ HttpWebRequest httpRequest = (HttpWebRequest)WebRequest.Create(request.Recipient);
+
MessageScheme transmissionMethod = MessageScheme.AuthorizationHeaderRequest;
switch (transmissionMethod) {
case MessageScheme.AuthorizationHeaderRequest:
- throw new NotImplementedException();
+ this.InitializeRequestAsAuthHeader(httpRequest, request);
break;
case MessageScheme.PostRequest:
- throw new NotImplementedException();
+ this.InitializeRequestAsPost(httpRequest, request);
break;
case MessageScheme.GetRequest:
- throw new NotImplementedException();
+ this.InitializeRequestAsGet(httpRequest, request);
break;
default:
throw new NotSupportedException();
}
+
+ // Submit the request and await the reply.
+ Dictionary<string, string> responseFields;
+ try {
+ using (HttpWebResponse response = (HttpWebResponse)httpRequest.GetResponse()) {
+ using (StreamReader reader = new StreamReader(response.GetResponseStream())) {
+ string queryString = reader.ReadToEnd();
+ responseFields = HttpUtility.ParseQueryString(queryString).ToDictionary();
+ }
+ }
+ } catch (WebException ex) {
+ throw new ProtocolException(MessagingStrings.ErrorInRequestReplyMessage, ex);
+ }
+
+ Type messageType = this.messageTypeProvider.GetMessageType(responseFields);
+ var responseSerialize = MessageSerializer.Get(messageType);
+ var responseMessage = responseSerialize.Deserialize(responseFields);
+
+ return responseMessage;
}
/// <summary>
@@ -84,6 +126,18 @@ namespace DotNetOAuth.Messaging { }
}
+ private void InitializeRequestAsAuthHeader(HttpWebRequest httpRequest, IDirectedProtocolMessage requestMessage) {
+ throw new NotImplementedException();
+ }
+
+ private void InitializeRequestAsPost(HttpWebRequest httpRequest, IDirectedProtocolMessage requestMessage) {
+ throw new NotImplementedException();
+ }
+
+ private void InitializeRequestAsGet(HttpWebRequest httpRequest, IDirectedProtocolMessage requestMessage) {
+ throw new NotImplementedException();
+ }
+
private void SendIndirectMessage(IDirectedProtocolMessage directedMessage) {
throw new NotImplementedException();
}
diff --git a/src/DotNetOAuth/Messaging/IMessageTypeProvider.cs b/src/DotNetOAuth/Messaging/IMessageTypeProvider.cs new file mode 100644 index 0000000..4a2f7c7 --- /dev/null +++ b/src/DotNetOAuth/Messaging/IMessageTypeProvider.cs @@ -0,0 +1,16 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace DotNetOAuth.Messaging {
+ internal interface IMessageTypeProvider {
+ /// <summary>
+ /// Analyzes a message payload to discover what kind of message is embedded in it.
+ /// </summary>
+ /// <param name="fields">The name/value pairs that make up the message payload.</param>
+ /// <returns>The <see cref="IProtocolMessage"/>-derived concrete class that
+ /// this message can deserialize to.</returns>
+ Type GetMessageType(IDictionary<string, string> fields);
+ }
+}
diff --git a/src/DotNetOAuth/Messaging/MessagingStrings.Designer.cs b/src/DotNetOAuth/Messaging/MessagingStrings.Designer.cs index 30321ca..60aadfb 100644 --- a/src/DotNetOAuth/Messaging/MessagingStrings.Designer.cs +++ b/src/DotNetOAuth/Messaging/MessagingStrings.Designer.cs @@ -70,6 +70,15 @@ namespace DotNetOAuth.Messaging { }
/// <summary>
+ /// Looks up a localized string similar to Error occurred while sending a direct message or gettings the response..
+ /// </summary>
+ internal static string ErrorInRequestReplyMessage {
+ get {
+ return ResourceManager.GetString("ErrorInRequestReplyMessage", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to A message response is already queued for sending in the response stream..
/// </summary>
internal static string QueuedMessageResponseAlreadyExists {
diff --git a/src/DotNetOAuth/Messaging/MessagingStrings.resx b/src/DotNetOAuth/Messaging/MessagingStrings.resx index c8ff072..4602058 100644 --- a/src/DotNetOAuth/Messaging/MessagingStrings.resx +++ b/src/DotNetOAuth/Messaging/MessagingStrings.resx @@ -120,6 +120,9 @@ <data name="DerivedTypeNotExpected" xml:space="preserve">
<value>An instance of type {0} was expected, but received unexpected derived type {1}.</value>
</data>
+ <data name="ErrorInRequestReplyMessage" xml:space="preserve">
+ <value>Error occurred while sending a direct message or gettings the response.</value>
+ </data>
<data name="QueuedMessageResponseAlreadyExists" xml:space="preserve">
<value>A message response is already queued for sending in the response stream.</value>
</data>
diff --git a/src/DotNetOAuth/Messaging/MessagingUtilities.cs b/src/DotNetOAuth/Messaging/MessagingUtilities.cs index c90a5fe..274aba8 100644 --- a/src/DotNetOAuth/Messaging/MessagingUtilities.cs +++ b/src/DotNetOAuth/Messaging/MessagingUtilities.cs @@ -7,6 +7,7 @@ namespace DotNetOAuth.Messaging {
using System;
using System.Collections.Generic;
+ using System.Collections.Specialized;
using System.Net;
using System.Text;
using System.Web;
@@ -14,7 +15,7 @@ namespace DotNetOAuth.Messaging { /// <summary>
/// A grab-bag of utility methods useful for the channel stack of the protocol.
/// </summary>
- internal class MessagingUtilities {
+ internal static class MessagingUtilities {
/// <summary>
/// Adds a set of HTTP headers to an <see cref="HttpResponse"/> instance,
/// taking care to set some headers to the appropriate properties of
@@ -69,5 +70,23 @@ namespace DotNetOAuth.Messaging { return sb.ToString();
}
+
+ /// <summary>
+ /// Converts a <see cref="NameValueCollection"/> to an IDictionary<string, string>.
+ /// </summary>
+ /// <param name="nvc">The NameValueCollection to convert. May be null.</param>
+ /// <returns>The generated dictionary, or null if <paramref name="nvc"/> is null.</returns>
+ internal static Dictionary<string, string> ToDictionary(this NameValueCollection nvc) {
+ if (nvc == null) {
+ return null;
+ }
+
+ var dictionary = new Dictionary<string, string>();
+ foreach (string key in nvc) {
+ dictionary.Add(key, nvc[key]);
+ }
+
+ return dictionary;
+ }
}
}
|