Commit Graph

36778 Commits

Author SHA1 Message Date
Bjarke Berg
5dbddfffc5 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore
# Conflicts:
#	.gitignore
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	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
2020-12-07 12:31:26 +01:00
Shannon
1a35cf5164 Merge branch 'netcore/task/cleanup-force-renew-auth' into netcore/netcore 2020-12-07 19:40:09 +11:00
Shannon
6f7a0f358a c# 9 2020-12-07 19:14:42 +11:00
Shannon Deminick
262cd19f8d Merge pull request #9506 from umbraco/netcore/task/cleanup-force-renew-auth
Netcore/task/cleanup force renew auth
2020-12-07 18:59:18 +11:00
Shannon
dcb00b729d remove more old code 2020-12-07 18:58:07 +11:00
Shannon
0d3aa828c1 remove more old code 2020-12-07 18:55:01 +11:00
Shannon
36342438da Deleting old code 2020-12-07 18:47:25 +11:00
Shannon
92cc23c5b3 Merge branch 'netcore/task/usermanager-object-cleanup' into netcore/task/cleanup-force-renew-auth 2020-12-07 18:17:07 +11:00
Shannon
375e056cef Removing old code 2020-12-07 18:16:42 +11:00
Bjarke Berg
dfb2b5515d Merge pull request #9505 from AndyButland/feature/clean-up-2
NetCore: updated some more code to match linting rules.
2020-12-07 07:56:59 +01:00
Shannon
835d1d0ad3 linting cleanup 2020-12-07 17:56:40 +11:00
Bjarke Berg
8261d9c320 Merge pull request #9503 from AndyButland/feature/clean-up
NetCore: updated some code to match linting rules
2020-12-07 07:54:22 +01:00
Shannon Deminick
96da33cfd6 Merge pull request #9496 from umbraco/netcore/task/usermanager-object-cleanup
Netcore/task/usermanager object cleanup
2020-12-07 17:38:25 +11:00
Andy Butland
9f8138b2d0 Adhered to linting rules configuration models, validators and tests. 2020-12-06 10:51:31 +01:00
Andy Butland
61cbb84dd3 Adhered to linting rules for authorization policy handlers, requirements and tests. 2020-12-06 09:13:29 +01:00
Bjarke Berg
e3761c7499 Merge pull request #9502 from umbraco/netcore/bugfix/nuspec-smidge-nuglify
NetCore: Fix wrong version of Smidge in nuspec + Updated to official 3.2.0
2020-12-05 12:37:34 +01:00
Andy Butland
ff03cd6a03 Adhered to linting rules in common unit test model builders. 2020-12-05 11:12:55 +01:00
Andy Butland
201940290c Adhered to linting rules in hosted services implementations and tests. 2020-12-05 10:06:59 +01:00
Bjarke Berg
d74cc9d35a Fix wrong version of Smidge in nuspec + Updated to official 3.2.0 2020-12-05 08:55:37 +01:00
Bjarke Berg
05dc597fc2 Merge pull request #9490 from AndyButland/feature/auth-policies-tests
NetCore: Adds unit tests for authorization policy handlers
2020-12-04 12:16:04 +01:00
Shannon
9441f5c5ea fix remaining test 2020-12-04 15:05:47 +11:00
Shannon
10fc351470 merge cleanup 2020-12-04 13:09:08 +11: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
406528f553 flows claims 2020-12-04 12:54:31 +11:00
Shannon
216b8559da cleanup 2020-12-04 12:52:25 +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
Bjarke Berg
f7067dbe08 Merge pull request #9478 from JimBobSquarePants/netcore/feature/9397
Add EventAggregator
2020-12-03 18:22:25 +01:00
Matthew Wise
946a4abc75 changed IResultFilter to IActionFilter 2020-12-03 16:49:09 +00:00
Shannon
4dea624e23 remove code 2020-12-04 02:28:11 +11:00
Shannon
86d231f5de removes remaining back office things from underlying UmbracoUserManager moves files 2020-12-04 02:21:21 +11:00
Shannon
aeec18d808 removes the interface 2020-12-04 01:50:30 +11:00
Shannon
0825db6861 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/usermanager-object-cleanup
# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs
#	src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
2020-12-04 01:44:01 +11:00
Shannon
35af86c3d3 Splits user manager into a base class that can be reused changes base class of IdentityUser to UmbracoIdentityUser 2020-12-04 01:38:36 +11:00
Shannon
8e9dfad381 Simplifying IdentityUser 2020-12-04 00:54:28 +11:00
James Jackson-South
826e5a9bad Update to match new rules. And fix dup usings 2020-12-03 13:32:04 +00:00
Shannon
c51ed88d56 Adds notes for external login service/repo, changes IdentityUserLogin user id to string for now so it can be shared with members/users 2020-12-04 00:20:48 +11:00
Shannon
90b7ee3f37 oops broke build 2020-12-03 23:55:10 +11:00
Shannon
de03dae46f Moving namespaces, cleaning up some stuff on the underlying base identity classes 2020-12-03 23:49:32 +11:00
James Jackson-South
606d8bcf51 Merge remote-tracking branch 'upstream/netcore/netcore' into netcore/feature/9397 2020-12-03 12:39:08 +00:00
Andy Butland
3acea01501 Restored functionality and fixed tests for BackOfficeHandler. 2020-12-03 12:22:31 +01:00
Bjarke Berg
2f537c6ec8 Fix mocking 2020-12-03 11:57:03 +01:00
Bjarke Berg
8e3a01cdfc Merge remote-tracking branch 'origin/netcore/netcore' into feature/auth-policies-tests 2020-12-03 11:30:35 +01:00
Bjarke Berg
d711bce5ef build fix 2020-12-03 11:29:17 +01:00
Andy Butland
324b983c57 Added tests for ContentPermissionsPublishBranchHandler. 2020-12-03 11:10:16 +01:00
Shannon
2f9e92eee7 Make BackOfficeClaimsPrincipalFactory not be generic, doesn't need to be, cleans up code as per rules 2020-12-03 20:30:35 +11:00
Andy Butland
76dafcc413 Added tests for MediaPermissionsQueryStringHandler.
Introduced base class to share code between content and media query string related permissions handlers.
2020-12-03 10:01:46 +01:00
Shannon
8b57e3080e Fixing fields vs props (oops) and some other stylecop violations 2020-12-03 19:36:38 +11:00
Andy Butland
6857a92460 Added tests for ContentPermissionsQueryStringHandler. 2020-12-03 09:31:20 +01:00
Shannon Deminick
0f872f5e4a Merge pull request #9338 from JimBobSquarePants/netcore/linting
Add Stylecop and .EditorConfig Linting.
2020-12-03 19:20:00 +11:00