diff options
Diffstat (limited to 'src')
10 files changed, 65 insertions, 65 deletions
diff --git a/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs b/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs index 3d83df5..827027e 100644 --- a/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs +++ b/src/DotNetOpenAuth.Test/OAuthWrap/MessageFactoryTests.cs @@ -73,7 +73,7 @@ namespace DotNetOpenAuth.Test.OAuthWrap { { Protocol.redirect_uri, "abc" }, }; IDirectedProtocolMessage request = this.messageFactory.GetNewRequestMessage(this.recipient, fields); - Assert.IsInstanceOf(typeof(WebAppRequest), request); + Assert.IsInstanceOf(typeof(WebServerRequest), request); } [TestCase] @@ -81,9 +81,9 @@ namespace DotNetOpenAuth.Test.OAuthWrap { var fields = new Dictionary<string, string> { { Protocol.error, "user_denied" }, }; - var request = new WebAppRequest(this.recipient.Location, Protocol.Default.Version); + var request = new WebServerRequest(this.recipient.Location, Protocol.Default.Version); Assert.IsInstanceOf( - typeof(WebAppFailedResponse), + typeof(WebServerFailedResponse), this.messageFactory.GetNewResponseMessage(request, fields)); } @@ -92,9 +92,9 @@ namespace DotNetOpenAuth.Test.OAuthWrap { var fields = new Dictionary<string, string> { { Protocol.code, "abc" }, }; - var request = new WebAppRequest(this.recipient.Location, Protocol.Default.Version); + var request = new WebServerRequest(this.recipient.Location, Protocol.Default.Version); Assert.IsInstanceOf( - typeof(WebAppSuccessResponse), + typeof(WebServerSuccessResponse), this.messageFactory.GetNewResponseMessage(request, fields)); } @@ -107,7 +107,7 @@ namespace DotNetOpenAuth.Test.OAuthWrap { { Protocol.redirect_uri, "abc" }, }; IDirectedProtocolMessage request = this.messageFactory.GetNewRequestMessage(this.recipient, fields); - Assert.IsInstanceOf(typeof(WebAppAccessTokenRequest), request); + Assert.IsInstanceOf(typeof(WebServerAccessTokenRequest), request); } [TestCase, Ignore("Not implemented")] diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj index d151076..ba776b6 100644 --- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj +++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj @@ -643,10 +643,10 @@ http://opensource.org/licenses/ms-pl.html <Compile Include="OAuthWrap\ChannelElements\OAuthWrapAuthorizationServerChannel.cs" /> <Compile Include="OAuthWrap\ClientBase.cs" /> <Compile Include="OAuthWrap\Messages\MessageBase.cs" /> - <Compile Include="OAuthWrap\Messages\WebServer\WebAppAccessTokenRequest.cs" /> - <Compile Include="OAuthWrap\Messages\WebServer\WebAppFailedResponse.cs" /> - <Compile Include="OAuthWrap\Messages\WebServer\WebAppRequest.cs" /> - <Compile Include="OAuthWrap\Messages\WebServer\WebAppSuccessResponse.cs" /> + <Compile Include="OAuthWrap\Messages\WebServer\WebServerAccessTokenRequest.cs" /> + <Compile Include="OAuthWrap\Messages\WebServer\WebServerFailedResponse.cs" /> + <Compile Include="OAuthWrap\Messages\WebServer\WebServerRequest.cs" /> + <Compile Include="OAuthWrap\Messages\WebServer\WebServerSuccessResponse.cs" /> <Compile Include="OAuthWrap\Messages\UsernameAndPassword\UserNamePasswordFailedResponse.cs" /> <Compile Include="OAuthWrap\Messages\UsernameAndPassword\UserNamePasswordRequest.cs" /> <Compile Include="OAuthWrap\Messages\UsernameAndPassword\UserNamePasswordSuccessResponse.cs" /> diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs index 25f3bd9..4b7b472 100644 --- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs +++ b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/OAuthWrapAuthorizationServerChannel.cs @@ -40,10 +40,10 @@ namespace DotNetOpenAuth.OAuthWrap.ChannelElements { typeof(Messages.UserNamePasswordVerificationResponse), typeof(Messages.UserNamePasswordFailedResponse), typeof(Messages.UsernamePasswordCaptchaResponse), - typeof(Messages.WebAppRequest), - typeof(Messages.WebAppSuccessResponse), - typeof(Messages.WebAppFailedResponse), - typeof(Messages.WebAppAccessTokenRequest), + typeof(Messages.WebServerRequest), + typeof(Messages.WebServerSuccessResponse), + typeof(Messages.WebServerFailedResponse), + typeof(Messages.WebServerAccessTokenRequest), typeof(Messages.UserAgentRequest), typeof(Messages.UserAgentSuccessResponse), typeof(Messages.UserAgentFailedResponse), diff --git a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/WebAppVerificationCodeBindingElement.cs b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/WebAppVerificationCodeBindingElement.cs index 11f028a..585e02f 100644 --- a/src/DotNetOpenAuth/OAuthWrap/ChannelElements/WebAppVerificationCodeBindingElement.cs +++ b/src/DotNetOpenAuth/OAuthWrap/ChannelElements/WebAppVerificationCodeBindingElement.cs @@ -48,10 +48,10 @@ namespace DotNetOpenAuth.OAuthWrap.ChannelElements { /// <see cref="MessagePartAttribute.RequiredProtection"/> properties where applicable. /// </remarks> public override MessageProtections? ProcessOutgoingMessage(IProtocolMessage message) { - var response = message as WebAppSuccessResponse; + var response = message as WebServerSuccessResponse; if (response != null) { var directResponse = (IDirectResponseProtocolMessage)response; - var request = (WebAppRequest)directResponse.OriginatingRequest; + var request = (WebServerRequest)directResponse.OriginatingRequest; ITokenCarryingRequest tokenCarryingResponse = response; tokenCarryingResponse.AuthorizationDescription = new VerificationCode(this.AuthorizationServer.Secret, this.AuthorizationServer.VerificationCodeNonceStore, request.ClientIdentifier, request.Callback, request.Scope, response.AuthorizingUsername); @@ -79,7 +79,7 @@ namespace DotNetOpenAuth.OAuthWrap.ChannelElements { /// <see cref="MessagePartAttribute.RequiredProtection"/> properties where applicable. /// </remarks> public override MessageProtections? ProcessIncomingMessage(IProtocolMessage message) { - var request = message as WebAppAccessTokenRequest; + var request = message as WebServerAccessTokenRequest; if (request != null) { ITokenCarryingRequest tokenRequest = request; ((VerificationCode)tokenRequest.AuthorizationDescription).VerifyCallback(request.Callback); diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebAppAccessTokenRequest.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerAccessTokenRequest.cs index ccfc8a3..ff5eb9a 100644 --- a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebAppAccessTokenRequest.cs +++ b/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerAccessTokenRequest.cs @@ -1,5 +1,5 @@ //----------------------------------------------------------------------- -// <copyright file="WebAppAccessTokenRequest.cs" company="Andrew Arnott"> +// <copyright file="WebServerAccessTokenRequest.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. // </copyright> //----------------------------------------------------------------------- @@ -18,7 +18,7 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { /// <remarks> /// Used by the Web App (and Rich App?) profiles. /// </remarks> - internal class WebAppAccessTokenRequest : MessageBase, IAccessTokenRequest, ITokenCarryingRequest, IOAuthDirectResponseFormat { + internal class WebServerAccessTokenRequest : MessageBase, IAccessTokenRequest, ITokenCarryingRequest, IOAuthDirectResponseFormat { /// <summary> /// The type of message. /// </summary> @@ -26,20 +26,20 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { private const string Type = "web_server"; /// <summary> - /// Initializes a new instance of the <see cref="WebAppAccessTokenRequest"/> class. + /// Initializes a new instance of the <see cref="WebServerAccessTokenRequest"/> class. /// </summary> /// <param name="accessTokenEndpoint">The Authorization Server's access token endpoint URL.</param> /// <param name="version">The version.</param> - internal WebAppAccessTokenRequest(Uri accessTokenEndpoint, Version version) + internal WebServerAccessTokenRequest(Uri accessTokenEndpoint, Version version) : base(version, MessageTransport.Direct, accessTokenEndpoint) { this.HttpMethods = HttpDeliveryMethods.PostRequest; } /// <summary> - /// Initializes a new instance of the <see cref="WebAppAccessTokenRequest"/> class. + /// Initializes a new instance of the <see cref="WebServerAccessTokenRequest"/> class. /// </summary> /// <param name="authorizationServer">The authorization server.</param> - internal WebAppAccessTokenRequest(AuthorizationServerDescription authorizationServer) + internal WebServerAccessTokenRequest(AuthorizationServerDescription authorizationServer) : this(authorizationServer.TokenEndpoint, authorizationServer.Version) { Contract.Requires<ArgumentNullException>(authorizationServer != null); Contract.Requires<ArgumentException>(authorizationServer.Version != null); @@ -79,14 +79,14 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { /// <summary> /// Gets or sets the verification code previously communicated to the Client - /// in <see cref="WebAppSuccessResponse.VerificationCode"/>. + /// in <see cref="WebServerSuccessResponse.VerificationCode"/>. /// </summary> /// <value>The verification code received from the authorization server.</value> [MessagePart(Protocol.code, IsRequired = true, AllowEmpty = false)] internal string VerificationCode { get; set; } /// <summary> - /// Gets or sets the callback URL used in <see cref="WebAppRequest.Callback"/> + /// Gets or sets the callback URL used in <see cref="WebServerRequest.Callback"/> /// </summary> /// <value> /// The Callback URL used to obtain the Verification Code. diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebAppFailedResponse.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerFailedResponse.cs index e29da23..8cb1cb0 100644 --- a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebAppFailedResponse.cs +++ b/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerFailedResponse.cs @@ -1,5 +1,5 @@ //----------------------------------------------------------------------- -// <copyright file="WebAppFailedResponse.cs" company="Andrew Arnott"> +// <copyright file="WebServerFailedResponse.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. // </copyright> //----------------------------------------------------------------------- @@ -14,7 +14,7 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { /// following the user's denial to grant Consumer with authorization of /// access to requested resources. /// </summary> - internal class WebAppFailedResponse : MessageBase, IMessageWithClientState { + internal class WebServerFailedResponse : MessageBase, IMessageWithClientState { /// <summary> /// A constant parameter that indicates the user refused to grant the requested authorization. /// </summary> @@ -22,22 +22,22 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { private const string ErrorReason = Protocol.user_denied; /// <summary> - /// Initializes a new instance of the <see cref="WebAppFailedResponse"/> class. + /// Initializes a new instance of the <see cref="WebServerFailedResponse"/> class. /// </summary> /// <param name="clientCallback">The recipient of the message.</param> /// <param name="version">The version.</param> - internal WebAppFailedResponse(Uri clientCallback, Version version) : + internal WebServerFailedResponse(Uri clientCallback, Version version) : base(version, MessageTransport.Indirect, clientCallback) { Contract.Requires<ArgumentNullException>(version != null); Contract.Requires<ArgumentNullException>(clientCallback != null); } /// <summary> - /// Initializes a new instance of the <see cref="WebAppFailedResponse"/> class. + /// Initializes a new instance of the <see cref="WebServerFailedResponse"/> class. /// </summary> /// <param name="clientCallback">The client callback.</param> /// <param name="request">The request.</param> - internal WebAppFailedResponse(Uri clientCallback, WebAppRequest request) + internal WebServerFailedResponse(Uri clientCallback, WebServerRequest request) : this(clientCallback, ((IMessage)request).Version) { Contract.Requires<ArgumentNullException>(clientCallback != null, "clientCallback"); Contract.Requires<ArgumentNullException>(request != null, "request"); diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebAppRequest.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerRequest.cs index 14c99d9..dc0332d 100644 --- a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebAppRequest.cs +++ b/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerRequest.cs @@ -1,5 +1,5 @@ //----------------------------------------------------------------------- -// <copyright file="WebAppRequest.cs" company="Andrew Arnott"> +// <copyright file="WebServerRequest.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. // </copyright> //----------------------------------------------------------------------- @@ -15,7 +15,7 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { /// to issue an access token to the Consumer if permission is granted. /// </summary> [Serializable] - public class WebAppRequest : MessageBase, IMessageWithClientState, IRequestWithRedirectUri { + public class WebServerRequest : MessageBase, IMessageWithClientState, IRequestWithRedirectUri { /// <summary> /// The type of message. /// </summary> @@ -25,11 +25,11 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { #pragma warning restore 169 /// <summary> - /// Initializes a new instance of the <see cref="WebAppRequest"/> class. + /// Initializes a new instance of the <see cref="WebServerRequest"/> class. /// </summary> /// <param name="authorizationEndpoint">The Authorization Server's user authorization URL to direct the user to.</param> /// <param name="version">The protocol version.</param> - internal WebAppRequest(Uri authorizationEndpoint, Version version) + internal WebServerRequest(Uri authorizationEndpoint, Version version) : base(version, MessageTransport.Indirect, authorizationEndpoint) { Contract.Requires<ArgumentNullException>(authorizationEndpoint != null); Contract.Requires<ArgumentNullException>(version != null); @@ -37,10 +37,10 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { } /// <summary> - /// Initializes a new instance of the <see cref="WebAppRequest"/> class. + /// Initializes a new instance of the <see cref="WebServerRequest"/> class. /// </summary> /// <param name="authorizationServer">The authorization server.</param> - internal WebAppRequest(AuthorizationServerDescription authorizationServer) + internal WebServerRequest(AuthorizationServerDescription authorizationServer) : this(authorizationServer.AuthorizationEndpoint, authorizationServer.Version) { Contract.Requires<ArgumentNullException>(authorizationServer != null); Contract.Requires<ArgumentException>(authorizationServer.Version != null); diff --git a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebAppSuccessResponse.cs b/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerSuccessResponse.cs index 277653e..4f86d9b 100644 --- a/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebAppSuccessResponse.cs +++ b/src/DotNetOpenAuth/OAuthWrap/Messages/WebServer/WebServerSuccessResponse.cs @@ -1,5 +1,5 @@ //----------------------------------------------------------------------- -// <copyright file="WebAppSuccessResponse.cs" company="Andrew Arnott"> +// <copyright file="WebServerSuccessResponse.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. // </copyright> //----------------------------------------------------------------------- @@ -15,24 +15,24 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { /// to indicate that user authorization was granted, and to return the user /// to the Client where they started their experience. /// </summary> - internal class WebAppSuccessResponse : MessageBase, IMessageWithClientState, ITokenCarryingRequest { + internal class WebServerSuccessResponse : MessageBase, IMessageWithClientState, ITokenCarryingRequest { /// <summary> - /// Initializes a new instance of the <see cref="WebAppSuccessResponse"/> class. + /// Initializes a new instance of the <see cref="WebServerSuccessResponse"/> class. /// </summary> /// <param name="clientCallback">The client callback.</param> /// <param name="version">The protocol version.</param> - internal WebAppSuccessResponse(Uri clientCallback, Version version) + internal WebServerSuccessResponse(Uri clientCallback, Version version) : base(version, MessageTransport.Indirect, clientCallback) { Contract.Requires<ArgumentNullException>(version != null); Contract.Requires<ArgumentNullException>(clientCallback != null); } /// <summary> - /// Initializes a new instance of the <see cref="WebAppSuccessResponse"/> class. + /// Initializes a new instance of the <see cref="WebServerSuccessResponse"/> class. /// </summary> /// <param name="clientCallback">The client callback.</param> /// <param name="request">The request.</param> - internal WebAppSuccessResponse(Uri clientCallback, WebAppRequest request) + internal WebServerSuccessResponse(Uri clientCallback, WebServerRequest request) : base(request, clientCallback) { Contract.Requires<ArgumentNullException>(clientCallback != null, "clientCallback"); Contract.Requires<ArgumentNullException>(request != null, "request"); @@ -55,7 +55,7 @@ namespace DotNetOpenAuth.OAuthWrap.Messages { /// </summary> /// <value>An opaque value defined by the client.</value> /// <remarks> - /// REQUIRED if the Client sent the value in the <see cref="WebAppRequest"/>. + /// REQUIRED if the Client sent the value in the <see cref="WebServerRequest"/>. /// </remarks> [MessagePart(Protocol.state, IsRequired = false, AllowEmpty = true)] string IMessageWithClientState.ClientState { get; set; } diff --git a/src/DotNetOpenAuth/OAuthWrap/WebAppAuthorizationServer.cs b/src/DotNetOpenAuth/OAuthWrap/WebAppAuthorizationServer.cs index 6fe36ef..b4efb4f 100644 --- a/src/DotNetOpenAuth/OAuthWrap/WebAppAuthorizationServer.cs +++ b/src/DotNetOpenAuth/OAuthWrap/WebAppAuthorizationServer.cs @@ -32,17 +32,17 @@ namespace DotNetOpenAuth.OAuthWrap { /// <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> - public WebAppRequest ReadAuthorizationRequest(HttpRequestInfo request = null) { + public WebServerRequest ReadAuthorizationRequest(HttpRequestInfo request = null) { if (request == null) { request = this.Channel.GetRequestFromContext(); } - WebAppRequest message; + WebServerRequest message; this.Channel.TryReadFromRequest(request, out message); return message; } - public void ApproveAuthorizationRequest(WebAppRequest authorizationRequest, string username, Uri callback = null) { + public void ApproveAuthorizationRequest(WebServerRequest authorizationRequest, string username, Uri callback = null) { Contract.Requires<ArgumentNullException>(authorizationRequest != null, "authorizationRequest"); var response = this.PrepareApproveAuthorizationRequest(authorizationRequest, callback); @@ -50,7 +50,7 @@ namespace DotNetOpenAuth.OAuthWrap { this.Channel.Send(response); } - public void RejectAuthorizationRequest(WebAppRequest authorizationRequest, Uri callback = null) { + public void RejectAuthorizationRequest(WebServerRequest authorizationRequest, Uri callback = null) { Contract.Requires<ArgumentNullException>(authorizationRequest != null, "authorizationRequest"); var response = this.PrepareRejectAuthorizationRequest(authorizationRequest, callback); @@ -89,32 +89,32 @@ namespace DotNetOpenAuth.OAuthWrap { return request; } - internal WebAppFailedResponse PrepareRejectAuthorizationRequest(WebAppRequest authorizationRequest, Uri callback = null) { + internal WebServerFailedResponse PrepareRejectAuthorizationRequest(WebServerRequest authorizationRequest, Uri callback = null) { Contract.Requires<ArgumentNullException>(authorizationRequest != null, "authorizationRequest"); - Contract.Ensures(Contract.Result<WebAppFailedResponse>() != null); + Contract.Ensures(Contract.Result<WebServerFailedResponse>() != null); if (callback == null) { callback = this.GetCallback(authorizationRequest); } - var response = new WebAppFailedResponse(callback, authorizationRequest); + var response = new WebServerFailedResponse(callback, authorizationRequest); return response; } - internal WebAppSuccessResponse PrepareApproveAuthorizationRequest(WebAppRequest authorizationRequest, Uri callback = null) { + internal WebServerSuccessResponse PrepareApproveAuthorizationRequest(WebServerRequest authorizationRequest, Uri callback = null) { Contract.Requires<ArgumentNullException>(authorizationRequest != null, "authorizationRequest"); - Contract.Ensures(Contract.Result<WebAppSuccessResponse>() != null); + Contract.Ensures(Contract.Result<WebServerSuccessResponse>() != null); if (callback == null) { callback = this.GetCallback(authorizationRequest); } var client = this.AuthorizationServer.GetClientOrThrow(authorizationRequest.ClientIdentifier); - var response = new WebAppSuccessResponse(callback, authorizationRequest); + var response = new WebServerSuccessResponse(callback, authorizationRequest); return response; } - protected Uri GetCallback(WebAppRequest authorizationRequest) { + protected Uri GetCallback(WebServerRequest authorizationRequest) { Contract.Requires<ArgumentNullException>(authorizationRequest != null, "authorizationRequest"); Contract.Ensures(Contract.Result<Uri>() != null); diff --git a/src/DotNetOpenAuth/OAuthWrap/WebAppClient.cs b/src/DotNetOpenAuth/OAuthWrap/WebAppClient.cs index 865bf3c..3e10da3 100644 --- a/src/DotNetOpenAuth/OAuthWrap/WebAppClient.cs +++ b/src/DotNetOpenAuth/OAuthWrap/WebAppClient.cs @@ -29,25 +29,25 @@ namespace DotNetOpenAuth.OAuthWrap { public IClientTokenManager TokenManager { get; set; } - public WebAppRequest PrepareRequestUserAuthorization() { + public WebServerRequest PrepareRequestUserAuthorization() { return this.PrepareRequestUserAuthorization(new AuthorizationState()); } - public WebAppRequest PrepareRequestUserAuthorization(IAuthorizationState authorization) { + public WebServerRequest PrepareRequestUserAuthorization(IAuthorizationState authorization) { Contract.Requires<ArgumentNullException>(authorization != null); Contract.Requires<InvalidOperationException>(authorization.Callback != null || (HttpContext.Current != null && HttpContext.Current.Request != null), MessagingStrings.HttpContextRequired); Contract.Requires<InvalidOperationException>(!string.IsNullOrEmpty(this.ClientIdentifier)); - Contract.Ensures(Contract.Result<WebAppRequest>() != null); - Contract.Ensures(Contract.Result<WebAppRequest>().ClientIdentifier == this.ClientIdentifier); - Contract.Ensures(Contract.Result<WebAppRequest>().Callback == authorization.Callback); + Contract.Ensures(Contract.Result<WebServerRequest>() != null); + Contract.Ensures(Contract.Result<WebServerRequest>().ClientIdentifier == this.ClientIdentifier); + Contract.Ensures(Contract.Result<WebServerRequest>().Callback == authorization.Callback); if (authorization.Callback == null) { authorization.Callback = this.Channel.GetRequestFromContext().UrlBeforeRewriting - .StripMessagePartsFromQueryString(this.Channel.MessageDescriptions.Get(typeof(WebAppSuccessResponse), Protocol.Default.Version)); + .StripMessagePartsFromQueryString(this.Channel.MessageDescriptions.Get(typeof(WebServerSuccessResponse), Protocol.Default.Version)); authorization.SaveChanges(); } - var request = new WebAppRequest(this.AuthorizationServer) { + var request = new WebServerRequest(this.AuthorizationServer) { ClientIdentifier = this.ClientIdentifier, Callback = authorization.Callback, Scope = authorization.Scope, @@ -70,11 +70,11 @@ namespace DotNetOpenAuth.OAuthWrap { Uri callback = MessagingUtilities.StripMessagePartsFromQueryString(request.UrlBeforeRewriting, this.Channel.MessageDescriptions.Get(response)); IAuthorizationState authorizationState = this.TokenManager.GetAuthorizationState(callback, response.ClientState); ErrorUtilities.VerifyProtocol(authorizationState != null, "Unexpected OAuth authorization response received with callback and client state that does not match an expected value."); - var success = response as WebAppSuccessResponse; - var failure = response as WebAppFailedResponse; + var success = response as WebServerSuccessResponse; + var failure = response as WebServerFailedResponse; ErrorUtilities.VerifyProtocol(success != null || failure != null, MessagingStrings.UnexpectedMessageReceivedOfMany); if (success != null) { - var accessTokenRequest = new WebAppAccessTokenRequest(this.AuthorizationServer) { + var accessTokenRequest = new WebServerAccessTokenRequest(this.AuthorizationServer) { ClientIdentifier = this.ClientIdentifier, ClientSecret = this.ClientSecret, Callback = authorizationState.Callback, |