Skip to content

V13: Clear username cache #17815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elit0451 merged 2 commits into from
Dec 16, 2024
Merged

V13: Clear username cache #17815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d902127
Clear member username cache on delete
Zeegaan Dec 13, 2024
ee0a332
Also refresh cache on update
Zeegaan Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Umbraco.Infrastructure/Cache/MemberRepositoryUsernameCachePolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,10 @@ public MemberRepositoryUsernameCachePolicy(IAppPolicyCache cache, IScopeAccessor

return entity;
}

public void DeleteByUserName(string key, string? username)
{
var cacheKey = GetEntityCacheKey(key + username);
Cache.ClearByKey(cacheKey);
}
}
11 changes: 10 additions & 1 deletion src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class MemberRepository : ContentRepositoryBase<int, IMember, MemberReposi
private readonly ITagRepository _tagRepository;
private bool _passwordConfigInitialized;
private string? _passwordConfigJson;
private const string UsernameCacheKey = "uRepo_userNameKey+";

public MemberRepository(
IScopeAccessor scopeAccessor,
Expand Down Expand Up @@ -228,7 +229,7 @@ public override IEnumerable<IMember> GetPage(IQuery<IMember>? query,
}

public IMember? GetByUsername(string? username) =>
_memberByUsernameCachePolicy.GetByUserName("uRepo_userNameKey+", username, PerformGetByUsername, PerformGetAllByUsername);
_memberByUsernameCachePolicy.GetByUserName(UsernameCacheKey, username, PerformGetByUsername, PerformGetAllByUsername);

public int[] GetMemberIds(string[] usernames)
{
Expand Down Expand Up @@ -508,6 +509,12 @@ protected virtual Sql<ISqlContext> GetBaseQuery(QueryType queryType, bool curren
return sql;
}

protected override void PersistDeletedItem(IMember entity)
{
_memberByUsernameCachePolicy.DeleteByUserName(UsernameCacheKey, entity.Username);
base.PersistDeletedItem(entity);
}

// TODO: move that one up to Versionable! or better: kill it!
protected override Sql<ISqlContext> GetBaseQuery(bool isCount) =>
GetBaseQuery(isCount ? QueryType.Count : QueryType.Single);
Expand Down Expand Up @@ -837,6 +844,8 @@ protected override void PersistUpdatedItem(IMember entity)

OnUowRefreshedEntity(new MemberRefreshNotification(entity, new EventMessages()));

_memberByUsernameCachePolicy.DeleteByUserName(UsernameCacheKey, entity.Username);

entity.ResetDirtyProperties();
}

Expand Down