Move to HttpClient throughout library.

1 files changed, 30 insertions, 29 deletions

diff --git a/samples/OAuthServiceProvider/Code/OAuthAuthorizationManager.cs b/samples/OAuthServiceProvider/Code/OAuthAuthorizationManager.cs
index 917a252..2d942b5 100644
--- a/samples/OAuthServiceProvider/Code/OAuthAuthorizationManager.cs
+++ b/samples/OAuthServiceProvider/Code/OAuthAuthorizationManager.cs
@@ -7,6 +7,7 @@
 	using System.ServiceModel;
 	using System.ServiceModel.Channels;
 	using System.ServiceModel.Security;
+	using System.Threading.Tasks;
 	using DotNetOpenAuth;
 	using DotNetOpenAuth.OAuth;
 
@@ -25,41 +26,41 @@
 			HttpRequestMessageProperty httpDetails = operationContext.RequestContext.RequestMessage.Properties[HttpRequestMessageProperty.Name] as HttpRequestMessageProperty;
 			Uri requestUri = operationContext.RequestContext.RequestMessage.Properties.Via;
 			ServiceProvider sp = Constants.CreateServiceProvider();
-			try {
-				var auth = sp.ReadProtectedResourceAuthorization(httpDetails, requestUri);
-				if (auth != null) {
-					var accessToken = Global.DataContext.OAuthTokens.Single(token => token.Token == auth.AccessToken);
+			((DatabaseTokenManager)sp.TokenManager).OperationContext = operationContext; // artificially preserve this across thread changes.
+			return Task.Run(
+				async delegate {
+					try {
+						var auth = await sp.ReadProtectedResourceAuthorizationAsync(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 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,
-						};
-					}
+							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,
-				};
+							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);
 					}
-				}
-			} catch (ProtocolException ex) {
-				Global.Logger.Error("Error processing OAuth messages.", ex);
-			}
 
-			return false;
+					return false;
+				}).GetAwaiter().GetResult();
 		}
 	}
 }
\ No newline at end of file