Merge pull request #9045 from NuGet/dev

[ReleasePrep][2022.03.10]RI of dev into main

Author: Daniel Jacinto

src/AccountDeleter/EmptyFeatureFlagService.cs

@@ -141,6 +141,11 @@ public bool IsMarkdigMdRenderingEnabled()
             throw new NotImplementedException();
         }
 
+        public bool IsNewAccount2FAEnforcementEnabled()
+        {
+            throw new NotImplementedException();
+        }
+
         public bool IsODataDatabaseReadOnlyEnabled()
         {
             throw new NotImplementedException();

src/Bootstrap/dist/css/bootstrap-theme.css

@@ -11,7 +11,6 @@
   &:focus,
   &.focus {
     color: @color;
-    background-color: darken(@background, 10%);
     border-color: darken(@border, 25%);
   }
   &:hover {

src/Bootstrap/dist/css/bootstrap.css

@@ -21,6 +21,11 @@
   @media (min-width: @grid-float-breakpoint) {
     border-radius: @navbar-border-radius;
   }
+
+  a:focus {
+    outline: 4px solid white;
+    outline-offset: -2px;
+  }
 }
 
 

src/Bootstrap/less/mixins/buttons.less

@@ -83,6 +83,11 @@ body {
 
   a {
     color: @panel-footer-color;
+
+    &:focus {
+      outline: 3px solid white;
+      outline-offset: 2px;
+    }
   }
 
   .footer-release-info {

src/Bootstrap/less/navbar.less

@@ -274,5 +274,10 @@ public bool IsRecentPackagesNoIndexEnabled()
         {
             throw new NotImplementedException();
         }
+
+        public bool IsNewAccount2FAEnforcementEnabled()
+        {
+            throw new NotImplementedException();
+        }
     }
 }

src/Bootstrap/less/theme/base.less

@@ -345,7 +345,7 @@ private async Task<Claim[]> GetUserLoginClaims(AuthenticatedUser user, bool wasM
                     .Where(cred => cred.IsExternal())
                     .Select(cred => cred.Identity)
                     .ToArray();
-                
+
                 var identityList = string.Join(" or ", externalIdentities);
                 ClaimsExtensions.AddExternalCredentialIdentityClaim(claims, identityList);
             }
@@ -365,7 +365,7 @@ private async Task<Claim[]> GetUserLoginClaims(AuthenticatedUser user, bool wasM
             return claims.ToArray();
         }
 
-        public virtual async Task<AuthenticatedUser> Register(string username, string emailAddress, Credential credential, bool autoConfirm = false)
+        public virtual async Task<AuthenticatedUser> Register(string username, string emailAddress, Credential credential, bool autoConfirm = false, bool enableMultiFactorAuthentication = false)
         {
             if (_config.FeedOnlyMode)
             {
@@ -392,7 +392,8 @@ public virtual async Task<AuthenticatedUser> Register(string username, string em
                 UnconfirmedEmailAddress = emailAddress,
                 EmailConfirmationToken = CryptographyService.GenerateToken(),
                 NotifyPackagePushed = true,
-                CreatedUtc = _dateTimeProvider.UtcNow
+                CreatedUtc = _dateTimeProvider.UtcNow,
+                EnableMultiFactorAuthentication = enableMultiFactorAuthentication
             };
 
             // Add a credential for the password
@@ -799,15 +800,15 @@ private async Task ReplaceCredentialInternal(User user, Credential credential)
             Func<Credential, bool> replacingPredicate;
             if (!string.IsNullOrEmpty(replaceCredPrefix))
             {
-                 replacingPredicate = cred => cred.Type.StartsWith(replaceCredPrefix, StringComparison.OrdinalIgnoreCase);
+                replacingPredicate = cred => cred.Type.StartsWith(replaceCredPrefix, StringComparison.OrdinalIgnoreCase);
             }
             else
             {
                 replacingPredicate = cred => cred.Type.Equals(credential.Type, StringComparison.OrdinalIgnoreCase);
             }
 
             var toRemove = user.Credentials
-                .Where(replacingPredicate) 
+                .Where(replacingPredicate)
                 .ToList();
 
             foreach (var cred in toRemove)

src/GitHubVulnerabilities2Db/Fakes/FakeFeatureFlagService.cs

@@ -53,6 +53,7 @@ public class FeatureFlagService : IFeatureFlagService
         private const string DisplayTargetFrameworkFeatureName = GalleryPrefix + "DisplayTargetFramework";
         private const string ComputeTargetFrameworkFeatureName = GalleryPrefix + "ComputeTargetFramework";
         private const string RecentPackagesNoIndexFeatureName = GalleryPrefix + "RecentPackagesNoIndex";
+        private const string NewAccount2FAEnforcementFeatureName = GalleryPrefix + "NewAccount2FAEnforcement";
 
         private const string ODataV1GetAllNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllNonHijacked";
         private const string ODataV1GetAllCountNonHijackedFeatureName = GalleryPrefix + "ODataV1GetAllCountNonHijacked";
@@ -362,5 +363,10 @@ public bool IsRecentPackagesNoIndexEnabled()
         {
             return _client.IsEnabled(RecentPackagesNoIndexFeatureName, defaultValue: false);
         }
+
+        public bool IsNewAccount2FAEnforcementEnabled()
+        {
+            return _client.IsEnabled(NewAccount2FAEnforcementFeatureName, defaultValue: false);
+        }
     }
 }

src/NuGetGallery.Services/Authentication/AuthenticationService.cs

@@ -291,5 +291,10 @@ public interface IFeatureFlagService
         /// Whether or not recent packages has no index applied to block search engine indexing.
         /// </summary>
         bool IsRecentPackagesNoIndexEnabled();
+
+        /// <summary>
+        /// Whether or not to enforce 2FA for new external account link or replacement.
+        /// </summary>
+        bool IsNewAccount2FAEnforcementEnabled();
     }
 }