From c699df0b548b98515b28bc1fb03a03c899b5a295 Mon Sep 17 00:00:00 2001
From: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Date: Tue, 29 Apr 2025 10:31:55 -0400
Subject: [PATCH] Fix namespaces after merge

---
 .../ClientProviders/InstallationClientProvider.cs               | 2 +-
 .../IdentityServer/ClientProviders/InternalClientProvider.cs    | 2 +-
 .../ClientProviders/OrganizationClientProvider.cs               | 2 +-
 .../ClientProviders/SecretsManagerApiKeyProvider.cs             | 2 +-
 .../IdentityServer/ClientProviders/UserClientProvider.cs        | 2 +-
 .../ClientProviders/InstallationClientProviderTests.cs          | 2 +-
 .../ClientProviders/InternalClientProviderTests.cs              | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Identity/IdentityServer/ClientProviders/InstallationClientProvider.cs b/src/Identity/IdentityServer/ClientProviders/InstallationClientProvider.cs
index f3ddef9812..91cf5cdb72 100644
--- a/src/Identity/IdentityServer/ClientProviders/InstallationClientProvider.cs
+++ b/src/Identity/IdentityServer/ClientProviders/InstallationClientProvider.cs
@@ -1,6 +1,6 @@
 using Bit.Core.IdentityServer;
 using Bit.Core.Platform.Installations;
-using Duende.IdentityModel;
+using IdentityModel;
 using Duende.IdentityServer.Models;
 
 namespace Bit.Identity.IdentityServer.ClientProviders;
diff --git a/src/Identity/IdentityServer/ClientProviders/InternalClientProvider.cs b/src/Identity/IdentityServer/ClientProviders/InternalClientProvider.cs
index 3cab275a8f..eae593fb70 100644
--- a/src/Identity/IdentityServer/ClientProviders/InternalClientProvider.cs
+++ b/src/Identity/IdentityServer/ClientProviders/InternalClientProvider.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics;
 using Bit.Core.IdentityServer;
 using Bit.Core.Settings;
-using Duende.IdentityModel;
+using IdentityModel;
 using Duende.IdentityServer.Models;
 
 namespace Bit.Identity.IdentityServer.ClientProviders;
diff --git a/src/Identity/IdentityServer/ClientProviders/OrganizationClientProvider.cs b/src/Identity/IdentityServer/ClientProviders/OrganizationClientProvider.cs
index d4d707ed12..0119f05438 100644
--- a/src/Identity/IdentityServer/ClientProviders/OrganizationClientProvider.cs
+++ b/src/Identity/IdentityServer/ClientProviders/OrganizationClientProvider.cs
@@ -2,7 +2,7 @@
 using Bit.Core.Identity;
 using Bit.Core.IdentityServer;
 using Bit.Core.Repositories;
-using Duende.IdentityModel;
+using IdentityModel;
 using Duende.IdentityServer.Models;
 
 namespace Bit.Identity.IdentityServer.ClientProviders;
diff --git a/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs b/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs
index 87d2d8fb2c..4d3ade2c5e 100644
--- a/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs
+++ b/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs
@@ -2,7 +2,7 @@
 using Bit.Core.Repositories;
 using Bit.Core.SecretsManager.Models.Data;
 using Bit.Core.SecretsManager.Repositories;
-using Duende.IdentityModel;
+using IdentityModel;
 using Duende.IdentityServer.Models;
 
 namespace Bit.Identity.IdentityServer.ClientProviders;
diff --git a/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs b/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs
index e2da11e414..c49c3ffa13 100644
--- a/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs
+++ b/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs
@@ -8,7 +8,7 @@ using Bit.Core.Identity;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
-using Duende.IdentityModel;
+using IdentityModel;
 using Duende.IdentityServer.Models;
 
 namespace Bit.Identity.IdentityServer.ClientProviders;
diff --git a/test/Identity.Test/IdentityServer/ClientProviders/InstallationClientProviderTests.cs b/test/Identity.Test/IdentityServer/ClientProviders/InstallationClientProviderTests.cs
index 8128cfa557..c8d345d4fa 100644
--- a/test/Identity.Test/IdentityServer/ClientProviders/InstallationClientProviderTests.cs
+++ b/test/Identity.Test/IdentityServer/ClientProviders/InstallationClientProviderTests.cs
@@ -1,7 +1,7 @@
 using Bit.Core.IdentityServer;
 using Bit.Core.Platform.Installations;
 using Bit.Identity.IdentityServer.ClientProviders;
-using Duende.IdentityModel;
+using IdentityModel;
 using NSubstitute;
 using Xunit;
 
diff --git a/test/Identity.Test/IdentityServer/ClientProviders/InternalClientProviderTests.cs b/test/Identity.Test/IdentityServer/ClientProviders/InternalClientProviderTests.cs
index d8a30b31d1..e19e5c2607 100644
--- a/test/Identity.Test/IdentityServer/ClientProviders/InternalClientProviderTests.cs
+++ b/test/Identity.Test/IdentityServer/ClientProviders/InternalClientProviderTests.cs
@@ -1,7 +1,7 @@
 using Bit.Core.IdentityServer;
 using Bit.Core.Settings;
 using Bit.Identity.IdentityServer.ClientProviders;
-using Duende.IdentityModel;
+using IdentityModel;
 using Xunit;
 
 namespace Bit.Identity.Test.IdentityServer.ClientProviders;