huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Using 'nameof' operator instead of magic string

This commit is contained in:
Hisham Bin Ateya 2015-09-15 23:25:37 +03:00
parent 150df1659a
commit a2cbaa0666
5 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Microsoft.AspNet.Identity.EntityFramework/RoleStore.cs
View File

@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (role == null)
{
throw new ArgumentNullException("role");
throw new ArgumentNullException(nameof(role));
}
Context.Add(role);
await SaveChanges(cancellationToken);
@ -85,7 +85,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (role == null)
{
throw new ArgumentNullException("role");
throw new ArgumentNullException(nameof(role));
}
Context.Attach(role);
role.ConcurrencyStamp = Guid.NewGuid().ToString();
@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (role == null)
{
throw new ArgumentNullException("role");
throw new ArgumentNullException(nameof(role));
}
Context.Remove(role);
try
@ -127,7 +127,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (role == null)
{
throw new ArgumentNullException("role");
throw new ArgumentNullException(nameof(role));
}
return Task.FromResult(ConvertIdToString(role.Id));
}
@ -138,7 +138,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (role == null)
{
throw new ArgumentNullException("role");
throw new ArgumentNullException(nameof(role));
}
return Task.FromResult(role.Name);
}
@ -149,7 +149,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (role == null)
{
throw new ArgumentNullException("role");
throw new ArgumentNullException(nameof(role));
}
role.Name = roleName;
return Task.FromResult(0);
@ -244,7 +244,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (role == null)
{
throw new ArgumentNullException("role");
throw new ArgumentNullException(nameof(role));
}
return await RoleClaims.Where(rc => rc.RoleId.Equals(role.Id)).Select(c => new Claim(c.ClaimType, c.ClaimValue)).ToListAsync(cancellationToken);
@ -255,11 +255,11 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (role == null)
{
throw new ArgumentNullException("role");
throw new ArgumentNullException(nameof(role));
}
if (claim == null)
{
throw new ArgumentNullException("claim");
throw new ArgumentNullException(nameof(claim));
}
RoleClaims.Add(new IdentityRoleClaim<TKey> { RoleId = role.Id, ClaimType = claim.Type, ClaimValue = claim.Value });
@ -272,11 +272,11 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (role == null)
{
throw new ArgumentNullException("role");
throw new ArgumentNullException(nameof(role));
}
if (claim == null)
{
throw new ArgumentNullException("claim");
throw new ArgumentNullException(nameof(claim));
}
var claims = await RoleClaims.Where(rc => rc.RoleId.Equals(role.Id) && rc.ClaimValue == claim.Value && rc.ClaimType == claim.Type).ToListAsync(cancellationToken);
foreach (var c in claims)

104
src/Microsoft.AspNet.Identity.EntityFramework/UserStore.cs
View File

@ -85,7 +85,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(ConvertIdToString(user.Id));
}
@ -96,7 +96,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.UserName);
}
@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.UserName = userName;
return Task.FromResult(0);
@ -119,7 +119,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.NormalizedUserName);
}
@ -130,7 +130,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.NormalizedUserName = normalizedName;
return Task.FromResult(0);
@ -142,7 +142,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
Context.Add(user);
await SaveChanges(cancellationToken);
@ -155,7 +155,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
Context.Attach(user);
@ -178,7 +178,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
Context.Remove(user);
@ -256,7 +256,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.PasswordHash = passwordHash;
return Task.FromResult(0);
@ -274,7 +274,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.PasswordHash);
}
@ -304,11 +304,11 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
if (String.IsNullOrWhiteSpace(roleName))
{
throw new ArgumentException(Resources.ValueCannotBeNullOrEmpty, "roleName");
throw new ArgumentException(Resources.ValueCannotBeNullOrEmpty, nameof(roleName));
}
var roleEntity = await Roles.SingleOrDefaultAsync(r => r.Name.ToUpper() == roleName.ToUpper(), cancellationToken);
if (roleEntity == null)
@ -332,11 +332,11 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
if (String.IsNullOrWhiteSpace(roleName))
{
throw new ArgumentException(Resources.ValueCannotBeNullOrEmpty, "roleName");
throw new ArgumentException(Resources.ValueCannotBeNullOrEmpty, nameof(roleName));
}
var roleEntity = await Roles.SingleOrDefaultAsync(r => r.Name.ToUpper() == roleName.ToUpper(), cancellationToken);
if (roleEntity != null)
@ -361,7 +361,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
var userId = user.Id;
var query = from userRole in UserRoles
@ -384,11 +384,11 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
if (string.IsNullOrWhiteSpace(roleName))
{
throw new ArgumentException(Resources.ValueCannotBeNullOrEmpty, "roleName");
throw new ArgumentException(Resources.ValueCannotBeNullOrEmpty, nameof(roleName));
}
var role = await Roles.SingleOrDefaultAsync(r => r.Name.ToUpper() == roleName.ToUpper(), cancellationToken);
if (role != null)
@ -426,7 +426,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return await UserClaims.Where(uc => uc.UserId.Equals(user.Id)).Select(c => new Claim(c.ClaimType, c.ClaimValue)).ToListAsync(cancellationToken);
@ -437,11 +437,11 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
if (claims == null)
{
throw new ArgumentNullException("claims");
throw new ArgumentNullException(nameof(claims));
}
foreach (var claim in claims)
{
@ -455,15 +455,15 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
if (claim == null)
{
throw new ArgumentNullException("claim");
throw new ArgumentNullException(nameof(claim));
}
if (newClaim == null)
{
throw new ArgumentNullException("newClaim");
throw new ArgumentNullException(nameof(newClaim));
}
var matchedClaims = await UserClaims.Where(uc => uc.UserId.Equals(user.Id) && uc.ClaimValue == claim.Value && uc.ClaimType == claim.Type).ToListAsync(cancellationToken);
@ -479,11 +479,11 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
if (claims == null)
{
throw new ArgumentNullException("claims");
throw new ArgumentNullException(nameof(claims));
}
foreach (var claim in claims)
{
@ -502,11 +502,11 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
if (login == null)
{
throw new ArgumentNullException("login");
throw new ArgumentNullException(nameof(login));
}
var l = new IdentityUserLogin<TKey>
{
@ -527,7 +527,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
var userId = user.Id;
var entry = await UserLogins.SingleOrDefaultAsync(l => l.UserId.Equals(userId) && l.LoginProvider == loginProvider && l.ProviderKey == providerKey, cancellationToken);
@ -543,7 +543,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
var userId = user.Id;
return await UserLogins.Where(l => l.UserId.Equals(userId))
@ -576,7 +576,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.EmailConfirmed);
}
@ -594,7 +594,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.EmailConfirmed = confirmed;
return Task.FromResult(0);
@ -613,7 +613,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.Email = email;
return Task.FromResult(0);
@ -631,7 +631,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.Email);
}
@ -642,7 +642,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.NormalizedEmail);
}
@ -653,7 +653,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.NormalizedEmail = normalizedEmail;
return Task.FromResult(0);
@ -685,7 +685,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.LockoutEnd);
}
@ -703,7 +703,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.LockoutEnd = lockoutEnd;
return Task.FromResult(0);
@ -721,7 +721,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.AccessFailedCount++;
return Task.FromResult(user.AccessFailedCount);
@ -739,7 +739,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.AccessFailedCount = 0;
return Task.FromResult(0);
@ -758,7 +758,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.AccessFailedCount);
}
@ -775,7 +775,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.LockoutEnabled);
}
@ -793,7 +793,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.LockoutEnabled = enabled;
return Task.FromResult(0);
@ -812,7 +812,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.PhoneNumber = phoneNumber;
return Task.FromResult(0);
@ -830,7 +830,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.PhoneNumber);
}
@ -847,7 +847,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.PhoneNumberConfirmed);
}
@ -865,7 +865,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.PhoneNumberConfirmed = confirmed;
return Task.FromResult(0);
@ -884,7 +884,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.SecurityStamp = stamp;
return Task.FromResult(0);
@ -902,7 +902,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.SecurityStamp);
}
@ -920,7 +920,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
user.TwoFactorEnabled = enabled;
return Task.FromResult(0);
@ -938,7 +938,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
return Task.FromResult(user.TwoFactorEnabled);
}
@ -955,7 +955,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (claim == null)
{
throw new ArgumentNullException("claim");
throw new ArgumentNullException(nameof(claim));
}
var query = from userclaims in UserClaims
@ -979,7 +979,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ThrowIfDisposed();
if (String.IsNullOrEmpty(roleName))
{
throw new ArgumentNullException("role");
throw new ArgumentNullException(nameof(role));
}
var role = await Roles.Where(x => x.Name.Equals(roleName)).FirstOrDefaultAsync(cancellationToken);

2
src/Microsoft.AspNet.Identity/PhoneNumberTokenProvider.cs
View File

@ -47,7 +47,7 @@ namespace Microsoft.AspNet.Identity
{
if (manager == null)
{
throw new ArgumentNullException("manager");
throw new ArgumentNullException(nameof(manager));
}
var phoneNumber = await manager.GetPhoneNumberAsync(user);
return "PhoneNumber:" + purpose + ":" + phoneNumber;

2
src/Microsoft.AspNet.Identity/TotpSecurityStampBasedTokenProvider.cs
View File

@ -85,7 +85,7 @@ namespace Microsoft.AspNet.Identity
{
if (manager == null)
{
throw new ArgumentNullException("manager");
throw new ArgumentNullException(nameof(manager));
}
var userId = await manager.GetUserIdAsync(user);
return "Totp:" + purpose + ":" + userId;

2
src/Microsoft.AspNet.Identity/UserClaimsPrincipalFactory.cs
View File

@ -81,7 +81,7 @@ namespace Microsoft.AspNet.Identity
{
if (user == null)
{
throw new ArgumentNullException("user");
throw new ArgumentNullException(nameof(user));
}
var userId = await UserManager.GetUserIdAsync(user);
var userName = await UserManager.GetUserNameAsync(user);