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

Fixes issue of moving/deleting media along with other issues of us returning plain text responses with incorrect mime type results and an issue with our interceptors

Browse Source
This commit is contained in:
Shannon
2018-08-08 11:49:05 +10:00
parent 4a43b97f64
commit 9e6947f62c
14 changed files with 69 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Core/Services/Implement/MediaService.cs
View File

@@ -1010,7 +1010,7 @@ namespace Umbraco.Core.Services.Implement
var originalPath = media.Path;
if (scope.Events.DispatchCancelable(Trashing, this, new MoveEventArgs<IMedia>(new MoveEventInfo<IMedia>(media, originalPath, Constants.System.RecycleBinMedia))))
if (scope.Events.DispatchCancelable(Trashing, this, new MoveEventArgs<IMedia>(new MoveEventInfo<IMedia>(media, originalPath, Constants.System.RecycleBinMedia)), nameof(Trashing)))
{
scope.Complete();
return OperationResult.Attempt.Cancel(evtMsgs);
@@ -1022,7 +1022,7 @@ namespace Umbraco.Core.Services.Implement
var moveInfo = moves.Select(x => new MoveEventInfo<IMedia>(x.Item1, x.Item2, x.Item1.ParentId))
.ToArray();
scope.Events.Dispatch(Trashed, this, new MoveEventArgs<IMedia>(false, evtMsgs, moveInfo));
scope.Events.Dispatch(Trashed, this, new MoveEventArgs<IMedia>(false, evtMsgs, moveInfo), nameof(Trashed));
Audit(AuditType.Move, "Move Media to Recycle Bin performed by user", userId, media.Id);
scope.Complete();
@@ -1058,7 +1058,7 @@ namespace Umbraco.Core.Services.Implement
var moveEventInfo = new MoveEventInfo<IMedia>(media, media.Path, parentId);
var moveEventArgs = new MoveEventArgs<IMedia>(moveEventInfo);
if (scope.Events.DispatchCancelable(Moving, this, moveEventArgs))
if (scope.Events.DispatchCancelable(Moving, this, moveEventArgs, nameof(Moving)))
{
scope.Complete();
return;
@@ -1082,7 +1082,7 @@ namespace Umbraco.Core.Services.Implement
.ToArray();
moveEventArgs.MoveInfoCollection = moveInfo;
moveEventArgs.CanCancel = false;
scope.Events.Dispatch(Moved, this, moveEventArgs);
scope.Events.Dispatch(Moved, this, moveEventArgs, nameof(Moved));
Audit(AuditType.Move, "Move Media performed by user", userId, media.Id);
scope.Complete();
}
@@ -1382,7 +1382,7 @@ namespace Umbraco.Core.Services.Implement
/// <para>Deletes media items of the specified type, and only that type. Does *not* handle content types
/// inheritance and compositions, which need to be managed outside of this method.</para>
/// </remarks>
/// <param name="mediaTypeId">Id of the <see cref="IMediaType"/></param>
/// <param name="mediaTypeIds">Id of the <see cref="IMediaType"/></param>
/// <param name="userId">Optional id of the user deleting the media</param>
public void DeleteMediaOfTypes(IEnumerable<int> mediaTypeIds, int userId = 0)
{
@@ -1434,7 +1434,7 @@ namespace Umbraco.Core.Services.Implement
var moveInfos = moves.Select(x => new MoveEventInfo<IMedia>(x.Item1, x.Item2, x.Item1.ParentId))
.ToArray();
if (moveInfos.Length > 0)
scope.Events.Dispatch(Trashed, this, new MoveEventArgs<IMedia>(false, moveInfos), "Trashed");
scope.Events.Dispatch(Trashed, this, new MoveEventArgs<IMedia>(false, moveInfos), nameof(Trashed));
scope.Events.Dispatch(TreeChanged, this, changes.ToEventArgs());
Audit(AuditType.Delete, $"Delete Media of types {string.Join(",", mediaTypeIdsA)} performed by user", userId, Constants.System.Root);

2
src/Umbraco.Tests/Services/ContentServiceTests.cs
View File

@@ -63,7 +63,7 @@ namespace Umbraco.Tests.Services
/// <summary>
/// Used to list out all ambiguous events that will require dispatching with a name
/// </summary>
[Test]
[Test, Explicit]
public void List_Ambiguous_Events()
{
var events = ServiceContext.ContentService.GetType().GetEvents(BindingFlags.Static | BindingFlags.Public);

29
src/Umbraco.Tests/Services/MediaServiceTests.cs
View File

@@ -1,16 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading;
using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.Events;
using Umbraco.Core.Models;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
using Umbraco.Core.Persistence.Dtos;
using Umbraco.Core.Persistence.Repositories;
using Umbraco.Core.Services;
using Umbraco.Core.Services.Implement;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.TestHelpers.Entities;
using Umbraco.Tests.Testing;
@@ -22,6 +25,32 @@ namespace Umbraco.Tests.Services
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
public class MediaServiceTests : TestWithSomeContentBase
{
/// <summary>
/// Used to list out all ambiguous events that will require dispatching with a name
/// </summary>
[Test, Explicit]
public void List_Ambiguous_Events()
{
var events = ServiceContext.MediaService.GetType().GetEvents(BindingFlags.Static | BindingFlags.Public);
var typedEventHandler = typeof(TypedEventHandler<,>);
foreach (var e in events)
{
//only continue if this is a TypedEventHandler
if (!e.EventHandlerType.IsGenericType) continue;
var typeDef = e.EventHandlerType.GetGenericTypeDefinition();
if (typedEventHandler != typeDef) continue;
//get the event arg type
var eventArgType = e.EventHandlerType.GenericTypeArguments[1];
var found = EventNameExtractor.FindEvent(typeof(MediaService), eventArgType, EventNameExtractor.MatchIngNames);
if (!found.Success && found.Result.Error == EventNameExtractorError.Ambiguous)
{
Console.WriteLine($"Ambiguous event, source: {typeof(MediaService)}, args: {eventArgType}");
}
}
}
[Test]
public void Get_Paged_Children_With_Media_Type_Filter()
{

13
src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js
View File

@@ -48,11 +48,14 @@
//exit/ignore
return $q.reject(rejection);
}
var filtered = _.find(requestInterceptorFilter(), function (val) {
return config.url.indexOf(val) > 0;
});
if (filtered) {
return $q.reject(rejection);
if (config.url) {
var filtered = _.find(requestInterceptorFilter(), function (val) {
return config.url.indexOf(val) > 0;
});
if (filtered) {
return $q.reject(rejection);
}
}
//A 401 means that the user is not logged in

7
src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
View File

@@ -157,7 +157,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
{
parentId: args.parentId,
id: args.id
}),
}, { responseType: 'text' }),
'Failed to move content');
},
@@ -198,7 +198,7 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
return umbRequestHelper.resourcePromise(
$http.post(umbRequestHelper.getApiUrl("contentApiBaseUrl", "PostCopy"),
args),
args, { responseType: 'text' }),
'Failed to copy content');
},
@@ -467,7 +467,8 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
$http.get(
umbRequestHelper.getApiUrl(
"contentApiBaseUrl",
"GetNiceUrl", [{ id: id }])),
"GetNiceUrl", { id: id }),
{ responseType: 'text' }),
'Failed to retrieve url for id:' + id);
},

4
src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
View File

@@ -266,7 +266,7 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
{
parentId: args.parentId,
id: args.id
}),
}, { responseType: 'text' }),
'Failed to move content');
},
@@ -286,7 +286,7 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter, loca
{
parentId: args.parentId,
id: args.id
}),
}, { responseType: 'text' }),
'Failed to copy content');
},

2
src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
View File

@@ -344,7 +344,7 @@ function dataTypeResource($q, $http, umbDataFormatter, umbRequestHelper) {
{
parentId: args.parentId,
id: args.id
}),
}, { responseType: 'text' }),
'Failed to move content');
},

2
src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
View File

@@ -112,7 +112,7 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
{
parentId: args.parentId,
id: args.id
}),
}, {responseType: 'text'}),
'Failed to move media');
},

4
src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
View File

@@ -213,7 +213,7 @@ function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
{
parentId: args.parentId,
id: args.id
}),
}, { responseType: 'text' }),
'Failed to move content');
},
@@ -233,7 +233,7 @@ function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
{
parentId: args.parentId,
id: args.id
}),
}, { responseType: 'text' }),
'Failed to copy content');
},

7
src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
View File

@@ -152,6 +152,13 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
}, function (response) {
if (!response.status && response.message && response.stack) {
//this is a JS/angular error that we should deal with
return $q.reject({
errorMsg: response.message
})
}
//invoke the callback
var result = callbacks.error.apply(this, [response.data, response.status, response.headers, response.config]);

8
src/Umbraco.Web/Editors/ContentController.cs
View File

@@ -396,7 +396,7 @@ namespace Umbraco.Web.Editors
{
var url = Umbraco.Url(id);
var response = Request.CreateResponse(HttpStatusCode.OK);
response.Content = new StringContent(url, Encoding.UTF8, "application/json");
response.Content = new StringContent(url, Encoding.UTF8, "text/plain");
return response;
}
@@ -409,7 +409,7 @@ namespace Umbraco.Web.Editors
{
var url = Umbraco.UrlProvider.GetUrl(id);
var response = Request.CreateResponse(HttpStatusCode.OK);
response.Content = new StringContent(url, Encoding.UTF8, "application/json");
response.Content = new StringContent(url, Encoding.UTF8, "text/plain");
return response;
}
@@ -1005,7 +1005,7 @@ namespace Umbraco.Web.Editors
Services.ContentService.Move(toMove, move.ParentId, Security.GetUserId().ResultOr(0));
var response = Request.CreateResponse(HttpStatusCode.OK);
response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
response.Content = new StringContent(toMove.Path, Encoding.UTF8, "text/plain");
return response;
}
@@ -1022,7 +1022,7 @@ namespace Umbraco.Web.Editors
var c = Services.ContentService.Copy(toCopy, copy.ParentId, copy.RelateToOriginal, copy.Recursive, Security.GetUserId().ResultOr(0));
var response = Request.CreateResponse(HttpStatusCode.OK);
response.Content = new StringContent(c.Path, Encoding.UTF8, "application/json");
response.Content = new StringContent(c.Path, Encoding.UTF8, "text/plain");
return response;
}

4
src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
View File

@@ -321,7 +321,7 @@ namespace Umbraco.Web.Editors
if (result.Success)
{
var response = Request.CreateResponse(HttpStatusCode.OK);
response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
response.Content = new StringContent(toMove.Path, Encoding.UTF8, "text/plain");
return response;
}
@@ -365,7 +365,7 @@ namespace Umbraco.Web.Editors
{
var copy = result.Result.Entity;
var response = Request.CreateResponse(HttpStatusCode.OK);
response.Content = new StringContent(copy.Path, Encoding.UTF8, "application/json");
response.Content = new StringContent(copy.Path, Encoding.UTF8, "text/plain");
return response;
}

2
src/Umbraco.Web/Editors/DataTypeController.cs
View File

@@ -250,7 +250,7 @@ namespace Umbraco.Web.Editors
if (result.Success)
{
var response = Request.CreateResponse(HttpStatusCode.OK);
response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
response.Content = new StringContent(toMove.Path, Encoding.UTF8, "text/plain");
return response;
}

2
src/Umbraco.Web/Editors/MediaController.cs
View File

@@ -422,7 +422,7 @@ namespace Umbraco.Web.Editors
Services.MediaService.Move(toMove, move.ParentId);
var response = Request.CreateResponse(HttpStatusCode.OK);
response.Content = new StringContent(toMove.Path, Encoding.UTF8, "application/json");
response.Content = new StringContent(toMove.Path, Encoding.UTF8, "text/plain");
return response;
}