yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Throw from IUserIdKeyResolver if id/key not found. (#14101)

Browse Source 
* Throw from IUserIdKeyResolver if id/key not found. This is too critical to not throw.

* Fixed tests

* Explicitly test that we can resolve super user key/ID from their counterparts

---------

Co-authored-by: kjac <kja@umbraco.dk>
This commit is contained in:
Bjarke Berg
2023-04-14 12:03:25 +02:00
committed by GitHub
parent d625fee1ad
commit 861b883d29
16 changed files with 82 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Services/LocalizationService.cs
View File

@@ -221,7 +221,7 @@ internal class LocalizationService : RepositoryService, ILocalizationService
[Obsolete("Please use IDictionaryItemService for dictionary item operations. Will be removed in V15.")]
public void Save(IDictionaryItem dictionaryItem, int userId = Constants.Security.SuperUserId)
{ ;
Guid currentUserKey = _userIdKeyResolver.GetAsync(userId).GetAwaiter().GetResult() ?? Constants.Security.SuperUserKey;
Guid currentUserKey = _userIdKeyResolver.GetAsync(userId).GetAwaiter().GetResult();
if (dictionaryItem.Id > 0)
{
_dictionaryItemService.UpdateAsync(dictionaryItem, currentUserKey).GetAwaiter().GetResult();
@@ -241,7 +241,7 @@ internal class LocalizationService : RepositoryService, ILocalizationService
[Obsolete("Please use IDictionaryItemService for dictionary item operations. Will be removed in V15.")]
public void Delete(IDictionaryItem dictionaryItem, int userId = Constants.Security.SuperUserId)
{
Guid currentUserKey = _userIdKeyResolver.GetAsync(userId).GetAwaiter().GetResult() ?? Constants.Security.SuperUserKey;
Guid currentUserKey = _userIdKeyResolver.GetAsync(userId).GetAwaiter().GetResult();
_dictionaryItemService.DeleteAsync(dictionaryItem.Key, currentUserKey).GetAwaiter().GetResult();
}
@@ -321,7 +321,7 @@ internal class LocalizationService : RepositoryService, ILocalizationService
[Obsolete("Please use ILanguageService for language operations. Will be removed in V15.")]
public void Save(ILanguage language, int userId = Constants.Security.SuperUserId)
{
Guid currentUserKey = _userIdKeyResolver.GetAsync(userId).GetAwaiter().GetResult() ?? Constants.Security.SuperUserKey;
Guid currentUserKey = _userIdKeyResolver.GetAsync(userId).GetAwaiter().GetResult();
Attempt<ILanguage, LanguageOperationStatus> result = language.Id > 0
? _languageService.UpdateAsync(language, currentUserKey).GetAwaiter().GetResult()
: _languageService.CreateAsync(language, currentUserKey).GetAwaiter().GetResult();
@@ -341,7 +341,7 @@ internal class LocalizationService : RepositoryService, ILocalizationService
[Obsolete("Please use ILanguageService for language operations. Will be removed in V15.")]
public void Delete(ILanguage language, int userId = Constants.Security.SuperUserId)
{
Guid currentUserKey = _userIdKeyResolver.GetAsync(userId).GetAwaiter().GetResult() ?? Constants.Security.SuperUserKey;
Guid currentUserKey = _userIdKeyResolver.GetAsync(userId).GetAwaiter().GetResult();
_languageService.DeleteAsync(language.IsoCode, currentUserKey).GetAwaiter().GetResult();
}