1 files changed, 43 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.OAuth2/OAuth2/Messages/AccessTokenClientCredentialsRequest.cs b/src/DotNetOpenAuth.OAuth2/OAuth2/Messages/AccessTokenClientCredentialsRequest.cs
index 266dbce..48419eb 100644
--- a/src/DotNetOpenAuth.OAuth2/OAuth2/Messages/AccessTokenClientCredentialsRequest.cs
+++ b/src/DotNetOpenAuth.OAuth2/OAuth2/Messages/AccessTokenClientCredentialsRequest.cs
@@ -19,7 +19,7 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 	/// <remarks>
 	/// This is somewhat analogous to 2-legged OAuth.
 	/// </remarks>
-	internal class AccessTokenClientCredentialsRequest : ScopedAccessTokenRequest {
+	internal class AccessTokenClientCredentialsRequest : ScopedAccessTokenRequest, IAuthorizationCarryingRequest, IAuthorizationDescription {
 		/// <summary>
 		/// Initializes a new instance of the <see cref="AccessTokenClientCredentialsRequest"/> class.
 		/// </summary>
@@ -30,6 +30,43 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 			this.HttpMethods = HttpDeliveryMethods.PostRequest;
 		}
 
+		#region IAuthorizationCarryingRequest members
+
+		/// <summary>
+		/// Gets the authorization that the code or token describes.
+		/// </summary>
+		IAuthorizationDescription IAuthorizationCarryingRequest.AuthorizationDescription {
+			get { return this.CredentialsValidated ? this : null; }
+		}
+
+		#endregion
+
+		#region IAuthorizationDescription Members
+
+		/// <summary>
+		/// Gets the date this authorization was established or the token was issued.
+		/// </summary>
+		/// <value>A date/time expressed in UTC.</value>
+		DateTime IAuthorizationDescription.UtcIssued {
+			get { return DateTime.UtcNow; }
+		}
+
+		/// <summary>
+		/// Gets the name on the account whose data on the resource server is accessible using this authorization.
+		/// </summary>
+		string IAuthorizationDescription.User {
+			get { return null; }
+		}
+
+		/// <summary>
+		/// Gets the scope of operations the client is allowed to invoke.
+		/// </summary>
+		HashSet<string> IAuthorizationDescription.Scope {
+			get { return this.Scope; }
+		}
+
+		#endregion
+
 		/// <summary>
 		/// Gets the type of the grant.
 		/// </summary>
@@ -37,5 +74,10 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		internal override GrantType GrantType {
 			get { return Messages.GrantType.ClientCredentials; }
 		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the resource owner's credentials have been validated at the authorization server.
+		/// </summary>
+		internal bool CredentialsValidated { get; set; }
 	}
 }