From be334b0d00bac91d96c89dc6bab2e3158bb31c5a Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 10 Jun 2020 11:57:29 +0200 Subject: [PATCH] Update PhoneNumberTokenProvider.cs Add license header. Hyphenate two-factor authentication in documentation. Add line breaks before return statements. Use string interpolation instead of string concatenation. --- .../src/PhoneNumberTokenProvider.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Identity/Extensions.Core/src/PhoneNumberTokenProvider.cs b/src/Identity/Extensions.Core/src/PhoneNumberTokenProvider.cs index b3c497f867..b87a2f9b9c 100644 --- a/src/Identity/Extensions.Core/src/PhoneNumberTokenProvider.cs +++ b/src/Identity/Extensions.Core/src/PhoneNumberTokenProvider.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; using System.Threading.Tasks; @@ -12,7 +15,7 @@ namespace Microsoft.AspNetCore.Identity where TUser : class { /// - /// Returns a flag indicating whether the token provider can generate a token suitable for two factor authentication token for + /// Returns a flag indicating whether the token provider can generate a token suitable for two-factor authentication token for /// the specified . /// /// The that can be used to retrieve user properties. @@ -20,7 +23,7 @@ namespace Microsoft.AspNetCore.Identity /// /// The that represents the asynchronous operation, containing the a flag indicating if a two /// factor token could be generated by this provider for the specified . - /// The task will return true if a two factor authentication token could be generated as the user has + /// The task will return true if a two-factor authentication token could be generated as the user has /// a telephone number, otherwise false. /// public override async Task CanGenerateTwoFactorTokenAsync(UserManager manager, TUser user) @@ -29,7 +32,9 @@ namespace Microsoft.AspNetCore.Identity { throw new ArgumentNullException(nameof(manager)); } + var phoneNumber = await manager.GetPhoneNumberAsync(user); + return !string.IsNullOrWhiteSpace(phoneNumber) && await manager.IsPhoneNumberConfirmedAsync(user); } @@ -49,8 +54,10 @@ namespace Microsoft.AspNetCore.Identity { throw new ArgumentNullException(nameof(manager)); } + var phoneNumber = await manager.GetPhoneNumberAsync(user); - return "PhoneNumber:" + purpose + ":" + phoneNumber; + + return $"{PhoneNumber}:{purpose}:{phoneNumber}"; } } -} \ No newline at end of file +}