1 files changed, 11 insertions, 32 deletions

diff --git a/samples/OAuthConsumer/Yammer.aspx.cs b/samples/OAuthConsumer/Yammer.aspx.cs
index 57169fc..b1031ae 100644
--- a/samples/OAuthConsumer/Yammer.aspx.cs
+++ b/samples/OAuthConsumer/Yammer.aspx.cs
@@ -11,48 +11,27 @@
 	using DotNetOpenAuth.OAuth;
 
 	public partial class Yammer : System.Web.UI.Page {
-		private string RequestToken {
-			get { return (string)ViewState["YammerRequestToken"]; }
-			set { ViewState["YammerRequestToken"] = value; }
-		}
-
-		private string AccessToken {
-			get { return (string)Session["YammerAccessToken"]; }
+		private AccessToken AccessToken {
+			get { return (AccessToken)Session["YammerAccessToken"]; }
 			set { Session["YammerAccessToken"] = value; }
 		}
 
-		private InMemoryTokenManager TokenManager {
-			get {
-				var tokenManager = (InMemoryTokenManager)Application["YammerTokenManager"];
-				if (tokenManager == null) {
-					string consumerKey = ConfigurationManager.AppSettings["YammerConsumerKey"];
-					string consumerSecret = ConfigurationManager.AppSettings["YammerConsumerSecret"];
-					if (!string.IsNullOrEmpty(consumerKey)) {
-						tokenManager = new InMemoryTokenManager(consumerKey, consumerSecret);
-						Application["YammerTokenManager"] = tokenManager;
-					}
-				}
-
-				return tokenManager;
-			}
-		}
-
 		protected void Page_Load(object sender, EventArgs e) {
-			if (this.TokenManager != null) {
+			var yammer = new YammerConsumer();
+			if (yammer.ConsumerKey != null) {
 				this.MultiView1.SetActiveView(this.BeginAuthorizationView);
 			}
 		}
 
 		protected void getYammerMessages_Click(object sender, EventArgs e) {
-			var yammer = new WebConsumer(YammerConsumer.ServiceDescription, this.TokenManager);
+			var yammer = new YammerConsumer();
+
+			// TODO: code here
 		}
 
 		protected async void obtainAuthorizationButton_Click(object sender, EventArgs e) {
-			var yammer = YammerConsumer.CreateConsumer(this.TokenManager);
-			var tuple = await YammerConsumer.PrepareRequestAuthorizationAsync(yammer, Response.ClientDisconnectedToken);
-			Uri popupWindowLocation = tuple.Item1;
-			string requestToken = tuple.Item2;
-			this.RequestToken = requestToken;
+			var yammer = new YammerConsumer();
+			Uri popupWindowLocation = await yammer.RequestUserAuthorizationAsync(MessagingUtilities.GetPublicFacingUrl());
 			string javascript = "window.open('" + popupWindowLocation.AbsoluteUri + "');";
 			this.Page.ClientScript.RegisterStartupScript(GetType(), "YammerPopup", javascript, true);
 			this.MultiView1.SetActiveView(this.CompleteAuthorizationView);
@@ -63,8 +42,8 @@
 				return;
 			}
 
-			var yammer = YammerConsumer.CreateConsumer(this.TokenManager);
-			var authorizationResponse = await YammerConsumer.CompleteAuthorizationAsync(yammer, this.RequestToken, this.yammerUserCode.Text, Response.ClientDisconnectedToken);
+			var yammer = new YammerConsumer();
+			var authorizationResponse = await yammer.ProcessUserAuthorizationAsync(this.yammerUserCode.Text);
 			if (authorizationResponse != null) {
 				this.accessTokenLabel.Text = HttpUtility.HtmlEncode(authorizationResponse.AccessToken);
 				this.MultiView1.SetActiveView(this.AuthorizationCompleteView);