diff options
author | Andrew Arnott <andrewarnott@gmail.com> | 2011-06-24 08:46:24 -0700 |
---|---|---|
committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-06-24 08:46:24 -0700 |
commit | 6afe362c46799401eb8dd74faab58c7e51482228 (patch) | |
tree | 03f08e33b473a12206cca0ce4a84f16e02da9873 /src | |
parent | 23cb348e7eab957e39a5a80d23f097c15595db84 (diff) | |
download | DotNetOpenAuth-6afe362c46799401eb8dd74faab58c7e51482228.zip DotNetOpenAuth-6afe362c46799401eb8dd74faab58c7e51482228.tar.gz DotNetOpenAuth-6afe362c46799401eb8dd74faab58c7e51482228.tar.bz2 |
Non-impactful code tidying.
Diffstat (limited to 'src')
-rw-r--r-- | src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs b/src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs index 1c71b29..bae752c 100644 --- a/src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs +++ b/src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs @@ -77,7 +77,6 @@ namespace DotNetOpenAuth.OAuth2 { Contract.Requires<ArgumentNullException>(authorizationRequest != null); var response = this.PrepareApproveAuthorizationRequest(authorizationRequest, userName, scopes, callback); - this.Channel.Respond(response); } @@ -123,7 +122,6 @@ namespace DotNetOpenAuth.OAuth2 { var request = this.ReadAccessTokenRequest(httpRequestInfo); if (request != null) { response = this.PrepareAccessTokenResponse(request); - return true; } @@ -186,8 +184,8 @@ namespace DotNetOpenAuth.OAuth2 { switch (authorizationRequest.ResponseType) { case EndUserAuthorizationResponseType.AccessToken: var accessTokenResponse = new EndUserAuthorizationSuccessAccessTokenResponse(callback, authorizationRequest); - response = accessTokenResponse; accessTokenResponse.Lifetime = this.AuthorizationServerServices.GetAccessTokenLifetime(authorizationRequest); + response = accessTokenResponse; break; case EndUserAuthorizationResponseType.AuthorizationCode: response = new EndUserAuthorizationSuccessAuthCodeResponse(callback, authorizationRequest); @@ -218,8 +216,8 @@ namespace DotNetOpenAuth.OAuth2 { var tokenRequest = (IAuthorizationCarryingRequest)request; TimeSpan accessTokenLifetime = this.AuthorizationServerServices.GetAccessTokenLifetime(request); using (var resourceServerEncryptionKey = this.AuthorizationServerServices.GetResourceServerEncryptionKey(request)) { - var accessTokenFormatter = AccessToken.CreateFormatter(this.AuthorizationServerServices.AccessTokenSigningKey, resourceServerEncryptionKey); var accessToken = new AccessToken(tokenRequest.AuthorizationDescription, accessTokenLifetime); + var accessTokenFormatter = AccessToken.CreateFormatter(this.AuthorizationServerServices.AccessTokenSigningKey, resourceServerEncryptionKey); var response = new AccessTokenSuccessResponse(request) { AccessToken = accessTokenFormatter.Serialize(accessToken), @@ -228,8 +226,8 @@ namespace DotNetOpenAuth.OAuth2 { response.Scope.ResetContents(tokenRequest.AuthorizationDescription.Scope); if (includeRefreshToken) { - var refreshTokenFormatter = RefreshToken.CreateFormatter(this.AuthorizationServerServices.CryptoKeyStore); var refreshToken = new RefreshToken(tokenRequest.AuthorizationDescription); + var refreshTokenFormatter = RefreshToken.CreateFormatter(this.AuthorizationServerServices.CryptoKeyStore); response.RefreshToken = refreshTokenFormatter.Serialize(refreshToken); } |