Merge branch 'v3.2' into mono2

1 files changed, 20 insertions, 3 deletions

diff --git a/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs b/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
index 275a7c9..710508d 100644
--- a/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
+++ b/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
@@ -14,14 +14,30 @@ using DotNetOpenAuth.OAuth.Messages;
 public class DatabaseTokenManager : IServiceProviderTokenManager {
 	#region IServiceProviderTokenManager
 
-	public string GetConsumerSecret(string consumerKey) {
+	public IConsumerDescription GetConsumer(string consumerKey) {
 		var consumerRow = Global.DataContext.OAuthConsumers.SingleOrDefault(
 			consumerCandidate => consumerCandidate.ConsumerKey == consumerKey);
 		if (consumerRow == null) {
-			throw new ArgumentException();
+			throw new KeyNotFoundException();
 		}
 
-		return consumerRow.ConsumerSecret;
+		return consumerRow;
+	}
+
+	public IServiceProviderRequestToken GetRequestToken(string token) {
+		try {
+			return Global.DataContext.OAuthTokens.First(t => t.Token == token && t.State != TokenAuthorizationState.AccessToken);
+		} catch (InvalidOperationException ex) {
+			throw new KeyNotFoundException("Unrecognized token", ex);
+		}
+	}
+
+	public IServiceProviderAccessToken GetAccessToken(string token) {
+		try {
+			return Global.DataContext.OAuthTokens.First(t => t.Token == token && t.State == TokenAuthorizationState.AccessToken);
+		} catch (InvalidOperationException ex) {
+			throw new KeyNotFoundException("Unrecognized token", ex);
+		}
 	}
 
 	#endregion
@@ -51,6 +67,7 @@ public class DatabaseTokenManager : IServiceProviderTokenManager {
 		};
 
 		Global.DataContext.OAuthTokens.InsertOnSubmit(newToken);
+		Global.DataContext.SubmitChanges();
 	}
 
 	/// <summary>