Merge pull request #1927 from dotnet-maestro-bot/merge/release/2.2-to-master

[automated] Merge branch 'release/2.2' => 'master'

src/Core/TokenOptions.cs

@@ -75,5 +75,10 @@ namespace Microsoft.AspNetCore.Identity
         /// The <see cref="AuthenticatorTokenProvider"/> used to validate two factor sign ins with an authenticator.
         /// </value>
         public string AuthenticatorTokenProvider { get; set; } = DefaultAuthenticatorProvider;
+
+        /// <summary>
+        /// Gets or sets the issuer used for the authenticator issuer.
+        /// </summary>
+        public string AuthenticatorIssuer { get; set; } = "Microsoft.AspNetCore.Identity.UI";
     }
 }

src/UI/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs

@@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Identity.UI.Pages.Account.Manage.Internal
         {
             return string.Format(
                 AuthenticatorUriFormat,
-                _urlEncoder.Encode("Microsoft.AspNetCore.Identity.UI"),
+                _urlEncoder.Encode(_userManager.Options.Tokens.AuthenticatorIssuer),
                 _urlEncoder.Encode(email),
                 unformattedKey);
         }