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

diff --git a/samples/OAuthServiceProvider/DataApi.cs b/samples/OAuthServiceProvider/DataApi.cs
new file mode 100644
index 0000000..9d531e6
--- /dev/null
+++ b/samples/OAuthServiceProvider/DataApi.cs
@@ -0,0 +1,34 @@
+namespace OAuthServiceProvider {
+	using System.Linq;
+	using System.ServiceModel;
+	using OAuthServiceProvider.Code;
+
+	/// <summary>
+	/// The WCF service API.
+	/// </summary>
+	/// <remarks>
+	/// Note how there is no code here that is bound to OAuth or any other
+	/// credential/authorization scheme.  That's all part of the channel/binding elsewhere.
+	/// And the reference to OperationContext.Current.ServiceSecurityContext.PrimaryIdentity 
+	/// is the user being impersonated by the WCF client.
+	/// In the OAuth case, it is the user who authorized the OAuth access token that was used
+	/// to gain access to the service.
+	/// </remarks>
+	public class DataApi : IDataApi {
+		private User User {
+			get { return OperationContext.Current.ServiceSecurityContext.PrimaryIdentity.GetUser(); }
+		}
+
+		public int? GetAge() {
+			return User.Age;
+		}
+
+		public string GetName() {
+			return User.FullName;
+		}
+
+		public string[] GetFavoriteSites() {
+			return User.FavoriteSites.Select(site => site.SiteUrl).ToArray();
+		}
+	}
+}
\ No newline at end of file