2 files changed, 11 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.Test/OAuth2/UserAgentClientAuthorizeTests.cs b/src/DotNetOpenAuth.Test/OAuth2/UserAgentClientAuthorizeTests.cs
index 82c8b66..6494b13 100644
--- a/src/DotNetOpenAuth.Test/OAuth2/UserAgentClientAuthorizeTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuth2/UserAgentClientAuthorizeTests.cs
@@ -40,6 +40,8 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 					var request = server.ReadAuthorizationRequest();
 					server.ApproveAuthorizationRequest(request, Username);
 					var tokenRequest = server.ReadAccessTokenRequest();
+					IAccessTokenRequest accessTokenRequest = tokenRequest;
+					Assert.IsTrue(accessTokenRequest.ClientAuthenticated);
 					var tokenResponse = server.PrepareAccessTokenResponse(tokenRequest);
 					server.Channel.Respond(tokenResponse);
 				});
@@ -48,10 +50,11 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 
 		[TestCase]
 		public void ImplicitGrantAuthorization() {
+			var coordinatorClient = new UserAgentClient(AuthorizationServerDescription);
 			var coordinator = new OAuth2Coordinator<UserAgentClient>(
 				AuthorizationServerDescription,
 				AuthorizationServerMock,
-				new UserAgentClient(AuthorizationServerDescription),
+				coordinatorClient,
 				client => {
 					var authState = new AuthorizationState {
 						Callback = ClientCallback,
@@ -66,8 +69,12 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 				},
 				server => {
 					var request = server.ReadAuthorizationRequest();
+					IAccessTokenRequest accessTokenRequest = request;
+					Assert.IsFalse(accessTokenRequest.ClientAuthenticated);
 					server.ApproveAuthorizationRequest(request, Username);
 				});
+
+			coordinatorClient.ClientSecret = null; // implicit grant clients don't need a secret.
 			coordinator.Run();
 		}
 	}
diff --git a/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs b/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs
index ec466f8..02fc25b 100644
--- a/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs
@@ -10,6 +10,7 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 	using System.Linq;
 	using System.Text;
 	using DotNetOpenAuth.OAuth2;
+	using DotNetOpenAuth.OAuth2.Messages;
 	using NUnit.Framework;
 
 	[TestFixture]
@@ -33,6 +34,8 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 					var request = server.ReadAuthorizationRequest();
 					server.ApproveAuthorizationRequest(request, Username);
 					var tokenRequest = server.ReadAccessTokenRequest();
+					IAccessTokenRequest accessTokenRequest = tokenRequest;
+					Assert.IsTrue(accessTokenRequest.ClientAuthenticated);
 					var tokenResponse = server.PrepareAccessTokenResponse(tokenRequest);
 					server.Channel.Respond(tokenResponse);
 				});