Browse Source

Merge branch 'main' into BRE-443-get-major-repos-to-bwwl-lint-passing-stage

BRE-443-get-major-repos-to-bwwl-lint-passing-stage
Opeyemi 1 year ago committed by GitHub
parent
commit
62ce26765d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      src/Api/Vault/Controllers/SyncController.cs
  2. 1
      src/Core/Constants.cs

2
src/Api/Vault/Controllers/SyncController.cs

@ -112,7 +112,7 @@ public class SyncController : Controller @@ -112,7 +112,7 @@ public class SyncController : Controller
private ICollection<CipherDetails> FilterSSHKeys(ICollection<CipherDetails> ciphers)
{
if (_currentContext.ClientVersion >= _sshKeyCipherMinimumVersion)
if (_currentContext.ClientVersion >= _sshKeyCipherMinimumVersion || _featureService.IsEnabled(FeatureFlagKeys.SSHVersionCheckQAOverride))
{
return ciphers;
}

1
src/Core/Constants.cs

@ -123,6 +123,7 @@ public static class FeatureFlagKeys @@ -123,6 +123,7 @@ public static class FeatureFlagKeys
public const string DeviceTrustLogging = "pm-8285-device-trust-logging";
public const string SSHKeyItemVaultItem = "ssh-key-vault-item";
public const string SSHAgent = "ssh-agent";
public const string SSHVersionCheckQAOverride = "ssh-version-check-qa-override";
public const string AuthenticatorTwoFactorToken = "authenticator-2fa-token";
public const string IdpAutoSubmitLogin = "idp-auto-submit-login";
public const string UnauthenticatedExtensionUIRefresh = "unauth-ui-refresh";

Loading…
Cancel
Save