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

diff --git a/samples/OAuthServiceProvider/Code/Global.cs b/samples/OAuthServiceProvider/Code/Global.cs
new file mode 100644
index 0000000..ceaeac8
--- /dev/null
+++ b/samples/OAuthServiceProvider/Code/Global.cs
@@ -0,0 +1,126 @@
+namespace OAuthServiceProvider.Code {
+	using System;
+	using System.Linq;
+	using System.ServiceModel;
+	using System.Text;
+	using System.Web;
+	using DotNetOpenAuth.OAuth.Messages;
+
+	/// <summary>
+	/// The web application global events and properties.
+	/// </summary>
+	public class Global : HttpApplication {
+		/// <summary>
+		/// An application memory cache of recent log messages.
+		/// </summary>
+		public static StringBuilder LogMessages = new StringBuilder();
+
+		/// <summary>
+		/// The logger for this sample to use.
+		/// </summary>
+		public static log4net.ILog Logger = log4net.LogManager.GetLogger("DotNetOpenAuth.OAuthServiceProvider");
+
+		/// <summary>
+		/// Gets the transaction-protected database connection for the current request.
+		/// </summary>
+		public static DataClassesDataContext DataContext {
+			get {
+				DataClassesDataContext dataContext = dataContextSimple;
+				if (dataContext == null) {
+					dataContext = new DataClassesDataContext();
+					dataContext.Connection.Open();
+					dataContext.Transaction = dataContext.Connection.BeginTransaction();
+					dataContextSimple = dataContext;
+				}
+
+				return dataContext;
+			}
+		}
+
+		public static DatabaseTokenManager TokenManager { get; set; }
+
+		public static DatabaseNonceStore NonceStore { get; set; }
+
+		public static User LoggedInUser {
+			get { return Global.DataContext.Users.SingleOrDefault(user => user.OpenIDClaimedIdentifier == HttpContext.Current.User.Identity.Name); }
+		}
+
+		public static UserAuthorizationRequest PendingOAuthAuthorization {
+			get { return HttpContext.Current.Session["authrequest"] as UserAuthorizationRequest; }
+			set { HttpContext.Current.Session["authrequest"] = value; }
+		}
+
+		private static DataClassesDataContext dataContextSimple {
+			get {
+				if (HttpContext.Current != null) {
+					return HttpContext.Current.Items["DataContext"] as DataClassesDataContext;
+				} else if (OperationContext.Current != null) {
+					object data;
+					if (OperationContext.Current.IncomingMessageProperties.TryGetValue("DataContext", out data)) {
+						return data as DataClassesDataContext;
+					} else {
+						return null;
+					}
+				} else {
+					throw new InvalidOperationException();
+				}
+			}
+
+			set {
+				if (HttpContext.Current != null) {
+					HttpContext.Current.Items["DataContext"] = value;
+				} else if (OperationContext.Current != null) {
+					OperationContext.Current.IncomingMessageProperties["DataContext"] = value;
+				} else {
+					throw new InvalidOperationException();
+				}
+			}
+		}
+
+		public static void AuthorizePendingRequestToken() {
+			ITokenContainingMessage tokenMessage = PendingOAuthAuthorization;
+			TokenManager.AuthorizeRequestToken(tokenMessage.Token, LoggedInUser);
+			PendingOAuthAuthorization = null;
+		}
+
+		private static void CommitAndCloseDatabaseIfNecessary() {
+			var dataContext = dataContextSimple;
+			if (dataContext != null) {
+				dataContext.SubmitChanges();
+				dataContext.Transaction.Commit();
+				dataContext.Connection.Close();
+			}
+		}
+
+		private void Application_Start(object sender, EventArgs e) {
+			log4net.Config.XmlConfigurator.Configure();
+			Logger.Info("Sample starting...");
+			string appPath = HttpContext.Current.Request.ApplicationPath;
+			if (!appPath.EndsWith("/")) {
+				appPath += "/";
+			}
+
+			// This will break in IIS Integrated Pipeline mode, since applications
+			// start before the first incoming request context is available.
+			// TODO: fix this.
+			Constants.WebRootUrl = new Uri(HttpContext.Current.Request.Url, appPath);
+			Global.TokenManager = new DatabaseTokenManager();
+			Global.NonceStore = new DatabaseNonceStore();
+		}
+
+		private void Application_End(object sender, EventArgs e) {
+			Logger.Info("Sample shutting down...");
+
+			// this would be automatic, but in partial trust scenarios it is not.
+			log4net.LogManager.Shutdown();
+		}
+
+		private void Application_Error(object sender, EventArgs e) {
+			Logger.Error("An unhandled exception occurred in ASP.NET processing: " + Server.GetLastError(), Server.GetLastError());
+		}
+
+		private void Application_EndRequest(object sender, EventArgs e) {
+			CommitAndCloseDatabaseIfNecessary();
+		}
+	}
+}
\ No newline at end of file