From 5972fa000436d68a2ffe4758e9f601efb48e553f Mon Sep 17 00:00:00 2001
From: Jonathan <vanillajonathan@users.noreply.github.com>
Date: Wed, 10 Jun 2020 12:02:18 +0200
Subject: [PATCH] Update EmailTokenProvider.cs

---
 .../Extensions.Core/src/EmailTokenProvider.cs   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Identity/Extensions.Core/src/EmailTokenProvider.cs b/src/Identity/Extensions.Core/src/EmailTokenProvider.cs
index a6ee043876..69daaf73be 100644
--- a/src/Identity/Extensions.Core/src/EmailTokenProvider.cs
+++ b/src/Identity/Extensions.Core/src/EmailTokenProvider.cs
@@ -1,3 +1,6 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System.Threading.Tasks;
 
 namespace Microsoft.AspNetCore.Identity
@@ -10,29 +13,31 @@ namespace Microsoft.AspNetCore.Identity
         where TUser : class
     {
         /// <summary>
-        /// Checks if a two factor authentication token can be generated for the specified <paramref name="user"/>.
+        /// Checks if a two-factor authentication token can be generated for the specified <paramref name="user"/>.
         /// </summary>
         /// <param name="manager">The <see cref="UserManager{TUser}"/> to retrieve the <paramref name="user"/> from.</param>
-        /// <param name="user">The <typeparamref name="TUser"/> to check for the possibility of generating a two factor authentication token.</param>
+        /// <param name="user">The <typeparamref name="TUser"/> to check for the possibility of generating a two-factor authentication token.</param>
         /// <returns>True if the user has an email address set, otherwise false.</returns>
         public override async Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<TUser> manager, TUser user)
         {
             var email = await manager.GetEmailAsync(user);
+
             return !string.IsNullOrWhiteSpace(email) && await manager.IsEmailConfirmedAsync(user);
         }
 
         /// <summary>
         /// Returns the a value for the user used as entropy in the generated token.
         /// </summary>
-        /// <param name="purpose">The purpose of the two factor authentication token.</param>
+        /// <param name="purpose">The purpose of the two-factor authentication token.</param>
         /// <param name="manager">The <see cref="UserManager{TUser}"/> to retrieve the <paramref name="user"/> from.</param>
-        /// <param name="user">The <typeparamref name="TUser"/> to check for the possibility of generating a two factor authentication token.</param>
+        /// <param name="user">The <typeparamref name="TUser"/> to check for the possibility of generating a two-factor authentication token.</param>
         /// <returns>A string suitable for use as entropy in token generation.</returns>
         public override async Task<string> GetUserModifierAsync(string purpose, UserManager<TUser> manager,
             TUser user)
         {
             var email = await manager.GetEmailAsync(user);
-            return "Email:" + purpose + ":" + email;
+
+            return $"{Email}:{purpose}:{email}";
         }
     }
-}
\ No newline at end of file
+}