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

Merge remote-tracking branch 'origin/netcore/dev' into 9622-remove-backofficeidentity

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Security/AuthenticationExtensions.cs
#	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAntiforgeryTests.cs
#	src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficeSecureDataFormat.cs
#	src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
#	src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs
This commit is contained in:
Mole
2021-02-22 08:38:12 +01:00
parent 8ba3f7ccb4 bf41c2eeaa
commit d413bf49f9
3187 changed files with 12519 additions and 11507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Tests/TestHelpers/ControllerTesting/AuthenticateEverythingMiddleware.cs
View File

@@ -5,7 +5,6 @@ using Microsoft.Owin;
using Microsoft.Owin.Security;
using Microsoft.Owin.Security.Infrastructure;
using Owin;
using Umbraco.Core.Security;
using Umbraco.Extensions;
namespace Umbraco.Tests.TestHelpers.ControllerTesting
@@ -32,7 +31,8 @@ namespace Umbraco.Tests.TestHelpers.ControllerTesting
var securityStamp = Guid.NewGuid().ToString();
var identity = new ClaimsIdentity();
identity.AddRequiredClaims(Core.Constants.Security.SuperUserIdAsString,
identity.AddRequiredClaims(
Core.Constants.Security.SuperUserIdAsString,
"admin",
"Admin",
new[] { -1 },