Skip to content

Commit

Permalink
v1.2.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
CDR-AndrewG authored Jun 13, 2023
2 parents cb7ff37 + 80cef5d commit 7f9f0bf
Show file tree
Hide file tree
Showing 24 changed files with 41 additions and 723 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0


## [Unreleased]

## [1.2.1] - 2023-06-07
### Changed
- Updated Authorisation Server git clone command in readme
- Rebuilt to include v1.0.1 of the [Authorisation Server](https://github.com/ConsumerDataRight/authorisation-server)

## [1.2.0] - 2023-03-21
### Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
<Version>1.2.0</Version>
<FileVersion>1.2.0</FileVersion>
<AssemblyVersion>1.2.0</AssemblyVersion>
<Version>1.2.1</Version>
<FileVersion>1.2.1</FileVersion>
<AssemblyVersion>1.2.1</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
82 changes: 0 additions & 82 deletions Source/CDR.DataHolder.API.Gateway.mTLS/appsettings.Container.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<Version>1.2.0</Version>
<FileVersion>1.2.0</FileVersion>
<AssemblyVersion>1.2.0</AssemblyVersion>
<Version>1.2.1</Version>
<FileVersion>1.2.1</FileVersion>
<AssemblyVersion>1.2.1</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>1.2.0</Version>
<FileVersion>1.2.0</FileVersion>
<AssemblyVersion>1.2.0</AssemblyVersion>
<Version>1.2.1</Version>
<FileVersion>1.2.1</FileVersion>
<AssemblyVersion>1.2.1</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>1.2.0</Version>
<FileVersion>1.2.0</FileVersion>
<AssemblyVersion>1.2.0</AssemblyVersion>
<Version>1.2.1</Version>
<FileVersion>1.2.1</FileVersion>
<AssemblyVersion>1.2.1</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
<Version>1.2.0</Version>
<FileVersion>1.2.0</FileVersion>
<AssemblyVersion>1.2.0</AssemblyVersion>
<Version>1.2.1</Version>
<FileVersion>1.2.1</FileVersion>
<AssemblyVersion>1.2.1</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
86 changes: 0 additions & 86 deletions Source/CDR.DataHolder.Admin.API/appsettings.Container.json

This file was deleted.

6 changes: 3 additions & 3 deletions Source/CDR.DataHolder.Domain/CDR.DataHolder.Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>1.2.0</Version>
<FileVersion>1.2.0</FileVersion>
<AssemblyVersion>1.2.0</AssemblyVersion>
<Version>1.2.1</Version>
<FileVersion>1.2.1</FileVersion>
<AssemblyVersion>1.2.1</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<Version>1.2.0</Version>
<FileVersion>1.2.0</FileVersion>
<AssemblyVersion>1.2.0</AssemblyVersion>
<Version>1.2.1</Version>
<FileVersion>1.2.1</FileVersion>
<AssemblyVersion>1.2.1</AssemblyVersion>
</PropertyGroup>
<ItemGroup>
<Content Include="appsettings.json">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
<Version>1.2.0</Version>
<FileVersion>1.2.0</FileVersion>
<AssemblyVersion>1.2.0</AssemblyVersion>
<Version>1.2.1</Version>
<FileVersion>1.2.1</FileVersion>
<AssemblyVersion>1.2.1</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
32 changes: 1 addition & 31 deletions Source/CDR.DataHolder.Manage.API/Controllers/ManageController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
using CDR.DataHolder.Repository.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Serilog.Context;
using System.IO;
using System.Net.Http;
using System.Threading.Tasks;

namespace CDR.DataHolder.Manage.API.Controllers
Expand Down Expand Up @@ -42,34 +40,6 @@ public async Task<IActionResult> LoadData()
}

return Ok();
}

private async Task<string> GetData(string endpoint, int version)
{
using (LogContext.PushProperty("MethodName", ControllerContext.RouteData.Values["action"].ToString()))
{
_logger.LogInformation("Retrieving data from {endpoint} (x-v: {version})...", endpoint, version);
}

var httpClient = GetHttpClient();
httpClient.DefaultRequestHeaders.Add("x-v", version.ToString());
var response = await httpClient.GetAsync(endpoint);

_logger.LogInformation("Status code: {statusCode}", response.StatusCode);

if (response.IsSuccessStatusCode)
{
return await response.Content.ReadAsStringAsync();
}

return null;
}

private static HttpClient GetHttpClient()
{
var clientHandler = new HttpClientHandler();
clientHandler.ServerCertificateCustomValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
return new HttpClient(clientHandler);
}
}
}
}
Loading

0 comments on commit 7f9f0bf

Please sign in to comment.