Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion EstateManagementUI.BlazorServer/appsettings.Test.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
"SecurityServicePort": null,
"HttpClientIgnoreCertificateErrors": false,
"TestMode": true,
"TestUserRole": "Estate"
"TestUserRole": "Estate",
//"ClientId": "estateUIClient",
//"ClientSecret": "Secret1"
},
"Authentication": {
"Authority": "https://localhost:5001",
Expand Down
4 changes: 3 additions & 1 deletion EstateManagementUI.BlazorServer/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"TransactionProcessorApi": "http://127.0.0.1:5002",
"EstateReportingApi": "http://127.0.0.1:5011",
"FileProcessorApi": "http://127.0.0.1:5009",
"SecurityService": "https://127.0.0.1:5001"
"SecurityService": "https://127.0.0.1:5001",
"ClientId": "serviceClient",
"ClientSecret": "d192cbc46d834d0da90e8a9d50ded543"
},
"Authentication": {
"Authority": "https://localhost:5001",
Expand Down
8 changes: 6 additions & 2 deletions EstateManagmentUI.BusinessLogic/Client/DateMethods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Collections.Generic;
using System.Text;
using System.Threading;
using Shared.General;
using TransactionProcessor.Client;

namespace EstateManagementUI.BusinessLogic.Client
Expand All @@ -24,7 +25,8 @@ public partial class ApiClient : IApiClient {
private readonly ISecurityServiceClient SecurityServiceClient;
private readonly ITransactionProcessorClient TransactionProcessorClient;

public ApiClient(IEstateReportingApiClient estateReportingApiClient, ISecurityServiceClient securityServiceClient,
public ApiClient(IEstateReportingApiClient estateReportingApiClient,
ISecurityServiceClient securityServiceClient,
ITransactionProcessorClient transactionProcessorClient) {
this.EstateReportingApiClient = estateReportingApiClient;
this.SecurityServiceClient = securityServiceClient;
Expand All @@ -50,7 +52,9 @@ public async Task<Result<List<ComparisonDateModel>>> GetComparisonDates(Queries.
private async Task<Result<String>> GetToken(CancellationToken cancellationToken) {
// Get a token here
// TODO: Add caching
Result<TokenResponse>? token = await this.SecurityServiceClient.GetToken("serviceClient", "d192cbc46d834d0da90e8a9d50ded543", cancellationToken);
var clientId = ConfigurationReader.GetValueOrDefault("AppSettings", "ClientId", "");
var clientSecret = ConfigurationReader.GetValueOrDefault("AppSettings", "ClientSecret", "");
Result<TokenResponse>? token = await this.SecurityServiceClient.GetToken(clientId, clientSecret, cancellationToken);
if (token.IsFailed)
return ResultHelpers.CreateFailure(token);
return Result.Success<String>(token.Data.AccessToken);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<PackageReference Include="ClientProxyBase" Version="2025.12.2" />
<PackageReference Include="MediatR" Version="14.0.0" />
<PackageReference Include="SecurityService.Client" Version="2025.12.2" />
<PackageReference Include="Shared" Version="2025.12.2" />
<PackageReference Include="Shared.Results" Version="2025.12.2" />
<PackageReference Include="SimpleResults" Version="4.0.0" />
<PackageReference Include="TransactionProcessor.Client" Version="2025.12.1" />
Expand Down
Loading