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, 66 insertions, 0 deletions

diff --git a/samples/OAuthServiceProvider/Code/OAuthToken.cs b/samples/OAuthServiceProvider/Code/OAuthToken.cs
new file mode 100644
index 0000000..182a3e3
--- /dev/null
+++ b/samples/OAuthServiceProvider/Code/OAuthToken.cs
@@ -0,0 +1,66 @@
+//-----------------------------------------------------------------------
+// <copyright file="OAuthToken.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace OAuthServiceProvider.Code {
+	using System;
+	using System.Collections.Generic;
+	using System.Linq;
+	using System.Web;
+	using DotNetOpenAuth.OAuth.ChannelElements;
+
+	public partial class OAuthToken : IServiceProviderRequestToken, IServiceProviderAccessToken {
+		#region IServiceProviderRequestToken Members
+
+		string IServiceProviderRequestToken.Token {
+			get { return this.Token; }
+		}
+
+		string IServiceProviderRequestToken.ConsumerKey {
+			get { return this.OAuthConsumer.ConsumerKey; }
+		}
+
+		DateTime IServiceProviderRequestToken.CreatedOn {
+			get { return this.IssueDate; }
+		}
+
+		Uri IServiceProviderRequestToken.Callback {
+			get { return string.IsNullOrEmpty(this.RequestTokenCallback) ? null : new Uri(this.RequestTokenCallback); }
+			set { this.RequestTokenCallback = value.AbsoluteUri; }
+		}
+
+		string IServiceProviderRequestToken.VerificationCode {
+			get { return this.RequestTokenVerifier; }
+			set { this.RequestTokenVerifier = value; }
+		}
+
+		Version IServiceProviderRequestToken.ConsumerVersion {
+			get { return new Version(this.ConsumerVersion); }
+			set { this.ConsumerVersion = value.ToString(); }
+		}
+
+		#endregion
+
+		#region IServiceProviderAccessToken Members
+
+		string IServiceProviderAccessToken.Token {
+			get { return this.Token; }
+		}
+
+		DateTime? IServiceProviderAccessToken.ExpirationDate {
+			get { return null; }
+		}
+
+		string IServiceProviderAccessToken.Username {
+			get { return this.User.OpenIDClaimedIdentifier; }
+		}
+
+		string[] IServiceProviderAccessToken.Roles {
+			get { return this.Scope.Split('|'); }
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file