1 files changed, 50 insertions, 32 deletions

diff --git a/samples/OAuthConsumer/GoogleAddressBook.aspx.cs b/samples/OAuthConsumer/GoogleAddressBook.aspx.cs
index f4aa090..2613b85 100644
--- a/samples/OAuthConsumer/GoogleAddressBook.aspx.cs
+++ b/samples/OAuthConsumer/GoogleAddressBook.aspx.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Configuration;
 using System.Linq;
 using System.Text;
 using System.Web;
@@ -12,47 +13,64 @@ using DotNetOpenAuth.OAuth;
 /// A page to demonstrate downloading a Gmail address book using OAuth.
 /// </summary>
 public partial class GoogleAddressBook : System.Web.UI.Page {
+	private string AccessToken {
+		get { return (string)Session["GoogleAccessToken"]; }
+		set { Session["GoogleAccessToken"] = value; }
+	}
+
+	private InMemoryTokenManager TokenManager {
+		get {
+			var tokenManager = (InMemoryTokenManager)Application["GoogleTokenManager"];
+			if (tokenManager == null) {
+				string consumerKey = ConfigurationManager.AppSettings["googleConsumerKey"];
+				string consumerSecret = ConfigurationManager.AppSettings["googleConsumerSecret"];
+				if (!string.IsNullOrEmpty(consumerKey)) {
+					tokenManager = new InMemoryTokenManager(consumerKey, consumerSecret);
+					Application["GoogleTokenManager"] = tokenManager;
+				}
+			}
+
+			return tokenManager;
+		}
+	}
+
 	protected void Page_Load(object sender, EventArgs e) {
-		if (!IsPostBack) {
-			if (Session["TokenManager"] != null) {
-				InMemoryTokenManager tokenManager = (InMemoryTokenManager)Session["TokenManager"];
-				var google = new WebConsumer(GoogleConsumer.ServiceDescription, tokenManager);
+		if (this.TokenManager != null) {
+			MultiView1.ActiveViewIndex = 1;
+
+			if (!IsPostBack) {
+				var google = new WebConsumer(GoogleConsumer.ServiceDescription, this.TokenManager);
 
+				// Is Google calling back with authorization?
 				var accessTokenResponse = google.ProcessUserAuthorization();
 				if (accessTokenResponse != null) {
-					// User has approved access
-					MultiView1.ActiveViewIndex = 1;
-					resultsPlaceholder.Controls.Add(new Label { Text = accessTokenResponse.AccessToken });
-
-					XDocument contactsDocument = GoogleConsumer.GetContacts(google, accessTokenResponse.AccessToken);
-					var contacts = from entry in contactsDocument.Root.Elements(XName.Get("entry", "http://www.w3.org/2005/Atom"))
-						select new {
-							Name = entry.Element(XName.Get("title", "http://www.w3.org/2005/Atom")).Value,
-							Email = entry.Element(XName.Get("email", "http://schemas.google.com/g/2005")).Attribute("address").Value,
-						};
-					StringBuilder tableBuilder = new StringBuilder();
-					tableBuilder.Append("<table><tr><td>Name</td><td>Email</td></tr>");
-					foreach (var contact in contacts) {
-						tableBuilder.AppendFormat(
-							"<tr><td>{0}</td><td>{1}</td></tr>",
-							HttpUtility.HtmlEncode(contact.Name),
-							HttpUtility.HtmlEncode(contact.Email));
-					}
-					tableBuilder.Append("</table>");
-					resultsPlaceholder.Controls.Add(new Literal { Text = tableBuilder.ToString() });
+					AccessToken = accessTokenResponse.AccessToken;
+				} else if (this.AccessToken == null) {
+					// If we don't yet have access, immediately request it.
+					GoogleConsumer.RequestAuthorization(google, GoogleConsumer.Applications.Contacts);
 				}
 			}
 		}
 	}
 
-	protected void authorizeButton_Click(object sender, EventArgs e) {
-		if (!Page.IsValid) {
-			return;
-		}
+	protected void getAddressBookButton_Click(object sender, EventArgs e) {
+		var google = new WebConsumer(GoogleConsumer.ServiceDescription, this.TokenManager);
 
-		InMemoryTokenManager tokenManager = new InMemoryTokenManager(consumerKeyBox.Text, consumerSecretBox.Text);
-		Session["TokenManager"] = tokenManager;
-		var google = new WebConsumer(GoogleConsumer.ServiceDescription, tokenManager);
-		GoogleConsumer.RequestAuthorization(google, GoogleConsumer.Applications.Contacts);
+		XDocument contactsDocument = GoogleConsumer.GetContacts(google, AccessToken);
+		var contacts = from entry in contactsDocument.Root.Elements(XName.Get("entry", "http://www.w3.org/2005/Atom"))
+					   select new {
+						   Name = entry.Element(XName.Get("title", "http://www.w3.org/2005/Atom")).Value,
+						   Email = entry.Element(XName.Get("email", "http://schemas.google.com/g/2005")).Attribute("address").Value,
+					   };
+		StringBuilder tableBuilder = new StringBuilder();
+		tableBuilder.Append("<table><tr><td>Name</td><td>Email</td></tr>");
+		foreach (var contact in contacts) {
+			tableBuilder.AppendFormat(
+				"<tr><td>{0}</td><td>{1}</td></tr>",
+				HttpUtility.HtmlEncode(contact.Name),
+				HttpUtility.HtmlEncode(contact.Email));
+		}
+		tableBuilder.Append("</table>");
+		resultsPlaceholder.Controls.Add(new Literal { Text = tableBuilder.ToString() });
 	}
 }