diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-05-13 21:40:54 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-05-13 21:40:54 -0700 |
| commit | 0b8f9cc1a6439edb623069f9efa4851aecc701bb (patch) | |
| tree | 2e8fa419ab97a9f83849e5f26e6f0ae13a5626e7 /src | |
| parent | f8f6611474aca1915721a2d2708891ef0649c04e (diff) | |
| download | DotNetOpenAuth-0b8f9cc1a6439edb623069f9efa4851aecc701bb.zip DotNetOpenAuth-0b8f9cc1a6439edb623069f9efa4851aecc701bb.tar.gz DotNetOpenAuth-0b8f9cc1a6439edb623069f9efa4851aecc701bb.tar.bz2 | |
Fixed some bugs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenAuth/DotNetOpenAuth.csproj | 1 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OAuthWrap/ClientBase.cs | 2 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OAuthWrap/Protocol.cs | 2 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OAuthWrap/WrapUtilities.cs | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj index 31b51c5..bd38345 100644 --- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj +++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj @@ -307,6 +307,7 @@ http://opensource.org/licenses/ms-pl.html <Compile Include="Mvc\OpenIdAjaxOptions.cs" /> <Compile Include="Messaging\StandardMessageFactory.cs" /> <Compile Include="OAuthWrap\AuthorizationState.cs" /> + <Compile Include="OAuthWrap\IAuthorizationState.cs" /> <Compile Include="OAuthWrap\IClientTokenManager.cs" /> <Compile Include="OAuthWrap\Messages\Assertion\AssertionRequest.cs" /> <Compile Include="OAuthWrap\Messages\ClientCredentials\ClientCredentialsRequest.cs" /> diff --git a/src/DotNetOpenAuth/OAuthWrap/ClientBase.cs b/src/DotNetOpenAuth/OAuthWrap/ClientBase.cs index 178764a..d5746bc 100644 --- a/src/DotNetOpenAuth/OAuthWrap/ClientBase.cs +++ b/src/DotNetOpenAuth/OAuthWrap/ClientBase.cs @@ -63,7 +63,7 @@ namespace DotNetOpenAuth.OAuthWrap { Contract.Requires<ArgumentNullException>(request != null); Contract.Requires<ArgumentNullException>(authorization != null); Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(authorization.AccessToken)); - Contract.Requires<ProtocolException>(authorization.AccessTokenExpirationUtc < DateTime.UtcNow); + Contract.Requires<ProtocolException>(!authorization.AccessTokenExpirationUtc.HasValue || authorization.AccessTokenExpirationUtc < DateTime.UtcNow); AuthorizeRequest(request, authorization.AccessToken); } } diff --git a/src/DotNetOpenAuth/OAuthWrap/Protocol.cs b/src/DotNetOpenAuth/OAuthWrap/Protocol.cs index 9ee7091..c11c127 100644 --- a/src/DotNetOpenAuth/OAuthWrap/Protocol.cs +++ b/src/DotNetOpenAuth/OAuthWrap/Protocol.cs @@ -31,7 +31,7 @@ namespace DotNetOpenAuth.OAuthWrap { /// <summary> /// The format of the HTTP Authorization header value that authorizes OAuth WRAP requests. /// </summary> - internal const string HttpAuthorizationHeaderFormat = "WRAP access_token=\"{0}\""; + internal const string HttpAuthorizationHeaderFormat = "Token token=\"{0}\""; /// <summary> /// The "type" string. diff --git a/src/DotNetOpenAuth/OAuthWrap/WrapUtilities.cs b/src/DotNetOpenAuth/OAuthWrap/WrapUtilities.cs index a892364..7e04f3f 100644 --- a/src/DotNetOpenAuth/OAuthWrap/WrapUtilities.cs +++ b/src/DotNetOpenAuth/OAuthWrap/WrapUtilities.cs @@ -16,13 +16,13 @@ namespace DotNetOpenAuth.OAuthWrap { /// <summary> /// Some common utility methods for OAuth WRAP. /// </summary> - public static class WrapUtilities { + internal static class WrapUtilities { /// <summary> /// Authorizes an HTTP request using an OAuth WRAP access token in an HTTP Authorization header. /// </summary> /// <param name="request">The request to authorize.</param> /// <param name="accessToken">The access token previously obtained from the Authorization Server.</param> - public static void AuthorizeWithOAuthWrap(this HttpWebRequest request, string accessToken) { + internal static void AuthorizeWithOAuthWrap(this HttpWebRequest request, string accessToken) { Contract.Requires<ArgumentNullException>(request != null); Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(accessToken)); request.Headers[HttpRequestHeader.Authorization] = string.Format( |