Update packages

Signed-off-by: Victor Chang <vicchang@nvidia.com>

Author: mocsharp

src/Authentication/Configurations/OpenIdOptions.cs

@@ -31,5 +31,8 @@ public class OpenIdOptions
 
         [ConfigurationKeyName("Claims")]
         public Claims? Claims { get; set; }
+
+        [ConfigurationKeyName("Audiences")]
+        public IList<string>? Audiences { get; set; }
     }
 }

src/Authentication/Extensions/AuthKeys.cs

@@ -24,15 +24,7 @@ public static class AuthKeys
         public const string UserPolicyName = "User";
 
         // Configuration Keys
-        public const string ServerRealm = "ServerRealm";
-
-        public const string ServerRealmKey = "ServerRealmKey";
-        public const string Claims = "Claims";
         public const string OpenId = "OpenId";
-        public const string MonaiDeployAuthentication = "MonaiDeployAuthentication";
-        public const string RequiredUserClaims = "RequiredUserClaims";
-        public const string RequiredAdminClaims = "RequiredAdminClaims";
         public const string UserRoles = "user_roles";
-        public const string Endpoints = "endpoints";
     }
 }

src/Authentication/Extensions/HttpContextExtension.cs

@@ -32,15 +32,15 @@ public static List<string> GetValidEndpoints(this HttpContext httpcontext, List<
             Guard.Against.Null(adminClaims);
             Guard.Against.Null(userClaims);
 
-            foreach (var claim in adminClaims)
+            foreach (var claim in adminClaims!)
             {
                 if (httpcontext.User.HasClaim(AuthKeys.UserRoles, claim.UserRoles!))
                 {
                     return new List<string> { "all" };
                 }
             }
 
-            foreach (var claim in userClaims)
+            foreach (var claim in userClaims!)
             {
                 if (httpcontext.User.HasClaim(AuthKeys.UserRoles, claim.UserRoles!))
                 {

src/Authentication/Extensions/MonaiAuthenticationExtensions.cs

@@ -64,7 +64,7 @@ public static IServiceCollection AddMonaiAuthentication(
                 {
                     IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configurations.Value.OpenId!.ServerRealmKey!)),
                     ValidIssuer = configurations.Value.OpenId.ServerRealm,
-                    ValidAudiences = new List<string>() { "account", "monai-app" },
+                    ValidAudiences = configurations.Value.OpenId.Audiences,
                     ValidateIssuerSigningKey = true,
                     ValidateIssuer = true,
                     ValidateLifetime = true,

src/Authentication/Tests/EndpointAuthorizationMiddlewareTest.cs

@@ -84,6 +84,7 @@ public async Task GivenConfigurationFileWithOpenIdConfigured_WhenUserIsAuthentic
 
             var data = await responseMessage.Content.ReadFromJsonAsync<List<string>>().ConfigureAwait(false);
 
+            Assert.NotNull(data);
             Assert.Collection(data,
                 item => item.Equals("A", StringComparison.Ordinal),
                 item => item.Equals("B", StringComparison.Ordinal),

src/Authentication/Tests/Monai.Deploy.Security.Authentication.Tests.csproj

@@ -11,13 +11,13 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.11" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/Authentication/Tests/test.auth.json

@@ -4,6 +4,7 @@
     "OpenId": {
       "ServerRealm": "TEST-REALM",
       "ServerRealmKey": "l9ZRlbMQBt9k1klUUrlWFuke8WbqnEde",
+      "Audiences": [ "monai-app" ],
       "ClientId": "monai-app-test",
       "Claims": {
         "RequiredUserClaims": [

src/Authentication/example.json

@@ -5,6 +5,7 @@
       "ServerRealm": "TEST-REALM",
       "ServerRealmKey": "EncryptionKey",
       "ClientId": "monai-app",
+      "Audiences": [ "monai-deploy" ],
       "Claims": {
         "RequiredUserClaims": [
           {