From 2d2b0de31ccab707ffce5b432c55c0d8eaa26285 Mon Sep 17 00:00:00 2001 From: CDR-AmirM <88067035+CDR-AmirM@users.noreply.github.com> Date: Thu, 25 Aug 2022 11:57:23 +1000 Subject: [PATCH] v1.0.1 release --- CHANGELOG.md | 8 ++++++-- LICENSE | 4 ++-- README.md | 10 +++++----- .../CDR.DataHolder.API.Gateway.mTLS.csproj | 8 ++++---- Source/CDR.DataHolder.API.Gateway.mTLS/Startup.cs | 3 +-- ....DataHolder.API.Infrastructure.UnitTests.csproj | 6 +++--- .../CDR.DataHolder.API.Infrastructure.csproj | 6 +++--- .../CDR.DataHolder.Admin.API.csproj | 8 ++++---- .../CDR.DataHolder.Domain.csproj | 6 +++--- .../CDR.DataHolder.IdentityServer.UnitTests.csproj | 6 +++--- .../CDR.DataHolder.IdentityServer.csproj | 10 +++++----- .../CDR.DataHolder.IntegrationTests.csproj | 10 +++++----- .../Infrastructure/API2/Register_SSA_API.cs | 4 ++-- ...5584_MDH_InfosecProfileAPI_Registration_POST.cs | 10 +++++----- .../CDR.DataHolder.Manage.API.csproj | 12 ++++++------ .../CDR.DataHolder.Public.API.csproj | 8 ++++---- .../CDR.DataHolder.Repository.csproj | 14 +++++++------- .../CDR.DataHolder.Resource.API.UnitTests.csproj | 6 +++--- .../CDR.DataHolder.Resource.API.csproj | 10 +++++----- .../CDR.GetDataRecipients.csproj | 6 +++--- 20 files changed, 79 insertions(+), 76 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 548fa5a..a609cb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [1.0.0] - 2022-08-02 +## [1.0.1] - 2022-08-30 +### Changed +- Updated package references. + +## [1.0.0] - 2022-07-22 ### Added - Azure function to perform Data Recipient discovery by polling the Get Data Recipients API of the Register. @@ -57,4 +61,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.1.0] - 2021-10-01 ### Added -- First release of the Mock Data Holder. \ No newline at end of file +- First release of the Mock Data Holder. diff --git a/LICENSE b/LICENSE index 73cc6df..aa21f3d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Commonwealth of Australia +Copyright (c) 2021 Commonwealth of Australia Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/README.md b/README.md index 77ed0e2..25e4c8c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![Consumer Data Right Logo](https://raw.githubusercontent.com/ConsumerDataRight/mock-data-holder/main/cdr-logo.png) -[![Consumer Data Standards v1.16.0](https://img.shields.io/badge/Consumer%20Data%20Standards-v1.16.0-blue.svg)](https://consumerdatastandardsaustralia.github.io/standards-archives/standards-1.16.0/#introduction) -[![Conformance Test Suite 3.2](https://img.shields.io/badge/Conformance%20Test%20Suite-v3.2-darkblue.svg)](https://www.cdr.gov.au/for-providers/conformance-test-suite-data-holders) +[![Consumer Data Standards v1.17.0](https://img.shields.io/badge/Consumer%20Data%20Standards-v1.17.0-blue.svg)](https://consumerdatastandardsaustralia.github.io/standards/#introduction) +[![Conformance Test Suite 4.0](https://img.shields.io/badge/Conformance%20Test%20Suite-v4.0-darkblue.svg)](https://www.cdr.gov.au/for-providers/conformance-test-suite-data-holders) [![FAPI 1.0 Advanced Profile](https://img.shields.io/badge/FAPI%201.0-orange.svg)](https://openid.net/specs/openid-financial-api-part-2-1_0.html) [![made-with-dotnet](https://img.shields.io/badge/Made%20with-.NET-1f425Ff.svg)](https://dotnet.microsoft.com/) [![made-with-csharp](https://img.shields.io/badge/Made%20with-C%23-1f425Ff.svg)](https://docs.microsoft.com/en-us/dotnet/csharp/) @@ -14,10 +14,10 @@ This project includes source code, documentation and instructions for a Consumer This repository contains a mock implementation of a Mock Data Holder and is offered to help the community in the development and testing of their CDR solutions. ## Mock Data Holder - Alignment -The Mock Data Holder aligns to [v1.16.0](https://consumerdatastandardsaustralia.github.io/standards-archives/standards-1.16.0/#introduction) of the [Consumer Data Standards](https://consumerdatastandardsaustralia.github.io/standards/#introduction). -The Mock Data Holder passed v3.2 of the [Conformance Test Suite for Data Holders](https://www.cdr.gov.au/for-providers/conformance-test-suite-data-holders). +The Mock Data Holder aligns to [v1.17.0](https://consumerdatastandardsaustralia.github.io/standards/#introduction) of the [Consumer Data Standards](https://consumerdatastandardsaustralia.github.io/standards/#introduction). +The Mock Data Holder passed v4.0 of the [Conformance Test Suite for Data Holders](https://www.cdr.gov.au/for-providers/conformance-test-suite-data-holders). The Mock Data Holder is compliant with the [FAPI 1.0 Advanced Profile](https://openid.net/specs/openid-financial-api-part-2-1_0.html). -The Mock Data Holder aligns to [FAPI 1.0 Migration Phase 1 and Phase 2](https://consumerdatastandardsaustralia.github.io/standards-archives/standards-1.16.0/#authentication-flows). Phase 1 requirements are switched on by default. Configuration has been added to allow switching on Phase 2 requirements. +The Mock Data Holder aligns to [FAPI 1.0 Migration Phase 1 and Phase 2](https://consumerdatastandardsaustralia.github.io/standards/#authentication-flows). Phase 1 requirements are switched on by default. Configuration has been added to allow switching on Phase 2 requirements. ## Getting Started The Mock Data Holder was built using the [Mock Register](https://github.com/ConsumerDataRight/mock-register) and the [Mock Data Recipient](https://github.com/ConsumerDataRight/mock-data-recipient). You can swap out any of the Mock Data Holder, Mock Data Register and Mock Data Recipient solutions with a solution of your own. diff --git a/Source/CDR.DataHolder.API.Gateway.mTLS/CDR.DataHolder.API.Gateway.mTLS.csproj b/Source/CDR.DataHolder.API.Gateway.mTLS/CDR.DataHolder.API.Gateway.mTLS.csproj index 24d1544..f3776dd 100644 --- a/Source/CDR.DataHolder.API.Gateway.mTLS/CDR.DataHolder.API.Gateway.mTLS.csproj +++ b/Source/CDR.DataHolder.API.Gateway.mTLS/CDR.DataHolder.API.Gateway.mTLS.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 @@ -30,7 +30,7 @@ - + diff --git a/Source/CDR.DataHolder.API.Gateway.mTLS/Startup.cs b/Source/CDR.DataHolder.API.Gateway.mTLS/Startup.cs index 083dda8..7085ce8 100644 --- a/Source/CDR.DataHolder.API.Gateway.mTLS/Startup.cs +++ b/Source/CDR.DataHolder.API.Gateway.mTLS/Startup.cs @@ -87,8 +87,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { context.Response.StatusCode = StatusCodes.Status502BadGateway; } - - // using static System.Net.Mime.MediaTypeNames; + context.Response.ContentType = Text.Plain; await context.Response.WriteAsync($"An error occurred handling the request: {ex?.Message}"); }); diff --git a/Source/CDR.DataHolder.API.Infrastructure.UnitTests/CDR.DataHolder.API.Infrastructure.UnitTests.csproj b/Source/CDR.DataHolder.API.Infrastructure.UnitTests/CDR.DataHolder.API.Infrastructure.UnitTests.csproj index 16d4b75..2617cb4 100644 --- a/Source/CDR.DataHolder.API.Infrastructure.UnitTests/CDR.DataHolder.API.Infrastructure.UnitTests.csproj +++ b/Source/CDR.DataHolder.API.Infrastructure.UnitTests/CDR.DataHolder.API.Infrastructure.UnitTests.csproj @@ -5,11 +5,11 @@ false - 1.0.0 + 1.0.1 - 1.0.0 + 1.0.1 - 1.0.0 + 1.0.1 diff --git a/Source/CDR.DataHolder.API.Infrastructure/CDR.DataHolder.API.Infrastructure.csproj b/Source/CDR.DataHolder.API.Infrastructure/CDR.DataHolder.API.Infrastructure.csproj index 3276eb8..3ac3ecd 100644 --- a/Source/CDR.DataHolder.API.Infrastructure/CDR.DataHolder.API.Infrastructure.csproj +++ b/Source/CDR.DataHolder.API.Infrastructure/CDR.DataHolder.API.Infrastructure.csproj @@ -2,9 +2,9 @@ net6.0 - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 diff --git a/Source/CDR.DataHolder.Admin.API/CDR.DataHolder.Admin.API.csproj b/Source/CDR.DataHolder.Admin.API/CDR.DataHolder.Admin.API.csproj index 1826dc9..5a1fabc 100644 --- a/Source/CDR.DataHolder.Admin.API/CDR.DataHolder.Admin.API.csproj +++ b/Source/CDR.DataHolder.Admin.API/CDR.DataHolder.Admin.API.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 @@ -25,7 +25,7 @@ - + diff --git a/Source/CDR.DataHolder.Domain/CDR.DataHolder.Domain.csproj b/Source/CDR.DataHolder.Domain/CDR.DataHolder.Domain.csproj index 3bd403b..c5df528 100644 --- a/Source/CDR.DataHolder.Domain/CDR.DataHolder.Domain.csproj +++ b/Source/CDR.DataHolder.Domain/CDR.DataHolder.Domain.csproj @@ -2,9 +2,9 @@ net6.0 - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 diff --git a/Source/CDR.DataHolder.IdentityServer.UnitTests/CDR.DataHolder.IdentityServer.UnitTests.csproj b/Source/CDR.DataHolder.IdentityServer.UnitTests/CDR.DataHolder.IdentityServer.UnitTests.csproj index f43a55b..933dbf3 100644 --- a/Source/CDR.DataHolder.IdentityServer.UnitTests/CDR.DataHolder.IdentityServer.UnitTests.csproj +++ b/Source/CDR.DataHolder.IdentityServer.UnitTests/CDR.DataHolder.IdentityServer.UnitTests.csproj @@ -3,9 +3,9 @@ net6.0 false - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 diff --git a/Source/CDR.DataHolder.IdentityServer/CDR.DataHolder.IdentityServer.csproj b/Source/CDR.DataHolder.IdentityServer/CDR.DataHolder.IdentityServer.csproj index fb998ec..0fef801 100644 --- a/Source/CDR.DataHolder.IdentityServer/CDR.DataHolder.IdentityServer.csproj +++ b/Source/CDR.DataHolder.IdentityServer/CDR.DataHolder.IdentityServer.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 @@ -79,14 +79,14 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + diff --git a/Source/CDR.DataHolder.IntegrationTests/CDR.DataHolder.IntegrationTests.csproj b/Source/CDR.DataHolder.IntegrationTests/CDR.DataHolder.IntegrationTests.csproj index e1cccfe..ff434d5 100644 --- a/Source/CDR.DataHolder.IntegrationTests/CDR.DataHolder.IntegrationTests.csproj +++ b/Source/CDR.DataHolder.IntegrationTests/CDR.DataHolder.IntegrationTests.csproj @@ -2,9 +2,9 @@ net6.0 false - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 @@ -26,7 +26,7 @@ - + @@ -40,7 +40,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/Source/CDR.DataHolder.IntegrationTests/Infrastructure/API2/Register_SSA_API.cs b/Source/CDR.DataHolder.IntegrationTests/Infrastructure/API2/Register_SSA_API.cs index e63b1cc..1014896 100644 --- a/Source/CDR.DataHolder.IntegrationTests/Infrastructure/API2/Register_SSA_API.cs +++ b/Source/CDR.DataHolder.IntegrationTests/Infrastructure/API2/Register_SSA_API.cs @@ -22,8 +22,8 @@ public static async Task GetSSA(string brandId, string softwareProductId CertificatePassword = BaseTest.CERTIFICATE_PASSWORD, JWT_CertificateFilename = jwtCertificateFilename, JWT_CertificatePassword = jwtCertificatePassword, - ClientId = softwareProductId, - Scope = "cdr-register:bank:read", + ClientId = softwareProductId, + Scope = "cdr-register:read", ClientAssertionType = BaseTest.CLIENTASSERTIONTYPE, GrantType = "client_credentials", Issuer = softwareProductId, diff --git a/Source/CDR.DataHolder.IntegrationTests/US15221_US12969_US15584_MDH_InfosecProfileAPI_Registration_POST.cs b/Source/CDR.DataHolder.IntegrationTests/US15221_US12969_US15584_MDH_InfosecProfileAPI_Registration_POST.cs index 3178bc7..2dfb10f 100644 --- a/Source/CDR.DataHolder.IntegrationTests/US15221_US12969_US15584_MDH_InfosecProfileAPI_Registration_POST.cs +++ b/Source/CDR.DataHolder.IntegrationTests/US15221_US12969_US15584_MDH_InfosecProfileAPI_Registration_POST.cs @@ -44,7 +44,7 @@ static private Dictionary GetJWTPayload(JwtSecurityToken jwt) } [Theory] - [InlineData("2")] + [InlineData("3")] public async Task AC01_Post_WithUnregistedSoftwareProduct_ShouldRespondWith_201Created_CreatedProfile(string ssaVersion) { // Arrange @@ -84,7 +84,7 @@ static async Task Arrange(string ssa) } // Arrange - var ssa = await Register_SSA_API.GetSSA(BRANDID, SOFTWAREPRODUCT_ID, "2"); + var ssa = await Register_SSA_API.GetSSA(BRANDID, SOFTWAREPRODUCT_ID, "3"); await Arrange(ssa); // Act - Try to register the same product again @@ -133,7 +133,7 @@ static string CreateFakeSSA(string ssa) // Arrange TestSetup.DataHolder_PurgeIdentityServer(); - var ssa = await Register_SSA_API.GetSSA(BRANDID, SOFTWAREPRODUCT_ID, "2"); + var ssa = await Register_SSA_API.GetSSA(BRANDID, SOFTWAREPRODUCT_ID, "3"); var registrationRequest = DataHolder_Register_API.CreateRegistrationRequest( signedWithRegisterCertificate ? ssa : CreateFakeSSA(ssa) @@ -169,7 +169,7 @@ public async Task AC06_Post_WithInvalidSSAPayload_400BadRequest_InvalidSSAPayloa // Arrange TestSetup.DataHolder_PurgeIdentityServer(); - var ssa = await Register_SSA_API.GetSSA(BRANDID, SOFTWAREPRODUCT_ID, "2"); + var ssa = await Register_SSA_API.GetSSA(BRANDID, SOFTWAREPRODUCT_ID, "3"); var registrationRequest = DataHolder_Register_API.CreateRegistrationRequest(ssa, redirect_uris: new string[] { "foo" }); // Act @@ -199,7 +199,7 @@ public async Task AC07_Post_WithInvalidMetadata_400BadRequest_InvalidMetadataRes // Arrange TestSetup.DataHolder_PurgeIdentityServer(); - var ssa = await Register_SSA_API.GetSSA(BRANDID, SOFTWAREPRODUCT_ID, "2"); + var ssa = await Register_SSA_API.GetSSA(BRANDID, SOFTWAREPRODUCT_ID, "3"); var registrationRequest = DataHolder_Register_API.CreateRegistrationRequest(ssa, token_endpoint_auth_signing_alg: "HS256"); // HS256 is invalid metadata (ie should be PS256) // Act diff --git a/Source/CDR.DataHolder.Manage.API/CDR.DataHolder.Manage.API.csproj b/Source/CDR.DataHolder.Manage.API/CDR.DataHolder.Manage.API.csproj index 896209e..6b36d0c 100644 --- a/Source/CDR.DataHolder.Manage.API/CDR.DataHolder.Manage.API.csproj +++ b/Source/CDR.DataHolder.Manage.API/CDR.DataHolder.Manage.API.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 @@ -21,14 +21,14 @@ - + - + - + diff --git a/Source/CDR.DataHolder.Public.API/CDR.DataHolder.Public.API.csproj b/Source/CDR.DataHolder.Public.API/CDR.DataHolder.Public.API.csproj index 1826dc9..5a1fabc 100644 --- a/Source/CDR.DataHolder.Public.API/CDR.DataHolder.Public.API.csproj +++ b/Source/CDR.DataHolder.Public.API/CDR.DataHolder.Public.API.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 @@ -25,7 +25,7 @@ - + diff --git a/Source/CDR.DataHolder.Repository/CDR.DataHolder.Repository.csproj b/Source/CDR.DataHolder.Repository/CDR.DataHolder.Repository.csproj index abbdac8..ade85ea 100644 --- a/Source/CDR.DataHolder.Repository/CDR.DataHolder.Repository.csproj +++ b/Source/CDR.DataHolder.Repository/CDR.DataHolder.Repository.csproj @@ -2,22 +2,22 @@ net6.0 - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Source/CDR.DataHolder.Resource.API.UnitTests/CDR.DataHolder.Resource.API.UnitTests.csproj b/Source/CDR.DataHolder.Resource.API.UnitTests/CDR.DataHolder.Resource.API.UnitTests.csproj index b919cec..1e5b62a 100644 --- a/Source/CDR.DataHolder.Resource.API.UnitTests/CDR.DataHolder.Resource.API.UnitTests.csproj +++ b/Source/CDR.DataHolder.Resource.API.UnitTests/CDR.DataHolder.Resource.API.UnitTests.csproj @@ -5,11 +5,11 @@ false - 1.0.0 + 1.0.1 - 1.0.0 + 1.0.1 - 1.0.0 + 1.0.1 diff --git a/Source/CDR.DataHolder.Resource.API/CDR.DataHolder.Resource.API.csproj b/Source/CDR.DataHolder.Resource.API/CDR.DataHolder.Resource.API.csproj index dd8c873..c873c8a 100644 --- a/Source/CDR.DataHolder.Resource.API/CDR.DataHolder.Resource.API.csproj +++ b/Source/CDR.DataHolder.Resource.API/CDR.DataHolder.Resource.API.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 @@ -28,13 +28,13 @@ - + - + diff --git a/Source/CDR.GetDataRecipients/CDR.GetDataRecipients.csproj b/Source/CDR.GetDataRecipients/CDR.GetDataRecipients.csproj index 15cbfce..8427aa7 100644 --- a/Source/CDR.GetDataRecipients/CDR.GetDataRecipients.csproj +++ b/Source/CDR.GetDataRecipients/CDR.GetDataRecipients.csproj @@ -3,9 +3,9 @@ net6.0 v4 <_FunctionsSkipCleanOutput>true - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1