Renamed all the OAuth message types.

7 files changed, 11 insertions, 11 deletions

diff --git a/samples/Consumer/App_Code/InMemoryTokenManager.cs b/samples/Consumer/App_Code/InMemoryTokenManager.cs
index 89400c0..7312c2e 100644
--- a/samples/Consumer/App_Code/InMemoryTokenManager.cs
+++ b/samples/Consumer/App_Code/InMemoryTokenManager.cs
@@ -36,7 +36,7 @@ public class InMemoryTokenManager : ITokenManager {
 		return this.tokensAndSecrets[token];

 	}

 

-	public void StoreNewRequestToken(GetRequestTokenMessage request, ITokenSecretContainingMessage response) {

+	public void StoreNewRequestToken(UnauthorizedTokenRequest request, ITokenSecretContainingMessage response) {

 		this.tokensAndSecrets[response.Token] = response.TokenSecret;

 	}

 

diff --git a/samples/ConsumerWpf/InMemoryTokenManager.cs b/samples/ConsumerWpf/InMemoryTokenManager.cs
index 5be2626..b29d2e0 100644
--- a/samples/ConsumerWpf/InMemoryTokenManager.cs
+++ b/samples/ConsumerWpf/InMemoryTokenManager.cs
@@ -35,7 +35,7 @@ namespace DotNetOAuth.Samples.ConsumerWpf {
 			return this.tokensAndSecrets[token];

 		}

 

-		public void StoreNewRequestToken(GetRequestTokenMessage request, ITokenSecretContainingMessage response) {

+		public void StoreNewRequestToken(UnauthorizedTokenRequest request, ITokenSecretContainingMessage response) {

 			this.tokensAndSecrets[response.Token] = response.TokenSecret;

 		}

 

diff --git a/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs b/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs
index c1773a5..98eae68 100644
--- a/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs
+++ b/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs
@@ -21,7 +21,7 @@ public class CustomOAuthTypeProvider : OAuthServiceProviderMessageTypeProvider {
 		Type type = base.GetRequestMessageType(fields);

 

 		// inject our own type here to replace the standard one

-		if (type == typeof(GetRequestTokenMessage)) {

+		if (type == typeof(UnauthorizedTokenRequest)) {

 			type = typeof(RequestScopedTokenMessage);

 		}

 

diff --git a/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs b/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs
index f5f7d39..2a0e265 100644
--- a/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs
+++ b/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs
@@ -34,7 +34,7 @@ public class DatabaseTokenManager : ITokenManager {
 		return tokenRow.TokenSecret;

 	}

 

-	public void StoreNewRequestToken(GetRequestTokenMessage request, ITokenSecretContainingMessage response) {

+	public void StoreNewRequestToken(UnauthorizedTokenRequest request, ITokenSecretContainingMessage response) {

 		RequestScopedTokenMessage scopedRequest = (RequestScopedTokenMessage)request;

 		var consumer = Global.DataContext.OAuthConsumers.Single(consumerRow => consumerRow.ConsumerKey == request.ConsumerKey);

 		string scope = scopedRequest.Scope;

diff --git a/samples/ServiceProvider/App_Code/Global.cs b/samples/ServiceProvider/App_Code/Global.cs
index 7e8d92d..aa0d738 100644
--- a/samples/ServiceProvider/App_Code/Global.cs
+++ b/samples/ServiceProvider/App_Code/Global.cs
@@ -42,8 +42,8 @@ public class Global : HttpApplication {
 		get { return Global.DataContext.Users.SingleOrDefault(user => user.OpenIDClaimedIdentifier == HttpContext.Current.User.Identity.Name); }

 	}

 

-	public static DirectUserToServiceProviderMessage PendingOAuthAuthorization {

-		get { return HttpContext.Current.Session["authrequest"] as DirectUserToServiceProviderMessage; }

+	public static UserAuthorizationRequest PendingOAuthAuthorization {

+		get { return HttpContext.Current.Session["authrequest"] as UserAuthorizationRequest; }

 		set { HttpContext.Current.Session["authrequest"] = value; }

 	}

 

diff --git a/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs b/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs
index afd35c9..fa23dc2 100644
--- a/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs
+++ b/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs
@@ -4,7 +4,7 @@ using DotNetOAuth.Messaging;
 /// <summary>

 /// A custom web app version of the message sent to request an unauthorized token.

 /// </summary>

-public class RequestScopedTokenMessage : GetRequestTokenMessage {

+public class RequestScopedTokenMessage : UnauthorizedTokenRequest {

 	/// <summary>

 	/// Initializes a new instance of the <see cref="RequestScopedTokenMessage"/> class.

 	/// </summary>

diff --git a/samples/ServiceProvider/OAuth.ashx b/samples/ServiceProvider/OAuth.ashx
index 6de26ef..2577b9a 100644
--- a/samples/ServiceProvider/OAuth.ashx
+++ b/samples/ServiceProvider/OAuth.ashx
@@ -19,15 +19,15 @@ public class OAuth : IHttpHandler, IRequiresSessionState {
 	public void ProcessRequest(HttpContext context) {

 		IProtocolMessage request = sp.ReadRequest();

 		RequestScopedTokenMessage requestToken;

-		DirectUserToServiceProviderMessage requestAuth;

-		GetAccessTokenMessage requestAccessToken;

+		UserAuthorizationRequest requestAuth;

+		AuthorizedTokenRequest requestAccessToken;

 		if ((requestToken = request as RequestScopedTokenMessage) != null) {

 			var response = sp.PrepareUnauthorizedTokenMessage(requestToken);

 			sp.Channel.Send(response).Send();

-		} else if ((requestAuth = request as DirectUserToServiceProviderMessage) != null) {

+		} else if ((requestAuth = request as UserAuthorizationRequest) != null) {

 			Global.PendingOAuthAuthorization = requestAuth;

 			HttpContext.Current.Response.Redirect("~/Members/Authorize.aspx");

-		} else if ((requestAccessToken = request as GetAccessTokenMessage) != null) {

+		} else if ((requestAccessToken = request as AuthorizedTokenRequest) != null) {

 			var response = sp.PrepareAccessTokenMessage(requestAccessToken);

 			sp.Channel.Send(response).Send();

 		} else {