Merge branch 'master' into contracts

Conflicts:
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/Configuration/TypeConfigurationCollection.cs
	src/DotNetOpenAuth/Configuration/TypeConfigurationElement.cs
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs
	src/DotNetOpenAuth/Messaging/Reflection/MessagePart.cs
	src/DotNetOpenAuth/Messaging/Reflection/ValueMapping.cs
	src/DotNetOpenAuth/OAuth/ChannelElements/OAuthChannel.cs
	src/DotNetOpenAuth/OAuth/ConsumerBase.cs
	src/DotNetOpenAuth/OAuth/Messages/MessageBase.cs
	src/DotNetOpenAuth/OAuth/Messages/UnauthorizedTokenResponse.cs
	src/DotNetOpenAuth/OAuth/ServiceProvider.cs
	src/DotNetOpenAuth/OpenId/Protocol.cs
	src/DotNetOpenAuth/OpenId/Provider/AutoResponsiveRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/HostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/IHostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/Request.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingParty.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/ServiceEndpoint.cs

1 files changed, 64 insertions, 0 deletions

diff --git a/samples/OAuthServiceProvider/App_Code/OAuthToken.cs b/samples/OAuthServiceProvider/App_Code/OAuthToken.cs
new file mode 100644
index 0000000..fc1d6c5
--- /dev/null
+++ b/samples/OAuthServiceProvider/App_Code/OAuthToken.cs
@@ -0,0 +1,64 @@
+//-----------------------------------------------------------------------
+// <copyright file="OAuthToken.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+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 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
+}