Merge branch 'v3.0' into v3.1

Conflicts:
	src/DotNetOpenAuth.vsmdi
	src/version.txt

1 files changed, 14 insertions, 0 deletions

diff --git a/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs b/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
index d922901..275a7c9 100644
--- a/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
+++ b/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
@@ -119,4 +119,18 @@ public class DatabaseTokenManager : IServiceProviderTokenManager {
 		tokenRow.State = TokenAuthorizationState.AuthorizedRequestToken;
 		tokenRow.User = user;
 	}
+
+	public OAuthConsumer GetConsumerForToken(string token) {
+		if (String.IsNullOrEmpty(token)) {
+			throw new ArgumentNullException("requestToken");
+		}
+
+		var tokenRow = Global.DataContext.OAuthTokens.SingleOrDefault(
+			tokenCandidate => tokenCandidate.Token == token);
+		if (tokenRow == null) {
+			throw new ArgumentException();
+		}
+
+		return tokenRow.OAuthConsumer;
+	}
 }