SignInManager.AuthenticationScheme rename (#50169)

Co-authored-by: Stephen Halter (from Dev Box) <[email protected]>

Author: halter73

src/Identity/Core/src/IdentityApiEndpointRouteBuilderExtensions.cs

@@ -96,7 +96,7 @@ public static IEndpointConventionBuilder MapIdentityApi<TUser>(this IEndpointRou
 
             var useCookieScheme = (useCookies == true) || (useSessionCookies == true);
             var isPersistent = (useCookies == true) && (useSessionCookies != true);
-            signInManager.PrimaryAuthenticationScheme = useCookieScheme ? IdentityConstants.ApplicationScheme : IdentityConstants.BearerScheme;
+            signInManager.AuthenticationScheme = useCookieScheme ? IdentityConstants.ApplicationScheme : IdentityConstants.BearerScheme;
 
             var result = await signInManager.PasswordSignInAsync(login.Email, login.Password, isPersistent, lockoutOnFailure: true);
 

src/Identity/Core/src/PublicAPI.Unshipped.txt

@@ -3,8 +3,8 @@ Microsoft.AspNetCore.Identity.SecurityStampValidator<TUser>.SecurityStampValidat
 Microsoft.AspNetCore.Identity.SecurityStampValidator<TUser>.TimeProvider.get -> System.TimeProvider!
 Microsoft.AspNetCore.Identity.SecurityStampValidatorOptions.TimeProvider.get -> System.TimeProvider?
 Microsoft.AspNetCore.Identity.SecurityStampValidatorOptions.TimeProvider.set -> void
-Microsoft.AspNetCore.Identity.SignInManager<TUser>.PrimaryAuthenticationScheme.get -> string!
-Microsoft.AspNetCore.Identity.SignInManager<TUser>.PrimaryAuthenticationScheme.set -> void
+Microsoft.AspNetCore.Identity.SignInManager<TUser>.AuthenticationScheme.get -> string!
+Microsoft.AspNetCore.Identity.SignInManager<TUser>.AuthenticationScheme.set -> void
 Microsoft.AspNetCore.Identity.TwoFactorSecurityStampValidator<TUser>.TwoFactorSecurityStampValidator(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Identity.SecurityStampValidatorOptions!>! options, Microsoft.AspNetCore.Identity.SignInManager<TUser!>! signInManager, Microsoft.Extensions.Logging.ILoggerFactory! logger) -> void
 Microsoft.AspNetCore.Routing.IdentityApiEndpointRouteBuilderExtensions
 static Microsoft.AspNetCore.Identity.IdentityBuilderExtensions.AddApiEndpoints(this Microsoft.AspNetCore.Identity.IdentityBuilder! builder) -> Microsoft.AspNetCore.Identity.IdentityBuilder!

src/Identity/Core/src/SignInManager.cs

@@ -84,7 +84,7 @@ public SignInManager(UserManager<TUser> userManager,
     /// <summary>
     /// The authentication scheme to sign in with. Defaults to <see cref="IdentityConstants.ApplicationScheme"/>.
     /// </summary>
-    public string PrimaryAuthenticationScheme { get; set; } = IdentityConstants.ApplicationScheme;
+    public string AuthenticationScheme { get; set; } = IdentityConstants.ApplicationScheme;
 
     /// <summary>
     /// The <see cref="HttpContext"/> used.
@@ -122,7 +122,7 @@ public virtual bool IsSignedIn(ClaimsPrincipal principal)
     {
         ArgumentNullException.ThrowIfNull(principal);
         return principal.Identities != null &&
-            principal.Identities.Any(i => i.AuthenticationType == PrimaryAuthenticationScheme);
+            principal.Identities.Any(i => i.AuthenticationType == AuthenticationScheme);
     }
 
     /// <summary>
@@ -161,7 +161,7 @@ public virtual async Task<bool> CanSignInAsync(TUser user)
     /// <returns>The task object representing the asynchronous operation.</returns>
     public virtual async Task RefreshSignInAsync(TUser user)
     {
-        var auth = await Context.AuthenticateAsync(PrimaryAuthenticationScheme);
+        var auth = await Context.AuthenticateAsync(AuthenticationScheme);
         IList<Claim> claims = Array.Empty<Claim>();
 
         var authenticationMethod = auth?.Principal?.FindFirst(ClaimTypes.AuthenticationMethod);
@@ -237,7 +237,7 @@ public virtual async Task SignInWithClaimsAsync(TUser user, AuthenticationProper
         {
             userPrincipal.Identities.First().AddClaim(claim);
         }
-        await Context.SignInAsync(PrimaryAuthenticationScheme,
+        await Context.SignInAsync(AuthenticationScheme,
             userPrincipal,
             authenticationProperties ?? new AuthenticationProperties());
 
@@ -250,7 +250,7 @@ await Context.SignInAsync(PrimaryAuthenticationScheme,
     /// </summary>
     public virtual async Task SignOutAsync()
     {
-        await Context.SignOutAsync(PrimaryAuthenticationScheme);
+        await Context.SignOutAsync(AuthenticationScheme);
 
         if (await _schemes.GetSchemeAsync(IdentityConstants.ExternalScheme) != null)
         {
@@ -669,9 +669,9 @@ public virtual async Task<SignInResult> ExternalLoginSignInAsync(string loginPro
     }
 
     /// <summary>
-    /// Gets a collection of <see cref="AuthenticationScheme"/>s for the known external login providers.
+    /// Gets a collection of <see cref="Authentication.AuthenticationScheme"/>s for the known external login providers.
     /// </summary>
-    /// <returns>A collection of <see cref="AuthenticationScheme"/>s for the known external login providers.</returns>
+    /// <returns>A collection of <see cref="Authentication.AuthenticationScheme"/>s for the known external login providers.</returns>
     public virtual async Task<IEnumerable<AuthenticationScheme>> GetExternalAuthenticationSchemesAsync()
     {
         var schemes = await _schemes.GetAllSchemesAsync();