1 files changed, 28 insertions, 24 deletions

diff --git a/samples/OAuthServiceProvider/App_Code/OAuthAuthorizationManager.cs b/samples/OAuthServiceProvider/App_Code/OAuthAuthorizationManager.cs
index 8589932..ee90364 100644
--- a/samples/OAuthServiceProvider/App_Code/OAuthAuthorizationManager.cs
+++ b/samples/OAuthServiceProvider/App_Code/OAuthAuthorizationManager.cs
@@ -24,34 +24,38 @@ public class OAuthAuthorizationManager : ServiceAuthorizationManager {
 		HttpRequestMessageProperty httpDetails = operationContext.RequestContext.RequestMessage.Properties[HttpRequestMessageProperty.Name] as HttpRequestMessageProperty;
 		Uri requestUri = operationContext.RequestContext.RequestMessage.Properties["OriginalHttpRequestUri"] as Uri;
 		ServiceProvider sp = Constants.CreateServiceProvider();
-		var auth = sp.ReadProtectedResourceAuthorization(httpDetails, requestUri);
-		if (auth != null) {
-			var accessToken = Global.DataContext.OAuthTokens.Single(token => token.Token == auth.AccessToken);
-
-			var principal = sp.CreatePrincipal(auth);
-			var policy = new OAuthPrincipalAuthorizationPolicy(principal);
-			var policies = new List<IAuthorizationPolicy> {
-				policy,
-			};
-
-			var securityContext = new ServiceSecurityContext(policies.AsReadOnly());
-			if (operationContext.IncomingMessageProperties.Security != null) {
-				operationContext.IncomingMessageProperties.Security.ServiceSecurityContext = securityContext;
-			} else {
-				operationContext.IncomingMessageProperties.Security = new SecurityMessageProperty {
-					ServiceSecurityContext = securityContext,
+		try {
+			var auth = sp.ReadProtectedResourceAuthorization(httpDetails, requestUri);
+			if (auth != null) {
+				var accessToken = Global.DataContext.OAuthTokens.Single(token => token.Token == auth.AccessToken);
+
+				var principal = sp.CreatePrincipal(auth);
+				var policy = new OAuthPrincipalAuthorizationPolicy(principal);
+				var policies = new List<IAuthorizationPolicy> {
+					policy,
 				};
-			}
 
-			securityContext.AuthorizationContext.Properties["Identities"] = new List<IIdentity> {
-				principal.Identity,
-			};
+				var securityContext = new ServiceSecurityContext(policies.AsReadOnly());
+				if (operationContext.IncomingMessageProperties.Security != null) {
+					operationContext.IncomingMessageProperties.Security.ServiceSecurityContext = securityContext;
+				} else {
+					operationContext.IncomingMessageProperties.Security = new SecurityMessageProperty {
+						ServiceSecurityContext = securityContext,
+					};
+				}
+
+				securityContext.AuthorizationContext.Properties["Identities"] = new List<IIdentity> {
+					principal.Identity,
+				};
 
-			// Only allow this method call if the access token scope permits it.
-			string[] scopes = accessToken.Scope.Split('|');
-			if (scopes.Contains(operationContext.IncomingMessageHeaders.Action)) {
-				return true;
+				// Only allow this method call if the access token scope permits it.
+				string[] scopes = accessToken.Scope.Split('|');
+				if (scopes.Contains(operationContext.IncomingMessageHeaders.Action)) {
+					return true;
+				}
 			}
+		} catch (ProtocolException ex) {
+			Global.Logger.Error("Error processing OAuth messages.", ex);
 		}
 
 		return false;