diff options
Diffstat (limited to 'src')
19 files changed, 139 insertions, 116 deletions
diff --git a/src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs b/src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs index f02098d..ec6f71f 100644 --- a/src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs +++ b/src/DotNetOAuth.Test/ChannelElements/HmacSha1SigningBindingElementTests.cs @@ -13,7 +13,7 @@ namespace DotNetOAuth.Test.ChannelElements { public class HmacSha1SigningBindingElementTests : MessagingTestBase {
[TestMethod]
public void SignatureTest() {
- RequestTokenMessage message = SigningBindingElementBaseTests.CreateTestRequestTokenMessage();
+ GetRequestTokenMessage message = SigningBindingElementBaseTests.CreateTestRequestTokenMessage();
HmacSha1SigningBindingElement_Accessor hmac = new HmacSha1SigningBindingElement_Accessor();
Assert.AreEqual("kR0LhH8UqylaLfR/esXVVlP4sQI=", hmac.GetSignature(message));
diff --git a/src/DotNetOAuth.Test/ChannelElements/PlainTextSigningBindingElementTest.cs b/src/DotNetOAuth.Test/ChannelElements/PlainTextSigningBindingElementTest.cs index 00ede7d..ef27e94 100644 --- a/src/DotNetOAuth.Test/ChannelElements/PlainTextSigningBindingElementTest.cs +++ b/src/DotNetOAuth.Test/ChannelElements/PlainTextSigningBindingElementTest.cs @@ -17,7 +17,7 @@ namespace DotNetOAuth.Test.ChannelElements public void HttpsSignatureGeneration() {
SigningBindingElementBase target = new PlainTextSigningBindingElement();
MessageReceivingEndpoint endpoint = new MessageReceivingEndpoint("https://localtest", HttpDeliveryMethod.GetRequest);
- ITamperResistantOAuthMessage message = new RequestTokenMessage(endpoint);
+ ITamperResistantOAuthMessage message = new GetRequestTokenMessage(endpoint);
message.ConsumerSecret = "cs";
message.TokenSecret = "ts";
Assert.IsTrue(target.PrepareMessageForSending(message));
@@ -29,7 +29,7 @@ namespace DotNetOAuth.Test.ChannelElements public void HttpsSignatureVerification() {
MessageReceivingEndpoint endpoint = new MessageReceivingEndpoint("https://localtest", HttpDeliveryMethod.GetRequest);
ITamperProtectionChannelBindingElement target = new PlainTextSigningBindingElement();
- ITamperResistantOAuthMessage message = new RequestTokenMessage(endpoint);
+ ITamperResistantOAuthMessage message = new GetRequestTokenMessage(endpoint);
message.ConsumerSecret = "cs";
message.TokenSecret = "ts";
message.SignatureMethod = "PLAINTEXT";
@@ -41,7 +41,7 @@ namespace DotNetOAuth.Test.ChannelElements public void HttpsSignatureVerificationNotApplicable() {
SigningBindingElementBase target = new PlainTextSigningBindingElement();
MessageReceivingEndpoint endpoint = new MessageReceivingEndpoint("https://localtest", HttpDeliveryMethod.GetRequest);
- ITamperResistantOAuthMessage message = new RequestTokenMessage(endpoint);
+ ITamperResistantOAuthMessage message = new GetRequestTokenMessage(endpoint);
message.ConsumerSecret = "cs";
message.TokenSecret = "ts";
message.SignatureMethod = "ANOTHERALGORITHM";
@@ -53,7 +53,7 @@ namespace DotNetOAuth.Test.ChannelElements public void HttpSignatureGeneration() {
SigningBindingElementBase target = new PlainTextSigningBindingElement();
MessageReceivingEndpoint endpoint = new MessageReceivingEndpoint("http://localtest", HttpDeliveryMethod.GetRequest);
- ITamperResistantOAuthMessage message = new RequestTokenMessage(endpoint);
+ ITamperResistantOAuthMessage message = new GetRequestTokenMessage(endpoint);
message.ConsumerSecret = "cs";
message.TokenSecret = "ts";
@@ -67,7 +67,7 @@ namespace DotNetOAuth.Test.ChannelElements public void HttpSignatureVerification() {
SigningBindingElementBase target = new PlainTextSigningBindingElement();
MessageReceivingEndpoint endpoint = new MessageReceivingEndpoint("http://localtest", HttpDeliveryMethod.GetRequest);
- ITamperResistantOAuthMessage message = new RequestTokenMessage(endpoint);
+ ITamperResistantOAuthMessage message = new GetRequestTokenMessage(endpoint);
message.ConsumerSecret = "cs";
message.TokenSecret = "ts";
message.SignatureMethod = "PLAINTEXT";
diff --git a/src/DotNetOAuth.Test/ChannelElements/SigningBindingElementBaseTests.cs b/src/DotNetOAuth.Test/ChannelElements/SigningBindingElementBaseTests.cs index 94dec72..3883b38 100644 --- a/src/DotNetOAuth.Test/ChannelElements/SigningBindingElementBaseTests.cs +++ b/src/DotNetOAuth.Test/ChannelElements/SigningBindingElementBaseTests.cs @@ -15,16 +15,16 @@ namespace DotNetOAuth.Test.ChannelElements { public class SigningBindingElementBaseTests : MessagingTestBase {
[TestMethod]
public void BaseSignatureStringTest() {
- RequestTokenMessage message = CreateTestRequestTokenMessage();
+ GetRequestTokenMessage message = CreateTestRequestTokenMessage();
Assert.AreEqual(
"GET&https%3A%2F%2Fwww.google.com%2Faccounts%2FOAuthGetRequestToken&oauth_consumer_key%3Dnerdbank.org%26oauth_nonce%3Dfe4045a3f0efdd1e019fa8f8ae3f5c38%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1222665749%26oauth_version%3D1.0%26scope%3Dhttp%253A%252F%252Fwww.google.com%252Fm8%252Ffeeds%252F",
SigningBindingElementBase_Accessor.ConstructSignatureBaseString(message));
}
- internal static RequestTokenMessage CreateTestRequestTokenMessage() {
+ internal static GetRequestTokenMessage CreateTestRequestTokenMessage() {
MessageReceivingEndpoint endpoint = new MessageReceivingEndpoint("https://www.google.com/accounts/OAuthGetRequestToken", HttpDeliveryMethod.AuthorizationHeaderRequest | HttpDeliveryMethod.GetRequest);
- RequestTokenMessage message = new RequestTokenMessage(endpoint);
+ GetRequestTokenMessage message = new GetRequestTokenMessage(endpoint);
message.ConsumerKey = "nerdbank.org";
message.ConsumerSecret = "nerdbanksecret";
var signedMessage = (ITamperResistantOAuthMessage)message;
diff --git a/src/DotNetOAuth.Test/Mocks/InMemoryTokenManager.cs b/src/DotNetOAuth.Test/Mocks/InMemoryTokenManager.cs index dbc7cd9..c00e181 100644 --- a/src/DotNetOAuth.Test/Mocks/InMemoryTokenManager.cs +++ b/src/DotNetOAuth.Test/Mocks/InMemoryTokenManager.cs @@ -35,7 +35,7 @@ namespace DotNetOAuth.Test.Mocks { return this.tokensAndSecrets[token];
}
- public void StoreNewRequestToken(RequestTokenMessage request, UnauthorizedRequestTokenMessage response) {
+ public void StoreNewRequestToken(GetRequestTokenMessage request, GrantRequestTokenMessage response) {
this.tokensAndSecrets[response.RequestToken] = response.TokenSecret;
this.requestTokens.Add(response.RequestToken, false);
}
diff --git a/src/DotNetOAuth.Test/Scenarios/AppendixScenarios.cs b/src/DotNetOAuth.Test/Scenarios/AppendixScenarios.cs index dfc7b8a..afa49a3 100644 --- a/src/DotNetOAuth.Test/Scenarios/AppendixScenarios.cs +++ b/src/DotNetOAuth.Test/Scenarios/AppendixScenarios.cs @@ -37,7 +37,7 @@ namespace DotNetOAuth.Test { consumer => {
consumer.RequestUserAuthorization(new Uri("http://printer.example.com/request_token_ready"), null, null);
string accessToken = consumer.ProcessUserAuthorization().AccessToken;
- var photoRequest = consumer.CreateAuthorizedRequestInternal(accessPhotoEndpoint, accessToken);
+ var photoRequest = consumer.CreateAuthorizingMessage(accessPhotoEndpoint, accessToken);
Response protectedPhoto = ((CoordinatingOAuthChannel)consumer.Channel).RequestProtectedResource(photoRequest);
Assert.IsNotNull(protectedPhoto);
Assert.AreEqual(HttpStatusCode.OK, protectedPhoto.Status);
diff --git a/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs b/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs index 08f086f..d5dddcf 100644 --- a/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs +++ b/src/DotNetOAuth.Test/Scenarios/CoordinatingOAuthChannel.cs @@ -45,7 +45,7 @@ namespace DotNetOAuth.Test.Scenarios { /// </summary>
internal CoordinatingOAuthChannel RemoteChannel { get; set; }
- internal Response RequestProtectedResource(AccessProtectedResourcesMessage request) {
+ internal Response RequestProtectedResource(AccessProtectedResourceMessage request) {
((ITamperResistantOAuthMessage)request).HttpMethod = this.GetHttpMethod(((ITamperResistantOAuthMessage)request).HttpMethods);
this.PrepareMessageForSending(request);
HttpRequestInfo requestInfo = this.SpoofHttpMethod(request);
diff --git a/src/DotNetOAuth/ChannelElements/ITokenManager.cs b/src/DotNetOAuth/ChannelElements/ITokenManager.cs index e3b218b..2b8c3b5 100644 --- a/src/DotNetOAuth/ChannelElements/ITokenManager.cs +++ b/src/DotNetOAuth/ChannelElements/ITokenManager.cs @@ -42,7 +42,7 @@ namespace DotNetOAuth.ChannelElements { /// <param name="request">The request message that resulted in the generation of a new unauthorized request token.</param>
/// <param name="response">The response message that includes the unauthorized request token.</param>
/// <exception cref="ArgumentException">Thrown if the consumer key is not registered, or a required parameter was not found in the parameters collection.</exception>
- void StoreNewRequestToken(RequestTokenMessage request, UnauthorizedRequestTokenMessage response);
+ void StoreNewRequestToken(GetRequestTokenMessage request, GrantRequestTokenMessage response);
/// <summary>
/// Checks whether a given request token has already been authorized
diff --git a/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs b/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs index af17527..b3cc859 100644 --- a/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs +++ b/src/DotNetOAuth/ChannelElements/OAuthConsumerMessageTypeProvider.cs @@ -74,7 +74,7 @@ namespace DotNetOAuth.ChannelElements { /// </returns>
/// <remarks>
/// The response messages are:
- /// UnauthorizedRequestTokenMessage
+ /// GrantRequestTokenMessage
/// GrantAccessTokenMessage
/// </remarks>
public virtual Type GetResponseMessageType(IProtocolMessage request, IDictionary<string, string> fields) {
@@ -93,9 +93,9 @@ namespace DotNetOAuth.ChannelElements { return null;
}
- if (request is RequestTokenMessage) {
- return typeof(UnauthorizedRequestTokenMessage);
- } else if (request is RequestAccessTokenMessage) {
+ if (request is GetRequestTokenMessage) {
+ return typeof(GrantRequestTokenMessage);
+ } else if (request is GetAccessTokenMessage) {
return typeof(GrantAccessTokenMessage);
} else {
Logger.ErrorFormat("Unexpected response message given the request type {0}", request.GetType().Name);
diff --git a/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs b/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs index ab9105f..8632f0f 100644 --- a/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs +++ b/src/DotNetOAuth/ChannelElements/OAuthServiceProviderMessageTypeProvider.cs @@ -41,10 +41,10 @@ namespace DotNetOAuth.ChannelElements { /// <param name="fields">The name/value pairs that make up the message payload.</param>
/// <remarks>
/// The request messages are:
- /// RequestTokenMessage
- /// RequestAccessTokenMessage
+ /// GetRequestTokenMessage
+ /// GetAccessTokenMessage
/// DirectUserToServiceProviderMessage
- /// AccessProtectedResourcesMessage
+ /// AccessProtectedResourceMessage
/// </remarks>
/// <returns>
/// The <see cref="IProtocolMessage"/>-derived concrete class that this message can
@@ -57,7 +57,7 @@ namespace DotNetOAuth.ChannelElements { if (fields.ContainsKey("oauth_consumer_key") &&
!fields.ContainsKey("oauth_token")) {
- return typeof(RequestTokenMessage);
+ return typeof(GetRequestTokenMessage);
}
if (fields.ContainsKey("oauth_consumer_key") &&
@@ -67,8 +67,8 @@ namespace DotNetOAuth.ChannelElements { // is in the token parameter.
bool tokenTypeIsAccessToken = this.tokenManager.GetTokenType(fields["oauth_token"]) == TokenType.AccessToken;
- return tokenTypeIsAccessToken ? typeof(AccessProtectedResourcesMessage) :
- typeof(RequestAccessTokenMessage);
+ return tokenTypeIsAccessToken ? typeof(AccessProtectedResourceMessage) :
+ typeof(GetAccessTokenMessage);
}
// fail over to the message with no required fields at all.
diff --git a/src/DotNetOAuth/Consumer.cs b/src/DotNetOAuth/Consumer.cs index 0fc511a..9000a08 100644 --- a/src/DotNetOAuth/Consumer.cs +++ b/src/DotNetOAuth/Consumer.cs @@ -146,7 +146,7 @@ namespace DotNetOAuth { /// <returns>The access token assigned by the Service Provider.</returns>
public GrantAccessTokenMessage ProcessUserAuthorization(string requestToken) {
string requestTokenSecret = this.TokenManager.GetTokenSecret(requestToken);
- var requestAccess = new RequestAccessTokenMessage(this.ServiceProvider.AccessTokenEndpoint) {
+ var requestAccess = new GetAccessTokenMessage(this.ServiceProvider.AccessTokenEndpoint) {
RequestToken = requestToken,
TokenSecret = requestTokenSecret,
ConsumerKey = this.ConsumerKey,
@@ -164,8 +164,8 @@ namespace DotNetOAuth { /// <param name="endpoint">The URL and method on the Service Provider to send the request to.</param>
/// <param name="accessToken">The access token that permits access to the protected resource.</param>
/// <returns>The initialized WebRequest object.</returns>
- public WebRequest CreateAuthorizedRequest(MessageReceivingEndpoint endpoint, string accessToken) {
- IDirectedProtocolMessage message = this.CreateAuthorizedRequestInternal(endpoint, accessToken);
+ public WebRequest PrepareAuthorizedRequest(MessageReceivingEndpoint endpoint, string accessToken) {
+ IDirectedProtocolMessage message = this.CreateAuthorizingMessage(endpoint, accessToken);
HttpWebRequest wr = this.Channel.InitializeRequest(message);
return wr;
}
@@ -178,8 +178,8 @@ namespace DotNetOAuth { /// <param name="accessToken">The access token that permits access to the protected resource.</param>
/// <returns>The initialized WebRequest object.</returns>
/// <exception cref="WebException">Thrown if the request fails for any reason after it is sent to the Service Provider.</exception>
- public Response SendAuthorizedRequest(MessageReceivingEndpoint endpoint, string accessToken) {
- IDirectedProtocolMessage message = this.CreateAuthorizedRequestInternal(endpoint, accessToken);
+ public Response PrepareAuthorizedRequestAndSend(MessageReceivingEndpoint endpoint, string accessToken) {
+ IDirectedProtocolMessage message = this.CreateAuthorizingMessage(endpoint, accessToken);
HttpWebRequest wr = this.Channel.InitializeRequest(message);
return this.WebRequestHandler.GetResponse(wr);
}
@@ -198,12 +198,12 @@ namespace DotNetOAuth { /// <returns>The pending user agent redirect based message to be sent as an HttpResponse.</returns>
internal Response RequestUserAuthorization(Uri callback, IDictionary<string, string> requestParameters, IDictionary<string, string> redirectParameters, out string token) {
// Obtain an unauthorized request token.
- var requestToken = new RequestTokenMessage(this.ServiceProvider.RequestTokenEndpoint) {
+ var requestToken = new GetRequestTokenMessage(this.ServiceProvider.RequestTokenEndpoint) {
ConsumerKey = this.ConsumerKey,
ConsumerSecret = this.ConsumerSecret,
};
requestToken.AddNonOAuthParameters(requestParameters);
- var requestTokenResponse = this.Channel.Request<UnauthorizedRequestTokenMessage>(requestToken);
+ var requestTokenResponse = this.Channel.Request<GrantRequestTokenMessage>(requestToken);
this.TokenManager.StoreNewRequestToken(requestToken, requestTokenResponse);
// Request user authorization.
@@ -238,7 +238,7 @@ namespace DotNetOAuth { /// <param name="endpoint">The URL and method on the Service Provider to send the request to.</param>
/// <param name="accessToken">The access token that permits access to the protected resource.</param>
/// <returns>The initialized WebRequest object.</returns>
- internal AccessProtectedResourcesMessage CreateAuthorizedRequestInternal(MessageReceivingEndpoint endpoint, string accessToken) {
+ internal AccessProtectedResourceMessage CreateAuthorizingMessage(MessageReceivingEndpoint endpoint, string accessToken) {
if (endpoint == null) {
throw new ArgumentNullException("endpoint");
}
@@ -246,7 +246,7 @@ namespace DotNetOAuth { throw new ArgumentNullException("accessToken");
}
- AccessProtectedResourcesMessage message = new AccessProtectedResourcesMessage(endpoint) {
+ AccessProtectedResourceMessage message = new AccessProtectedResourceMessage(endpoint) {
AccessToken = accessToken,
TokenSecret = this.TokenManager.GetTokenSecret(accessToken),
ConsumerKey = this.ConsumerKey,
diff --git a/src/DotNetOAuth/DotNetOAuth.csproj b/src/DotNetOAuth/DotNetOAuth.csproj index bb8fe2d..43e0849 100644 --- a/src/DotNetOAuth/DotNetOAuth.csproj +++ b/src/DotNetOAuth/DotNetOAuth.csproj @@ -79,7 +79,7 @@ <Compile Include="ChannelElements\IWebRequestHandler.cs" />
<Compile Include="ChannelElements\ITamperResistantOAuthMessage.cs" />
<Compile Include="Messages\MessageBase.cs" />
- <Compile Include="Messages\RequestAccessTokenMessage.cs" />
+ <Compile Include="Messages\GetAccessTokenMessage.cs" />
<Compile Include="Messaging\Bindings\INonceStore.cs" />
<Compile Include="Messaging\Bindings\StandardReplayProtectionBindingElement.cs" />
<Compile Include="Messaging\MessagePartAttribute.cs" />
@@ -90,12 +90,12 @@ <Compile Include="Messaging\Bindings\InvalidSignatureException.cs" />
<Compile Include="Messaging\Bindings\IReplayProtectedProtocolMessage.cs" />
<Compile Include="Messaging\Bindings\IExpiringProtocolMessage.cs" />
- <Compile Include="Messages\AccessProtectedResourcesMessage.cs" />
+ <Compile Include="Messages\AccessProtectedResourceMessage.cs" />
<Compile Include="Messages\GrantAccessTokenMessage.cs" />
<Compile Include="ChannelElements\IOAuthDirectedMessage.cs" />
<Compile Include="Messages\DirectUserToConsumerMessage.cs" />
<Compile Include="Messages\DirectUserToServiceProviderMessage.cs" />
- <Compile Include="Messages\UnauthorizedRequestTokenMessage.cs" />
+ <Compile Include="Messages\GrantRequestTokenMessage.cs" />
<Compile Include="Messaging\Channel.cs" />
<Compile Include="Messaging\HttpRequestInfo.cs" />
<Compile Include="Messaging\IDirectedProtocolMessage.cs" />
@@ -127,7 +127,7 @@ <Compile Include="ChannelElements\OAuthServiceProviderMessageTypeProvider.cs" />
<Compile Include="Messaging\ProtocolException.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Messages\RequestTokenMessage.cs" />
+ <Compile Include="Messages\GetRequestTokenMessage.cs" />
<Compile Include="ChannelElements\RsaSha1SigningBindingElement.cs" />
<Compile Include="ChannelElements\StandardWebRequestHandler.cs" />
<Compile Include="Messaging\MessageReceivingEndpoint.cs" />
diff --git a/src/DotNetOAuth/Messages/AccessProtectedResourcesMessage.cs b/src/DotNetOAuth/Messages/AccessProtectedResourceMessage.cs index b9817f6..df037cf 100644 --- a/src/DotNetOAuth/Messages/AccessProtectedResourcesMessage.cs +++ b/src/DotNetOAuth/Messages/AccessProtectedResourceMessage.cs @@ -1,5 +1,5 @@ //-----------------------------------------------------------------------
-// <copyright file="AccessProtectedResourcesMessage.cs" company="Andrew Arnott">
+// <copyright file="AccessProtectedResourceMessage.cs" company="Andrew Arnott">
// Copyright (c) Andrew Arnott. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
@@ -12,12 +12,12 @@ 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>
- public class AccessProtectedResourcesMessage : SignedMessageBase, ITokenContainingMessage {
+ public class AccessProtectedResourceMessage : SignedMessageBase, ITokenContainingMessage {
/// <summary>
- /// Initializes a new instance of the <see cref="AccessProtectedResourcesMessage"/> class.
+ /// Initializes a new instance of the <see cref="AccessProtectedResourceMessage"/> class.
/// </summary>
/// <param name="serviceProvider">The URI of the Service Provider endpoint to send this message to.</param>
- protected internal AccessProtectedResourcesMessage(MessageReceivingEndpoint serviceProvider)
+ protected internal AccessProtectedResourceMessage(MessageReceivingEndpoint serviceProvider)
: base(MessageTransport.Direct, serviceProvider) {
}
diff --git a/src/DotNetOAuth/Messages/RequestAccessTokenMessage.cs b/src/DotNetOAuth/Messages/GetAccessTokenMessage.cs index 12bd577..d5f4700 100644 --- a/src/DotNetOAuth/Messages/RequestAccessTokenMessage.cs +++ b/src/DotNetOAuth/Messages/GetAccessTokenMessage.cs @@ -1,5 +1,5 @@ //-----------------------------------------------------------------------
-// <copyright file="RequestAccessTokenMessage.cs" company="Andrew Arnott">
+// <copyright file="GetAccessTokenMessage.cs" company="Andrew Arnott">
// Copyright (c) Andrew Arnott. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
@@ -9,15 +9,15 @@ namespace DotNetOAuth.Messages { using DotNetOAuth.Messaging;
/// <summary>
- /// A direct message sent by the Consumer to exchange a Request Token for an Access Token
- /// and Token Secret.
+ /// A direct message sent by the Consumer to exchange an authorized Request Token
+ /// for an Access Token and Token Secret.
/// </summary>
- public class RequestAccessTokenMessage : SignedMessageBase, ITokenContainingMessage {
+ public class GetAccessTokenMessage : SignedMessageBase, ITokenContainingMessage {
/// <summary>
- /// Initializes a new instance of the <see cref="RequestAccessTokenMessage"/> class.
+ /// Initializes a new instance of the <see cref="GetAccessTokenMessage"/> class.
/// </summary>
/// <param name="serviceProvider">The URI of the Service Provider endpoint to send this message to.</param>
- protected internal RequestAccessTokenMessage(MessageReceivingEndpoint serviceProvider)
+ protected internal GetAccessTokenMessage(MessageReceivingEndpoint serviceProvider)
: base(MessageTransport.Direct, serviceProvider) {
}
diff --git a/src/DotNetOAuth/Messages/RequestTokenMessage.cs b/src/DotNetOAuth/Messages/GetRequestTokenMessage.cs index e90b63d..e980f08 100644 --- a/src/DotNetOAuth/Messages/RequestTokenMessage.cs +++ b/src/DotNetOAuth/Messages/GetRequestTokenMessage.cs @@ -1,5 +1,5 @@ //-----------------------------------------------------------------------
-// <copyright file="RequestTokenMessage.cs" company="Andrew Arnott">
+// <copyright file="GetRequestTokenMessage.cs" company="Andrew Arnott">
// Copyright (c) Andrew Arnott. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
@@ -8,14 +8,14 @@ namespace DotNetOAuth.Messages { using DotNetOAuth.Messaging;
/// <summary>
- /// A direct message sent from Consumer to Service Provider to request a token.
+ /// A direct message sent from Consumer to Service Provider to request a Request Token.
/// </summary>
- public class RequestTokenMessage : SignedMessageBase {
+ public class GetRequestTokenMessage : SignedMessageBase {
/// <summary>
- /// Initializes a new instance of the <see cref="RequestTokenMessage"/> class.
+ /// Initializes a new instance of the <see cref="GetRequestTokenMessage"/> class.
/// </summary>
/// <param name="serviceProvider">The URI of the Service Provider endpoint to send this message to.</param>
- protected internal RequestTokenMessage(MessageReceivingEndpoint serviceProvider)
+ protected internal GetRequestTokenMessage(MessageReceivingEndpoint serviceProvider)
: base(MessageTransport.Direct, serviceProvider) {
}
}
diff --git a/src/DotNetOAuth/Messages/GrantAccessTokenMessage.cs b/src/DotNetOAuth/Messages/GrantAccessTokenMessage.cs index f1c5214..dbcd6a1 100644 --- a/src/DotNetOAuth/Messages/GrantAccessTokenMessage.cs +++ b/src/DotNetOAuth/Messages/GrantAccessTokenMessage.cs @@ -9,7 +9,7 @@ namespace DotNetOAuth.Messages { /// <summary>
/// A direct message sent from Service Provider to Consumer in response to
- /// a Consumer's <see cref="RequestAccessTokenMessage"/> request.
+ /// a Consumer's <see cref="GetAccessTokenMessage"/> request.
/// </summary>
public class GrantAccessTokenMessage : MessageBase {
/// <summary>
diff --git a/src/DotNetOAuth/Messages/UnauthorizedRequestTokenMessage.cs b/src/DotNetOAuth/Messages/GrantRequestTokenMessage.cs index dd1203e..9caf6e6 100644 --- a/src/DotNetOAuth/Messages/UnauthorizedRequestTokenMessage.cs +++ b/src/DotNetOAuth/Messages/GrantRequestTokenMessage.cs @@ -1,5 +1,5 @@ //-----------------------------------------------------------------------
-// <copyright file="UnauthorizedRequestTokenMessage.cs" company="Andrew Arnott">
+// <copyright file="GrantRequestTokenMessage.cs" company="Andrew Arnott">
// Copyright (c) Andrew Arnott. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
@@ -9,13 +9,13 @@ namespace DotNetOAuth.Messages { /// <summary>
/// A direct message sent from Service Provider to Consumer in response to
- /// a Consumer's <see cref="RequestTokenMessage"/> request.
+ /// a Consumer's <see cref="GetRequestTokenMessage"/> request.
/// </summary>
- public class UnauthorizedRequestTokenMessage : MessageBase {
+ public class GrantRequestTokenMessage : MessageBase {
/// <summary>
- /// Initializes a new instance of the <see cref="UnauthorizedRequestTokenMessage"/> class.
+ /// Initializes a new instance of the <see cref="GrantRequestTokenMessage"/> class.
/// </summary>
- protected internal UnauthorizedRequestTokenMessage()
+ protected internal GrantRequestTokenMessage()
: base(MessageProtection.None, MessageTransport.Direct) {
}
diff --git a/src/DotNetOAuth/Messages/OAuth Messages.cd b/src/DotNetOAuth/Messages/OAuth Messages.cd index 634a154..dfe4c03 100644 --- a/src/DotNetOAuth/Messages/OAuth Messages.cd +++ b/src/DotNetOAuth/Messages/OAuth Messages.cd @@ -1,24 +1,38 @@ <?xml version="1.0" encoding="utf-8"?>
<ClassDiagram MajorVersion="1" MinorVersion="1" GroupingSetting="Access">
- <Class Name="DotNetOAuth.Messages.AccessProtectedResourcesMessage">
- <Position X="0.5" Y="7.5" Width="3.5" />
+ <Comment CommentText="Messages from Service Provider">
+ <Position X="7.912" Y="0.715" Height="0.291" Width="2.02" />
+ </Comment>
+ <Comment CommentText="Messages from Consumer">
+ <Position X="4.36" Y="0.683" Height="0.291" Width="2.02" />
+ </Comment>
+ <Class Name="DotNetOAuth.Messages.AccessProtectedResourceMessage">
+ <Position X="3.75" Y="7.5" Width="3.5" />
+ <InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="3.562" Y="5.367" />
+ <Point X="3.562" Y="7.625" />
+ <Point X="3.75" Y="7.625" />
+ </Path>
+ </InheritanceLine>
<TypeIdentifier>
- <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAA=</HashCode>
- <FileName>Messages\AccessProtectedResourcesMessage.cs</FileName>
+ <HashCode>AAAAAAACAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAA=</HashCode>
+ <FileName>Messages\AccessProtectedResourceMessage.cs</FileName>
</TypeIdentifier>
+ <Lollipop Position="0.2" />
</Class>
- <Class Name="DotNetOAuth.Messages.UnauthorizedRequestTokenMessage">
- <Position X="9" Y="0.75" Width="3" />
+ <Class Name="DotNetOAuth.Messages.GrantRequestTokenMessage">
+ <Position X="7.5" Y="1.5" Width="3" />
<Compartments>
<Compartment Name="Methods" Collapsed="true" />
</Compartments>
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAIAAIAAAAAAAAAAAAAA=</HashCode>
- <FileName>Messages\UnauthorizedRequestTokenMessage.cs</FileName>
+ <FileName>Messages\GrantRequestTokenMessage.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="DotNetOAuth.Messages.DirectUserToConsumerMessage">
- <Position X="9" Y="2.75" Width="2.5" />
+ <Position X="7.5" Y="3.75" Width="2.5" />
<Compartments>
<Compartment Name="Methods" Collapsed="true" />
</Compartments>
@@ -28,7 +42,7 @@ </TypeIdentifier>
</Class>
<Class Name="DotNetOAuth.Messages.DirectUserToServiceProviderMessage">
- <Position X="1.5" Y="2.75" Width="3" />
+ <Position X="4.25" Y="2.75" Width="3" />
<Compartments>
<Compartment Name="Methods" Collapsed="true" />
</Compartments>
@@ -38,16 +52,16 @@ </TypeIdentifier>
</Class>
<Class Name="DotNetOAuth.Messages.GrantAccessTokenMessage">
- <Position X="9" Y="4.5" Width="2.5" />
+ <Position X="7.5" Y="5.75" Width="2.5" />
<Compartments>
<Compartment Name="Methods" Collapsed="true" />
</Compartments>
- <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedFromPoint="true">
+ <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
<Path>
- <Point X="8.5" Y="4.098" />
- <Point X="8.74" Y="4.098" />
- <Point X="8.74" Y="5.438" />
- <Point X="9" Y="5.438" />
+ <Point X="10.75" Y="5.875" />
+ <Point X="10.375" Y="5.875" />
+ <Point X="10.375" Y="5.875" />
+ <Point X="10" Y="5.875" />
</Path>
</InheritanceLine>
<TypeIdentifier>
@@ -56,37 +70,35 @@ </TypeIdentifier>
</Class>
<Class Name="DotNetOAuth.Messages.MessageBase">
- <Position X="5" Y="1" Width="3.5" />
+ <Position X="10.75" Y="1" Width="3.5" />
<Compartments>
<Compartment Name="Fields" Collapsed="true" />
</Compartments>
<TypeIdentifier>
- <HashCode>AAAKAAAAYAAAAAAEAIAAAAAAAAQEIBAAIgCAACAAAAA=</HashCode>
+ <HashCode>AAAKAAAAYAAAAAAEAIAAAAAAAAQEIDAAIgCAACAAAAA=</HashCode>
<FileName>Messages\MessageBase.cs</FileName>
</TypeIdentifier>
<Lollipop Position="0.2" />
</Class>
- <Class Name="DotNetOAuth.Messages.RequestAccessTokenMessage">
- <Position X="1.5" Y="4.75" Width="2.5" />
+ <Class Name="DotNetOAuth.Messages.GetAccessTokenMessage">
+ <Position X="4.25" Y="5" Width="2.5" />
<Compartments>
<Compartment Name="Methods" Collapsed="true" />
</Compartments>
<InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
<Path>
- <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.435" />
+ <Point X="4" Y="5.125" />
+ <Point X="4.25" Y="5.125" />
</Path>
</InheritanceLine>
<TypeIdentifier>
- <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA=</HashCode>
- <FileName>Messages\RequestAccessTokenMessage.cs</FileName>
+ <HashCode>AAAAAAACAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA=</HashCode>
+ <FileName>Messages\GetAccessTokenMessage.cs</FileName>
</TypeIdentifier>
+ <Lollipop Position="0.2" />
</Class>
- <Class Name="DotNetOAuth.Messages.RequestTokenMessage">
- <Position X="1.5" Y="0.75" Width="2" />
+ <Class Name="DotNetOAuth.Messages.GetRequestTokenMessage">
+ <Position X="4.25" Y="1" Width="2.25" />
<Compartments>
<Compartment Name="Internal" Collapsed="true" />
<Compartment Name="Private" Collapsed="true" />
@@ -94,33 +106,44 @@ </Compartments>
<InheritanceLine Type="DotNetOAuth.Messages.SignedMessageBase" FixedFromPoint="true">
<Path>
- <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.27" />
- <Point X="3.5" Y="1.27" />
+ <Point X="4" Y="1.938" />
+ <Point X="4.25" Y="1.938" />
</Path>
</InheritanceLine>
<TypeIdentifier>
<HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
- <FileName>Messages\RequestTokenMessage.cs</FileName>
+ <FileName>Messages\GetRequestTokenMessage.cs</FileName>
</TypeIdentifier>
</Class>
<Class Name="DotNetOAuth.Messages.SignedMessageBase">
- <Position X="4.75" Y="6.75" Width="3.5" />
+ <Position X="0.5" Y="1.5" Width="3.5" />
+ <InheritanceLine Type="DotNetOAuth.Messages.MessageBase" FixedFromPoint="true" FixedToPoint="true">
+ <Path>
+ <Point X="12.875" Y="1" />
+ <Point X="12.875" Y="0.625" />
+ <Point X="3" Y="0.625" />
+ <Point X="3" Y="1.5" />
+ </Path>
+ </InheritanceLine>
<TypeIdentifier>
- <HashCode>IAAAFAAAAIAAAAAAAACAAgAAAgAAIAQAAAAAoAAQAAA=</HashCode>
+ <HashCode>IAAAFAAAAIAAAAAAAACAAgAAAgAAIAQAAAAAIAAQAAA=</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" />
+ <Interface Name="DotNetOAuth.ChannelElements.ITamperResistantOAuthMessage">
+ <Position X="10.75" Y="6.25" Width="2.5" />
<TypeIdentifier>
- <HashCode>AIAAAAAAAAAAAAAAAIAAAhAAAAAAIAQAAAAAAAAAAAA=</HashCode>
+ <HashCode>AIAAAAAAAAAAAAAAAIAAAgAAAAAAIAQAAAAAAAAAAAA=</HashCode>
<FileName>ChannelElements\ITamperResistantOAuthMessage.cs</FileName>
</TypeIdentifier>
</Interface>
+ <Interface Name="DotNetOAuth.Messages.ITokenContainingMessage">
+ <Position X="1" Y="6" Width="2" />
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAA=</HashCode>
+ <FileName>Messages\ITokenContainingMessage.cs</FileName>
+ </TypeIdentifier>
+ </Interface>
<Font Name="Segoe UI" Size="9" />
</ClassDiagram>
\ No newline at end of file diff --git a/src/DotNetOAuth/ServiceProvider.cs b/src/DotNetOAuth/ServiceProvider.cs index 77a6186..f93599e 100644 --- a/src/DotNetOAuth/ServiceProvider.cs +++ b/src/DotNetOAuth/ServiceProvider.cs @@ -110,7 +110,7 @@ namespace DotNetOAuth { /// <remarks>
/// Requires HttpContext.Current.
/// </remarks>
- public RequestTokenMessage ReadTokenRequest() {
+ public GetRequestTokenMessage ReadTokenRequest() {
return this.ReadTokenRequest(this.Channel.GetRequestFromContext());
}
@@ -120,7 +120,7 @@ namespace DotNetOAuth { /// <param name="request">The incoming HTTP request.</param>
/// <returns>The incoming request, or null if no OAuth message was attached.</returns>
/// <exception cref="ProtocolException">Thrown if an unexpected OAuth message is attached to the incoming request.</exception>
- public RequestTokenMessage ReadTokenRequest(HttpRequest request) {
+ public GetRequestTokenMessage ReadTokenRequest(HttpRequest request) {
return this.ReadTokenRequest(new HttpRequestInfo(request));
}
@@ -131,10 +131,10 @@ namespace DotNetOAuth { /// <param name="request">The token request message the Consumer sent that the Service Provider is now responding to.</param>
/// <param name="extraParameters">Any extra parameters the Consumer should receive with the OAuth message. May be null.</param>
/// <returns>The actual response the Service Provider will need to forward as the HTTP response.</returns>
- public Response SendUnauthorizedTokenResponse(RequestTokenMessage request, IDictionary<string, string> extraParameters) {
+ public Response SendUnauthorizedTokenResponse(GetRequestTokenMessage request, IDictionary<string, string> extraParameters) {
string token = this.TokenGenerator.GenerateRequestToken(request.ConsumerKey);
string secret = this.TokenGenerator.GenerateSecret();
- UnauthorizedRequestTokenMessage response = new UnauthorizedRequestTokenMessage {
+ GrantRequestTokenMessage response = new GrantRequestTokenMessage {
RequestToken = token,
TokenSecret = secret,
};
@@ -199,7 +199,7 @@ namespace DotNetOAuth { /// <remarks>
/// Requires HttpContext.Current.
/// </remarks>
- public RequestAccessTokenMessage ReadAccessTokenRequest() {
+ public GetAccessTokenMessage ReadAccessTokenRequest() {
return this.ReadAccessTokenRequest(this.Channel.GetRequestFromContext());
}
@@ -209,7 +209,7 @@ namespace DotNetOAuth { /// <param name="request">The incoming HTTP request.</param>
/// <returns>The incoming request, or null if no OAuth message was attached.</returns>
/// <exception cref="ProtocolException">Thrown if an unexpected OAuth message is attached to the incoming request.</exception>
- public RequestAccessTokenMessage ReadAccessTokenRequest(HttpRequest request) {
+ public GetAccessTokenMessage ReadAccessTokenRequest(HttpRequest request) {
return this.ReadAccessTokenRequest(new HttpRequestInfo(request));
}
@@ -219,7 +219,7 @@ namespace DotNetOAuth { /// <param name="request">The Consumer's message requesting an access token.</param>
/// <param name="extraParameters">Any extra parameters the Consumer should receive with the OAuth message. May be null.</param>
/// <returns>The HTTP response to actually send to the Consumer.</returns>
- public Response SendAccessToken(RequestAccessTokenMessage request, IDictionary<string, string> extraParameters) {
+ public Response SendAccessToken(GetAccessTokenMessage request, IDictionary<string, string> extraParameters) {
if (request == null) {
throw new ArgumentNullException("request");
}
@@ -254,7 +254,7 @@ namespace DotNetOAuth { /// to access the resources being requested.
/// </remarks>
/// <exception cref="ProtocolException">Thrown if an unexpected message is attached to the request.</exception>
- public AccessProtectedResourcesMessage GetProtectedResourceAuthorization() {
+ public AccessProtectedResourceMessage GetProtectedResourceAuthorization() {
return this.GetProtectedResourceAuthorization(this.Channel.GetRequestFromContext());
}
@@ -269,7 +269,7 @@ namespace DotNetOAuth { /// to access the resources being requested.
/// </remarks>
/// <exception cref="ProtocolException">Thrown if an unexpected message is attached to the request.</exception>
- public AccessProtectedResourcesMessage GetProtectedResourceAuthorization(HttpRequest request) {
+ public AccessProtectedResourceMessage GetProtectedResourceAuthorization(HttpRequest request) {
return this.GetProtectedResourceAuthorization(new HttpRequestInfo(request));
}
@@ -285,7 +285,7 @@ namespace DotNetOAuth { /// to access the resources being requested.
/// </remarks>
/// <exception cref="ProtocolException">Thrown if an unexpected message is attached to the request.</exception>
- public AccessProtectedResourcesMessage GetProtectedResourceAuthorization(HttpRequestMessageProperty request, Uri requestUri) {
+ public AccessProtectedResourceMessage GetProtectedResourceAuthorization(HttpRequestMessageProperty request, Uri requestUri) {
return this.GetProtectedResourceAuthorization(new HttpRequestInfo(request, requestUri));
}
@@ -295,8 +295,8 @@ namespace DotNetOAuth { /// <param name="request">The HTTP request to read from.</param>
/// <returns>The incoming request, or null if no OAuth message was attached.</returns>
/// <exception cref="ProtocolException">Thrown if an unexpected OAuth message is attached to the incoming request.</exception>
- internal RequestTokenMessage ReadTokenRequest(HttpRequestInfo request) {
- RequestTokenMessage message;
+ internal GetRequestTokenMessage ReadTokenRequest(HttpRequestInfo request) {
+ GetRequestTokenMessage message;
this.Channel.TryReadFromRequest(request, out message);
return message;
}
@@ -320,8 +320,8 @@ namespace DotNetOAuth { /// <param name="request">The HTTP request to read from.</param>
/// <returns>The incoming request, or null if no OAuth message was attached.</returns>
/// <exception cref="ProtocolException">Thrown if an unexpected OAuth message is attached to the incoming request.</exception>
- internal RequestAccessTokenMessage ReadAccessTokenRequest(HttpRequestInfo request) {
- RequestAccessTokenMessage message;
+ internal GetAccessTokenMessage ReadAccessTokenRequest(HttpRequestInfo request) {
+ GetAccessTokenMessage message;
this.Channel.TryReadFromRequest(request, out message);
return message;
}
@@ -337,13 +337,13 @@ namespace DotNetOAuth { /// to access the resources being requested.
/// </remarks>
/// <exception cref="ProtocolException">Thrown if an unexpected message is attached to the request.</exception>
- internal AccessProtectedResourcesMessage GetProtectedResourceAuthorization(HttpRequestInfo request) {
+ internal AccessProtectedResourceMessage GetProtectedResourceAuthorization(HttpRequestInfo request) {
if (request == null) {
throw new ArgumentNullException("request");
}
- AccessProtectedResourcesMessage accessMessage;
- if (this.Channel.TryReadFromRequest<AccessProtectedResourcesMessage>(request, out accessMessage)) {
+ AccessProtectedResourceMessage accessMessage;
+ if (this.Channel.TryReadFromRequest<AccessProtectedResourceMessage>(request, out accessMessage)) {
if (this.TokenManager.GetTokenType(accessMessage.AccessToken) != TokenType.AccessToken) {
throw new ProtocolException(
string.Format(
diff --git a/src/DotNetOAuth/ServiceProviderDescription.cs b/src/DotNetOAuth/ServiceProviderDescription.cs index 56e5378..efb4290 100644 --- a/src/DotNetOAuth/ServiceProviderDescription.cs +++ b/src/DotNetOAuth/ServiceProviderDescription.cs @@ -33,7 +33,7 @@ namespace DotNetOAuth { /// </summary>
/// <remarks>
/// The request URL query MUST NOT contain any OAuth Protocol Parameters.
- /// This is the URL that <see cref="Messages.RequestTokenMessage"/> messages are directed to.
+ /// This is the URL that <see cref="Messages.GetRequestTokenMessage"/> messages are directed to.
/// </remarks>
/// <exception cref="ArgumentException">Thrown if this property is set to a URI with OAuth protocol parameters.</exception>
public MessageReceivingEndpoint RequestTokenEndpoint {
@@ -65,7 +65,7 @@ namespace DotNetOAuth { /// for an Access Token, described in Section 6.3 (Obtaining an Access Token).
/// </summary>
/// <remarks>
- /// This is the URL that <see cref="Messages.RequestAccessTokenMessage"/> messages are directed to.
+ /// This is the URL that <see cref="Messages.GetAccessTokenMessage"/> messages are directed to.
/// </remarks>
public MessageReceivingEndpoint AccessTokenEndpoint { get; set; }
|