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

React to removal of AddAsync

This commit is contained in:
ajcvickers 2015-01-30 14:24:57 -08:00
parent 33247af5df
commit 774d06e7a6
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
{ {
throw new ArgumentNullException("role"); throw new ArgumentNullException("role");
} }
await Context.AddAsync(role, cancellationToken); Context.Add(role);
await SaveChanges(cancellationToken); await SaveChanges(cancellationToken);
return IdentityResult.Success; return IdentityResult.Success;
} }
@ -261,7 +261,9 @@ namespace Microsoft.AspNet.Identity.EntityFramework
throw new ArgumentNullException("claim"); throw new ArgumentNullException("claim");
} }
return RoleClaims.AddAsync(new IdentityRoleClaim<TKey> { RoleId = role.Id, ClaimType = claim.Type, ClaimValue = claim.Value }, cancellationToken); RoleClaims.Add(new IdentityRoleClaim<TKey> { RoleId = role.Id, ClaimType = claim.Type, ClaimValue = claim.Value });
return Task.FromResult(false);
} }
public async Task RemoveClaimAsync(TRole role, Claim claim, CancellationToken cancellationToken = default(CancellationToken)) public async Task RemoveClaimAsync(TRole role, Claim claim, CancellationToken cancellationToken = default(CancellationToken))

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

@ -143,7 +143,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
{ {
throw new ArgumentNullException("user"); throw new ArgumentNullException("user");
} }
await Context.AddAsync(user, cancellationToken); Context.Add(user);
await SaveChanges(cancellationToken); await SaveChanges(cancellationToken);
return IdentityResult.Success; return IdentityResult.Success;
} }
@ -315,7 +315,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture, Resources.RoleNotFound, roleName)); throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture, Resources.RoleNotFound, roleName));
} }
var ur = new IdentityUserRole<TKey> { UserId = user.Id, RoleId = roleEntity.Id }; var ur = new IdentityUserRole<TKey> { UserId = user.Id, RoleId = roleEntity.Id };
await UserRoles.AddAsync(ur); UserRoles.Add(ur);
} }
/// <summary> /// <summary>
@ -431,7 +431,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
return await UserClaims.Where(uc => uc.UserId.Equals(user.Id)).Select(c => new Claim(c.ClaimType, c.ClaimValue)).ToListAsync(cancellationToken); return await UserClaims.Where(uc => uc.UserId.Equals(user.Id)).Select(c => new Claim(c.ClaimType, c.ClaimValue)).ToListAsync(cancellationToken);
} }
public async virtual Task AddClaimsAsync(TUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken = default(CancellationToken)) public virtual Task AddClaimsAsync(TUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken = default(CancellationToken))
{ {
ThrowIfDisposed(); ThrowIfDisposed();
if (user == null) if (user == null)
@ -444,8 +444,9 @@ namespace Microsoft.AspNet.Identity.EntityFramework
} }
foreach (var claim in claims) foreach (var claim in claims)
{ {
await UserClaims.AddAsync(new IdentityUserClaim<TKey> { UserId = user.Id, ClaimType = claim.Type, ClaimValue = claim.Value }, cancellationToken); UserClaims.Add(new IdentityUserClaim<TKey> { UserId = user.Id, ClaimType = claim.Type, ClaimValue = claim.Value });
} }
return Task.FromResult(false);
} }
public async virtual Task ReplaceClaimAsync(TUser user, Claim claim, Claim newClaim, CancellationToken cancellationToken = default(CancellationToken)) public async virtual Task ReplaceClaimAsync(TUser user, Claim claim, Claim newClaim, CancellationToken cancellationToken = default(CancellationToken))
@ -493,7 +494,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
} }
} }
public virtual async Task AddLoginAsync(TUser user, UserLoginInfo login, public virtual Task AddLoginAsync(TUser user, UserLoginInfo login,
CancellationToken cancellationToken = default(CancellationToken)) CancellationToken cancellationToken = default(CancellationToken))
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
@ -514,7 +515,8 @@ namespace Microsoft.AspNet.Identity.EntityFramework
ProviderDisplayName = login.ProviderDisplayName ProviderDisplayName = login.ProviderDisplayName
}; };
// TODO: fixup so we don't have to update both // TODO: fixup so we don't have to update both
await UserLogins.AddAsync(l); UserLogins.Add(l);
return Task.FromResult(false);
} }
public virtual async Task RemoveLoginAsync(TUser user, string loginProvider, string providerKey, public virtual async Task RemoveLoginAsync(TUser user, string loginProvider, string providerKey,