Skip to content

Add in token renewal #75

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

Merged
merged 3 commits into from
Apr 22, 2020
Merged

Add in token renewal #75

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ace892
Add in token renewal
StuartFerguson Apr 22, 2020
dbf9f32
Merge branch 'master' into bug/#72_tokenexpiryissue
StuartFerguson Apr 22, 2020
2fd1aee
:|
StuartFerguson Apr 22, 2020
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
37 changes: 26 additions & 11 deletions TransactionProcessor.BusinessLogic/Services/TransactionDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
using System;
using System.Collections.Generic;
using System.Diagnostics.Eventing.Reader;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -259,7 +260,7 @@ private async Task AddDeviceToMerchant(Guid estateId,
String deviceIdentifier,
CancellationToken cancellationToken)
{
await this.GetToken(cancellationToken);
this.TokenResponse = await this.GetToken(cancellationToken);

// Add the device to the merchant
await this.EstateClient.AddDeviceToMerchant(this.TokenResponse.AccessToken,
Expand Down Expand Up @@ -290,7 +291,7 @@ private String GenerateTransactionReference()
private async Task<EstateResponse> GetEstate(Guid estateId,
CancellationToken cancellationToken)
{
await this.GetToken(cancellationToken);
this.TokenResponse = await this.GetToken(cancellationToken);

EstateResponse estate = await this.EstateClient.GetEstate(this.TokenResponse.AccessToken, estateId, cancellationToken);

Expand All @@ -301,28 +302,42 @@ private async Task<MerchantResponse> GetMerchant(Guid estateId,
Guid merchantId,
CancellationToken cancellationToken)
{
await this.GetToken(cancellationToken);
this.TokenResponse = await this.GetToken(cancellationToken);

MerchantResponse merchant = await this.EstateClient.GetMerchant(this.TokenResponse.AccessToken, estateId, merchantId, cancellationToken);

return merchant;
}

private async Task GetToken(CancellationToken cancellationToken)
/// <summary>
/// Gets the token.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns></returns>
private async Task<TokenResponse> GetToken(CancellationToken cancellationToken)
{
// Get a token to talk to the estate service
String clientId = ConfigurationReader.GetValue("AppSettings", "ClientId");
String clientSecret = ConfigurationReader.GetValue("AppSettings", "ClientSecret");
Logger.LogInformation($"Client Id is {clientId}");
Logger.LogInformation($"Client Secret is {clientSecret}");

if (this.TokenResponse == null)
{
// Get a token to talk to the estate service
String clientId = ConfigurationReader.GetValue("AppSettings", "ClientId");
String clientSecret = ConfigurationReader.GetValue("AppSettings", "ClientSecret");

Logger.LogInformation($"Client Id is {clientId}");
Logger.LogInformation($"Client Secret is {clientSecret}");
TokenResponse token = await this.SecurityServiceClient.GetToken(clientId, clientSecret, cancellationToken);
Logger.LogInformation($"Token is {token.AccessToken}");
return token;
}

if (this.TokenResponse.Expires.UtcDateTime.Subtract(DateTime.UtcNow) < TimeSpan.FromMinutes(2))
{
Logger.LogInformation($"Token is about to expire at {this.TokenResponse.Expires.DateTime:O}");
TokenResponse token = await this.SecurityServiceClient.GetToken(clientId, clientSecret, cancellationToken);
Logger.LogInformation($"Token is {token.AccessToken}");
this.TokenResponse = token;
return token;
}

return this.TokenResponse;
}

/// <summary>
Expand Down