Merge branch 'master' of https://github.com/rcollette/DotNetOpenAuth into rcollette-master

2 files changed, 6 insertions, 2 deletions

diff --git a/samples/OAuthAuthorizationServer/Controllers/AccountController.cs b/samples/OAuthAuthorizationServer/Controllers/AccountController.cs
index 9c755ea..b3d24a2 100644
--- a/samples/OAuthAuthorizationServer/Controllers/AccountController.cs
+++ b/samples/OAuthAuthorizationServer/Controllers/AccountController.cs
@@ -30,6 +30,7 @@
 					}
 
 					var response = await request.GetRedirectingResponseAsync();
+					Response.ContentType = response.Content.Headers.ContentType.ToString();
 					return response.AsActionResult();
 				} else {
 					ModelState.AddModelError(string.Empty, "The identifier you supplied is not recognized as a valid OpenID Identifier.");
@@ -75,4 +76,4 @@
 			return RedirectToAction("Index", "Home");
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/samples/OAuthAuthorizationServer/Controllers/OAuthController.cs b/samples/OAuthAuthorizationServer/Controllers/OAuthController.cs
index 3ab4096..3953c62 100644
--- a/samples/OAuthAuthorizationServer/Controllers/OAuthController.cs
+++ b/samples/OAuthAuthorizationServer/Controllers/OAuthController.cs
@@ -21,6 +21,7 @@
 		/// <returns>The response to the Client.</returns>

 		public async Task<ActionResult> Token() {

 			var request = await this.authorizationServer.HandleTokenRequestAsync(this.Request, this.Response.ClientDisconnectedToken);

+			Response.ContentType = request.Content.Headers.ContentType.ToString();

 			return request.AsActionResult();

 		}

 

@@ -42,6 +43,7 @@
 			if (((OAuth2AuthorizationServer)this.authorizationServer.AuthorizationServerServices).CanBeAutoApproved(pendingRequest)) {

 				var approval = this.authorizationServer.PrepareApproveAuthorizationRequest(pendingRequest, HttpContext.User.Identity.Name);

 				var response = await this.authorizationServer.Channel.PrepareResponseAsync(approval, Response.ClientDisconnectedToken);

+				Response.ContentType = response.Content.Headers.ContentType.ToString();

 				return response.AsActionResult();

 			}

 

@@ -88,7 +90,8 @@
 			}

 

 			var preparedResponse = await this.authorizationServer.Channel.PrepareResponseAsync(response, Response.ClientDisconnectedToken);

+			Response.ContentType = preparedResponse.Content.Headers.ContentType.ToString();

 			return preparedResponse.AsActionResult();

 		}

 	}

-}

+}
\ No newline at end of file