swcs/RavenDB.Identity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed UserStore.AddToRoleAsync to use TRole instead of IdentityRole.

Browse Source
This commit is contained in:
Josh Close
2019-07-07 22:52:23 -05:00
parent c53464cd47
commit 95ea3159ac
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RavenDB.Identity/ServiceCollectionExtensions.cs
+1 -1
View File
@@ -50,7 +50,7 @@ namespace Raven.Identity
.AddDefaultTokenProviders();
}
services.AddScoped<Microsoft.AspNetCore.Identity.IUserStore<TUser>, UserStore<TUser>>();
services.AddScoped<Microsoft.AspNetCore.Identity.IUserStore<TUser>, UserStore<TUser, TRole>>();
services.AddScoped<Microsoft.AspNetCore.Identity.IRoleStore<TRole>, RoleStore<TRole>>();
return identityBuilder;
RavenDB.Identity/UserStore.cs
+5 -3
View File
@@ -16,7 +16,8 @@ namespace Raven.Identity
/// UserStore for entities in a RavenDB database.
/// </summary>
/// <typeparam name="TUser"></typeparam>
public class UserStore<TUser> :
/// <typeparam name="TRole"></typeparam>
public class UserStore<TUser, TRole> :
IUserStore<TUser>,
IUserLoginStore<TUser>,
IUserClaimStore<TUser>,
@@ -32,6 +33,7 @@ namespace Raven.Identity
IUserTwoFactorRecoveryCodeStore<TUser>,
IQueryableUserStore<TUser>
where TUser : IdentityUser
where TRole : IdentityRole
{
private bool _disposed;
private readonly Func<IAsyncDocumentSession> getSessionFunc;
@@ -390,7 +392,7 @@ namespace Raven.Identity
ThrowIfNullDisposedCancelled(user, cancellationToken);
// See if we have an IdentityRole with that name.
var identityUserCollection = DbSession.Advanced.DocumentStore.Conventions.GetCollectionName(typeof(IdentityRole));
var identityUserCollection = DbSession.Advanced.DocumentStore.Conventions.GetCollectionName(typeof(TRole));
var prefix = DbSession.Advanced.DocumentStore.Conventions.TransformTypeCollectionNameToDocumentIdPrefix(identityUserCollection);
var identityPartSeperator = DbSession.Advanced.DocumentStore.Conventions.IdentityPartsSeparator;
var roleNameLowered = roleName.ToLowerInvariant();
@@ -423,7 +425,7 @@ namespace Raven.Identity
user.GetRolesList().RemoveAll(r => string.Equals(r, roleName, StringComparison.InvariantCultureIgnoreCase));
var roleId = RoleStore<IdentityRole>.GetRavenIdFromRoleName(roleName, DbSession.Advanced.DocumentStore);
var roleId = RoleStore<TRole>.GetRavenIdFromRoleName(roleName, DbSession.Advanced.DocumentStore);
var roleOrNull = await DbSession.LoadAsync<IdentityRole>(roleId, cancellationToken);
if (roleOrNull != null)
{