1
0
mirror of https://github.com/bitwarden/server synced 2026-01-31 08:43:19 +00:00

fix(redirect): [PM-30810] Https Redirection for Cloud Users - Rename enum.

This commit is contained in:
Patrick Pimentel
2026-01-23 17:59:42 -05:00
parent 094754b58f
commit 0f3fcd81dd
2 changed files with 5 additions and 5 deletions

View File

@@ -3,7 +3,7 @@
/// <summary>
/// Deeplink scheme values used for mobile client redirects after Duo authentication.
/// </summary>
public enum DeeplinkScheme : byte
public enum DuoDeeplinkScheme : byte
{
/// <summary>
/// HTTPS scheme used for Bitwarden cloud-hosted environments.

View File

@@ -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<DeeplinkScheme>(candidate, ignoreCase: true, out var scheme) ? scheme : null;
return Enum.TryParse<DuoDeeplinkScheme>(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