diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs | 8 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/DotNetOpenAuth.csproj | 6 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs | 6 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceAccessTokenRequest.cs (renamed from src/DotNetOpenAuth/OAuthWrap/Messages/Device/RichAppAccessTokenRequest.cs) | 14 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceRequest.cs (renamed from src/DotNetOpenAuth/OAuthWrap/Messages/Device/RichAppRequest.cs) | 12 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceResponse.cs (renamed from src/DotNetOpenAuth/OAuthWrap/Messages/Device/RichAppResponse.cs) | 8 |
6 files changed, 27 insertions, 27 deletions
diff --git a/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs b/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs index a9a696b..3d83df5 100644 --- a/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs +++ b/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs @@ -187,7 +187,7 @@ namespace DotNetOpenAuth.Test.OAuthWrap { { Protocol.client_id, "abc" }, }; IDirectedProtocolMessage request = this.messageFactory.GetNewRequestMessage(this.recipient, fields); - Assert.IsInstanceOf(typeof(RichAppRequest), request); + Assert.IsInstanceOf(typeof(DeviceRequest), request); // including optional parts fields = new Dictionary<string, string> { @@ -197,7 +197,7 @@ namespace DotNetOpenAuth.Test.OAuthWrap { { Protocol.scope, "abc" }, }; request = this.messageFactory.GetNewRequestMessage(this.recipient, fields); - Assert.IsInstanceOf(typeof(RichAppRequest), request); + Assert.IsInstanceOf(typeof(DeviceRequest), request); } [TestCase] @@ -207,7 +207,7 @@ namespace DotNetOpenAuth.Test.OAuthWrap { { Protocol.access_token, "abc" }, }; IDirectedProtocolMessage request = this.messageFactory.GetNewRequestMessage(this.recipient, fields); - Assert.IsInstanceOf(typeof(RichAppResponse), request); + Assert.IsInstanceOf(typeof(DeviceResponse), request); } [TestCase] @@ -218,7 +218,7 @@ namespace DotNetOpenAuth.Test.OAuthWrap { { Protocol.code, "abc" }, }; IDirectedProtocolMessage request = this.messageFactory.GetNewRequestMessage(this.recipient, fields); - Assert.IsInstanceOf(typeof(RichAppAccessTokenRequest), request); + Assert.IsInstanceOf(typeof(DeviceAccessTokenRequest), request); } #endregion diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj index 1ba2f20..d151076 100644 --- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj +++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj @@ -336,9 +336,9 @@ http://opensource.org/licenses/ms-pl.html <Compile Include="OAuthWrap\Messages\IOAuthDirectResponseFormat.cs" /> <Compile Include="OAuthWrap\Messages\IRequestWithRedirectUri.cs" /> <Compile Include="OAuthWrap\Messages\RefreshAccessTokenRequest.cs" /> - <Compile Include="OAuthWrap\Messages\Device\RichAppAccessTokenRequest.cs" /> - <Compile Include="OAuthWrap\Messages\Device\RichAppRequest.cs" /> - <Compile Include="OAuthWrap\Messages\Device\RichAppResponse.cs" /> + <Compile Include="OAuthWrap\Messages\Device\DeviceAccessTokenRequest.cs" /> + <Compile Include="OAuthWrap\Messages\Device\DeviceRequest.cs" /> + <Compile Include="OAuthWrap\Messages\Device\DeviceResponse.cs" /> <Compile Include="OAuthWrap\Messages\UnauthorizedResponse.cs" /> <Compile Include="OAuthWrap\Messages\AccessTokenFailedResponse.cs" /> <Compile Include="OAuthWrap\Messages\AccessTokenSuccessResponse.cs" /> diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs index 702c29a..25f3bd9 100644 --- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs +++ b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs @@ -32,9 +32,9 @@ namespace DotNetOpenAuth.OAuthWrap.ChannelElements { typeof(Messages.UnauthorizedResponse), typeof(Messages.AssertionRequest), typeof(Messages.ClientCredentialsRequest), - typeof(Messages.RichAppRequest), - typeof(Messages.RichAppResponse), - typeof(Messages.RichAppAccessTokenRequest), + typeof(Messages.DeviceRequest), + typeof(Messages.DeviceResponse), + typeof(Messages.DeviceAccessTokenRequest), typeof(Messages.UserNamePasswordRequest), typeof(Messages.UserNamePasswordSuccessResponse), typeof(Messages.UserNamePasswordVerificationResponse), diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/RichAppAccessTokenRequest.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceAccessTokenRequest.cs index ee0deb7..010e80a 100644 --- a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/RichAppAccessTokenRequest.cs +++ b/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceAccessTokenRequest.cs @@ -1,5 +1,5 @@ //----------------------------------------------------------------------- -// <copyright file="RichAppAccessTokenRequest.cs" company="Andrew Arnott"> +// <copyright file="DeviceAccessTokenRequest.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. // </copyright> //----------------------------------------------------------------------- @@ -17,25 +17,25 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { /// A message from the Client to the Authorization Server exchanging a /// verification code for refresh and access tokens. /// </summary> - internal class RichAppAccessTokenRequest : MessageBase, IAccessTokenRequest, IOAuthDirectResponseFormat { + internal class DeviceAccessTokenRequest : MessageBase, IAccessTokenRequest, IOAuthDirectResponseFormat { [MessagePart(Protocol.type, IsRequired = true)] private const string MessageType = "device_token"; /// <summary> - /// Initializes a new instance of the <see cref="RichAppAccessTokenRequest"/> class. + /// Initializes a new instance of the <see cref="DeviceAccessTokenRequest"/> class. /// </summary> /// <param name="authorizationServer">The authorization server.</param> /// <param name="version">The version.</param> - internal RichAppAccessTokenRequest(Uri authorizationServer, Version version) + internal DeviceAccessTokenRequest(Uri authorizationServer, Version version) : base(version, MessageTransport.Direct, authorizationServer) { this.HttpMethods = HttpDeliveryMethods.PostRequest; } /// <summary> - /// Initializes a new instance of the <see cref="RichAppAccessTokenRequest"/> class. + /// Initializes a new instance of the <see cref="DeviceAccessTokenRequest"/> class. /// </summary> /// <param name="authorizationServer">The authorization server.</param> - internal RichAppAccessTokenRequest(AuthorizationServerDescription authorizationServer) + internal DeviceAccessTokenRequest(AuthorizationServerDescription authorizationServer) : this(authorizationServer.TokenEndpoint, authorizationServer.Version) { Contract.Requires<ArgumentNullException>(authorizationServer != null); Contract.Requires<ArgumentException>(authorizationServer.Version != null); @@ -58,7 +58,7 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { /// <summary> /// Gets or sets the verification code previously communicated to the Client - /// in <see cref="RichAppResponse.VerificationCode"/>. + /// in <see cref="DeviceResponse.VerificationCode"/>. /// </summary> /// <value>The verification code.</value> [MessagePart(Protocol.code, IsRequired = true, AllowEmpty = false)] diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/RichAppRequest.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceRequest.cs index d6ee485..836ea0d 100644 --- a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/RichAppRequest.cs +++ b/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceRequest.cs @@ -1,5 +1,5 @@ //----------------------------------------------------------------------- -// <copyright file="RichAppRequest.cs" company="Andrew Arnott"> +// <copyright file="DeviceRequest.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. // </copyright> //----------------------------------------------------------------------- @@ -16,25 +16,25 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { /// A request from a rich app Client to an Authorization Server requested /// authorization to access user Protected Data. /// </summary> - internal class RichAppRequest : MessageBase, IOAuthDirectResponseFormat { + internal class DeviceRequest : MessageBase, IOAuthDirectResponseFormat { [MessagePart(Protocol.type, IsRequired = true)] private const string MessageType = "device_code"; /// <summary> - /// Initializes a new instance of the <see cref="RichAppRequest"/> class. + /// Initializes a new instance of the <see cref="DeviceRequest"/> class. /// </summary> /// <param name="tokenEndpoint">The authorization server.</param> /// <param name="version">The version.</param> - internal RichAppRequest(Uri tokenEndpoint, Version version) + internal DeviceRequest(Uri tokenEndpoint, Version version) : base(version, MessageTransport.Direct, tokenEndpoint) { this.HttpMethods = HttpDeliveryMethods.GetRequest; } /// <summary> - /// Initializes a new instance of the <see cref="RichAppRequest"/> class. + /// Initializes a new instance of the <see cref="DeviceRequest"/> class. /// </summary> /// <param name="authorizationServer">The authorization server.</param> - internal RichAppRequest(AuthorizationServerDescription authorizationServer) + internal DeviceRequest(AuthorizationServerDescription authorizationServer) : this(authorizationServer.TokenEndpoint, authorizationServer.Version) { Contract.Requires<ArgumentNullException>(authorizationServer != null); Contract.Requires<ArgumentException>(authorizationServer.Version != null); diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/RichAppResponse.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceResponse.cs index 98a7b6e..783ddaa 100644 --- a/src/DotNetOpenAuth/OAuthWrap/Messages/Device/RichAppResponse.cs +++ b/src/DotNetOpenAuth/OAuthWrap/Messages/Device/DeviceResponse.cs @@ -1,5 +1,5 @@ //----------------------------------------------------------------------- -// <copyright file="RichAppResponse.cs" company="Andrew Arnott"> +// <copyright file="DeviceResponse.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. // </copyright> //----------------------------------------------------------------------- @@ -15,12 +15,12 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { /// An indirect response from the Authorization Server to the rich app Client /// with the verification code. /// </summary> - internal class RichAppResponse : MessageBase { + internal class DeviceResponse : MessageBase { /// <summary> - /// Initializes a new instance of the <see cref="RichAppResponse"/> class. + /// Initializes a new instance of the <see cref="DeviceResponse"/> class. /// </summary> /// <param name="request">The request.</param> - internal RichAppResponse(RichAppRequest request) + internal DeviceResponse(DeviceRequest request) : base(request) { } |