[ODS-6440] Sandbox Admin's "Change Secret" button fails after EFCore …

…upgrade (#1107)
Ed-Fi-Alliance-OSS · Jul 24, 2024 · 7ceb412 · 7ceb412
1 parent 38a6425
commit 7ceb412
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/Application/EdFi.Admin.DataAccess/Repositories/ClientAppRepo.cs b/Application/EdFi.Admin.DataAccess/Repositories/ClientAppRepo.cs
@@ -242,6 +242,16 @@ public async Task<ApiClient> GetClientAsync(string key)
             }
         }
 
+        public ApiClient GetClientIncludingApplication(string key)
+        {
+            using (var context = _contextFactory.CreateContext())
+            {
+                return context.ApiClients
+                    .Include(c => c.Application)
+                    .FirstOrDefault(c => c.Key == key);
+            }
+        }
+
         public ApiClient GetClient(string key, string secret)
         {
             using (var context = _contextFactory.CreateContext())

diff --git a/Application/EdFi.Admin.DataAccess/Repositories/IClientAppRepo.cs b/Application/EdFi.Admin.DataAccess/Repositories/IClientAppRepo.cs
@@ -29,6 +29,8 @@ public interface IClientAppRepo
 
         Task<ApiClient> GetClientAsync(string key);
 
+        ApiClient GetClientIncludingApplication(string key);
+
         ApiClient GetClient(string key, string secret);
 
         ApiClient UpdateClient(ApiClient client);

diff --git a/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj b/Application/EdFi.Ods.Api/EdFi.Ods.Api.csproj
@@ -26,7 +26,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.3.0" />
+        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.3.33" />
         <PackageReference Include="EdFi.Suite3.Security.DataAccess" Version="7.3.0" />
         <PackageReference Include="EdFi.Suite3.Common" Version="7.3.0" />
       </ItemGroup>

diff --git a/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj b/Application/EdFi.Ods.Sandbox/EdFi.Ods.Sandbox.csproj
@@ -20,7 +20,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.3.0" />
+        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.3.33" />
         <PackageReference Include="EdFi.Suite3.Common" Version="7.3.0" />
       </ItemGroup>
     </Otherwise>

diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj b/Application/EdFi.Ods.Tests/EdFi.Ods.Tests.csproj
@@ -27,7 +27,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.3.0" />
+        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.3.33" />
         <PackageReference Include="EdFi.Suite3.Common" Version="7.3.0" />
       </ItemGroup>
     </Otherwise>

diff --git a/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj b/tests/EdFi.Ods.WebApi.CompositeSpecFlowTests/EdFi.Ods.WebApi.CompositeSpecFlowTests.csproj
@@ -32,7 +32,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.3.0" />
+        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.3.33" />
         <PackageReference Include="EdFi.Suite3.Common" Version="7.3.0" />
       </ItemGroup>
     </Otherwise>

diff --git a/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj b/tests/EdFi.Ods.WebApi.IntegrationTests/EdFi.Ods.WebApi.IntegrationTests.csproj
@@ -21,7 +21,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.3.0" />
+        <PackageReference Include="EdFi.Suite3.Admin.DataAccess" Version="7.3.33" />
         <PackageReference Include="EdFi.Suite3.Common" Version="7.3.0" />
       </ItemGroup>
     </Otherwise>