Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add TokenResponseGenerator.CreateResponseAsync #1178

Merged
merged 5 commits into from
Apr 1, 2023
Merged

Add TokenResponseGenerator.CreateResponseAsync #1178

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0a786f
Add TokenResponseGenerator.CreateResponseAsync
josephdecock Feb 8, 2023
81a85de
Clean up comments
josephdecock Feb 8, 2023
283235c
Add obsolete attribute to deprecated method
josephdecock Feb 10, 2023
92bb6d4
Revert rename of ProcessTokenRequestAsync
josephdecock Mar 31, 2023
3bcba0d
Merge branch 'main' into joe/token-response-gen-virtuals
josephdecock Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 6 additions & 73 deletions src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,30 +143,8 @@ protected virtual async Task<TokenResponse> ProcessAuthorizationCodeRequestAsync
{
Logger.LogTrace("Creating response for authorization code request");

//////////////////////////
// access token
/////////////////////////
var (accessToken, refreshToken) = await CreateAccessTokenAsync(request.ValidatedRequest);
var response = new TokenResponse
{
AccessToken = accessToken,
AccessTokenType = request.ValidatedRequest.ProofType == ProofType.DPoP ? OidcConstants.TokenResponse.DPoPTokenType : OidcConstants.TokenResponse.BearerTokenType,
AccessTokenLifetime = request.ValidatedRequest.AccessTokenLifetime,
Custom = request.CustomResponse,
Scope = request.ValidatedRequest.ValidatedResources.RawScopeValues.ToSpaceSeparatedString()
};

//////////////////////////
// refresh token
/////////////////////////
if (refreshToken.IsPresent())
{
response.RefreshToken = refreshToken;
}
var response = await ProcessTokenRequestAsync(request);

//////////////////////////
// id token
/////////////////////////
if (request.ValidatedRequest.AuthorizationCode.IsOpenId)
{
// load the client that belongs to the authorization code
Expand Down Expand Up @@ -267,30 +245,8 @@ protected virtual async Task<TokenResponse> ProcessDeviceCodeRequestAsync(TokenR
{
Logger.LogTrace("Creating response for device code request");

//////////////////////////
// access token
/////////////////////////
var (accessToken, refreshToken) = await CreateAccessTokenAsync(request.ValidatedRequest);
var response = new TokenResponse
{
AccessToken = accessToken,
AccessTokenType = request.ValidatedRequest.ProofType == ProofType.DPoP ? OidcConstants.TokenResponse.DPoPTokenType : OidcConstants.TokenResponse.BearerTokenType,
AccessTokenLifetime = request.ValidatedRequest.AccessTokenLifetime,
Custom = request.CustomResponse,
Scope = request.ValidatedRequest.ValidatedResources.RawScopeValues.ToSpaceSeparatedString()
};
var response = await ProcessTokenRequestAsync(request);

//////////////////////////
// refresh token
/////////////////////////
if (refreshToken.IsPresent())
{
response.RefreshToken = refreshToken;
}

//////////////////////////
// id token
/////////////////////////
if (request.ValidatedRequest.DeviceCode.IsOpenId)
{
// load the client that belongs to the device code
Expand Down Expand Up @@ -330,31 +286,8 @@ protected virtual async Task<TokenResponse> ProcessCibaRequestAsync(TokenRequest
{
Logger.LogTrace("Creating response for CIBA request");

//////////////////////////
// access token
/////////////////////////
var (accessToken, refreshToken) = await CreateAccessTokenAsync(request.ValidatedRequest);
var response = new TokenResponse
{
AccessToken = accessToken,
AccessTokenType = request.ValidatedRequest.ProofType == ProofType.DPoP ? OidcConstants.TokenResponse.DPoPTokenType : OidcConstants.TokenResponse.BearerTokenType,
AccessTokenLifetime = request.ValidatedRequest.AccessTokenLifetime,
Custom = request.CustomResponse,
Scope = request.ValidatedRequest.ValidatedResources.RawScopeValues.ToSpaceSeparatedString()
};
var response = await ProcessTokenRequestAsync(request);

//////////////////////////
// refresh token
/////////////////////////
if (refreshToken.IsPresent())
{
response.RefreshToken = refreshToken;
}

//////////////////////////
// id token
/////////////////////////

// load the client that belongs to the device code
Client client = null;
if (request.ValidatedRequest.BackChannelAuthenticationRequest.ClientId != null)
Expand Down Expand Up @@ -395,10 +328,9 @@ protected virtual Task<TokenResponse> ProcessExtensionGrantRequestAsync(TokenReq
}

/// <summary>
/// Creates the response for a token request.
/// Creates a response for a token request containing an access token and a
/// refresh token if requested.
/// </summary>
/// <param name="validationResult">The validation result.</param>
/// <returns></returns>
protected virtual async Task<TokenResponse> ProcessTokenRequestAsync(TokenRequestValidationResult validationResult)
{
(var accessToken, var refreshToken) = await CreateAccessTokenAsync(validationResult.ValidatedRequest);
Expand All @@ -419,6 +351,7 @@ protected virtual async Task<TokenResponse> ProcessTokenRequestAsync(TokenReques
return response;
}


/// <summary>
/// Creates the access/refresh token.
/// </summary>
Expand Down