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

Merge remote-tracking branch 'origin/netcore/feature/remaining-backoffice-controllers' into netcore/feature/fix-integration-tests

Browse Source
This commit is contained in:
Bjarke Berg
2020-07-07 13:25:58 +02:00
parent 7b546e6cee f3614d51fa
commit a67629e9c0
23 changed files with 186 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Composing/Current.cs
View File

@@ -24,7 +24,7 @@ namespace Umbraco.Composing
public static IBackOfficeInfo BackOfficeInfo => EnsureInitialized(_backOfficeInfo);
public static IProfiler Profiler => EnsureInitialized(_profiler);
public static bool IsInitialized { get; private set; }
public static bool IsInitialized { get; internal set; }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static T EnsureInitialized<T>(T returnValue)

1
src/Umbraco.Infrastructure/Composing/UmbracoServiceProviderFactory.cs
View File

@@ -2,7 +2,6 @@
using LightInject.Microsoft.DependencyInjection;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Diagnostics;
using Umbraco.Composing;
using Umbraco.Core.Composing.LightInject;
using Umbraco.Core.Configuration;

7
src/Umbraco.Infrastructure/Examine/IndexRebuilder.cs
View File

@@ -52,8 +52,11 @@ namespace Umbraco.Examine
index.CreateIndex(); // clear the index
}
//run the populators in parallel against all indexes
Parallel.ForEach(_populators, populator => populator.Populate(indexes));
// run each populator over the indexes
foreach(var populator in _populators)
{
populator.Populate(indexes);
}
}
/// <summary>

8
src/Umbraco.Infrastructure/Media/UploadAutoFillProperties.cs
View File

@@ -112,16 +112,16 @@ namespace Umbraco.Web.Media
if (content == null) throw new ArgumentNullException(nameof(content));
if (autoFillConfig == null) throw new ArgumentNullException(nameof(autoFillConfig));
if (!string.IsNullOrEmpty(autoFillConfig.WidthFieldAlias) && content.Properties.Contains(autoFillConfig.WidthFieldAlias))
if (!string.IsNullOrWhiteSpace(autoFillConfig.WidthFieldAlias) && content.Properties.Contains(autoFillConfig.WidthFieldAlias))
content.Properties[autoFillConfig.WidthFieldAlias].SetValue(size.HasValue ? size.Value.Width.ToInvariantString() : string.Empty, culture, segment);
if (!string.IsNullOrEmpty(autoFillConfig.HeightFieldAlias) && content.Properties.Contains(autoFillConfig.HeightFieldAlias))
if (!string.IsNullOrWhiteSpace(autoFillConfig.HeightFieldAlias) && content.Properties.Contains(autoFillConfig.HeightFieldAlias))
content.Properties[autoFillConfig.HeightFieldAlias].SetValue(size.HasValue ? size.Value.Height.ToInvariantString() : string.Empty, culture, segment);
if (!string.IsNullOrEmpty(autoFillConfig.LengthFieldAlias) && content.Properties.Contains(autoFillConfig.LengthFieldAlias))
if (!string.IsNullOrWhiteSpace(autoFillConfig.LengthFieldAlias) && content.Properties.Contains(autoFillConfig.LengthFieldAlias))
content.Properties[autoFillConfig.LengthFieldAlias].SetValue(length, culture, segment);
if (!string.IsNullOrEmpty(autoFillConfig.ExtensionFieldAlias) && content.Properties.Contains(autoFillConfig.ExtensionFieldAlias))
if (!string.IsNullOrWhiteSpace(autoFillConfig.ExtensionFieldAlias) && content.Properties.Contains(autoFillConfig.ExtensionFieldAlias))
content.Properties[autoFillConfig.ExtensionFieldAlias].SetValue(extension, culture, segment);
}

32
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/memberGroups.js Normal file
View File

@@ -0,0 +1,32 @@
context('User Groups', () => {
beforeEach(() => {
cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
});
it('Create member group', () => {
const name = "Test Group";
cy.umbracoEnsureMemberGroupNameNotExists(name);
cy.umbracoSection('member');
cy.get('li .umb-tree-root:contains("Members")').should("be.visible");
cy.umbracoTreeItem("member", ["Member Groups"]).rightclick();
cy.umbracoContextMenuAction("action-create").click();
//Type name
cy.umbracoEditorHeaderName(name);
// Save
cy.get('.btn-success').click();
//Assert
cy.umbracoSuccessNotification().should('be.visible');
//Clean up
cy.umbracoEnsureMemberGroupNameNotExists(name);
});
});

41
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Members/members.js Normal file
View File

@@ -0,0 +1,41 @@
/// <reference types="Cypress" />
context('Members', () => {
beforeEach(() => {
cy.umbracoLogin(Cypress.env('username'), Cypress.env('password'));
});
it('Create member', () => {
const name = "Alice Bobson";
const email = "alice-bobson@acceptancetest.umbraco";
const password = "$AUlkoF*St0kgPiyyVEk5iU5JWdN*F7&@OSl5Y4pOofnidfifkBj5Ns2ONv%FzsTl36V1E924Gw97zcuSeT7UwK&qb5l&O9h!d!w";
cy.umbracoEnsureMemberEmailNotExists(email);
cy.umbracoSection('member');
cy.get('li .umb-tree-root:contains("Members")').should("be.visible");
cy.umbracoTreeItem("member", ["Members"]).rightclick();
cy.umbracoContextMenuAction("action-create").click();
cy.get('.menu-label').first().click();
//Type name
cy.umbracoEditorHeaderName(name);
cy.get('input#_umb_login').clear().type(email);
cy.get('input#_umb_email').clear().type(email);
cy.get('input#password').clear().type(password);
cy.get('input#confirmPassword').clear().type(password);
// Save
cy.get('.btn-success').click();
//Assert
cy.umbracoSuccessNotification().should('be.visible');
//Clean up
cy.umbracoEnsureMemberEmailNotExists(email);
});
});

1
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/userGroups.ts → src/Umbraco.Tests.AcceptanceTest/cypress/integration/Users/userGroups.js
View File

@@ -1,4 +1,3 @@
context('User Groups', () => {
beforeEach(() => {

4
src/Umbraco.Tests.AcceptanceTest/package.json
View File

@@ -6,8 +6,8 @@
"devDependencies": {
"cross-env": "^7.0.2",
"ncp": "^2.0.0",
"cypress": "^4.6.0",
"umbraco-cypress-testhelpers": "1.0.0-beta-39"
"cypress": "^4.9.0",
"umbraco-cypress-testhelpers": "1.0.0-beta-44"
},
"dependencies": {
"typescript": "^3.9.2"

11
src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
View File

@@ -33,7 +33,16 @@ namespace Umbraco.Tests.Integration.TestServerTest
LinkGenerator = Factory.Services.GetRequiredService<LinkGenerator>();
}
/// <summary>
/// Get the service from the underlying container that is also used by the <see cref="Client"/>.
/// </summary>
protected T GetRequiredService<T>() => Factory.Services.GetRequiredService<T>();
/// <summary>
/// Prepare a url before using <see cref="Client"/>.
/// This returns the url but also sets the HttpContext.request into to use this url.
/// </summary>
/// <returns>The string URL of the controller action.</returns>
protected string PrepareUrl<T>(Expression<Func<T, object>> methodSelector)
where T : UmbracoApiController
{
@@ -70,7 +79,7 @@ namespace Umbraco.Tests.Integration.TestServerTest
if (Current.IsInitialized)
{
typeof(Current).GetProperty(nameof(Current.IsInitialized), BindingFlags.Public | BindingFlags.Static).SetValue(null, false);
Current.IsInitialized = false;
}
}

1
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -249,7 +249,6 @@
<Compile Include="Cache\SingleItemsOnlyCachePolicyTests.cs" />
<Compile Include="Web\Controllers\AuthenticationControllerTests.cs" />
<Compile Include="Web\Controllers\BackOfficeControllerUnitTests.cs" />
<Compile Include="Web\Controllers\ContentControllerTests.cs" />
<Compile Include="Web\Controllers\UserEditorAuthorizationHelperTests.cs" />
<Compile Include="Web\Controllers\UsersControllerTests.cs" />
<Compile Include="Web\HealthChecks\HealthCheckResultsTests.cs" />

518
src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
View File

@@ -1,518 +0,0 @@
// using System;
// using System.Collections.Generic;
// using System.Globalization;
// using System.Linq;
// using System.Net;
// using System.Net.Http;
// using System.Net.Http.Headers;
// using System.Web.Http;
// using Moq;
// using Newtonsoft.Json;
// using Newtonsoft.Json.Linq;
// using NUnit.Framework;
// using Umbraco.Core;
// using Umbraco.Core.Cache;
// using Umbraco.Core.Configuration;
// using Umbraco.Core.Dictionary;
// using Umbraco.Core.Logging;
// using Umbraco.Core.Models;
// using Umbraco.Core.Models.Entities;
// using Umbraco.Core.Models.Membership;
// using Umbraco.Core.Persistence;
// using Umbraco.Core.PropertyEditors;
// using Umbraco.Core.Services;
// using Umbraco.Tests.TestHelpers;
// using Umbraco.Tests.TestHelpers.ControllerTesting;
// using Umbraco.Tests.TestHelpers.Entities;
// using Umbraco.Tests.Testing;
// using Umbraco.Web;
// using Umbraco.Web.Actions;
// using Umbraco.Web.Editors;
// using Umbraco.Web.Models.ContentEditing;
// using Umbraco.Web.PropertyEditors;
// using Umbraco.Web.Trees;
// using Umbraco.Web.WebApi;
// using Umbraco.Web.Composing;
// using Task = System.Threading.Tasks.Task;
// using Umbraco.Core.Mapping;
// using Umbraco.Web.Routing;
//
// namespace Umbraco.Tests.Web.Controllers
// {
// [TestFixture]
// [UmbracoTest(Database = UmbracoTestOptions.Database.None)]
// public class ContentControllerTests : TestWithDatabaseBase
// {
// private IContentType _contentTypeForMockedContent;
//
// public override void SetUp()
// {
// base.SetUp();
// _contentTypeForMockedContent = null;
// }
//
// protected override void ComposeApplication(bool withApplication)
// {
// base.ComposeApplication(withApplication);
//
// //Replace with mockable services:
//
// var userServiceMock = new Mock<IUserService>();
// userServiceMock.Setup(service => service.GetUserById(It.IsAny<int>()))
// .Returns((int id) => id == 1234 ? new User(TestObjects.GetGlobalSettings(), 1234, "Test", "test@test.com", "test@test.com", "", null, new List<IReadOnlyUserGroup>(), new int[0], new int[0]) : null);
// userServiceMock.Setup(x => x.GetProfileById(It.IsAny<int>()))
// .Returns((int id) => id == 1234 ? new User(TestObjects.GetGlobalSettings(), 1234, "Test", "test@test.com", "test@test.com", "", null, new List<IReadOnlyUserGroup>(), new int[0], new int[0]) : null);
// userServiceMock.Setup(service => service.GetPermissionsForPath(It.IsAny<IUser>(), It.IsAny<string>()))
// .Returns(new EntityPermissionSet(123, new EntityPermissionCollection(new[]
// {
// new EntityPermission(0, 123, new[]
// {
// ActionBrowse.ActionLetter.ToString(),
// ActionUpdate.ActionLetter.ToString(),
// ActionPublish.ActionLetter.ToString(),
// ActionNew.ActionLetter.ToString()
// }),
// })));
//
// var entityService = new Mock<IEntityService>();
// entityService.Setup(x => x.GetAllPaths(UmbracoObjectTypes.Document, It.IsAny<int[]>()))
// .Returns((UmbracoObjectTypes objType, int[] ids) => ids.Select(x => new TreeEntityPath { Path = $"-1,{x}", Id = x }).ToList());
// entityService.Setup(x => x.GetKey(It.IsAny<int>(), UmbracoObjectTypes.DataType))
// .Returns((int id, UmbracoObjectTypes objType) =>
// {
// switch (id)
// {
// case Constants.DataTypes.Textbox:
// return Attempt.Succeed(Constants.DataTypes.Guids.TextstringGuid);
// case Constants.DataTypes.RichtextEditor:
// return Attempt.Succeed(Constants.DataTypes.Guids.RichtextEditorGuid);
// }
// return Attempt.Fail<Guid>();
// });
//
//
// var dataTypeService = new Mock<IDataTypeService>();
// dataTypeService.Setup(service => service.GetDataType(It.IsAny<int>()))
// .Returns(Mock.Of<IDataType>(type => type.Id == 9876 && type.Name == "text"));
// dataTypeService.Setup(service => service.GetDataType(-87)) //the RTE
// .Returns(Mock.Of<IDataType>(type => type.Id == -87 && type.Name == "Rich text" && type.Configuration == new RichTextConfiguration()));
//
// var langService = new Mock<ILocalizationService>();
// langService.Setup(x => x.GetAllLanguages()).Returns(new[] {
// Mock.Of<ILanguage>(x => x.IsoCode == "en-US"),
// Mock.Of<ILanguage>(x => x.IsoCode == "es-ES"),
// Mock.Of<ILanguage>(x => x.IsoCode == "fr-FR")
// });
//
// var textService = new Mock<ILocalizedTextService>();
// textService.Setup(x => x.Localize(It.IsAny<string>(), It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("text");
//
// Composition.RegisterUnique(f => Mock.Of<IContentService>());
// Composition.RegisterUnique(f => Mock.Of<IContentTypeService>());
// Composition.RegisterUnique(f => userServiceMock.Object);
// Composition.RegisterUnique(f => entityService.Object);
// Composition.RegisterUnique(f => dataTypeService.Object);
// Composition.RegisterUnique(f => langService.Object);
// Composition.RegisterUnique(f => textService.Object);
// Composition.RegisterUnique(f => Mock.Of<ICultureDictionaryFactory>());
// Composition.RegisterUnique(f => new UmbracoApiControllerTypeCollection(new Type[] { }));
// }
//
// private MultipartFormDataContent GetMultiPartRequestContent(string json)
// {
// var multiPartBoundary = "----WebKitFormBoundary123456789";
// return new MultipartFormDataContent(multiPartBoundary)
// {
// new StringContent(json)
// {
// Headers =
// {
// ContentDisposition = new ContentDispositionHeaderValue("form-data")
// {
// Name = "contentItem"
// }
// }
// }
// };
// }
//
// private IContentType GetMockedContentType()
// {
// var contentType = MockedContentTypes.CreateSimpleContentType();
// //ensure things have ids
// var ids = 888;
// foreach (var g in contentType.CompositionPropertyGroups)
// {
// g.Id = ids;
// ids++;
// }
// foreach (var p in contentType.CompositionPropertyGroups)
// {
// p.Id = ids;
// ids++;
// }
//
// return contentType;
// }
//
// private IContent GetMockedContent()
// {
// if (_contentTypeForMockedContent == null)
// {
// _contentTypeForMockedContent = GetMockedContentType();
// Mock.Get(ServiceContext.ContentTypeService)
// .Setup(x => x.Get(_contentTypeForMockedContent.Id))
// .Returns(_contentTypeForMockedContent);
// Mock.Get(ServiceContext.ContentTypeService)
// .As<IContentTypeBaseService>()
// .Setup(x => x.Get(_contentTypeForMockedContent.Id))
// .Returns(_contentTypeForMockedContent);
// }
//
// var content = MockedContent.CreateSimpleContent(_contentTypeForMockedContent);
// content.Id = 123;
// content.Path = "-1,123";
// return content;
// }
//
// private const string PublishJsonInvariant = @"{
// ""id"": 123,
// ""contentTypeAlias"": ""page"",
// ""parentId"": -1,
// ""action"": ""save"",
// ""variants"": [
// {
// ""name"": ""asdf"",
// ""properties"": [
// {
// ""id"": 1,
// ""alias"": ""title"",
// ""value"": ""asdf""
// }
// ],
// ""culture"": null,
// ""save"": true,
// ""publish"": true
// }
// ]
// }";
//
// private const string PublishJsonVariant = @"{
// ""id"": 123,
// ""contentTypeAlias"": ""page"",
// ""parentId"": -1,
// ""action"": ""save"",
// ""variants"": [
// {
// ""name"": ""asdf"",
// ""properties"": [
// {
// ""id"": 1,
// ""alias"": ""title"",
// ""value"": ""asdf""
// }
// ],
// ""culture"": ""en-US"",
// ""save"": true,
// ""publish"": true
// },
// {
// ""name"": ""asdf"",
// ""properties"": [
// {
// ""id"": 1,
// ""alias"": ""title"",
// ""value"": ""asdf""
// }
// ],
// ""culture"": ""fr-FR"",
// ""save"": true,
// ""publish"": true
// },
// {
// ""name"": ""asdf"",
// ""properties"": [
// {
// ""id"": 1,
// ""alias"": ""title"",
// ""value"": ""asdf""
// }
// ],
// ""culture"": ""es-ES"",
// ""save"": true,
// ""publish"": true
// }
// ]
// }";
//
// /// <summary>
// /// Returns 404 if the content wasn't found based on the ID specified
// /// </summary>
// /// <returns></returns>
// [Test]
// public async Task PostSave_Validate_Existing_Content()
// {
// ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
// {
// var contentServiceMock = Mock.Get(ServiceContext.ContentService);
// contentServiceMock.Setup(x => x.GetById(123)).Returns(() => null); //do not find it
//
// var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
//
// var controller = new ContentController(
// Factory.GetInstance<ICultureDictionary>(),
// propertyEditorCollection,
// Factory.GetInstance<IGlobalSettings>(),
// umbracoContextAccessor,
// Factory.GetInstance<ISqlContext>(),
// Factory.GetInstance<ServiceContext>(),
// Factory.GetInstance<AppCaches>(),
// Factory.GetInstance<IProfilingLogger>(),
// Factory.GetInstance<IRuntimeState>(),
// ShortStringHelper,
// Factory.GetInstance<UmbracoMapper>(),
// Factory.GetInstance<IPublishedUrlProvider>());
//
// return controller;
// }
//
// var runner = new TestRunner(CtrlFactory);
// var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
// content: GetMultiPartRequestContent(PublishJsonInvariant),
// mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
// assertOkResponse: false);
//
// Assert.AreEqual(HttpStatusCode.NotFound, response.Item1.StatusCode);
// Assert.AreEqual(")]}',\n{\"Message\":\"content was not found\"}", response.Item1.Content.ReadAsStringAsync().Result);
//
// //var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
// //Assert.AreEqual(0, obj.TotalItems);
// }
//
// [Test]
// public async Task PostSave_Validate_At_Least_One_Variant_Flagged_For_Saving()
// {
// ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
// {
// var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
// var controller = new ContentController(
// Factory.GetInstance<ICultureDictionary>(),
// propertyEditorCollection,
// Factory.GetInstance<IGlobalSettings>(),
// umbracoContextAccessor,
// Factory.GetInstance<ISqlContext>(),
// Factory.GetInstance<ServiceContext>(),
// Factory.GetInstance<AppCaches>(),
// Factory.GetInstance<IProfilingLogger>(),
// Factory.GetInstance<IRuntimeState>(),
// ShortStringHelper,
// Factory.GetInstance<UmbracoMapper>(),
// Factory.GetInstance<IPublishedUrlProvider>());
//
// return controller;
// }
//
// var json = JsonConvert.DeserializeObject<JObject>(PublishJsonInvariant);
// //remove all save flaggs
// ((JArray)json["variants"])[0]["save"] = false;
//
// var runner = new TestRunner(CtrlFactory);
// var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
// content: GetMultiPartRequestContent(JsonConvert.SerializeObject(json)),
// mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
// assertOkResponse: false);
//
// Assert.AreEqual(HttpStatusCode.NotFound, response.Item1.StatusCode);
// Assert.AreEqual(")]}',\n{\"Message\":\"No variants flagged for saving\"}", response.Item1.Content.ReadAsStringAsync().Result);
// }
//
// /// <summary>
// /// Returns 404 if any of the posted properties dont actually exist
// /// </summary>
// /// <returns></returns>
// [Test]
// public async Task PostSave_Validate_Properties_Exist()
// {
// ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
// {
// var contentServiceMock = Mock.Get(ServiceContext.ContentService);
// contentServiceMock.Setup(x => x.GetById(123)).Returns(() => GetMockedContent());
//
// var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
// var controller = new ContentController(
// Factory.GetInstance<ICultureDictionary>(),
// propertyEditorCollection,
// Factory.GetInstance<IGlobalSettings>(),
// umbracoContextAccessor,
// Factory.GetInstance<ISqlContext>(),
// Factory.GetInstance<ServiceContext>(),
// Factory.GetInstance<AppCaches>(),
// Factory.GetInstance<IProfilingLogger>(),
// Factory.GetInstance<IRuntimeState>(),
// ShortStringHelper,
// Factory.GetInstance<UmbracoMapper>(),
// Factory.GetInstance<IPublishedUrlProvider>());
//
// return controller;
// }
//
// var json = JsonConvert.DeserializeObject<JObject>(PublishJsonInvariant);
// //add a non-existent property to a variant being saved
// var variantProps = (JArray)json["variants"].ElementAt(0)["properties"];
// variantProps.Add(JObject.FromObject(new
// {
// id = 2,
// alias = "doesntExist",
// value = "hello"
// }));
//
// var runner = new TestRunner(CtrlFactory);
// var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
// content: GetMultiPartRequestContent(JsonConvert.SerializeObject(json)),
// mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
// assertOkResponse: false);
//
// Assert.AreEqual(HttpStatusCode.NotFound, response.Item1.StatusCode);
// }
//
// [Test]
// public async Task PostSave_Simple_Invariant()
// {
// var content = GetMockedContent();
//
// ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
// {
// var contentServiceMock = Mock.Get(ServiceContext.ContentService);
// contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
// contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
// .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
//
// var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
// var controller = new ContentController(
// Factory.GetInstance<ICultureDictionary>(),
// propertyEditorCollection,
// Factory.GetInstance<IGlobalSettings>(),
// umbracoContextAccessor,
// Factory.GetInstance<ISqlContext>(),
// Factory.GetInstance<ServiceContext>(),
// Factory.GetInstance<AppCaches>(),
// Factory.GetInstance<IProfilingLogger>(),
// Factory.GetInstance<IRuntimeState>(),
// ShortStringHelper,
// Factory.GetInstance<UmbracoMapper>(),
// Factory.GetInstance<IPublishedUrlProvider>());
//
// return controller;
// }
//
// var runner = new TestRunner(CtrlFactory);
// var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
// content: GetMultiPartRequestContent(PublishJsonInvariant),
// mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
// assertOkResponse: false);
//
// Assert.AreEqual(HttpStatusCode.OK, response.Item1.StatusCode);
// var display = JsonConvert.DeserializeObject<ContentItemDisplay>(response.Item2);
// Assert.AreEqual(1, display.Variants.Count());
// }
//
// [Test]
// public async Task PostSave_Validate_Empty_Name()
// {
// var content = GetMockedContent();
//
// ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
// {
// var contentServiceMock = Mock.Get(ServiceContext.ContentService);
// contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
// contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
// .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
//
// var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
// var controller = new ContentController(
// Factory.GetInstance<ICultureDictionary>(),
// propertyEditorCollection,
// Factory.GetInstance<IGlobalSettings>(),
// umbracoContextAccessor,
// Factory.GetInstance<ISqlContext>(),
// Factory.GetInstance<ServiceContext>(),
// Factory.GetInstance<AppCaches>(),
// Factory.GetInstance<IProfilingLogger>(),
// Factory.GetInstance<IRuntimeState>(),
// ShortStringHelper,
// Factory.GetInstance<UmbracoMapper>(),
// Factory.GetInstance<IPublishedUrlProvider>()
// );
//
// return controller;
// }
//
// //clear out the name
// var json = JsonConvert.DeserializeObject<JObject>(PublishJsonInvariant);
// json["variants"].ElementAt(0)["name"] = null;
//
// var runner = new TestRunner(CtrlFactory);
// var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
// content: GetMultiPartRequestContent(JsonConvert.SerializeObject(json)),
// mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
// assertOkResponse: false);
//
// Assert.AreEqual(HttpStatusCode.BadRequest, response.Item1.StatusCode);
// var display = JsonConvert.DeserializeObject<ContentItemDisplay>(response.Item2);
// Assert.AreEqual(1, display.Errors.Count());
// Assert.IsTrue(display.Errors.ContainsKey("Variants[0].Name"));
// //ModelState":{"Variants[0].Name":["Required"]}
// }
//
// [Test]
// public async Task PostSave_Validate_Variants_Empty_Name()
// {
// var content = GetMockedContent();
//
// ApiController CtrlFactory(HttpRequestMessage message, IUmbracoContextAccessor umbracoContextAccessor)
// {
// var contentServiceMock = Mock.Get(ServiceContext.ContentService);
// contentServiceMock.Setup(x => x.GetById(123)).Returns(() => content);
// contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
// .Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
//
// var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
// var controller = new ContentController(
// Factory.GetInstance<ICultureDictionary>(),
// propertyEditorCollection,
// Factory.GetInstance<IGlobalSettings>(),
// umbracoContextAccessor,
// Factory.GetInstance<ISqlContext>(),
// Factory.GetInstance<ServiceContext>(),
// Factory.GetInstance<AppCaches>(),
// Factory.GetInstance<IProfilingLogger>(),
// Factory.GetInstance<IRuntimeState>(),
// ShortStringHelper,
// Factory.GetInstance<UmbracoMapper>(),
// Factory.GetInstance<IPublishedUrlProvider>()
// );
//
// return controller;
// }
//
// //clear out one of the names
// var json = JsonConvert.DeserializeObject<JObject>(PublishJsonVariant);
// json["variants"].ElementAt(0)["name"] = null;
//
// var runner = new TestRunner(CtrlFactory);
// var response = await runner.Execute("Content", "PostSave", HttpMethod.Post,
// content: GetMultiPartRequestContent(JsonConvert.SerializeObject(json)),
// mediaTypeHeader: new MediaTypeWithQualityHeaderValue("multipart/form-data"),
// assertOkResponse: false);
//
// Assert.AreEqual(HttpStatusCode.BadRequest, response.Item1.StatusCode);
// var display = JsonConvert.DeserializeObject<ContentItemDisplay>(response.Item2);
// Assert.AreEqual(2, display.Errors.Count());
// Assert.IsTrue(display.Errors.ContainsKey("Variants[0].Name"));
// Assert.IsTrue(display.Errors.ContainsKey("_content_variant_en-US_null_"));
// }
//
// // TODO: There are SOOOOO many more tests we should write - a lot of them to do with validation
//
// }
// }

4
src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
View File

@@ -130,7 +130,7 @@ namespace Umbraco.Web.Editors
/// </summary>
/// <returns></returns>
[HttpGet]
[UmbracoAuthorize]
[UmbracoAuthorize, OverrideAuthorization]
public bool AllowsCultureVariation()
{
var contentTypes = _contentTypeService.GetAll();
@@ -1733,7 +1733,7 @@ namespace Umbraco.Web.Editors
{
try
{
var uri = DomainUtilities.ParseUriFromDomainName(domain.Name, new Uri(Request.GetEncodedUrl(), UriKind.RelativeOrAbsolute));
var uri = DomainUtilities.ParseUriFromDomainName(domain.Name, new Uri(Request.GetEncodedUrl()));
}
catch (UriFormatException)
{

6
src/Umbraco.Web.BackOffice/Controllers/DetermineAmbiguousActionByPassingParameters.cs
View File

@@ -15,6 +15,12 @@ using Newtonsoft.Json.Linq;
namespace Umbraco.Web.BackOffice.Controllers
{
/// <summary>
/// This method determine ambiguous controller actions by making a tryparse of the string (from request) into the type of the argument.
/// </summary>
/// <remarks>
/// By using this methods you are allowed to to have multiple controller actions named equally. E.g. GetById(Guid id), GetById(int id),...
/// </remarks>
public class DetermineAmbiguousActionByPassingParameters : ActionMethodSelectorAttribute
{
private string _requestBody = null;

3
src/Umbraco.Web.BackOffice/Extensions/UmbracoBackOfficeServiceCollectionExtensions.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Umbraco.Core;
@@ -7,6 +8,7 @@ using Umbraco.Core.Configuration;
using Umbraco.Core.Security;
using Umbraco.Core.Serialization;
using Umbraco.Net;
using Umbraco.Web.BackOffice.Filters;
using Umbraco.Web.BackOffice.Security;
using Umbraco.Web.Common.AspNetCore;
using Umbraco.Web.Common.Security;
@@ -26,6 +28,7 @@ namespace Umbraco.Extensions
// TODO: We had this check in v8 where we don't enable these unless we can run...
//if (runtimeState.Level != RuntimeLevel.Upgrade && runtimeState.Level != RuntimeLevel.Run) return app;
services.AddSingleton<IFilterProvider, OverrideAuthorizationFilterProvider>();
services
.AddAuthentication(Constants.Security.BackOfficeAuthenticationType)
.AddCookie(Constants.Security.BackOfficeAuthenticationType);

24
src/Umbraco.Web.BackOffice/Filters/OverrideAuthorizationAttribute.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using Microsoft.AspNetCore.Mvc.Filters;
namespace Umbraco.Web.BackOffice.Filters
{
public class OverrideAuthorizationAttribute : ActionFilterAttribute
{
/// <summary>
/// Ensures a special type of authorization filter is ignored. Defaults to <see cref="IAuthorizationFilter"/>.
/// </summary>
/// <param name="type">The type of authorication filter to override. if null then <see cref="IAuthorizationFilter"/> is used.</param>
/// <remarks>
/// https://stackoverflow.com/questions/33558095/overrideauthorizationattribute-in-asp-net-5
/// </remarks>
public OverrideAuthorizationAttribute(Type filtersToOverride = null)
{
FiltersToOverride = filtersToOverride ?? typeof(IAuthorizationFilter);
}
public Type FiltersToOverride { get;}
}
}

34
src/Umbraco.Web.BackOffice/Filters/OverrideAuthorizationFilterProvider.cs Normal file
View File

@@ -0,0 +1,34 @@
using System.Linq;
using Microsoft.AspNetCore.Mvc.Filters;
using Umbraco.Core;
namespace Umbraco.Web.BackOffice.Filters
{
public class OverrideAuthorizationFilterProvider : IFilterProvider, IFilterMetadata
{
public void OnProvidersExecuted(FilterProviderContext context)
{
}
public void OnProvidersExecuting(FilterProviderContext context)
{
if (context.ActionContext.ActionDescriptor.FilterDescriptors != null)
{
//Does the action have any UmbracoAuthorizeFilter?
var overrideFilters = context.Results.Where(filterItem => filterItem.Filter is OverrideAuthorizationAttribute).ToArray();
foreach (var overrideFilter in overrideFilters)
{
context.Results.RemoveAll(filterItem =>
//Remove any filter for the type indicated in the UmbracoAuthorizeFilter attribute
filterItem.Descriptor.Filter.GetType() == ((OverrideAuthorizationAttribute)overrideFilter.Filter).FiltersToOverride &&
//Remove filters with lower scope (ie controller) than the override filter (ie action method)
filterItem.Descriptor.Scope < overrideFilter.Descriptor.Scope);
}
}
}
//all framework providers have negative orders, so ours will come later
public int Order => 1;
}
}

11
src/Umbraco.Web.BackOffice/Filters/PrefixlessBodyModelValidatorAttribute.cs
View File

@@ -1,13 +1,18 @@
using System;
using System.Linq;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.ModelBinding;
namespace Umbraco.Web.BackOffice.Filters
{
/// <summary>
/// Applying this attribute to any controller will ensure that the parameter name (prefix) is not part of the validation error keys.
/// </summary>
public class PrefixlessBodyModelValidatorAttribute : TypeFilterAttribute
{
//TODO: Could be a better solution to replace the IModelValidatorProvider and ensure the errors are created
//without the prefix, instead of removing it afterwards. But I couldn't find any way to do this for only some
//of the controllers. IObjectModelValidator seems to be the interface to implement and replace in the container
//to handle it for the entire solution.
public PrefixlessBodyModelValidatorAttribute() : base(typeof(PrefixlessBodyModelValidatorFilter))
{
}
@@ -23,8 +28,6 @@ namespace Umbraco.Web.BackOffice.Filters
if (context.ModelState.IsValid) return;
//Remove prefix from errors
foreach (var modelStateItem in context.ModelState)
{
foreach (var prefix in context.ActionArguments.Keys)

11
src/Umbraco.Web.BackOffice/Filters/UmbracoAuthorizeFilter.cs
View File

@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Routing;
using System;
@@ -44,6 +43,14 @@ namespace Umbraco.Web.BackOffice.Filters
_requireApproval = requireApproval;
}
/// <summary>
/// Default constructor
/// </summary>
/// <param name="hostingEnvironment"></param>
/// <param name="umbracoContext"></param>
/// <param name="runtimeState"></param>
/// <param name="linkGenerator"></param>
/// <param name="redirectUrl"></param>
public UmbracoAuthorizeFilter(
IHostingEnvironment hostingEnvironment,
IUmbracoContextAccessor umbracoContext,

6
src/Umbraco.Web.BackOffice/ModelBinders/BlueprintItemBinder.cs
View File

@@ -10,11 +10,11 @@ namespace Umbraco.Web.BackOffice.ModelBinders
{
internal class BlueprintItemBinder : ContentItemBinder
{
private readonly ContentService _contentService;
private readonly IContentService _contentService;
public BlueprintItemBinder(IJsonSerializer jsonSerializer, UmbracoMapper umbracoMapper, IContentService contentService, IContentTypeService contentTypeService, IHostingEnvironment hostingEnvironment, ContentService contentService2) : base(jsonSerializer, umbracoMapper, contentService, contentTypeService, hostingEnvironment)
public BlueprintItemBinder(IJsonSerializer jsonSerializer, UmbracoMapper umbracoMapper, IContentService contentService, IContentTypeService contentTypeService, IHostingEnvironment hostingEnvironment) : base(jsonSerializer, umbracoMapper, contentService, contentTypeService, hostingEnvironment)
{
_contentService = contentService2;
_contentService = contentService;
}
protected override IContent GetExisting(ContentItemSave model)

1
src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
View File

@@ -14,7 +14,6 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.4" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="System.IO.Pipelines" Version="4.7.1" />
</ItemGroup>
<ItemGroup>

1
src/Umbraco.Web.Common/ApplicationModels/UmbracoApiBehaviorApplicationModelProvider.cs
View File

@@ -36,7 +36,6 @@ namespace Umbraco.Web.Common.ApplicationModels
ActionModelConventions = new List<IActionModelConvention>()
{
new ClientErrorResultFilterConvention(), // Ensures the responses without any body is converted into a simple json object with info instead of a string like "Status Code: 404; Not Found"
//new InvalidModelStateFilterConvention(), // automatically 400 responses if ModelState is invalid before hitting the controller
new ConsumesConstraintForFormFileParameterConvention(), // If an controller accepts files, it must accept multipart/form-data.
new InferParameterBindingInfoConvention(modelMetadataProvider), // no need for [FromBody] everywhere, A complex type parameter is assigned to FromBody

1
src/Umbraco.Web.Common/Filters/AngularJsonOnlyConfigurationAttribute.cs
View File

@@ -16,7 +16,6 @@ namespace Umbraco.Web.Common.Filters
{
public AngularJsonOnlyConfigurationAttribute() : base(typeof(AngularJsonOnlyConfigurationFilter))
{
Order = -2400;
}
private class AngularJsonOnlyConfigurationFilter : IResultFilter

5
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -155,6 +155,9 @@
<Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
<Compile Include="Security\IdentityFactoryMiddleware.cs" />
<Compile Include="Security\WebSecurity.cs" />
<Compile Include="Trees\ITreeNodeController.cs" />
<Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
<Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
<Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
<Compile Include="WebAssets\CDF\ClientDependencyRuntimeMinifier.cs" />
<Compile Include="Models\NoNodesViewModel.cs" />
@@ -293,9 +296,7 @@
<Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
<Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
<Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
<Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
<Compile Include="WebApi\Filters\FilterGrouping.cs" />
<Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
<Compile Include="WebApi\Filters\SetAngularAntiForgeryTokensAttribute.cs" />
<Compile Include="WebApi\Filters\ValidateAngularAntiForgeryTokenAttribute.cs" />
<Compile Include="WebApi\HttpControllerContextExtensions.cs" />