diff --git a/Directory.Packages.props b/Directory.Packages.props
index dc366f08..086b452c 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -10,7 +10,7 @@
-
+
diff --git a/Udap.Client/Rest/FhirClientWithUrlProvider.cs b/Udap.Client/Rest/FhirClientWithUrlProvider.cs
index 678e4564..851f997d 100644
--- a/Udap.Client/Rest/FhirClientWithUrlProvider.cs
+++ b/Udap.Client/Rest/FhirClientWithUrlProvider.cs
@@ -10,12 +10,8 @@ namespace Udap.Client.Rest;
public class FhirClientWithUrlProvider : FhirClient
{
public FhirClientWithUrlProvider(IBaseUrlProvider baseUrlProvider, HttpClient httpClient, FhirClientSettings? settings = null, IStructureDefinitionSummaryProvider? provider = null)
- : base(baseUrlProvider.GetBaseUrl(), httpClient, settings, provider)
+ : base(baseUrlProvider.GetBaseUrl(), httpClient, settings)
{
- var requester = new HttpClientRequester(baseUrlProvider.GetBaseUrl(), Settings, httpClient);
- Requester = requester;
-
- // Expose default request headers to user.
- RequestHeaders = requester.Client.DefaultRequestHeaders;
+
}
}
diff --git a/Udap.Model/UdapAuthenticationExtensions/B2BAuthorizationExtension.cs b/Udap.Model/UdapAuthenticationExtensions/B2BAuthorizationExtension.cs
index 4cbe25e2..97a6d6a0 100644
--- a/Udap.Model/UdapAuthenticationExtensions/B2BAuthorizationExtension.cs
+++ b/Udap.Model/UdapAuthenticationExtensions/B2BAuthorizationExtension.cs
@@ -24,7 +24,7 @@ public class B2BAuthorizationExtension : Dictionary
private string? _subjectId;
private string? _subjectRole;
private string? _organizationName;
- private Uri _organizationId = default!;
+ private string? _organizationId = default!;
private ICollection _purposeOfUse = new HashSet();
private ICollection? _consentPolicy;
private ICollection? _consentReference;
@@ -104,13 +104,13 @@ public string? OraganizationName
}
[JsonPropertyName(UdapConstants.B2BAuthorizationExtension.OrganizationId)]
- public Uri OrganizationId
+ public string? OrganizationId
{
get
{
- if (Uri.TryCreate(GetStandardClaim(UdapConstants.RegistrationDocumentValues.ClientUri), UriKind.Absolute, out var value))
+ if (_organizationId == null)
{
- _organizationId = value;
+ _organizationId = GetStandardClaim(UdapConstants.B2BAuthorizationExtension.OrganizationId);
}
return _organizationId;
@@ -118,7 +118,7 @@ public Uri OrganizationId
set
{
_organizationId = value;
- this[UdapConstants.B2BAuthorizationExtension.OrganizationId] = value;
+ if (value != null) this[UdapConstants.B2BAuthorizationExtension.OrganizationId] = value;
}
}
diff --git a/_tests/Directory.Packages.props b/_tests/Directory.Packages.props
index 55d74254..baa0f7e0 100644
--- a/_tests/Directory.Packages.props
+++ b/_tests/Directory.Packages.props
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/examples/FhirLabsApi/FhirLabsApi.csproj b/examples/FhirLabsApi/FhirLabsApi.csproj
index 49336f30..c9d724d8 100644
--- a/examples/FhirLabsApi/FhirLabsApi.csproj
+++ b/examples/FhirLabsApi/FhirLabsApi.csproj
@@ -43,10 +43,10 @@
-
-
+
+
-
+
diff --git a/examples/Udap.Auth.Server.Admin/Udap.Auth.Server.Admin.csproj b/examples/Udap.Auth.Server.Admin/Udap.Auth.Server.Admin.csproj
index a9faea9f..1bb42e9c 100644
--- a/examples/Udap.Auth.Server.Admin/Udap.Auth.Server.Admin.csproj
+++ b/examples/Udap.Auth.Server.Admin/Udap.Auth.Server.Admin.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/examples/clients/UdapEd/Server/Controllers/AccessController.cs b/examples/clients/UdapEd/Server/Controllers/AccessController.cs
index 457ac7b2..39545198 100644
--- a/examples/clients/UdapEd/Server/Controllers/AccessController.cs
+++ b/examples/clients/UdapEd/Server/Controllers/AccessController.cs
@@ -129,9 +129,9 @@ public Task RequestAccessTokenClientCredentials(
var b2bHl7 = new B2BAuthorizationExtension()
{
SubjectId = "urn:oid:2.16.840.1.113883.4.6#1234567890",
- OrganizationId = new Uri("https://fhirlabs.net/fhir/r4"),
+ OrganizationId = new Uri("https://fhirlabs.net/fhir/r4").OriginalString,
OraganizationName = "FhirLabs",
- PurposeOfUse = new HashSet
+ PurposeOfUse = new List
{
"urn:oid:2.16.840.1.113883.5.8#TREAT"
}
diff --git a/migrations/UdapDb.SqlServer/UdapDb.SqlServer.csproj b/migrations/UdapDb.SqlServer/UdapDb.SqlServer.csproj
index 382b64a2..c56ea8a9 100644
--- a/migrations/UdapDb.SqlServer/UdapDb.SqlServer.csproj
+++ b/migrations/UdapDb.SqlServer/UdapDb.SqlServer.csproj
@@ -11,7 +11,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive