Commit Graph

37419 Commits

Author SHA1 Message Date
Bjarke Berg
bbaba0c542 Add or update the TicketExpiresClaimType claim, to ensure its not added multiple times, now that is can be there after a clone. 2021-02-23 10:07:17 +01:00
Mole
f1128d7d70 Replace usage of Thread.CurrentPrincipal with IBackofficeSecurityAccessor 2021-02-23 08:38:27 +01:00
Mole
9d0493d38f Merge remote-tracking branch 'origin/netcore/dev' into 9622-remove-backofficeidentity
# Conflicts:
#	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeClaimsPrincipalFactory.cs
2021-02-23 08:29:03 +01:00
Shannon Deminick
1bc8dbaaf2 Merge pull request #9472 from emmagarland/netcore/members-userstore
Initial creation of vertical slice for create member
2021-02-23 13:10:31 +11:00
Emma Garland
c35af99030 Reverted appsettings 2021-02-22 20:57:41 +00:00
Emma Garland
2109bee83b Merge branch 'netcore/dev' into netcore/members-userstore
# Conflicts:
#	src/Umbraco.Core/Models/Membership/IMembershipUser.cs
#	src/Umbraco.Core/Models/Membership/IUser.cs
#	src/Umbraco.Core/Services/IMembershipRoleService.cs
#	src/Umbraco.Infrastructure/Compose/AuditEventsComponent.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.MappingProfiles.cs
#	src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Services.cs
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeIdentityUser.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
#	src/Umbraco.Infrastructure/Security/IBackOfficeUserPasswordChecker.cs
#	src/Umbraco.Infrastructure/Security/IUmbracoUserManager.cs
#	src/Umbraco.Infrastructure/Security/IdentityMapDefinition.cs
#	src/Umbraco.Infrastructure/Security/SignOutAuditEventArgs.cs
#	src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
#	src/Umbraco.Infrastructure/Services/Implement/MemberService.cs
#	src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
#	src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs
#	src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeLookupNormalizerTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs
#	src/Umbraco.Web.BackOffice/Filters/CheckIfUserTicketDataIsStaleAttribute.cs
#	src/Umbraco.Web.BackOffice/Mapping/MemberMapDefinition.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficePasswordHasher.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficeSecurityStampValidator.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficeSignInManager.cs
#	src/Umbraco.Web.BackOffice/Security/BackOfficeUserManagerAuditer.cs
#	src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeIdentityOptions.cs
#	src/Umbraco.Web.BackOffice/Security/ExternalSignInAutoLinkOptions.cs
#	src/Umbraco.Web.BackOffice/Security/IBackOfficeSignInManager.cs
#	src/Umbraco.Web.BackOffice/Security/PasswordChanger.cs
#	src/Umbraco.Web.Common/DependencyInjection/ServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/Middleware/BootFailedMiddleware.cs
#	src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Security/MembershipHelper.cs
#	src/Umbraco.Web/Security/MembershipProviderBase.cs
#	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
#	src/Umbraco.Web/Security/Providers/MembersRoleProvider.cs
#	src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
2021-02-22 20:55:12 +00:00
Mole
1c1394e0bf Replace usages of ClaimsIdentityExtensions.Issuer with Constants.Security.BackOfficeAuthenticationType
Also remove todo and cases of using ClaimsIdentityExtensions = Umbraco.Extensions.ClaimsIdentityExtensions;
2021-02-22 15:31:25 +01:00
Bjarke Berg
9123c06aec Fixed issue with /~ folder created doing install 2021-02-22 12:51:17 +01:00
Bjarke Berg
b4fd47e3a8 Merge pull request #9838 from umbraco/netcore/feature/AB10314-mb-embedded-dependencies
NetCore: Moving MB.Embedded into the other existing assemblies
2021-02-22 10:57:41 +01:00
Bjarke Berg
bf936cbd65 Fix namespaces when building MB models 2021-02-22 10:32:09 +01:00
Bjarke Berg
890cd45677 Fix namespace 2021-02-22 10:09:20 +01:00
Bjarke Berg
c453719c2d Fix the register of the IModelsBuilderDashboardProvider 2021-02-22 09:49:24 +01:00
Bjarke Berg
6e89e9a8a9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB10314-mb-embedded-dependencies
# Conflicts:
#	src/Umbraco.Infrastructure/ModelsBuilder/ApiVersion.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/Builder.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/ModelsGenerator.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/PropertyModel.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TextHeaderWriter.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TypeModel.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TypeModelHasher.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/LiveModelsProvider.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderAssemblyAttribute.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderDashboard.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsGenerationError.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/OutOfDateModelsStatus.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/RoslynCompiler.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/TypeExtensions.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/UmbracoServices.cs
#	src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
#	src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
#	src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidatorBase.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/DashboardReport.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/DisableModelsBuilderNotificationHandler.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/MediaTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/MemberTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardController.cs
#	src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
#	src/Umbraco.Web.Common/ModelsBuilder/PureLiveModelFactory.cs
#	src/Umbraco.Web.Common/ModelsBuilder/RefreshingRazorViewEngine.cs
#	src/Umbraco.Web.Common/ModelsBuilder/UmbracoAssemblyLoadContext.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
2021-02-22 09:00:33 +01:00
Mole
63c8365e6a Fix merge and consolidate ClaimsIdentityExtensions into one file. 2021-02-22 08:51:37 +01:00
Mole
d413bf49f9 Merge remote-tracking branch 'origin/netcore/dev' into 9622-remove-backofficeidentity
# 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
2021-02-22 08:38:12 +01:00
Emma Garland
0fe7ad826d Updated membership successful result as per PR comments 2021-02-19 17:03:48 +00:00
Mole
bf41c2eeaa Netcore: Align namespaces (#9801)
* Rename Umbraco.Core namespace to Umbraco.Cms.Core

* Move extension methods in core project to Umbraco.Extensions

* Move extension methods in core project to Umbraco.Extensions

* Rename Umbraco.Examine namespace to Umbraco.Cms.Examine

* Move examine extensions to Umbraco.Extensions namespace

* Reflect changed namespaces in Builder and fix unit tests

* Adjust namespace in Umbraco.ModelsBuilder.Embedded

* Adjust namespace in Umbraco.Persistence.SqlCe

* Adjust namespace in Umbraco.PublishedCache.NuCache

* Align namespaces in Umbraco.Web.BackOffice

* Align namespaces in Umbraco.Web.Common

* Ensure that SqlCeSupport is still enabled after changing the namespace

* Align namespaces in Umbraco.Web.Website

* Align namespaces in Umbraco.Web.UI.NetCore

* Align namespaces in Umbraco.Tests.Common

* Align namespaces in Umbraco.Tests.UnitTests

* Align namespaces in Umbraco.Tests.Integration

* Fix errors caused by changed namespaces

* Fix integration tests

* Undo the Umbraco.Examine.Lucene namespace change

This breaks integration tests on linux, since the namespace wont exists there because it's only used on windows.

* Fix merge

* Fix Merge
2021-02-18 11:06:02 +01:00
Sebastiaan Janssen
f1717a17f5 Fixes error trying to load Cosmos.CRTCompat.dll (System.BadImageForma… (#9834)
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2021-02-18 09:27:14 +01:00
Elitsa Marinovska
a2cfd277ce Cleanup 2021-02-18 08:33:49 +01:00
Elitsa Marinovska
4bccb995ec Introducing IModelsBuilderDashboardProvider 2021-02-18 08:27:35 +01:00
Elitsa Marinovska
74a67bf8bc Migrating classes to Web.Common proj 2021-02-18 08:26:08 +01:00
Elitsa Marinovska
570d19f298 Migrating classes to Web.BackOffice proj 2021-02-18 08:21:48 +01:00
Elitsa Marinovska
e74836cb48 Moving classes to Infrastructure proj 2021-02-18 08:14:27 +01:00
Mole
8ba3f7ccb4 Remove UmbracoBackOfficeIdentity 2021-02-17 14:21:59 +01:00
Mole
b9d61f3ad8 Gut UmbracoBackOfficeIdentity 2021-02-17 14:17:38 +01:00
Bjarke Berg
88acb07873 Merge pull request #9821 from umbraco/netcore/task/9716-custom-routes
Custom controller routes within an Umbraco context (i.e. virtual nodes)
2021-02-17 12:29:20 +01:00
Bjarke Berg
2ba3eb436c Fixed up small findings in refiew..
- Uses ILogger<T> instead of ILoggerFactory
- Uses the GetControllerName extension
- Fixes views
2021-02-17 12:00:57 +01:00
Mole
33a99df73f Remove usage of FromClaimsIdentity 2021-02-17 11:50:19 +01:00
Mole
80716a18d2 Fix mistaken use of GetId() 2021-02-17 10:16:00 +01:00
Mole
a87075a941 Switch simple properties to extension methods 2021-02-17 10:11:04 +01:00
Mole
d14aa007ea Add extension methods to replace UmbracoBackOfficeIdentity 2021-02-17 09:50:27 +01:00
Mole
fac0be1701 Remove clone
It's no longer needed
2021-02-16 15:43:15 +01:00
Mole
0e16528db5 Merge pull request #9827 from umbraco/netcore/bugfix/fixed-build-script-to-use-Directory-build-props
Netcore: Fixed buildscripts to work with latest Umbraco.Build and Directory.Build.props
2021-02-16 14:55:26 +01:00
Bjarke Berg
b0150dc8a3 Fixed tests 2021-02-16 14:20:20 +01:00
Bjarke Berg
02ac81d53f Fixed buildscripts to work with latest Umbraco.Build (0.2.17) and Directory.Build.props. Also updates the port (Now located in launchSettings.json) number if SetUmbracoVersion is called. 2021-02-16 12:28:37 +01:00
Mole
e065ba593f Merge pull request #9822 from umbraco/netcore/bugfix/copy-static-files-to-publish-directory
Netcore: Copy static files to publish directory in dotnet template
2021-02-16 10:27:30 +01:00
Shannon
7e40a66fed Fixing tests 2021-02-16 18:04:32 +11:00
Shannon
9ef8de36e5 Ensures that we don't add duplicate UmbracoVirtualPageFilterAttribute and that we use the ActionExecutingContext as the context during the FindContent operation 2021-02-16 18:02:05 +11:00
Bjarke Berg
6fcfcb0003 https://github.com/umbraco/Umbraco-CMS/issues/9811 Copy static files to publish directory in dotnet template 2021-02-16 07:19:47 +01:00
Shannon
f40a6be9b6 Remove EnsurePublishedContentRequestAttribute 2021-02-16 12:19:25 +11:00
Bjarke Berg
5188bb09ce Reintroduced temp SolutionInfo 2021-02-15 17:50:33 +01:00
Bjarke Berg
285473d0e8 Fixed failing test 2021-02-15 15:47:59 +01:00
Bjarke Berg
2fa5c8e3be Fixed registration of IIndexPopulators, to allow injection as IEnumerable<IIndexPopulator> 2021-02-15 13:54:01 +01:00
Bjarke Berg
9ba04c394b Added Directory.Build.props to replace SolutionInfo 2021-02-15 13:53:06 +01:00
Shannon
4f2682678e Gets virtual page routing working, now just need to document. 2021-02-15 18:50:16 +11:00
Mole
1eac582649 Merge pull request #9814 from umbraco/netcore/bugfix/9813-DisableRedirectUrlTracking_value_cached
Netcore bugfix: DisableRedirectUrlTrackingValue was cached
2021-02-15 08:39:20 +01:00
Bjarke Berg
801c565bd5 https://github.com/umbraco/Umbraco-CMS/issues/9813 - Fixed issue with configuration value cached, even that the dashboard was updating its value. 2021-02-15 08:08:52 +01:00
Emma Garland
a931f3c263 Renamed members manager method 2021-02-14 13:01:27 +00:00
Emma Garland
167811b23b Moving adding members services to correct project for use on the front-end, not just the back-office. 2021-02-14 12:57:48 +00:00
Emma Garland
a4ee8055f9 Moved builder to corect location 2021-02-12 17:06:29 +00:00