Merge branch 'retargeting-contracts'

1 files changed, 5 insertions, 6 deletions

diff --git a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ClientBase.cs b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ClientBase.cs
index e9c952d..b2178e9 100644
--- a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ClientBase.cs
+++ b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ClientBase.cs
@@ -7,7 +7,6 @@
 namespace DotNetOpenAuth.OAuth2 {
 	using System;
 	using System.Collections.Generic;
-	using System.Diagnostics.Contracts;
 	using System.Globalization;
 	using System.Linq;
 	using System.Net;
@@ -21,6 +20,7 @@ namespace DotNetOpenAuth.OAuth2 {
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.OAuth2.ChannelElements;
 	using DotNetOpenAuth.OAuth2.Messages;
+	using Validation;
 
 	/// <summary>
 	/// A base class for common OAuth Client behaviors.
@@ -134,7 +134,7 @@ namespace DotNetOpenAuth.OAuth2 {
 		public void AuthorizeRequest(WebHeaderCollection requestHeaders, IAuthorizationState authorization) {
 			Requires.NotNull(requestHeaders, "requestHeaders");
 			Requires.NotNull(authorization, "authorization");
-			Requires.True(!string.IsNullOrEmpty(authorization.AccessToken), "authorization");
+			Requires.That(!string.IsNullOrEmpty(authorization.AccessToken), "authorization", "AccessToken required.");
 			ErrorUtilities.VerifyProtocol(!authorization.AccessTokenExpirationUtc.HasValue || authorization.AccessTokenExpirationUtc >= DateTime.UtcNow || authorization.RefreshToken != null, ClientStrings.AuthorizationExpired);
 
 			if (authorization.AccessTokenExpirationUtc.HasValue && authorization.AccessTokenExpirationUtc.Value < DateTime.UtcNow) {
@@ -186,7 +186,7 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// </remarks>
 		public bool RefreshAuthorization(IAuthorizationState authorization, TimeSpan? skipIfUsefulLifeExceeds = null) {
 			Requires.NotNull(authorization, "authorization");
-			Requires.True(!string.IsNullOrEmpty(authorization.RefreshToken), "authorization");
+			Requires.That(!string.IsNullOrEmpty(authorization.RefreshToken), "authorization", "RefreshToken required.");
 
 			if (skipIfUsefulLifeExceeds.HasValue && authorization.AccessTokenExpirationUtc.HasValue) {
 				TimeSpan usefulLifeRemaining = authorization.AccessTokenExpirationUtc.Value - DateTime.UtcNow;
@@ -223,7 +223,6 @@ namespace DotNetOpenAuth.OAuth2 {
 		public IAuthorizationState GetScopedAccessToken(string refreshToken, HashSet<string> scope) {
 			Requires.NotNullOrEmpty(refreshToken, "refreshToken");
 			Requires.NotNull(scope, "scope");
-			Contract.Ensures(Contract.Result<IAuthorizationState>() != null);
 
 			var request = new AccessTokenRefreshRequestC(this.AuthorizationServer) {
 				ClientIdentifier = this.ClientIdentifier,
@@ -377,8 +376,8 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <returns>A fractional number no greater than 1.  Could be negative if the access token has already expired.</returns>
 		private static double ProportionalLifeRemaining(IAuthorizationState authorization) {
 			Requires.NotNull(authorization, "authorization");
-			Requires.True(authorization.AccessTokenIssueDateUtc.HasValue, "authorization");
-			Requires.True(authorization.AccessTokenExpirationUtc.HasValue, "authorization");
+			Requires.That(authorization.AccessTokenIssueDateUtc.HasValue, "authorization", "AccessTokenIssueDateUtc required");
+			Requires.That(authorization.AccessTokenExpirationUtc.HasValue, "authorization", "AccessTokenExpirationUtc required");
 
 			// Calculate what % of the total life this access token has left.
 			TimeSpan totalLifetime = authorization.AccessTokenExpirationUtc.Value - authorization.AccessTokenIssueDateUtc.Value;