From 0f3fcd81dde275909d0a19090e38db515d4dc8b1 Mon Sep 17 00:00:00 2001 From: Patrick Pimentel Date: Fri, 23 Jan 2026 17:59:42 -0500 Subject: [PATCH] fix(redirect): [PM-30810] Https Redirection for Cloud Users - Rename enum. --- .../Enums/{DeeplinkScheme.cs => DuoDeeplinkScheme.cs} | 2 +- .../Identity/TokenProviders/DuoUniversalTokenService.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/Core/Auth/Enums/{DeeplinkScheme.cs => DuoDeeplinkScheme.cs} (91%) diff --git a/src/Core/Auth/Enums/DeeplinkScheme.cs b/src/Core/Auth/Enums/DuoDeeplinkScheme.cs similarity index 91% rename from src/Core/Auth/Enums/DeeplinkScheme.cs rename to src/Core/Auth/Enums/DuoDeeplinkScheme.cs index 3249c160d6..28e1d0ebf0 100644 --- a/src/Core/Auth/Enums/DeeplinkScheme.cs +++ b/src/Core/Auth/Enums/DuoDeeplinkScheme.cs @@ -3,7 +3,7 @@ /// /// Deeplink scheme values used for mobile client redirects after Duo authentication. /// -public enum DeeplinkScheme : byte +public enum DuoDeeplinkScheme : byte { /// /// HTTPS scheme used for Bitwarden cloud-hosted environments. diff --git a/src/Core/Auth/Identity/TokenProviders/DuoUniversalTokenService.cs b/src/Core/Auth/Identity/TokenProviders/DuoUniversalTokenService.cs index 778d124510..a6dbce032e 100644 --- a/src/Core/Auth/Identity/TokenProviders/DuoUniversalTokenService.cs +++ b/src/Core/Auth/Identity/TokenProviders/DuoUniversalTokenService.cs @@ -197,7 +197,7 @@ public class DuoUniversalTokenService( normalizedHost.EndsWith(".localhost"); } - private static DeeplinkScheme? GetDeeplinkSchemeOverride(HttpContext httpContext) + private static DuoDeeplinkScheme? GetDeeplinkSchemeOverride(HttpContext httpContext) { if (httpContext == null) { @@ -217,7 +217,7 @@ public class DuoUniversalTokenService( var candidate = (overrideFromQuery ?? overrideFromHeader)?.Trim(); // Allow only the two supported values - return Enum.TryParse(candidate, ignoreCase: true, out var scheme) ? scheme : null; + return Enum.TryParse(candidate, ignoreCase: true, out var scheme) ? scheme : null; } public string BuildDuoTwoFactorRedirectUri() @@ -237,7 +237,7 @@ public class DuoUniversalTokenService( { var requestHost = _currentContext.HttpContext.Request.Host.Host; var deeplinkScheme = GetDeeplinkSchemeOverride(_currentContext.HttpContext) ?? - (IsBitwardenCloudHost(requestHost) ? DeeplinkScheme.Https : DeeplinkScheme.Bitwarden); + (IsBitwardenCloudHost(requestHost) ? DuoDeeplinkScheme.Https : DuoDeeplinkScheme.Bitwarden); return string.Format(CultureInfo.InvariantCulture, "{0}/duo-redirect-connector.html?client={1}&deeplinkScheme={2}", _globalSettings.BaseServiceUri.Vault, clientName, deeplinkScheme.ToString().ToLowerInvariant()); @@ -249,7 +249,7 @@ public class DuoUniversalTokenService( { return string.Format(CultureInfo.InvariantCulture, "{0}/duo-redirect-connector.html?client={1}&deeplinkScheme={2}", - _globalSettings.BaseServiceUri.Vault, clientName, DeeplinkScheme.Bitwarden.ToString().ToLowerInvariant()); + _globalSettings.BaseServiceUri.Vault, clientName, DuoDeeplinkScheme.Bitwarden.ToString().ToLowerInvariant()); } // All other clients will not provide an explicit handling. See the complimentary