Merge branch 'v3.4' into oauthWRAP

Conflicts:
	samples/OAuthConsumer/Web.config
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/MessagingStrings.Designer.cs
	src/DotNetOpenAuth/Messaging/MessagingStrings.resx
	src/version.txt

1 files changed, 159 insertions, 0 deletions

diff --git a/samples/OAuthServiceProvider/Code/DatabaseTokenManager.cs b/samples/OAuthServiceProvider/Code/DatabaseTokenManager.cs
new file mode 100644
index 0000000..721e124
--- /dev/null
+++ b/samples/OAuthServiceProvider/Code/DatabaseTokenManager.cs
@@ -0,0 +1,159 @@
+//-----------------------------------------------------------------------
+// <copyright file="DatabaseTokenManager.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace OAuthServiceProvider.Code {
+	using System;
+	using System.Collections.Generic;
+	using System.Diagnostics;
+	using System.Linq;
+	using DotNetOpenAuth.OAuth.ChannelElements;
+	using DotNetOpenAuth.OAuth.Messages;
+
+	public class DatabaseTokenManager : IServiceProviderTokenManager {
+		#region IServiceProviderTokenManager
+
+		public IConsumerDescription GetConsumer(string consumerKey) {
+			var consumerRow = Global.DataContext.OAuthConsumers.SingleOrDefault(
+				consumerCandidate => consumerCandidate.ConsumerKey == consumerKey);
+			if (consumerRow == null) {
+				throw new KeyNotFoundException();
+			}
+
+			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);
+			}
+		}
+
+		public void UpdateToken(IServiceProviderRequestToken token) {
+			// Nothing to do here, since we're using Linq To SQL.
+		}
+
+		#endregion
+
+		#region ITokenManager Members
+
+		public string GetTokenSecret(string token) {
+			var tokenRow = Global.DataContext.OAuthTokens.SingleOrDefault(
+				tokenCandidate => tokenCandidate.Token == token);
+			if (tokenRow == null) {
+				throw new ArgumentException();
+			}
+
+			return tokenRow.TokenSecret;
+		}
+
+		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;
+			OAuthToken newToken = new OAuthToken {
+				OAuthConsumer = consumer,
+				Token = response.Token,
+				TokenSecret = response.TokenSecret,
+				IssueDate = DateTime.UtcNow,
+				Scope = scope,
+			};
+
+			Global.DataContext.OAuthTokens.InsertOnSubmit(newToken);
+			Global.DataContext.SubmitChanges();
+		}
+
+		/// <summary>
+		/// Checks whether a given request token has already been authorized
+		/// by some user for use by the Consumer that requested it.
+		/// </summary>
+		/// <param name="requestToken">The Consumer's request token.</param>
+		/// <returns>
+		/// True if the request token has already been fully authorized by the user
+		/// who owns the relevant protected resources.  False if the token has not yet
+		/// been authorized, has expired or does not exist.
+		/// </returns>
+		public bool IsRequestTokenAuthorized(string requestToken) {
+			var tokenFound = Global.DataContext.OAuthTokens.SingleOrDefault(
+				token => token.Token == requestToken &&
+				token.State == TokenAuthorizationState.AuthorizedRequestToken);
+			return tokenFound != null;
+		}
+
+		public void ExpireRequestTokenAndStoreNewAccessToken(string consumerKey, string requestToken, string accessToken, string accessTokenSecret) {
+			var data = Global.DataContext;
+			var consumerRow = data.OAuthConsumers.Single(consumer => consumer.ConsumerKey == consumerKey);
+			var tokenRow = data.OAuthTokens.Single(token => token.Token == requestToken && token.OAuthConsumer == consumerRow);
+			Debug.Assert(tokenRow.State == TokenAuthorizationState.AuthorizedRequestToken, "The token should be authorized already!");
+
+			// Update the existing row to be an access token.
+			tokenRow.IssueDate = DateTime.UtcNow;
+			tokenRow.State = TokenAuthorizationState.AccessToken;
+			tokenRow.Token = accessToken;
+			tokenRow.TokenSecret = accessTokenSecret;
+		}
+
+		/// <summary>
+		/// Classifies a token as a request token or an access token.
+		/// </summary>
+		/// <param name="token">The token to classify.</param>
+		/// <returns>Request or Access token, or invalid if the token is not recognized.</returns>
+		public TokenType GetTokenType(string token) {
+			var tokenRow = Global.DataContext.OAuthTokens.SingleOrDefault(tokenCandidate => tokenCandidate.Token == token);
+			if (tokenRow == null) {
+				return TokenType.InvalidToken;
+			} else if (tokenRow.State == TokenAuthorizationState.AccessToken) {
+				return TokenType.AccessToken;
+			} else {
+				return TokenType.RequestToken;
+			}
+		}
+
+		#endregion
+
+		public void AuthorizeRequestToken(string requestToken, User user) {
+			if (requestToken == null) {
+				throw new ArgumentNullException("requestToken");
+			}
+			if (user == null) {
+				throw new ArgumentNullException("user");
+			}
+
+			var tokenRow = Global.DataContext.OAuthTokens.SingleOrDefault(
+				tokenCandidate => tokenCandidate.Token == requestToken &&
+				tokenCandidate.State == TokenAuthorizationState.UnauthorizedRequestToken);
+			if (tokenRow == null) {
+				throw new ArgumentException();
+			}
+
+			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;
+		}
+	}
+}
\ No newline at end of file