From aa26a436b1fcc527c41a3b995c4bfddda62e0e80 Mon Sep 17 00:00:00 2001 From: CDR Open Source Date: Mon, 4 Aug 2025 06:18:22 +0000 Subject: [PATCH 1/2] v3.0.2 release --- .github/workflows/dotnet.yml | 14 +++++++------- CHANGELOG.md | 4 ++++ Source/CDR.DataRecipient.SDK/Models/Acr.cs | 6 +++--- .../Models/AuthorisationRequestClaims.cs | 10 +++++----- .../Models/AuthorisationRequestClaimsUserInfo.cs | 6 +++--- Source/CDR.DataRecipient.SDK/Models/IdToken.cs | 4 ++-- Source/Directory.Build.props | 2 +- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 4578a43..abb644a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -143,7 +143,7 @@ jobs: # Archive unit test results - name: Archive unit test results - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v2 if: always() with: name: unit-test-results @@ -151,7 +151,7 @@ jobs: # Archive integration test results - name: Archive integration test results - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v2 if: always() with: name: integration-test-results @@ -159,7 +159,7 @@ jobs: # Archive e2e test results - name: Archive e2e test results - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v2 if: always() with: name: e2e-test-results @@ -167,7 +167,7 @@ jobs: # Archive mock data recipient logs - name: Archive mock data recipient logs - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v2 if: always() with: name: integration-test-artifacts @@ -175,7 +175,7 @@ jobs: # Archive mock data holder logs - name: Archive mock data holder logs - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v2 if: always() with: name: integration-test-artifacts @@ -183,7 +183,7 @@ jobs: # Archive mock data holder energy logs - name: Archive mock data holder energy logs - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v2 if: always() with: name: integration-test-artifacts @@ -191,7 +191,7 @@ jobs: # Archive mock register logs - name: Archive mock register logs - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v2 if: always() with: name: integration-test-artifacts diff --git a/CHANGELOG.md b/CHANGELOG.md index e3ba295..e597c4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [3.0.2] - 2025-08-06 +### Fixed +- Fixed issue where some claims in the PAR request were not sent in lowercase. + ## [3.0.1] - 2025-06-19 ### Changed - Fixed multiple build warnings to improve code quality and maintainability diff --git a/Source/CDR.DataRecipient.SDK/Models/Acr.cs b/Source/CDR.DataRecipient.SDK/Models/Acr.cs index 819e46a..2e65796 100644 --- a/Source/CDR.DataRecipient.SDK/Models/Acr.cs +++ b/Source/CDR.DataRecipient.SDK/Models/Acr.cs @@ -1,13 +1,13 @@ -using Newtonsoft.Json; +using System.Text.Json.Serialization; namespace CDR.DataRecipient.SDK.Models.AuthorisationRequest { public class Acr { - [JsonProperty(PropertyName = "essential")] + [JsonPropertyName("essential")] public bool Essential { get; set; } - [JsonProperty(PropertyName = "values")] + [JsonPropertyName("values")] public string[] Values { get; set; } } } diff --git a/Source/CDR.DataRecipient.SDK/Models/AuthorisationRequestClaims.cs b/Source/CDR.DataRecipient.SDK/Models/AuthorisationRequestClaims.cs index 5e7e5bf..97fd30b 100644 --- a/Source/CDR.DataRecipient.SDK/Models/AuthorisationRequestClaims.cs +++ b/Source/CDR.DataRecipient.SDK/Models/AuthorisationRequestClaims.cs @@ -1,4 +1,4 @@ -using Newtonsoft.Json; +using System.Text.Json.Serialization; namespace CDR.DataRecipient.SDK.Models.AuthorisationRequest { @@ -10,16 +10,16 @@ public AuthorisationRequestClaims(int supportedAcr) this.Id_token = new IdToken(supportedAcr); } - [JsonProperty("sharing_duration")] + [JsonPropertyName("sharing_duration")] public int? Sharing_duration { get; set; } - [JsonProperty("cdr_arrangement_id")] + [JsonPropertyName("cdr_arrangement_id")] public string Cdr_arrangement_id { get; set; } - [JsonProperty("userinfo")] + [JsonPropertyName("userinfo")] public AuthorisationRequestClaimsUserInfo Userinfo { get; set; } - [JsonProperty("id_token")] + [JsonPropertyName("id_token")] public IdToken Id_token { get; set; } } } diff --git a/Source/CDR.DataRecipient.SDK/Models/AuthorisationRequestClaimsUserInfo.cs b/Source/CDR.DataRecipient.SDK/Models/AuthorisationRequestClaimsUserInfo.cs index 8b9979d..d95356d 100644 --- a/Source/CDR.DataRecipient.SDK/Models/AuthorisationRequestClaimsUserInfo.cs +++ b/Source/CDR.DataRecipient.SDK/Models/AuthorisationRequestClaimsUserInfo.cs @@ -1,13 +1,13 @@ -using Newtonsoft.Json; +using System.Text.Json.Serialization; namespace CDR.DataRecipient.SDK.Models.AuthorisationRequest { public class AuthorisationRequestClaimsUserInfo { - [JsonProperty("given_name")] + [JsonPropertyName("given_name")] public string Given_name { get; set; } - [JsonProperty("family_name")] + [JsonPropertyName("family_name")] public string Family_name { get; set; } } } diff --git a/Source/CDR.DataRecipient.SDK/Models/IdToken.cs b/Source/CDR.DataRecipient.SDK/Models/IdToken.cs index 963b611..32fd57d 100644 --- a/Source/CDR.DataRecipient.SDK/Models/IdToken.cs +++ b/Source/CDR.DataRecipient.SDK/Models/IdToken.cs @@ -1,4 +1,4 @@ -using Newtonsoft.Json; +using System.Text.Json.Serialization; namespace CDR.DataRecipient.SDK.Models.AuthorisationRequest { @@ -9,7 +9,7 @@ public IdToken(int supportedAcr) this.Acr = new Acr() { Essential = true, Values = new string[] { $"urn:cds.au:cdr:{supportedAcr}" } }; } - [JsonProperty("acr")] + [JsonPropertyName("acr")] public Acr Acr { get; set; } } } diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props index dcff766..9a0d1e6 100644 --- a/Source/Directory.Build.props +++ b/Source/Directory.Build.props @@ -1,7 +1,7 @@ net8.0 - 3.0.1 + 3.0.2 true true true From e0d8dff40e0857b42b10457936b92488e9cef494 Mon Sep 17 00:00:00 2001 From: CDR-FarooqK <110141673+CDR-FarooqK@users.noreply.github.com> Date: Mon, 4 Aug 2025 17:04:41 +1000 Subject: [PATCH 2/2] Update dotnet.yml Updating the version of upload-artifact --- .github/workflows/dotnet.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index abb644a..6624da4 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -143,7 +143,7 @@ jobs: # Archive unit test results - name: Archive unit test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: always() with: name: unit-test-results @@ -151,7 +151,7 @@ jobs: # Archive integration test results - name: Archive integration test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: always() with: name: integration-test-results @@ -159,7 +159,7 @@ jobs: # Archive e2e test results - name: Archive e2e test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: always() with: name: e2e-test-results @@ -167,7 +167,7 @@ jobs: # Archive mock data recipient logs - name: Archive mock data recipient logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: always() with: name: integration-test-artifacts @@ -175,7 +175,7 @@ jobs: # Archive mock data holder logs - name: Archive mock data holder logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: always() with: name: integration-test-artifacts @@ -183,7 +183,7 @@ jobs: # Archive mock data holder energy logs - name: Archive mock data holder energy logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: always() with: name: integration-test-artifacts @@ -191,8 +191,9 @@ jobs: # Archive mock register logs - name: Archive mock register logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: always() with: name: integration-test-artifacts path: ${{ github.workspace }}/mock-data-recipient/Source/DockerCompose/_temp/mock-register/tmp +