Removed some message parts from an earlier draft of the spec.

2 files changed, 1 insertions, 23 deletions

diff --git a/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationRequest.cs
index 2faa33b..d870aba 100644
--- a/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationRequest.cs
+++ b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationRequest.cs
@@ -84,27 +84,5 @@ namespace DotNetOpenAuth.OAuth2.Messages {
 		/// <value>The scope of the access request expressed as a list of space-delimited strings. The value of the scope parameter is defined by the authorization server. If the value contains multiple space-delimited strings, their order does not matter, and each string adds an additional access range to the requested scope.</value>
 		[MessagePart(Protocol.scope, IsRequired = false, AllowEmpty = true)]
 		public string Scope { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether the authorization server is
-		/// allowed to interact with the user before responding to the client's request.
-		/// </summary>
-		/// <remarks>
-		/// This is internal because it doesn't appear in recent drafts of the spec.
-		/// </remarks>
-		internal bool IsUserInteractionAllowed {
-			get { return !this.Immediate.HasValue || !this.Immediate.Value; }
-			set { this.Immediate = value ? (bool?)null : true; }
-		}
-
-		/// <summary>
-		/// Gets or sets a value indicating whether the authorization server is
-		/// required to redirect the browser back to the client immediately.
-		/// </summary>
-		/// <remarks>
-		/// OPTIONAL. The parameter value must be set to true or false. If set to true, the authorization server MUST NOT prompt the end-user to authenticate or approve access. Instead, the authorization server attempts to establish the end-user's identity via other means (e.g. browser cookies) and checks if the end-user has previously approved an identical access request by the same client and if that access grant is still active. If the authorization server does not support an immediate check or if it is unable to establish the end-user's identity or approval status, it MUST deny the request without prompting the end-user. Defaults to false  if omitted. 
-		/// </remarks>
-		[MessagePart(Protocol.immediate, IsRequired = false, AllowEmpty = false)]
-		internal bool? Immediate { get; set; }
 	}
 }
diff --git a/src/DotNetOpenAuth/OAuth2/OAuthUtilities.cs b/src/DotNetOpenAuth/OAuth2/OAuthUtilities.cs
index 4565a3f..609e0a6 100644
--- a/src/DotNetOpenAuth/OAuth2/OAuthUtilities.cs
+++ b/src/DotNetOpenAuth/OAuth2/OAuthUtilities.cs
@@ -82,7 +82,7 @@ namespace DotNetOpenAuth.OAuth2 {
 		internal static void AuthorizeWithOAuthWrap(this HttpWebRequest request, string accessToken) {
 			Contract.Requires<ArgumentNullException>(request != null);
 			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(accessToken));
-			Contract.Requires<ArgumentException>(accessToken.All(ch => accessTokenAuthorizationHeaderAllowedCharacters.IndexOf(ch) >= 0), "The access token contains characters that must not appear in the HTTP Authorization header.");
+			ErrorUtilities.VerifyProtocol(accessToken.All(ch => accessTokenAuthorizationHeaderAllowedCharacters.IndexOf(ch) >= 0), "The access token contains characters that must not appear in the HTTP Authorization header.");
 
 			request.Headers[HttpRequestHeader.Authorization] = string.Format(
 				CultureInfo.InvariantCulture,