Skip to content
This repository has been archived by the owner on Dec 14, 2018. It is now read-only.

Commit

Permalink
Addressed feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajaybhargavb
ajaybhargavb committed Oct 21, 2015
1 parent 30f9649 commit a938d7c
Showing 1 changed file with 68 additions and 37 deletions.
105 changes: 68 additions & 37 deletions src/Microsoft.AspNet.Mvc.Core/Controllers/FilterActionInvoker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,17 +241,6 @@ private IFilterMetadata[] GetFilters()
_filterProviders[i].OnProvidersExecuted(context);
}

if (_diagnosticSource.IsEnabled("Microsoft.AspNet.Mvc.RegisteredFilters"))
{
_diagnosticSource.Write(
"Microsoft.AspNet.Mvc.RegisteredFilters",
new
{
actionDescriptor = ActionContext.ActionDescriptor,
filterProviderContext = context
});
}

var count = 0;
for (var i = 0; i < items.Count; i++)
{
Expand Down Expand Up @@ -298,8 +287,32 @@ private async Task InvokeAuthorizationFilterAsync()
var current = _cursor.GetNextFilter<IAuthorizationFilter, IAsyncAuthorizationFilter>();
if (current.FilterAsync != null)
{
if (_diagnosticSource.IsEnabled("Microsoft.AspNet.Mvc.BeforeOnAuthorization"))
{
_diagnosticSource.Write(
"Microsoft.AspNet.Mvc.BeforeOnAuthorization",
new
{
actionDescriptor = _authorizationContext.ActionDescriptor,
authorizationContext = _authorizationContext,
filter = current.FilterAsync
});
}

await current.FilterAsync.OnAuthorizationAsync(_authorizationContext);

if (_diagnosticSource.IsEnabled("Microsoft.AspNet.Mvc.AfterOnAuthorization"))
{
_diagnosticSource.Write(
"Microsoft.AspNet.Mvc.AfterOnAuthorization",
new
{
actionDescriptor = _authorizationContext.ActionDescriptor,
authorizationContext = _authorizationContext,
filter = current.FilterAsync
});
}

if (_authorizationContext.Result == null)
{
// Only keep going if we don't have a result
Expand All @@ -319,7 +332,8 @@ private async Task InvokeAuthorizationFilterAsync()
new
{
actionDescriptor = _authorizationContext.ActionDescriptor,
authorizationContext = _authorizationContext
authorizationContext = _authorizationContext,
filter = current.Filter
});
}

Expand All @@ -333,6 +347,7 @@ private async Task InvokeAuthorizationFilterAsync()
{
actionDescriptor = _authorizationContext.ActionDescriptor,
authorizationContext = _authorizationContext,
filter = current.Filter
});
}

Expand Down Expand Up @@ -398,7 +413,7 @@ private async Task<ResourceExecutedContext> InvokeResourceFilterAsync()
{
actionDescriptor = _resourceExecutingContext.ActionDescriptor,
resourceExecutingContext = _resourceExecutingContext,
resourceExecutedContext = _resourceExecutedContext
filter = item.FilterAsync
});
}

Expand All @@ -413,8 +428,8 @@ await item.FilterAsync.OnResourceExecutionAsync(
new
{
actionDescriptor = _resourceExecutingContext.ActionDescriptor,
resourceExecutingContext = _resourceExecutingContext,
resourceExecutedContext = _resourceExecutedContext
resourceExecutedContext = _resourceExecutedContext,
filter = item.FilterAsync
});
}

Expand Down Expand Up @@ -446,7 +461,8 @@ await item.FilterAsync.OnResourceExecutionAsync(
new
{
actionDescriptor = _resourceExecutingContext.ActionDescriptor,
resourceExecutingContext = _resourceExecutingContext
resourceExecutingContext = _resourceExecutingContext,
filter = item.Filter
});
}

Expand All @@ -459,7 +475,8 @@ await item.FilterAsync.OnResourceExecutionAsync(
new
{
actionDescriptor = _resourceExecutingContext.ActionDescriptor,
resourceExecutingContext = _resourceExecutingContext
resourceExecutingContext = _resourceExecutingContext,
filter = item.Filter
});
}

Expand All @@ -486,7 +503,8 @@ await item.FilterAsync.OnResourceExecutionAsync(
new
{
actionDescriptor = _resourceExecutedContext.ActionDescriptor,
resourceExecutedContext = _resourceExecutedContext
resourceExecutedContext = _resourceExecutedContext,
filter = item.Filter
});
}

Expand All @@ -499,7 +517,8 @@ await item.FilterAsync.OnResourceExecutionAsync(
new
{
actionDescriptor = _resourceExecutedContext.ActionDescriptor,
resourceExecutedContext = _resourceExecutedContext
resourceExecutedContext = _resourceExecutedContext,
filter = item.Filter
});
}
}
Expand Down Expand Up @@ -608,7 +627,8 @@ private async Task InvokeExceptionFilterAsync()
new
{
actionDescriptor = _exceptionContext.ActionDescriptor,
exceptionContext = _exceptionContext
exceptionContext = _exceptionContext,
filter = current.FilterAsync
});
}

Expand All @@ -623,7 +643,8 @@ private async Task InvokeExceptionFilterAsync()
new
{
actionDescriptor = _exceptionContext.ActionDescriptor,
exceptionContext = _exceptionContext
exceptionContext = _exceptionContext,
filter = current.FilterAsync
});
}

Expand Down Expand Up @@ -651,7 +672,8 @@ private async Task InvokeExceptionFilterAsync()
new
{
actionDescriptor = _exceptionContext.ActionDescriptor,
exceptionContext = _exceptionContext
exceptionContext = _exceptionContext,
filter = current.Filter
});
}

Expand All @@ -666,7 +688,8 @@ private async Task InvokeExceptionFilterAsync()
new
{
actionDescriptor = _exceptionContext.ActionDescriptor,
exceptionContext = _exceptionContext
exceptionContext = _exceptionContext,
filter = current.Filter
});
}

Expand Down Expand Up @@ -755,7 +778,7 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
{
actionDescriptor = _actionExecutingContext.ActionDescriptor,
actionExecutingContext = _actionExecutingContext,
actionExecutedContext = _actionExecutedContext
filter = item.FilterAsync
});
}

Expand All @@ -768,8 +791,8 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
new
{
actionDescriptor = _actionExecutingContext.ActionDescriptor,
actionExecutingContext = _actionExecutingContext,
actionExecutedContext = _actionExecutedContext
actionExecutedContext = _actionExecutedContext,
filter = item.FilterAsync
});
}

Expand Down Expand Up @@ -798,7 +821,8 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
new
{
actionDescriptor = _actionExecutingContext.ActionDescriptor,
actionExecutingContext = _actionExecutingContext
actionExecutingContext = _actionExecutingContext,
filter = item.Filter
});
}

Expand All @@ -811,7 +835,8 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
new
{
actionDescriptor = _actionExecutingContext.ActionDescriptor,
actionExecutingContext = _actionExecutingContext
actionExecutingContext = _actionExecutingContext,
filter = item.Filter
});
}

Expand Down Expand Up @@ -839,7 +864,8 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
new
{
actionDescriptor = _actionExecutedContext.ActionDescriptor,
actionExecutedContext = _actionExecutedContext
actionExecutedContext = _actionExecutedContext,
filter = item.Filter
});
}

Expand All @@ -852,7 +878,8 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
new
{
actionDescriptor = _actionExecutedContext.ActionDescriptor,
actionExecutedContext = _actionExecutedContext
actionExecutedContext = _actionExecutedContext,
filter = item.Filter
});
}
}
Expand Down Expand Up @@ -968,7 +995,7 @@ private async Task<ResultExecutedContext> InvokeResultFilterAsync()
{
actionDescriptor = _resultExecutingContext.ActionDescriptor,
resultExecutingContext = _resultExecutingContext,
resultExecutedContext = _resultExecutedContext
filter = item.FilterAsync
});
}

Expand All @@ -981,8 +1008,8 @@ private async Task<ResultExecutedContext> InvokeResultFilterAsync()
new
{
actionDescriptor = _resultExecutingContext.ActionDescriptor,
resultExecutingContext = _resultExecutingContext,
resultExecutedContext = _resultExecutedContext
resultExecutedContext = _resultExecutedContext,
filter = item.FilterAsync
});
}

Expand Down Expand Up @@ -1011,7 +1038,8 @@ private async Task<ResultExecutedContext> InvokeResultFilterAsync()
new
{
actionDescriptor = _resultExecutingContext.ActionDescriptor,
resultExecutingContext = _resultExecutingContext
resultExecutingContext = _resultExecutingContext,
filter = item.Filter
});
}

Expand All @@ -1024,7 +1052,8 @@ private async Task<ResultExecutedContext> InvokeResultFilterAsync()
new
{
actionDescriptor = _resultExecutingContext.ActionDescriptor,
resultExecutingContext = _resultExecutingContext
resultExecutingContext = _resultExecutingContext,
filter = item.Filter
});
}

Expand Down Expand Up @@ -1052,7 +1081,8 @@ private async Task<ResultExecutedContext> InvokeResultFilterAsync()
new
{
actionDescriptor = _resultExecutingContext.ActionDescriptor,
resultExecutedContext = _resultExecutedContext
resultExecutedContext = _resultExecutedContext,
filter = item.Filter
});
}

Expand All @@ -1065,7 +1095,8 @@ private async Task<ResultExecutedContext> InvokeResultFilterAsync()
new
{
actionDescriptor = _resultExecutingContext.ActionDescriptor,
resultExecutedContext = _resultExecutedContext
resultExecutedContext = _resultExecutedContext,
filter = item.Filter
});
}
}
Expand Down

0 comments on commit a938d7c

Please sign in to comment.