From 8e6b4980e34ee1598477a15a5aaffe925cd4713f Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Fri, 18 Mar 2016 11:12:07 -0700
Subject: [PATCH] [Fixes #4310] Moved AuthorizeFilter and
 CorsAuthorizationFilter to a public namespace

---
 .../{Filters => Authorization}/IAllowAnonymousFilter.cs       | 4 +++-
 .../{Internal => Authorization}/AllowAnonymousFilter.cs       | 4 +---
 .../{Internal => Authorization}/AuthorizeFilter.cs            | 2 +-
 .../Filters/AuthorizationFilterAttribute.cs                   | 2 +-
 .../Internal/AuthorizationApplicationModelProvider.cs         | 2 +-
 .../{Internal => }/CorsAuthorizationFilter.cs                 | 3 ++-
 .../DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs    | 1 +
 .../{Internal => Authorization}/AuthorizeFilterTest.cs        | 2 +-
 .../Internal/AuthorizationApplicationModelProviderTest.cs     | 2 +-
 .../{Internal => }/CorsAuthorizationFilterTest.cs             | 2 +-
 10 files changed, 13 insertions(+), 11 deletions(-)
 rename src/Microsoft.AspNetCore.Mvc.Abstractions/{Filters => Authorization}/IAllowAnonymousFilter.cs (73%)
 rename src/Microsoft.AspNetCore.Mvc.Core/{Internal => Authorization}/AllowAnonymousFilter.cs (80%)
 rename src/Microsoft.AspNetCore.Mvc.Core/{Internal => Authorization}/AuthorizeFilter.cs (98%)
 rename src/Microsoft.AspNetCore.Mvc.Cors/{Internal => }/CorsAuthorizationFilter.cs (97%)
 rename test/Microsoft.AspNetCore.Mvc.Core.Test/{Internal => Authorization}/AuthorizeFilterTest.cs (99%)
 rename test/Microsoft.AspNetCore.Mvc.Cors.Test/{Internal => }/CorsAuthorizationFilterTest.cs (99%)

diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAllowAnonymousFilter.cs b/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs
similarity index 73%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAllowAnonymousFilter.cs
rename to src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs
index bc0fb724c2..0509ec1988 100644
--- a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAllowAnonymousFilter.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs
@@ -1,7 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Mvc.Filters
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Microsoft.AspNetCore.Mvc.Authorization
 {
     public interface IAllowAnonymousFilter : IFilterMetadata
     {
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/AllowAnonymousFilter.cs b/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs
similarity index 80%
rename from src/Microsoft.AspNetCore.Mvc.Core/Internal/AllowAnonymousFilter.cs
rename to src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs
index 716f3d9c49..34b785cbec 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/AllowAnonymousFilter.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs
@@ -1,9 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Mvc.Filters;
-
-namespace Microsoft.AspNetCore.Mvc.Internal
+namespace Microsoft.AspNetCore.Mvc.Authorization
 {
     /// <summary>
     /// An implementation of <see cref="IAllowAnonymousFilter"/>
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizeFilter.cs b/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizeFilter.cs
rename to src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs
index 1984cb4115..8052193d8d 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizeFilter.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNetCore.Mvc.Internal
+namespace Microsoft.AspNetCore.Mvc.Authorization
 {
     /// <summary>
     /// An implementation of <see cref="IAsyncAuthorizationFilter"/>
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/AuthorizationFilterAttribute.cs b/src/Microsoft.AspNetCore.Mvc.Core/Filters/AuthorizationFilterAttribute.cs
index 8b0b8ce38d..2f2eb5c9b6 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/Filters/AuthorizationFilterAttribute.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/Filters/AuthorizationFilterAttribute.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.AspNetCore.Mvc.Internal;
 
 namespace Microsoft.AspNetCore.Mvc.Filters
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs
index f99dc3a4c2..d8edf1e488 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs
@@ -5,7 +5,7 @@ using System;
 using System.Linq;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
-using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Mvc.Internal
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilter.cs b/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs
similarity index 97%
rename from src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilter.cs
rename to src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs
index d9db05ce91..62b7b24de0 100644
--- a/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilter.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs
@@ -7,10 +7,11 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Cors.Internal;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Mvc.Cors.Internal
+namespace Microsoft.AspNetCore.Mvc.Cors
 {
     /// <summary>
     /// A filter which applies the given <see cref="CorsPolicy"/> and adds appropriate response headers.
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
index 404248ad93..738c324811 100644
--- a/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Cors;
 using Microsoft.AspNetCore.Mvc.Cors.Internal;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizeFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
similarity index 99%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizeFilterTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
index f20b809746..96a7c9df36 100644
--- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizeFilterTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
@@ -15,7 +15,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Internal
+namespace Microsoft.AspNetCore.Mvc.Authorization
 {
     public class AuthorizeFilterTest
     {
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizationApplicationModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizationApplicationModelProviderTest.cs
index c598ce7069..905f085aa7 100644
--- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizationApplicationModelProviderTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizationApplicationModelProviderTest.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
-using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.Authorization;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Internal
diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsAuthorizationFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
similarity index 99%
rename from test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsAuthorizationFilterTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
index 13652c7eb6..d3dc965409 100644
--- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/Internal/CorsAuthorizationFilterTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
@@ -17,7 +17,7 @@ using Microsoft.Extensions.Logging.Testing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Cors.Internal
+namespace Microsoft.AspNetCore.Mvc.Cors
 {
     public class CorsAuthorizationFilterTest
     {