Skip to content

Commit 597e2b3

Browse files
HaoKHaoK
committed
Remove CancellationToken from Manager APIs
1 parent 228995c commit 597e2b3

38 files changed

+556
-818
lines changed

‎src/Microsoft.AspNet.Identity/ClaimsIdentityFactory.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,28 +77,26 @@ public ClaimsIdentityFactory(
7777
/// <param name="user">The user instance to create claims on.</param>
7878
/// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe while waiting for the tasks to complete.</param>
7979
/// <returns>A <see cref="Task{TResult}"/> that represents the started task.</returns>
80-
public virtual async Task<ClaimsIdentity> CreateAsync(
81-
TUser user,
82-
CancellationToken cancellationToken = default(CancellationToken))
80+
public virtual async Task<ClaimsIdentity> CreateAsync(TUser user)
8381
{
8482
if (user == null)
8583
{
8684
throw new ArgumentNullException("user");
8785
}
88-
var userId = await UserManager.GetUserIdAsync(user, cancellationToken);
89-
var userName = await UserManager.GetUserNameAsync(user, cancellationToken);
86+
var userId = await UserManager.GetUserIdAsync(user);
87+
var userName = await UserManager.GetUserNameAsync(user);
9088
var id = new ClaimsIdentity(IdentityOptions.ApplicationCookieAuthenticationType, Options.ClaimsIdentity.UserNameClaimType,
9189
Options.ClaimsIdentity.RoleClaimType);
9290
id.AddClaim(new Claim(Options.ClaimsIdentity.UserIdClaimType, userId));
9391
id.AddClaim(new Claim(Options.ClaimsIdentity.UserNameClaimType, userName, ClaimValueTypes.String));
9492
if (UserManager.SupportsUserSecurityStamp)
9593
{
9694
id.AddClaim(new Claim(Options.ClaimsIdentity.SecurityStampClaimType,
97-
await UserManager.GetSecurityStampAsync(user, cancellationToken)));
95+
await UserManager.GetSecurityStampAsync(user)));
9896
}
9997
if (UserManager.SupportsUserRole)
10098
{
101-
var roles = await UserManager.GetRolesAsync(user, cancellationToken);
99+
var roles = await UserManager.GetRolesAsync(user);
102100
foreach (var roleName in roles)
103101
{
104102
id.AddClaim(new Claim(Options.ClaimsIdentity.RoleClaimType, roleName, ClaimValueTypes.String));
@@ -107,14 +105,14 @@ public virtual async Task<ClaimsIdentity> CreateAsync(
107105
var role = await RoleManager.FindByNameAsync(roleName);
108106
if (role != null)
109107
{
110-
id.AddClaims(await RoleManager.GetClaimsAsync(role, cancellationToken));
108+
id.AddClaims(await RoleManager.GetClaimsAsync(role));
111109
}
112110
}
113111
}
114112
}
115113
if (UserManager.SupportsUserClaim)
116114
{
117-
id.AddClaims(await UserManager.GetClaimsAsync(user, cancellationToken));
115+
id.AddClaims(await UserManager.GetClaimsAsync(user));
118116
}
119117
return id;
120118
}

‎src/Microsoft.AspNet.Identity/DataProtectionTokenProvider.cs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,14 @@ public DataProtectorTokenProvider(IDataProtectionProvider dataProtectionProvider
6565
/// <param name="user">The <see cref="TUser"/> the token will be generated from.</param>
6666
/// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe while waiting for the tasks to complete.</param>
6767
/// <returns>A <see cref="Task{TResult}"/> that contains the protected token.</returns>
68-
public virtual async Task<string> GenerateAsync(string purpose, UserManager<TUser> manager, TUser user,
69-
CancellationToken cancellationToken = default(CancellationToken))
68+
public virtual async Task<string> GenerateAsync(string purpose, UserManager<TUser> manager, TUser user)
7069
{
7170
if (user == null)
7271
{
7372
throw new ArgumentNullException("user");
7473
}
7574
var ms = new MemoryStream();
76-
var userId = await manager.GetUserIdAsync(user, cancellationToken);
75+
var userId = await manager.GetUserIdAsync(user);
7776
using (var writer = ms.CreateWriter())
7877
{
7978
writer.Write(DateTimeOffset.UtcNow);
@@ -97,10 +96,8 @@ public virtual async Task<string> GenerateAsync(string purpose, UserManager<TUse
9796
/// <param name="token">The token to validate.</param>
9897
/// <param name="manager">The <see cref="UserManager{TUser}"/> to retrieve user properties from.</param>
9998
/// <param name="user">The <see cref="TUser"/> the token was generated for.</param>
100-
/// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe while waiting for the tasks to complete.</param>
10199
/// <returns>A <see cref="Task{TResult}"/> that is true if the token is valid, otherwise false.</returns>
102-
public virtual async Task<bool> ValidateAsync(string purpose, string token, UserManager<TUser> manager, TUser user,
103-
CancellationToken cancellationToken = default(CancellationToken))
100+
public virtual async Task<bool> ValidateAsync(string purpose, string token, UserManager<TUser> manager, TUser user)
104101
{
105102
try
106103
{
@@ -116,7 +113,7 @@ public virtual async Task<bool> ValidateAsync(string purpose, string token, User
116113
}
117114

118115
var userId = reader.ReadString();
119-
var actualUserId = await manager.GetUserIdAsync(user, cancellationToken);
116+
var actualUserId = await manager.GetUserIdAsync(user);
120117
if (userId != actualUserId)
121118
{
122119
return false;
@@ -155,8 +152,7 @@ public virtual async Task<bool> ValidateAsync(string purpose, string token, User
155152
/// <param name="user">The <see cref="TUser"/> the token was generated for.</param>
156153
/// <returns>True if a token generated by this instance can be used as a Two Factor Authentication token, otherwise false.</returns>
157154
/// <remarks>This method will always return false for instances of <see cref="DataProtectorTokenProvider{TUser}"/>.</remarks>
158-
public virtual Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<TUser> manager, TUser user,
159-
CancellationToken cancellationToken = default(CancellationToken))
155+
public virtual Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<TUser> manager, TUser user)
160156
{
161157
return Task.FromResult(false);
162158
}
@@ -167,10 +163,8 @@ public virtual Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<TUser> mana
167163
/// <param name="token">The token to generate notifications for..</param>
168164
/// <param name="manager">The <see cref="UserManager{TUser}"/> to retrieve user properties from.</param>
169165
/// <param name="user">The <see cref="TUser"/> the token was generated for.</param>
170-
/// <param name="cancellationToken">A <see cref="CancellationToken"/> to observe while waiting for the tasks to complete.</param>
171166
/// <returns>A <see cref="Task{TResult}"/> that represents the started task.</returns>
172-
public virtual Task NotifyAsync(string token, UserManager<TUser> manager, TUser user,
173-
CancellationToken cancellationToken = default(CancellationToken))
167+
public virtual Task NotifyAsync(string token, UserManager<TUser> manager, TUser user)
174168
{
175169
return Task.FromResult(0);
176170
}

‎src/Microsoft.AspNet.Identity/EmailTokenProvider.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,10 @@ public EmailTokenProvider(IOptions<EmailTokenProviderOptions> options, string na
4646
/// <param name="manager"></param>
4747
/// <param name="user"></param>
4848
/// <returns></returns>
49-
public override async Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<TUser> manager, TUser user,
50-
CancellationToken cancellationToken = default(CancellationToken))
49+
public override async Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<TUser> manager, TUser user)
5150
{
52-
var email = await manager.GetEmailAsync(user, cancellationToken);
53-
return !string.IsNullOrWhiteSpace(email) && await manager.IsEmailConfirmedAsync(user, cancellationToken);
51+
var email = await manager.GetEmailAsync(user);
52+
return !string.IsNullOrWhiteSpace(email) && await manager.IsEmailConfirmedAsync(user);
5453
}
5554

5655
/// <summary>
@@ -61,9 +60,9 @@ public override async Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<TUse
6160
/// <param name="user"></param>
6261
/// <returns></returns>
6362
public override async Task<string> GetUserModifierAsync(string purpose, UserManager<TUser> manager,
64-
TUser user, CancellationToken cancellationToken = default(CancellationToken))
63+
TUser user)
6564
{
66-
var email = await manager.GetEmailAsync(user, cancellationToken);
65+
var email = await manager.GetEmailAsync(user);
6766
return "Email:" + purpose + ":" + email;
6867
}
6968

@@ -74,20 +73,19 @@ public override async Task<string> GetUserModifierAsync(string purpose, UserMana
7473
/// <param name="manager"></param>
7574
/// <param name="user"></param>
7675
/// <returns></returns>
77-
public override async Task NotifyAsync(string token, UserManager<TUser> manager, TUser user,
78-
CancellationToken cancellationToken = default(CancellationToken))
76+
public override async Task NotifyAsync(string token, UserManager<TUser> manager, TUser user)
7977
{
8078
if (manager == null)
8179
{
8280
throw new ArgumentNullException(nameof(manager));
8381
}
8482
var msg = new IdentityMessage
8583
{
86-
Destination = await manager.GetEmailAsync(user, cancellationToken),
84+
Destination = await manager.GetEmailAsync(user),
8785
Subject = Options.Subject,
8886
Body = string.Format(CultureInfo.CurrentCulture, Options.BodyFormat, token)
8987
};
90-
await manager.SendMessageAsync(Options.MessageProvider, msg, cancellationToken);
88+
await manager.SendMessageAsync(Options.MessageProvider, msg);
9189
}
9290
}
9391
}

‎src/Microsoft.AspNet.Identity/IClaimsIdentityFactory.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ public interface IClaimsIdentityFactory<TUser>
1919
/// </summary>
2020
/// <param name="user"></param>
2121
/// <param name="authenticationType"></param>
22-
/// <param name="cancellationToken"></param>
2322
/// <returns></returns>
24-
Task<ClaimsIdentity> CreateAsync(TUser user, CancellationToken cancellationToken = default(CancellationToken));
23+
Task<ClaimsIdentity> CreateAsync(TUser user);
2524
}
2625
}

‎src/Microsoft.AspNet.Identity/IIdentityMessageProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ public interface IIdentityMessageProvider
1010
{
1111
string Name { get; }
1212

13-
Task SendAsync(IdentityMessage message, CancellationToken cancellationToken = default(CancellationToken));
13+
Task SendAsync(IdentityMessage message, CancellationToken cancellationToken);
1414
}
1515
}

‎src/Microsoft.AspNet.Identity/IPasswordValidator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public interface IPasswordValidator<TUser> where TUser : class
1515
/// Validate the password for the user
1616
/// </summary>
1717
/// <returns></returns>
18-
Task<IdentityResult> ValidateAsync(UserManager<TUser> manager, TUser user, string password,
19-
CancellationToken cancellationToken = default(CancellationToken));
18+
Task<IdentityResult> ValidateAsync(UserManager<TUser> manager, TUser user, string password);
2019
}
2120
}

‎src/Microsoft.AspNet.Identity/IRoleStore.cs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,39 @@ public interface IRoleStore<TRole> : IDisposable where TRole : class
1919
/// <param name="role"></param>
2020
/// <param name="cancellationToken"></param>
2121
/// <returns></returns>
22-
Task<IdentityResult> CreateAsync(TRole role, CancellationToken cancellationToken = default(CancellationToken));
22+
Task<IdentityResult> CreateAsync(TRole role, CancellationToken cancellationToken);
2323

2424
/// <summary>
2525
/// Update a role
2626
/// </summary>
2727
/// <param name="role"></param>
2828
/// <param name="cancellationToken"></param>
2929
/// <returns></returns>
30-
Task<IdentityResult> UpdateAsync(TRole role, CancellationToken cancellationToken = default(CancellationToken));
30+
Task<IdentityResult> UpdateAsync(TRole role, CancellationToken cancellationToken);
3131

3232
/// <summary>
3333
/// DeleteAsync a role
3434
/// </summary>
3535
/// <param name="role"></param>
3636
/// <param name="cancellationToken"></param>
3737
/// <returns></returns>
38-
Task<IdentityResult> DeleteAsync(TRole role, CancellationToken cancellationToken = default(CancellationToken));
38+
Task<IdentityResult> DeleteAsync(TRole role, CancellationToken cancellationToken);
3939

4040
/// <summary>
4141
/// Returns a role's id
4242
/// </summary>
4343
/// <param name="role"></param>
4444
/// <param name="cancellationToken"></param>
4545
/// <returns></returns>
46-
Task<string> GetRoleIdAsync(TRole role, CancellationToken cancellationToken = default(CancellationToken));
46+
Task<string> GetRoleIdAsync(TRole role, CancellationToken cancellationToken);
4747

4848
/// <summary>
4949
/// Returns a role's name
5050
/// </summary>
5151
/// <param name="role"></param>
5252
/// <param name="cancellationToken"></param>
5353
/// <returns></returns>
54-
Task<string> GetRoleNameAsync(TRole role, CancellationToken cancellationToken = default(CancellationToken));
54+
Task<string> GetRoleNameAsync(TRole role, CancellationToken cancellationToken);
5555

5656
/// <summary>
5757
/// Set a role's name
@@ -60,17 +60,15 @@ public interface IRoleStore<TRole> : IDisposable where TRole : class
6060
/// <param name="roleName"></param>
6161
/// <param name="cancellationToken"></param>
6262
/// <returns></returns>
63-
Task SetRoleNameAsync(TRole role, string roleName,
64-
CancellationToken cancellationToken = default(CancellationToken));
63+
Task SetRoleNameAsync(TRole role, string roleName, CancellationToken cancellationToken);
6564

6665
/// <summary>
6766
/// Get a role's normalized name
6867
/// </summary>
6968
/// <param name="role"></param>
7069
/// <param name="cancellationToken"></param>
7170
/// <returns></returns>
72-
Task<string> GetNormalizedRoleNameAsync(TRole role,
73-
CancellationToken cancellationToken = default(CancellationToken));
71+
Task<string> GetNormalizedRoleNameAsync(TRole role, CancellationToken cancellationToken);
7472

7573
/// <summary>
7674
/// Set a role's normalized name
@@ -79,8 +77,7 @@ Task<string> GetNormalizedRoleNameAsync(TRole role,
7977
/// <param name="normalizedName"></param>
8078
/// <param name="cancellationToken"></param>
8179
/// <returns></returns>
82-
Task SetNormalizedRoleNameAsync(TRole role, string normalizedName,
83-
CancellationToken cancellationToken = default(CancellationToken));
80+
Task SetNormalizedRoleNameAsync(TRole role, string normalizedName, CancellationToken cancellationToken);
8481

8582

8683
/// <summary>
@@ -89,14 +86,14 @@ Task SetNormalizedRoleNameAsync(TRole role, string normalizedName,
8986
/// <param name="roleId"></param>
9087
/// <param name="cancellationToken"></param>
9188
/// <returns></returns>
92-
Task<TRole> FindByIdAsync(string roleId, CancellationToken cancellationToken = default(CancellationToken));
89+
Task<TRole> FindByIdAsync(string roleId, CancellationToken cancellationToken);
9390

9491
/// <summary>
9592
/// Find a role by normalized name
9693
/// </summary>
9794
/// <param name="normalizedRoleName"></param>
9895
/// <param name="cancellationToken"></param>
9996
/// <returns></returns>
100-
Task<TRole> FindByNameAsync(string normalizedRoleName, CancellationToken cancellationToken = default(CancellationToken));
97+
Task<TRole> FindByNameAsync(string normalizedRoleName, CancellationToken cancellationToken);
10198
}
10299
}

‎src/Microsoft.AspNet.Identity/IRoleValidator.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ public interface IRoleValidator<TRole> where TRole : class
1717
/// </summary>
1818
/// <param name="role"></param>
1919
/// <param name="manager"></param>
20-
/// <param name="cancellationToken"></param>
2120
/// <returns></returns>
22-
Task<IdentityResult> ValidateAsync(RoleManager<TRole> manager, TRole role,
23-
CancellationToken cancellationToken = default(CancellationToken));
21+
Task<IdentityResult> ValidateAsync(RoleManager<TRole> manager, TRole role);
2422
}
2523
}

‎src/Microsoft.AspNet.Identity/ISecurityStampValidator.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Security.Claims;
5-
using System.Threading;
65
using System.Threading.Tasks;
76
using Microsoft.AspNet.Security.Cookies;
87

98
namespace Microsoft.AspNet.Identity
109
{
1110
public interface ISecurityStampValidator
1211
{
13-
Task ValidateAsync(CookieValidateIdentityContext context, ClaimsIdentity identity,
14-
CancellationToken cancellationToken = default(CancellationToken));
12+
Task ValidateAsync(CookieValidateIdentityContext context, ClaimsIdentity identity);
1513
}
1614
}

‎src/Microsoft.AspNet.Identity/IUserClaimStore.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ public interface IUserClaimStore<TUser> : IUserStore<TUser> where TUser : class
2020
/// <param name="user"></param>
2121
/// <param name="cancellationToken"></param>
2222
/// <returns></returns>
23-
Task<IList<Claim>> GetClaimsAsync(TUser user,
24-
CancellationToken cancellationToken = default(CancellationToken));
23+
Task<IList<Claim>> GetClaimsAsync(TUser user, CancellationToken cancellationToken);
2524

2625
/// <summary>
2726
/// Add a new user claim
@@ -30,7 +29,7 @@ Task<IList<Claim>> GetClaimsAsync(TUser user,
3029
/// <param name="claims"></param>
3130
/// <param name="cancellationToken"></param>
3231
/// <returns></returns>
33-
Task AddClaimsAsync(TUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken = default(CancellationToken));
32+
Task AddClaimsAsync(TUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken);
3433

3534
/// <summary>
3635
/// Updates the give claim information with the given new claim information
@@ -40,7 +39,7 @@ Task<IList<Claim>> GetClaimsAsync(TUser user,
4039
/// <param name="newClaim"></param>
4140
/// <param name="cancellationToken"></param>
4241
/// <returns></returns>
43-
Task ReplaceClaimAsync(TUser user, Claim claim, Claim newClaim, CancellationToken cancellationToken = default(CancellationToken));
42+
Task ReplaceClaimAsync(TUser user, Claim claim, Claim newClaim, CancellationToken cancellationToken);
4443

4544
/// <summary>
4645
/// Remove a user claim
@@ -49,15 +48,14 @@ Task<IList<Claim>> GetClaimsAsync(TUser user,
4948
/// <param name="claims"></param>
5049
/// <param name="cancellationToken"></param>
5150
/// <returns></returns>
52-
Task RemoveClaimsAsync(TUser user, IEnumerable<Claim> claims,
53-
CancellationToken cancellationToken = default(CancellationToken));
51+
Task RemoveClaimsAsync(TUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken);
5452

5553
/// <summary>
5654
/// Get users having a specific claim
5755
/// </summary>
5856
/// <param name="claim">Claim to look up</param>
5957
/// <param name="cancellationToken"></param>
6058
/// <returns></returns>
61-
Task<IList<TUser>> GetUsersForClaimAsync(Claim claim, CancellationToken cancellationToken = default(CancellationToken));
59+
Task<IList<TUser>> GetUsersForClaimAsync(Claim claim, CancellationToken cancellationToken);
6260
}
6361
}

0 commit comments

Comments
 (0)