diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2011-06-12 14:33:23 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-06-12 14:33:23 -0700 |
| commit | bdf648e967b58b7220f0de14a0f58ed8c7a93d41 (patch) | |
| tree | 24c320ffe3ec59144669b817d717c22fecd2ffc4 /src | |
| parent | da045c9dadb94d7bb5c62b1b3dd4613031a4c856 (diff) | |
| download | DotNetOpenAuth-bdf648e967b58b7220f0de14a0f58ed8c7a93d41.zip DotNetOpenAuth-bdf648e967b58b7220f0de14a0f58ed8c7a93d41.tar.gz DotNetOpenAuth-bdf648e967b58b7220f0de14a0f58ed8c7a93d41.tar.bz2 | |
Last touch-ups to get DNOA up to draft 16 compliance (at least for the success cases).
Incidentally, Facebook doesn't currently support draft 16, so fb interop is broken.
Diffstat (limited to 'src')
3 files changed, 3 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth/OAuth2/ChannelElements/ScopeEncoder.cs b/src/DotNetOpenAuth/OAuth2/ChannelElements/ScopeEncoder.cs index d35f982..7ae5fbf 100644 --- a/src/DotNetOpenAuth/OAuth2/ChannelElements/ScopeEncoder.cs +++ b/src/DotNetOpenAuth/OAuth2/ChannelElements/ScopeEncoder.cs @@ -33,7 +33,7 @@ namespace DotNetOpenAuth.OAuth2.ChannelElements { public string Encode(object value) { var scopes = (IEnumerable<string>)value; ErrorUtilities.VerifyProtocol(!scopes.Any(scope => scope.Contains(" ")), OAuthStrings.ScopesMayNotContainSpaces); - return scopes != null ? string.Join(" ", scopes.ToArray()) : null; + return (scopes != null && scopes.Any()) ? string.Join(" ", scopes.ToArray()) : null; } /// <summary> diff --git a/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenSuccessResponse.cs b/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenSuccessResponse.cs index e88c246..b7d8dea 100644 --- a/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenSuccessResponse.cs +++ b/src/DotNetOpenAuth/OAuth2/Messages/AccessTokenSuccessResponse.cs @@ -26,6 +26,7 @@ namespace DotNetOpenAuth.OAuth2.Messages { internal AccessTokenSuccessResponse(AccessTokenRequestBase request) : base(request) { this.Scope = new HashSet<string>(OAuthUtilities.ScopeStringComparer); + this.TokenType = Protocol.AccessTokenTypes.Bearer; } /// <summary> diff --git a/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationRequest.cs b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationRequest.cs index ce15222..802aed6 100644 --- a/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationRequest.cs +++ b/src/DotNetOpenAuth/OAuth2/Messages/EndUserAuthorizationRequest.cs @@ -31,6 +31,7 @@ namespace DotNetOpenAuth.OAuth2.Messages { Contract.Requires<ArgumentNullException>(version != null); this.HttpMethods = HttpDeliveryMethods.GetRequest | HttpDeliveryMethods.PostRequest; this.Scope = new HashSet<string>(OAuthUtilities.ScopeStringComparer); + this.ResponseType = EndUserAuthorizationResponseType.AuthorizationCode; } /// <summary> |