summaryrefslogtreecommitdiffstats
path: root/src/DotNetOAuth/Messages
diff options
context:
space:
mode:
Diffstat (limited to 'src/DotNetOAuth/Messages')
-rw-r--r--src/DotNetOAuth/Messages/AccessProtectedResourcesMessage.cs16
-rw-r--r--src/DotNetOAuth/Messages/ITokenContainingMessage.cs14
-rw-r--r--src/DotNetOAuth/Messages/OAuth Messages.cd39
-rw-r--r--src/DotNetOAuth/Messages/RequestAccessTokenMessage.cs16
-rw-r--r--src/DotNetOAuth/Messages/RequestTokenMessage.cs7
-rw-r--r--src/DotNetOAuth/Messages/SignedMessageBase.cs7
6 files changed, 58 insertions, 41 deletions
diff --git a/src/DotNetOAuth/Messages/AccessProtectedResourcesMessage.cs b/src/DotNetOAuth/Messages/AccessProtectedResourcesMessage.cs
index 8b8c1d5..85db448 100644
--- a/src/DotNetOAuth/Messages/AccessProtectedResourcesMessage.cs
+++ b/src/DotNetOAuth/Messages/AccessProtectedResourcesMessage.cs
@@ -12,7 +12,7 @@ namespace DotNetOAuth.Messages {
/// A message attached to a request for protected resources that provides the necessary
/// credentials to be granted access to those resources.
/// </summary>
- internal class AccessProtectedResourcesMessage : SignedMessageBase {
+ internal class AccessProtectedResourcesMessage : SignedMessageBase, ITokenContainingMessage {
/// <summary>
/// Initializes a new instance of the <see cref="AccessProtectedResourcesMessage"/> class.
/// </summary>
@@ -22,15 +22,17 @@ namespace DotNetOAuth.Messages {
}
/// <summary>
- /// Gets or sets the Consumer key.
- /// </summary>
- [MessagePart(Name = "oauth_consumer_key", IsRequired = true)]
- public string ConsumerKey { get; set; }
-
- /// <summary>
/// Gets or sets the Access Token.
/// </summary>
[MessagePart(Name = "oauth_token", IsRequired = true)]
public string AccessToken { get; set; }
+
+ /// <summary>
+ /// Gets or sets the Token.
+ /// </summary>
+ string ITokenContainingMessage.Token {
+ get { return this.AccessToken; }
+ set { this.AccessToken = value; }
+ }
}
}
diff --git a/src/DotNetOAuth/Messages/ITokenContainingMessage.cs b/src/DotNetOAuth/Messages/ITokenContainingMessage.cs
new file mode 100644
index 0000000..e0358f5
--- /dev/null
+++ b/src/DotNetOAuth/Messages/ITokenContainingMessage.cs
@@ -0,0 +1,14 @@
+//-----------------------------------------------------------------------
+// <copyright file="ITokenContainingMessage.cs" company="Andrew Arnott">
+// Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOAuth.Messages {
+ interface ITokenContainingMessage {
+ /// <summary>
+ /// Gets or sets the Request or Access Token.
+ /// </summary>
+ string Token { get; set; }
+ }
+}
diff --git a/src/DotNetOAuth/Messages/OAuth Messages.cd b/src/DotNetOAuth/Messages/OAuth Messages.cd
index 9b3e367..634a154 100644
--- a/src/DotNetOAuth/Messages/OAuth Messages.cd
+++ b/src/DotNetOAuth/Messages/OAuth Messages.cd
@@ -3,7 +3,7 @@
<Class Name="DotNetOAuth.Messages.AccessProtectedResourcesMessage">
<Position X="0.5" Y="7.5" Width="3.5" />
<TypeIdentifier>
- <HashCode>AAAAAAAAAAAAAAAAAAAAAgAAEAAAAAAAAAAAAAAAAAA=</HashCode>
+ <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Messages\AccessProtectedResourcesMessage.cs</FileName>
</TypeIdentifier>
</Class>
@@ -61,7 +61,7 @@
<Compartment Name="Fields" Collapsed="true" />
</Compartments>
<TypeIdentifier>
- <HashCode>AAAKAAAAYAAAAAAAAIAAAAAAAAQEIAAAAgCAACAAAAA=</HashCode>
+ <HashCode>AAAKAAAAYAAAAAAEAIAAAAAAAAQEIBAAIgCAACAAAAA=</HashCode>
<FileName>Messages\MessageBase.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
@@ -73,15 +73,15 @@
</Compartments>
<InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
<Path>
- <Point X="4.75" Y="7.625" />
- <Point X="4.5" Y="7.625" />
+ <Point X="4.75" Y="7.669" />
+ <Point X="4.5" Y="7.669" />
<Point X="4.5" Y="7.153" />
<Point X="3.125" Y="7.153" />
- <Point X="3.125" Y="6.627" />
+ <Point X="3.125" Y="6.435" />
</Path>
</InheritanceLine>
<TypeIdentifier>
- <HashCode>AAAAAAAAAAAAAAAAAAAAAgAAAIAAAAAAAAAAAAAAAAA=</HashCode>
+ <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Messages\RequestAccessTokenMessage.cs</FileName>
</TypeIdentifier>
</Class>
@@ -94,34 +94,33 @@
</Compartments>
<InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" FixedFromPoint="true">
<Path>
- <Point X="4.75" Y="6.875" />
- <Point X="4.375" Y="6.875" />
+ <Point X="4.75" Y="6.881" />
+ <Point X="4.375" Y="6.881" />
<Point X="4.375" Y="4.877" />
<Point X="4.75" Y="4.877" />
- <Point X="4.75" Y="1.496" />
- <Point X="3.5" Y="1.496" />
+ <Point X="4.75" Y="1.27" />
+ <Point X="3.5" Y="1.27" />
</Path>
</InheritanceLine>
<TypeIdentifier>
- <HashCode>AAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+ <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
<FileName>Messages\RequestTokenMessage.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="DotNetOAuth.Messages.SignedMessageBase">
<Position X="4.75" Y="6.75" Width="3.5" />
- <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" ManuallyRouted="true" FixedToPoint="true">
- <Path>
- <Point X="6.75" Y="4.478" />
- <Point X="6.75" Y="5.104" />
- <Point X="7.5" Y="5.104" />
- <Point X="7.5" Y="6.75" />
- </Path>
- </InheritanceLine>
<TypeIdentifier>
- <HashCode>IAAAFAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+ <HashCode>IAAAFAAAAIAAAAAAAACAAgAAAgAAIAQAAAAAoAAQAAA=</HashCode>
<FileName>Messages\SignedMessageBase.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
+ <Interface Name="DotNetOAuth.ChannelElements.ITamperResistantOAuthMessage" Collapsed="true">
+ <Position X="10.25" Y="7.75" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AIAAAAAAAAAAAAAAAIAAAhAAAAAAIAQAAAAAAAAAAAA=</HashCode>
+ <FileName>ChannelElements\ITamperResistantOAuthMessage.cs</FileName>
+ </TypeIdentifier>
+ </Interface>
<Font Name="Segoe UI" Size="9" />
</ClassDiagram> \ No newline at end of file
diff --git a/src/DotNetOAuth/Messages/RequestAccessTokenMessage.cs b/src/DotNetOAuth/Messages/RequestAccessTokenMessage.cs
index 143b67d..8b7adee 100644
--- a/src/DotNetOAuth/Messages/RequestAccessTokenMessage.cs
+++ b/src/DotNetOAuth/Messages/RequestAccessTokenMessage.cs
@@ -12,7 +12,7 @@ namespace DotNetOAuth.Messages {
/// A direct message sent by the Consumer to exchange a Request Token for an Access Token
/// and Token Secret.
/// </summary>
- internal class RequestAccessTokenMessage : SignedMessageBase {
+ internal class RequestAccessTokenMessage : SignedMessageBase, ITokenContainingMessage {
/// <summary>
/// Initializes a new instance of the <see cref="RequestAccessTokenMessage"/> class.
/// </summary>
@@ -22,15 +22,17 @@ namespace DotNetOAuth.Messages {
}
/// <summary>
- /// Gets or sets the Consumer Key.
- /// </summary>
- [MessagePart(Name = "oauth_consumer_key", IsRequired = true)]
- public string ConsumerKey { get; set; }
-
- /// <summary>
/// Gets or sets the Request Token.
/// </summary>
[MessagePart(Name = "oauth_token", IsRequired = true)]
public string RequestToken { get; set; }
+
+ /// <summary>
+ /// Gets or sets the Token.
+ /// </summary>
+ string ITokenContainingMessage.Token {
+ get { return this.RequestToken; }
+ set { this.RequestToken = value; }
+ }
}
}
diff --git a/src/DotNetOAuth/Messages/RequestTokenMessage.cs b/src/DotNetOAuth/Messages/RequestTokenMessage.cs
index 2a8cdfe..baadcdd 100644
--- a/src/DotNetOAuth/Messages/RequestTokenMessage.cs
+++ b/src/DotNetOAuth/Messages/RequestTokenMessage.cs
@@ -7,6 +7,7 @@
namespace DotNetOAuth.Messages {
using System;
using DotNetOAuth.Messaging;
+using System.Collections.Generic;
/// <summary>
/// A direct message sent from Consumer to Service Provider to request a token.
@@ -19,11 +20,5 @@ namespace DotNetOAuth.Messages {
internal RequestTokenMessage(ServiceProviderEndpoint serviceProvider)
: base(MessageTransport.Direct, serviceProvider) {
}
-
- /// <summary>
- /// Gets or sets the consumer key.
- /// </summary>
- [MessagePart(Name = "oauth_consumer_key", IsRequired = true)]
- public string ConsumerKey { get; set; }
}
}
diff --git a/src/DotNetOAuth/Messages/SignedMessageBase.cs b/src/DotNetOAuth/Messages/SignedMessageBase.cs
index 460a509..28026e6 100644
--- a/src/DotNetOAuth/Messages/SignedMessageBase.cs
+++ b/src/DotNetOAuth/Messages/SignedMessageBase.cs
@@ -58,6 +58,12 @@ namespace DotNetOAuth.Messages {
public string TokenSecret { get; set; }
/// <summary>
+ /// Gets or sets the Consumer key.
+ /// </summary>
+ [MessagePart(Name = "oauth_consumer_key", IsRequired = true)]
+ public string ConsumerKey { get; set; }
+
+ /// <summary>
/// Gets or sets the Consumer Secret used to sign the message.
/// Only applicable to Consumer.
/// </summary>
@@ -71,7 +77,6 @@ namespace DotNetOAuth.Messages {
/// <summary>
/// Gets or sets the extra, non-OAuth parameters that will be included in the request.
- /// Only applicable to Consumer.
/// </summary>
IDictionary<string, string> ITamperResistantOAuthMessage.AdditionalParametersInHttpRequest { get; set; }
generated by cgit v1.1 at 2025-05-29 01:41:31 +0000