Commit Graph

407 Commits

Author SHA1 Message Date
Emma Garland
67efe92858 Fixed tests, took out default data 2020-12-11 14:32:13 +00:00
Bjarke Berg
7776e203a6 Fix issue with auth on media upload 2020-12-10 08:55:47 +01:00
Emma Garland
2c006ea99f PR comments updated. Reorganised logic. Removed unused functionality. Started to reorganise update and save roles functionality. 2020-12-09 18:36:39 +00:00
Nikolaj
7ef6501bb1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/more-files-from-infrastructure-to-core
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs
2020-12-09 08:45:28 +01:00
Emma Garland
aa1fd298cd Re-included password for comparison 2020-12-08 17:27:22 +00:00
Emma Garland
205edf57b7 Added store functionality based on backoffice user (to be revisited as a lot of it may be shareable) and also added a new members service method for membergroups. 2020-12-08 17:18:22 +00:00
Elitsa Marinovska
54d1e9d5e0 Removing AllowsCultureVariation from ContentController, so we can get rid of OverrideAuthorization attribute 2020-12-08 15:36:37 +01:00
Emma Garland
2f7766a972 Updated correct class, commented 2020-12-08 11:25:01 +00:00
Emma Garland
9531550e86 Merge branch 'netcore/netcore' into netcore/members-userstore 2020-12-08 11:04:17 +00:00
Shannon
e3be4009c0 Getting front end routing poc going 2020-12-08 16:33:50 +11:00
emmagarland
3f0e7ab315 Merged and updated according to shared latest work, renamed to Members instead of UmbracoMembers. Tests currently red, fixing next. Empty appsettings again. 2020-12-08 01:57:14 +00:00
Shannon
ea55d2662e no app_data paths, changing to constants, some linting updates 2020-12-08 10:42:26 +11:00
emmagarland
b59935c799 Merge branch 'netcore/netcore' into netcore/members-userstore 2020-12-07 17:26:15 +00:00
Bjarke Berg
e7d9d38c52 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/more-files-from-infrastructure-to-core
# Conflicts:
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
#	src/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
2020-12-07 12:55:47 +01:00
Shannon
36342438da Deleting old code 2020-12-07 18:47:25 +11:00
emmagarland
79dccc87b1 Enable change tracking via mapper.
Added more unit tests for member controller.
2020-12-06 17:23:38 +00:00
emmagarland
40f2a881ab Added is dirty properties and updated to reflect linter update 2020-12-05 23:44:50 +00:00
emmagarland
0560bef48c Merge branch 'netcore/netcore' into netcore/members-userstore 2020-12-05 18:14:09 +00:00
Bjarke Berg
fb18317c0f Moved lots of property editors into core 2020-12-04 19:01:52 +01:00
Shannon
d206273753 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/usermanager-object-cleanup
# Conflicts:
#	src/Umbraco.Infrastructure/Composing/CompositionExtensions/CoreMappingProfiles.cs
#	src/Umbraco.Web.BackOffice/Extensions/WebMappingProfiles.cs
2020-12-04 12:59:19 +11:00
Shannon
5172b0e58a Updates user manager, user store and identity user to use the aspnetcore base classes instead of copies of our own, uses string ids for user and roles to simplify everything and to allow for sharing between members 2020-12-04 12:44:27 +11:00
Bjarke Berg
53d424244e Merge pull request #9486 from Matthew-Wise/feature/8264-typefilters-OutgoingEditorModelEventAttribute
Converted  OutgoingEditorModelEventAttribute to a type filter
2020-12-03 19:08:46 +01:00
Emma Garland
57684a8672 Removed unwanted comments 2020-12-03 17:54:02 +00:00
Shannon
86d231f5de removes remaining back office things from underlying UmbracoUserManager moves files 2020-12-04 02:21:21 +11:00
Emma Garland
cf2252f967 Reordered for better comparison 2020-12-03 14:59:57 +00:00
emmagarland
f1fbeb8ad3 Set hasIdentity if there is an ID, and logical adjustments to set passwords corectly 2020-12-03 01:27:54 +00:00
Matthew Wise
fdb6c21075 Converted OutgoingEditorModelEventAttribute to a type filter 2020-12-02 14:21:05 +00:00
Shannon
d0e17d16bc ext method for authn back office scheme with null check, fixing tests 2020-12-02 15:49:28 +11:00
Shannon
0846fc5690 Cleans up IBackofficeSecurity, ensures authn for the AuthenticationController/BackOfficeController 2020-12-02 14:28:16 +11:00
Shannon
0f0c50b56e Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/2FAuth
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
#	src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Filters/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Filters/OverrideAuthorizationFilterProvider.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeAttribute.cs
#	src/Umbraco.Web.Common/Filters/UmbracoBackOfficeAuthorizeFilter.cs
2020-12-02 13:14:47 +11:00
Shannon
999be04285 cleaning up TODOs 2020-12-02 12:22:08 +11:00
emmagarland
8a552a10d9 Added comments to understand where to implement 2020-12-01 20:51:13 +00:00
Emma Garland
f0f17b3cf8 Stop duplicate saving 2020-12-01 19:06:36 +00:00
Emma Garland
9c41d335ea Merge branch 'netcore/netcore' into netcore/members-userstore
# Conflicts:
#	src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
#	src/Umbraco.Web.BackOffice/Extensions/UmbracoBuilderExtensions.cs
2020-12-01 17:37:23 +00:00
Bjarke Berg
85c01d9905 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore
# Conflicts:
#	src/Umbraco.Configuration/Legacy/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/IGlobalSettings.cs
#	src/Umbraco.Core/Models/ContentBaseExtensions.cs
#	src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs
#	src/Umbraco.Infrastructure/RuntimeState.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web.BackOffice/PropertyEditors/RteEmbedController.cs
#	src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/Controllers/UmbLoginController.cs
#	src/Umbraco.Web/Install/Controllers/InstallController.cs
#	src/Umbraco.Web/PublishedElementExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
#	src/Umbraco.Web/UrlHelperExtensions.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
#	src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
2020-12-01 11:34:13 +01:00
Bjarke Berg
3e0d52b330 Merge pull request #9428 from umbraco/netcore/task/6666-auth-policies
Migrate authorization filters to authorization policies
2020-12-01 08:17:04 +01:00
Shannon
fe5dcd83bb removes the 2FA store implementation since that will need to be manually enabled 2020-12-01 18:14:37 +11:00
Shannon
20b4f55664 Fixes up a bunch of TODOs moves user manager to the back office project so we have acess to necessary services, splits apart files, removes old code, starts implementing the 2fa stuff 2020-12-01 17:24:23 +11:00
Shannon
47b4a4d234 FIxes authz on some controllers, fixes js var paths for login providers, simplifies gulp so we aren't building 2x. 2020-12-01 00:19:08 +11:00
Shannon
efff96f711 Creates IBackOfficeSignInManager interface 2020-11-30 22:46:05 +11:00
Shannon
6176046053 Deals with the Xsrf notes and handling in sign in manager 2020-11-30 22:23:10 +11:00
Shannon
76cbd76f32 Fixes content resource authz 2020-11-30 19:09:14 +11:00
emmagarland
17df4eb607 Members mapping definition updated, and commented out duplicate password work 2020-11-30 01:07:02 +00:00
emmagarland
5b4b948543 Added more layers to have a vertical slice through Umbraco for CreateMember via backoffice.
Still lots to implement and test, not complete and needs early review.
2020-11-30 00:45:38 +00:00
Bjarke Berg
2fb7f3ef84 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/linux-paths
# Conflicts:
#	src/Umbraco.Web.BackOffice/Security/AutoLinkSignInResult.cs
2020-11-27 13:49:42 +01:00
Bjarke Berg
5efa93d803 Revert "Revert "FIxes more of the auth procedure""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:36:09 +01:00
Bjarke Berg
26dc9219c4 Revert "Revert "Cleans up BackofficeSecurity, fixes up AuthenticationController for endpoints that aren't authorized (and simplifies)""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:35:43 +01:00
Bjarke Berg
a098b956a6 Revert "Revert "Ensures that all back office controllers are authenticated under the back office scheme""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:35:22 +01:00
Bjarke Berg
541ff0fdb0 Revert "Revert "Moves auto linking logic to the BackOfficeSignInManager""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:34:58 +01:00
Bjarke Berg
d6357e8fde Revert "Revert "Gets oauth working (with google) now need to test others and debug why the styles aren't working""
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-11-27 13:34:32 +01:00