imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revised IdentityUserToken.

Browse Source
pull/206/head
Halil İbrahim Kalkan 8 years ago
parent 7d75b4c403
commit 29fd0eba15
6 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityUserTokenConsts.cs
Unescape View File

@ -3,5 +3,7 @@
public static class IdentityUserTokenConsts
{
public const int MaxLoginProviderLength = 64;
public const int MaxNameLength = 128;
}
}

6
src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs
Unescape View File

@ -55,7 +55,7 @@ namespace Volo.Abp.Identity
Claims = new Collection<IdentityRoleClaim>();
}
public void AddClaim([NotNull] IGuidGenerator guidGenerator, [NotNull] Claim claim)
public virtual void AddClaim([NotNull] IGuidGenerator guidGenerator, [NotNull] Claim claim)
{
Check.NotNull(guidGenerator, nameof(guidGenerator));
Check.NotNull(claim, nameof(claim));
@ -63,7 +63,7 @@ namespace Volo.Abp.Identity
Claims.Add(new IdentityRoleClaim(guidGenerator.Create(), Id, claim));
}
public void AddClaims([NotNull] IGuidGenerator guidGenerator, [NotNull] IEnumerable<Claim> claims)
public virtual void AddClaims([NotNull] IGuidGenerator guidGenerator, [NotNull] IEnumerable<Claim> claims)
{
Check.NotNull(guidGenerator, nameof(guidGenerator));
Check.NotNull(claims, nameof(claims));
@ -74,7 +74,7 @@ namespace Volo.Abp.Identity
}
}
public void RemoveClaim([NotNull] Claim claim)
public virtual void RemoveClaim([NotNull] Claim claim)
{
Check.NotNull(claim, nameof(claim));

28
src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs
Unescape View File

@ -132,7 +132,7 @@ namespace Volo.Abp.Identity
Tokens = new Collection<IdentityUserToken>();
}
public void AddRole(Guid roleId)
public virtual void AddRole(Guid roleId)
{
Check.NotNull(roleId, nameof(roleId));
@ -144,7 +144,7 @@ namespace Volo.Abp.Identity
Roles.Add(new IdentityUserRole(Id, roleId));
}
public void RemoveRole(Guid roleId)
public virtual void RemoveRole(Guid roleId)
{
Check.NotNull(roleId, nameof(roleId));
@ -156,14 +156,14 @@ namespace Volo.Abp.Identity
Roles.RemoveAll(r => r.RoleId == roleId);
}
public bool IsInRole(Guid roleId)
public virtual bool IsInRole(Guid roleId)
{
Check.NotNull(roleId, nameof(roleId));
return Roles.Any(r => r.RoleId == roleId);
}
public void AddClaim([NotNull] IGuidGenerator guidGenerator, [NotNull] Claim claim)
public virtual void AddClaim([NotNull] IGuidGenerator guidGenerator, [NotNull] Claim claim)
{
Check.NotNull(guidGenerator, nameof(guidGenerator));
Check.NotNull(claim, nameof(claim));
@ -171,7 +171,7 @@ namespace Volo.Abp.Identity
Claims.Add(new IdentityUserClaim(guidGenerator.Create(), Id, claim));
}
public void AddClaims([NotNull] IGuidGenerator guidGenerator, [NotNull] IEnumerable<Claim> claims)
public virtual void AddClaims([NotNull] IGuidGenerator guidGenerator, [NotNull] IEnumerable<Claim> claims)
{
Check.NotNull(guidGenerator, nameof(guidGenerator));
Check.NotNull(claims, nameof(claims));
@ -182,7 +182,7 @@ namespace Volo.Abp.Identity
}
}
public void ReplaceClaim([NotNull] Claim claim, [NotNull] Claim newClaim)
public virtual void ReplaceClaim([NotNull] Claim claim, [NotNull] Claim newClaim)
{
Check.NotNull(claim, nameof(claim));
Check.NotNull(newClaim, nameof(newClaim));
@ -194,7 +194,7 @@ namespace Volo.Abp.Identity
}
}
public void RemoveClaims([NotNull] IEnumerable<Claim> claims)
public virtual void RemoveClaims([NotNull] IEnumerable<Claim> claims)
{
Check.NotNull(claims, nameof(claims));
@ -204,21 +204,21 @@ namespace Volo.Abp.Identity
}
}
public void RemoveClaim([NotNull] Claim claim)
public virtual void RemoveClaim([NotNull] Claim claim)
{
Check.NotNull(claim, nameof(claim));
Claims.RemoveAll(c => c.ClaimValue == claim.Value && c.ClaimType == claim.Type);
}
public void AddLogin([NotNull] UserLoginInfo login)
public virtual void AddLogin([NotNull] UserLoginInfo login)
{
Check.NotNull(login, nameof(login));
Logins.Add(new IdentityUserLogin(Id, login));
}
public void RemoveLogin([NotNull] string loginProvider, [NotNull] string providerKey)
public virtual void RemoveLogin([NotNull] string loginProvider, [NotNull] string providerKey)
{
Check.NotNull(loginProvider, nameof(loginProvider));
Check.NotNull(providerKey, nameof(providerKey));
@ -227,17 +227,17 @@ namespace Volo.Abp.Identity
}
[CanBeNull]
public IdentityUserToken FindToken(string loginProvider, string name)
public virtual IdentityUserToken FindToken(string loginProvider, string name)
{
return Tokens.FirstOrDefault(t => t.LoginProvider == loginProvider && t.Name == name);
}
public void SetToken(IGuidGenerator guidGenerator, string loginProvider, string name, string value)
public virtual void SetToken(string loginProvider, string name, string value)
{
var token = FindToken(loginProvider, name);
if (token == null)
{
Tokens.Add(new IdentityUserToken(guidGenerator.Create(), Id, loginProvider, name, value));
Tokens.Add(new IdentityUserToken(Id, loginProvider, name, value));
}
else
{
@ -245,7 +245,7 @@ namespace Volo.Abp.Identity
}
}
public void RemoveToken(string loginProvider, string name)
public virtual void RemoveToken(string loginProvider, string name)
{
Tokens.RemoveAll(t => t.LoginProvider == loginProvider && t.Name == name);
}

2
src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
Unescape View File

@ -1002,7 +1002,7 @@ namespace Volo.Abp.Identity
await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Tokens, cancellationToken);
user.SetToken(_guidGenerator, loginProvider, name, value);
user.SetToken(loginProvider, name, value);
}
/// <summary>

5
src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserToken.cs
Unescape View File

@ -7,7 +7,7 @@ namespace Volo.Abp.Identity
/// <summary>
/// Represents an authentication token for a user.
/// </summary>
public class IdentityUserToken : Entity<Guid>
public class IdentityUserToken : Entity
{
/// <summary>
/// Gets or sets the primary key of the user that the token belongs to.
@ -34,12 +34,11 @@ namespace Volo.Abp.Identity
}
protected internal IdentityUserToken(Guid id, Guid userId, [NotNull] string loginProvider, [NotNull] string name, string value)
protected internal IdentityUserToken(Guid userId, [NotNull] string loginProvider, [NotNull] string name, string value)
{
Check.NotNull(loginProvider, nameof(loginProvider));
Check.NotNull(name, nameof(name));
Id = id;
UserId = userId;
LoginProvider = loginProvider;
Name = name;

5
src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs
Unescape View File

@ -101,9 +101,10 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
{
b.ToTable(tablePrefix + "UserTokens", schema);
b.Property(ul => ul.LoginProvider).HasMaxLength(IdentityUserTokenConsts.MaxLoginProviderLength).IsRequired();
b.HasKey(l => new { l.UserId, l.LoginProvider, l.Name });
b.HasIndex(l => new { l.UserId, l.LoginProvider, l.Name });
b.Property(ul => ul.LoginProvider).HasMaxLength(IdentityUserTokenConsts.MaxLoginProviderLength).IsRequired();
b.Property(ul => ul.LoginProvider).HasMaxLength(IdentityUserTokenConsts.MaxNameLength).IsRequired();
});
}
}

Write Preview
Loading…
Cancel
Save