From 78a9471dac7bc380e7e71f0356bd67a73b58f969 Mon Sep 17 00:00:00 2001
From: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Date: Tue, 13 May 2025 12:47:21 -0400
Subject: [PATCH] Use preferred prefix for API keys

---
 .../ClientProviders/SecretsManagerApiKeyProvider.cs            | 2 ++
 src/Identity/IdentityServer/DynamicClientStore.cs              | 3 ++-
 src/Identity/Utilities/ServiceCollectionExtensions.cs          | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs b/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs
index 045b1a1c09..dec5f8dc64 100644
--- a/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs
+++ b/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs
@@ -9,6 +9,8 @@ namespace Bit.Identity.IdentityServer.ClientProviders;
 
 internal class SecretsManagerApiKeyProvider : IClientProvider
 {
+    public const string ApiKeyPrefix = "apikey";
+
     private readonly IApiKeyRepository _apiKeyRepository;
     private readonly IOrganizationRepository _organizationRepository;
 
diff --git a/src/Identity/IdentityServer/DynamicClientStore.cs b/src/Identity/IdentityServer/DynamicClientStore.cs
index b78a0ab4e5..9d7764bf42 100644
--- a/src/Identity/IdentityServer/DynamicClientStore.cs
+++ b/src/Identity/IdentityServer/DynamicClientStore.cs
@@ -1,5 +1,6 @@
 #nullable enable
 
+using Bit.Identity.IdentityServer.ClientProviders;
 using Duende.IdentityServer.Models;
 using Duende.IdentityServer.Stores;
 
@@ -18,7 +19,7 @@ internal class DynamicClientStore : IClientStore
 
     public DynamicClientStore(
       IServiceProvider serviceProvider,
-      [FromKeyedServices("sm-apikey")] IClientProvider apiKeyClientProvider,
+      [FromKeyedServices(SecretsManagerApiKeyProvider.ApiKeyPrefix)] IClientProvider apiKeyClientProvider,
       StaticClientStore staticClientStore
     )
     {
diff --git a/src/Identity/Utilities/ServiceCollectionExtensions.cs b/src/Identity/Utilities/ServiceCollectionExtensions.cs
index 01a3edf3ce..5effacc92d 100644
--- a/src/Identity/Utilities/ServiceCollectionExtensions.cs
+++ b/src/Identity/Utilities/ServiceCollectionExtensions.cs
@@ -69,7 +69,7 @@ public static class ServiceCollectionExtensions
 
         services.AddClientProvider<UserClientProvider>("user");
         services.AddClientProvider<OrganizationClientProvider>("organization");
-        services.AddClientProvider<SecretsManagerApiKeyProvider>("sm-apikey");
+        services.AddClientProvider<SecretsManagerApiKeyProvider>(SecretsManagerApiKeyProvider.ApiKeyPrefix);
 
         if (CoreHelpers.SettingHasValue(globalSettings.IdentityServer.CosmosConnectionString))
         {