yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,934 Commits 4 Branches 7 Tags
1400a02798bce933ebd47513462a8c98f92f762d
Commit Graph

35934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
1400a02798 Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller 
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Controllers/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web.BackOffice/Services/IconService.cs
#	src/Umbraco.Web.Common/Security/ExternalSignInAutoLinkOptions.cs
#	src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
#	src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
#	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/Views/AuthorizeUpgrade.cshtml
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2020-10-23 10:10:02 +11:00
Bjarke Berg
ca8e54ffc6 https://github.com/umbraco/Umbraco-CMS/pull/9248> 
- Removed BackOfficeArea
- Injected IEmailSender
- Uses nameof instead of magic strings
- Uses GetControllerName instead of magic strings

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-22 13:37:47 +02:00
Shannon
785c3a34e9 fix csproj 2020-10-22 21:18:46 +11:00
Shannon
2b1dfc5888 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller 
# Conflicts:
#	src/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
#	src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Mvc/UmbracoController.cs
 2020-10-22 21:16:44 +11:00
Mole
e9ae1a93c3 Merge pull request #9245 from umbraco/netcore/bugfix/unit_tests_runnable_on_linux 
Netcore: Ensure unit tests are runnable on linux
 2020-10-22 08:23:15 +02:00
berg
070307ea88 Ensure unit tests run on linux 
Signed-off-by: berg <mail@bergmania.dk>
 2020-10-21 21:04:10 +02:00
Bjarke Berg
5ecc2676e3 Migrated ThreadSafetyServiceTest.cs 2020-10-21 13:54:22 +02:00
Bjarke Berg
7e77feab1e Migrated ContentTypeServiceVariantsTests.cs 2020-10-21 13:47:52 +02:00
Emma L Garland
7a570110d0 Netcore/feature/healthcheck replaceconfiglogic (#8934) 
* Started moving to JSON instead of config.
Mild refactoring but overall keeping it the same, except for injecting IConfiguration and JSON parsing instead of XML
Tests currently unaffected, need to increase coverage

* Moved to constants for appsettings keys
Moved from IConfiguration to global settings - later to be replaced with IOptions
Updated translation messages
Installed IOptions ready for new PR
Updated to new interface, IConfigurationService

* Post-merge fix

* Namespace move from Umbraco.Web to Umbraco.Core where appropriate

* Renamed abstractsettings (from abstractconfig)
Moving out of configservice into the POCO config check

* Made the IIsCustomErrors healthcheck as obsolete, as no web.config setting). Investigate reintroducing this check in the .NET Core way (UseDevelopment).
Reducing use of abstractsettings as not needed - we don't need a config service to read the config settings anymore as they're all explicit POCOs.
Consolidated health-checks in project.

* Removed test views that weren't meant to be added

* Returned to use of abstractsettings with different use

* Moved more health checks into correct folder/namespace, and enum into their own file

* Correct namespace

* Git history/compare lost due to file move, temporarily moving back to original folder. Will do another PR to move after this

* Use existing GetStatus in abstract check for Debug mode

* Updating to return to previous logic and putting files back into line

* Macro errors returned to previous logic

* Reuse abstractsettings class

* Swapped order to assist with reviewing PR

* Updated to include itempath

* Not implemented comment to avoid confusion
Implemented NotificationEmailCheck

* Changed to IOptionsMonitor as per PR comments. Removed configurationservice as we need to rethink the fixing strategy. Updated logger.
Needs to show fix message instead of fixing. Temporary fix for IIS version

* Switched to IOptionsMonitor for all

* No longer attempts to actually fix header in config. Still need to show suggestions.

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-10-21 11:29:25 +02:00
Bjarke Berg
2bb3afb69d Merge pull request #9227 from umbraco/netcore/feature/migrate-unit-tests 
Netcore: Migrate rendering related unit tests
 2020-10-21 10:51:12 +02:00
Shannon
d1b35deb43 Migrates remaining backofficecontroller but still a bunch of work to do , streamlines Backoffice to BackOffice (but is that what we want?) 2020-10-21 16:51:00 +11:00
Bjarke Berg
35c22f9074 Introduced SetViewDataAsync on UmbracoViewPage 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-20 21:30:45 +02:00
Andy Butland
6e592d6467 NetCore: Reorganised integration tests into project grouped folders and namespaces (#9208) 
* Reorganised integration tests into folders and classes grouping by project.

* Updated namespaces and file locations from PR comments.

* Fix merge conflict

* Cleared content type service events looking to resolve failing integration test on build server.

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2020-10-20 18:43:03 +02:00
Andy Butland
5e70c503cd NetCore: migrated further unit tests (#9211) 
* Moved model unit tests into correct folder and namespace.

* Migrated ContentTests.

* Migrated VariationTests.

* Migrated ImageSharpImageUrlGeneratorTests.

* Fixes to integration tests.

* Unit and integration test updates from PR comments.

* Delete accidentally added log file.
 2020-10-20 14:49:52 +02:00
Mole
d315d2120e Migrate UmbracoViewPageTests 2020-10-20 13:41:21 +02:00
Bjarke Berg
05ac14d7f2 Merge pull request #8637 from umbraco/netcore/feature/move-tests 
Move unit tests
 2020-10-20 12:04:11 +02:00
Mole
568ce57e67 Remove folders that does not exist 2020-10-20 09:34:57 +02:00
Mole
e5a20aea6f Remove duplicate PackageReference 2020-10-20 09:10:16 +02:00
Mole
a88243b9ba Try and fix the merge 2020-10-20 09:06:42 +02:00
Mole
e87caac0dd Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/move-tests 
# Conflicts:
#	src/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs
#	src/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs
#	src/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Macros/MacroParserTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Manifest/ManifestContentAppTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Manifest/ManifestParserTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs
#	src/Umbraco.Tests/Macros/MacroParserTests.cs
#	src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs
#	src/Umbraco.Tests/Manifest/ManifestParserTests.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
 2020-10-20 08:40:41 +02:00
Mole
5f114e7228 Align ContentModelBinderTests to new behaviour 2020-10-19 14:34:08 +02:00
Mole
c3e92a91b5 Mingrate RenderModelBinderTests 2020-10-19 14:03:51 +02:00
Shannon
e68c37dc54 Migrates AuthenticationController for the 2FA requirements 2020-10-19 18:48:51 +11:00
Mole
c02e1c261d Merge pull request #9175 from umbraco/netcore/bugfix/smidge-nuglify 
Update and fix Umbraco's SmidgeRuntimeMinifier implementation and update to latest Smidge
 2020-10-19 09:35:39 +02:00
Bjarke Berg
908ab98040 Merge pull request #9159 from umbraco/netcore/feature/enable-sessions 
Netcore: Enable session
 2020-10-19 09:14:50 +02:00
Bjarke Berg
f6e462a4ea Merge pull request #9168 from umbraco/netcore/feature/clean-umbraco-web 
Netcore: Clean old Umbraco.Web project
 2020-10-19 09:14:39 +02:00
Bjarke Berg
3d7942bb7c Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/clean-umbraco-web 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-19 08:08:56 +02:00
Bjarke Berg
071016de47 Merge pull request #9169 from umbraco/netcore/feature/Migrate_RenderMvcController 
Migrated RenderMvcController and RenderIndexActionSelectorAttribute
 2020-10-19 08:07:03 +02:00
Bjarke Berg
f17c4631d2 Changed Exception to InvalidOperationException 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-19 06:38:57 +02:00
Bjarke Berg
31be4b7306 Cleanup + added missing file 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-18 19:53:59 +02:00
Bjarke Berg
d74ec6e130 Changed default test setting to Boot=false 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-16 07:08:50 +02:00
Shannon
779214f9d3 preserve function names and update smidge 2020-10-16 15:23:02 +11:00
Shannon
ca9fab6b48 Latest version of smidge, new custom NuglifyJs processor with custom settings, fixes some JS that Nuglify throws on because it's not formatted correctly, ensures nuglify is used for the minifier 2020-10-16 12:35:53 +11:00
Bjarke Berg
b27732adc8 Migrated RenderMvcController and RenderIndexActionSelectorAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-15 11:42:16 +02:00
Mole
4a91ee74c3 Remove old FormDataCollectionExtensions 2020-10-15 11:20:41 +02:00
Mole
7bc3cdafcb Remove ConfiguredPasswordValidator 2020-10-15 10:34:49 +02:00
Mole
c9985f0043 Remove DisableBrowserCacheAttribute 2020-10-15 08:58:01 +02:00
Mole
2a048681da Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/clean-umbraco-web 2020-10-15 08:04:46 +02:00
Shannon
457fb1c45d Merge branch 'netcore/netcore' into netcore/bugfix/smidge-nuglify 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-10-15 14:45:15 +11:00
Mole
9763d9f7e9 Removed more classes that has been migrated 2020-10-14 15:20:52 +02:00
Mole
f13f754bf0 Removed old JsonNetResult, MinifyJavaScriptResultAttribute, UmbracoViewPage 2020-10-14 14:19:18 +02:00
Mole
e2b1fb335e Remove old UmbracoAuthorizedJsonController 2020-10-14 13:46:08 +02:00
Bjarke Berg
29276acffd Merge pull request #9149 from AndyButland/feature/migrate-service-integration-tests 
NetCore: Further integration tests migrations (2)
 2020-10-14 13:40:54 +02:00
Mole
296217c917 Remove old BackOfficeServerVariables and LightInjectContainer 2020-10-14 13:40:10 +02:00
Mole
6664076976 Use default timeout in default session registration 2020-10-14 11:40:20 +02:00
Mole
d9b5aedca4 Register session service and middleware 2020-10-14 11:35:38 +02:00
Bjarke Berg
e567f25487 Migrated ContentEventsTests.cs 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-14 11:10:02 +02:00
Bjarke Berg
76f87a1243 Clean up 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-14 08:30:45 +02:00
Bjarke Berg
75944117c8 Merge remote-tracking branch 'origin/netcore/netcore' into feature/migrate-service-integration-tests 2020-10-14 08:02:50 +02:00
Bjarke Berg
231771a10e Migrated ContentServicePerformanceTest 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-10-14 08:02:43 +02:00