Updated OAuth C and SP samples to use standard WAP namespaces.

1 files changed, 77 insertions, 75 deletions

diff --git a/samples/OAuthConsumer/Twitter.aspx.cs b/samples/OAuthConsumer/Twitter.aspx.cs
index f309396..44350ca 100644
--- a/samples/OAuthConsumer/Twitter.aspx.cs
+++ b/samples/OAuthConsumer/Twitter.aspx.cs
@@ -1,94 +1,96 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Xml.Linq;
-using System.Xml.XPath;
-using DotNetOpenAuth.ApplicationBlock;
-using DotNetOpenAuth.OAuth;
+namespace OAuthConsumer {
+	using System;
+	using System.Collections.Generic;
+	using System.Configuration;
+	using System.Linq;
+	using System.Text;
+	using System.Web;
+	using System.Web.UI;
+	using System.Web.UI.WebControls;
+	using System.Xml.Linq;
+	using System.Xml.XPath;
+	using DotNetOpenAuth.ApplicationBlock;
+	using DotNetOpenAuth.OAuth;
 
-public partial class Twitter : System.Web.UI.Page {
-	private string AccessToken {
-		get { return (string)Session["TwitterAccessToken"]; }
-		set { Session["TwitterAccessToken"] = value; }
-	}
+	public partial class Twitter : System.Web.UI.Page {
+		private string AccessToken {
+			get { return (string)Session["TwitterAccessToken"]; }
+			set { Session["TwitterAccessToken"] = value; }
+		}
 
-	private InMemoryTokenManager TokenManager {
-		get {
-			var tokenManager = (InMemoryTokenManager)Application["TwitterTokenManager"];
-			if (tokenManager == null) {
-				string consumerKey = ConfigurationManager.AppSettings["twitterConsumerKey"];
-				string consumerSecret = ConfigurationManager.AppSettings["twitterConsumerSecret"];
-				if (!string.IsNullOrEmpty(consumerKey)) {
-					tokenManager = new InMemoryTokenManager(consumerKey, consumerSecret);
-					Application["TwitterTokenManager"] = tokenManager;
+		private InMemoryTokenManager TokenManager {
+			get {
+				var tokenManager = (InMemoryTokenManager)Application["TwitterTokenManager"];
+				if (tokenManager == null) {
+					string consumerKey = ConfigurationManager.AppSettings["twitterConsumerKey"];
+					string consumerSecret = ConfigurationManager.AppSettings["twitterConsumerSecret"];
+					if (!string.IsNullOrEmpty(consumerKey)) {
+						tokenManager = new InMemoryTokenManager(consumerKey, consumerSecret);
+						Application["TwitterTokenManager"] = tokenManager;
+					}
 				}
-			}
 
-			return tokenManager;
+				return tokenManager;
+			}
 		}
-	}
 
-	protected void Page_Load(object sender, EventArgs e) {
-		if (this.TokenManager != null) {
-			MultiView1.ActiveViewIndex = 1;
+		protected void Page_Load(object sender, EventArgs e) {
+			if (this.TokenManager != null) {
+				MultiView1.ActiveViewIndex = 1;
 
-			if (!IsPostBack) {
-				var twitter = new WebConsumer(TwitterConsumer.ServiceDescription, this.TokenManager);
+				if (!IsPostBack) {
+					var twitter = new WebConsumer(TwitterConsumer.ServiceDescription, this.TokenManager);
 
-				// Is Twitter calling back with authorization?
-				var accessTokenResponse = twitter.ProcessUserAuthorization();
-				if (accessTokenResponse != null) {
-					this.AccessToken = accessTokenResponse.AccessToken;
-				} else if (this.AccessToken == null) {
-					// If we don't yet have access, immediately request it.
-					twitter.Channel.Send(twitter.PrepareRequestUserAuthorization());
+					// Is Twitter calling back with authorization?
+					var accessTokenResponse = twitter.ProcessUserAuthorization();
+					if (accessTokenResponse != null) {
+						this.AccessToken = accessTokenResponse.AccessToken;
+					} else if (this.AccessToken == null) {
+						// If we don't yet have access, immediately request it.
+						twitter.Channel.Send(twitter.PrepareRequestUserAuthorization());
+					}
 				}
 			}
 		}
-	}
 
-	protected void downloadUpdates_Click(object sender, EventArgs e) {
-		var twitter = new WebConsumer(TwitterConsumer.ServiceDescription, this.TokenManager);
-		XPathDocument updates = new XPathDocument(TwitterConsumer.GetUpdates(twitter, this.AccessToken).CreateReader());
-		XPathNavigator nav = updates.CreateNavigator();
-		var parsedUpdates = from status in nav.Select("/statuses/status").OfType<XPathNavigator>()
-							where !status.SelectSingleNode("user/protected").ValueAsBoolean
-							select new {
-								User = status.SelectSingleNode("user/name").InnerXml,
-								Status = status.SelectSingleNode("text").InnerXml,
-							};
+		protected void downloadUpdates_Click(object sender, EventArgs e) {
+			var twitter = new WebConsumer(TwitterConsumer.ServiceDescription, this.TokenManager);
+			XPathDocument updates = new XPathDocument(TwitterConsumer.GetUpdates(twitter, this.AccessToken).CreateReader());
+			XPathNavigator nav = updates.CreateNavigator();
+			var parsedUpdates = from status in nav.Select("/statuses/status").OfType<XPathNavigator>()
+								where !status.SelectSingleNode("user/protected").ValueAsBoolean
+								select new {
+									User = status.SelectSingleNode("user/name").InnerXml,
+									Status = status.SelectSingleNode("text").InnerXml,
+								};
 
-		StringBuilder tableBuilder = new StringBuilder();
-		tableBuilder.Append("<table><tr><td>Name</td><td>Update</td></tr>");
+			StringBuilder tableBuilder = new StringBuilder();
+			tableBuilder.Append("<table><tr><td>Name</td><td>Update</td></tr>");
 
-		foreach (var update in parsedUpdates) {
-			tableBuilder.AppendFormat(
-				"<tr><td>{0}</td><td>{1}</td></tr>",
-				HttpUtility.HtmlEncode(update.User),
-				HttpUtility.HtmlEncode(update.Status));
+			foreach (var update in parsedUpdates) {
+				tableBuilder.AppendFormat(
+					"<tr><td>{0}</td><td>{1}</td></tr>",
+					HttpUtility.HtmlEncode(update.User),
+					HttpUtility.HtmlEncode(update.Status));
+			}
+			tableBuilder.Append("</table>");
+			resultsPlaceholder.Controls.Add(new Literal { Text = tableBuilder.ToString() });
 		}
-		tableBuilder.Append("</table>");
-		resultsPlaceholder.Controls.Add(new Literal { Text = tableBuilder.ToString() });
-	}
 
-	protected void uploadProfilePhotoButton_Click(object sender, EventArgs e) {
-		if (profilePhoto.PostedFile.ContentType == null) {
+		protected void uploadProfilePhotoButton_Click(object sender, EventArgs e) {
+			if (profilePhoto.PostedFile.ContentType == null) {
+				photoUploadedLabel.Visible = true;
+				photoUploadedLabel.Text = "Select a file first.";
+				return;
+			}
+
+			var twitter = new WebConsumer(TwitterConsumer.ServiceDescription, this.TokenManager);
+			XDocument imageResult = TwitterConsumer.UpdateProfileImage(
+				twitter,
+				this.AccessToken,
+				profilePhoto.PostedFile.InputStream,
+				profilePhoto.PostedFile.ContentType);
 			photoUploadedLabel.Visible = true;
-			photoUploadedLabel.Text = "Select a file first.";
-			return;
 		}
-
-		var twitter = new WebConsumer(TwitterConsumer.ServiceDescription, this.TokenManager);
-		XDocument imageResult = TwitterConsumer.UpdateProfileImage(
-			twitter,
-			this.AccessToken,
-			profilePhoto.PostedFile.InputStream,
-			profilePhoto.PostedFile.ContentType);
-		photoUploadedLabel.Visible = true;
 	}
-}
+}
\ No newline at end of file