From f19e18e160116ec64b95b68bfc3f323b2c8a97bc Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 8 Apr 2020 15:56:19 +1000 Subject: [PATCH] Removes new namespaces: Umbraco.Core.Cookie, Umbraco.Core.Session, Umbraco.Core.Request, these are web things and should be part of one namespace --- src/Umbraco.Core/Routing/ContentFinderByIdPath.cs | 1 - src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs | 3 +-- src/Umbraco.Core/Routing/PublishedRouter.cs | 1 - .../Scoping/RepositoryCacheMode.cs | 0 .../{Search => Trees}/SearchableTreeAttribute.cs | 2 +- src/Umbraco.Core/{Cookie => Web}/ICookieManager.cs | 2 +- src/Umbraco.Core/{Request => Web}/IRequestAccessor.cs | 2 +- src/Umbraco.Core/{Session => Web}/ISessionManager.cs | 2 +- .../BatchedDatabaseServerMessenger.cs | 1 - .../DatabaseServerRegistrarAndMessengerComponent.cs | 1 - src/Umbraco.Infrastructure/Intall/InstallHelper.cs | 1 - .../Migrations/PostMigrations/ClearCsrfCookies.cs | 1 - .../Scheduling/SchedulerComponent.cs | 1 - src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs | 3 +-- .../Routing/ContentFinderByPageIdQueryTests.cs | 1 - src/Umbraco.Tests/TestHelpers/BaseWebTest.cs | 9 +-------- src/Umbraco.Tests/Testing/UmbracoTestBase.cs | 3 --- src/Umbraco.Web/AspNet/AspNetCookieManager.cs | 1 - src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs | 1 - src/Umbraco.Web/AspNet/AspNetSessionManager.cs | 1 - src/Umbraco.Web/Editors/PreviewController.cs | 3 --- src/Umbraco.Web/HttpCookieExtensions.cs | 1 - src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs | 1 - src/Umbraco.Web/Macros/MacroRenderer.cs | 3 --- src/Umbraco.Web/Runtime/WebInitialComposer.cs | 3 --- src/Umbraco.Web/Security/BackOfficeCookieManager.cs | 4 ++-- src/Umbraco.Web/Security/SessionIdValidator.cs | 2 +- src/Umbraco.Web/UmbracoContext.cs | 2 -- src/Umbraco.Web/UmbracoContextFactory.cs | 2 -- 29 files changed, 10 insertions(+), 48 deletions(-) rename src/{Umbraco.Infrastructure => Umbraco.Core}/Scoping/RepositoryCacheMode.cs (100%) rename src/Umbraco.Core/{Search => Trees}/SearchableTreeAttribute.cs (98%) rename src/Umbraco.Core/{Cookie => Web}/ICookieManager.cs (89%) rename src/Umbraco.Core/{Request => Web}/IRequestAccessor.cs (91%) rename src/Umbraco.Core/{Session => Web}/ISessionManager.cs (84%) diff --git a/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs b/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs index 49a6ff6bfe..4b58832e8e 100644 --- a/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs +++ b/src/Umbraco.Core/Routing/ContentFinderByIdPath.cs @@ -4,7 +4,6 @@ using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Models.PublishedContent; using System.Globalization; -using Umbraco.Core.Request; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs b/src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs index 6a9adda5f8..16d7a0c4cf 100644 --- a/src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs +++ b/src/Umbraco.Core/Routing/ContentFinderByPageIdQuery.cs @@ -1,5 +1,4 @@ -using Umbraco.Core.Request; - + namespace Umbraco.Web.Routing { /// diff --git a/src/Umbraco.Core/Routing/PublishedRouter.cs b/src/Umbraco.Core/Routing/PublishedRouter.cs index af4ec60e4d..1a422dea92 100644 --- a/src/Umbraco.Core/Routing/PublishedRouter.cs +++ b/src/Umbraco.Core/Routing/PublishedRouter.cs @@ -8,7 +8,6 @@ using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; -using Umbraco.Core.Request; using Umbraco.Core.Services; using Umbraco.Web.Security; diff --git a/src/Umbraco.Infrastructure/Scoping/RepositoryCacheMode.cs b/src/Umbraco.Core/Scoping/RepositoryCacheMode.cs similarity index 100% rename from src/Umbraco.Infrastructure/Scoping/RepositoryCacheMode.cs rename to src/Umbraco.Core/Scoping/RepositoryCacheMode.cs diff --git a/src/Umbraco.Core/Search/SearchableTreeAttribute.cs b/src/Umbraco.Core/Trees/SearchableTreeAttribute.cs similarity index 98% rename from src/Umbraco.Core/Search/SearchableTreeAttribute.cs rename to src/Umbraco.Core/Trees/SearchableTreeAttribute.cs index d81a85bb4b..2a30725fde 100644 --- a/src/Umbraco.Core/Search/SearchableTreeAttribute.cs +++ b/src/Umbraco.Core/Trees/SearchableTreeAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Umbraco.Web.Search +namespace Umbraco.Web.Trees { [AttributeUsage(AttributeTargets.Class)] public sealed class SearchableTreeAttribute : Attribute diff --git a/src/Umbraco.Core/Cookie/ICookieManager.cs b/src/Umbraco.Core/Web/ICookieManager.cs similarity index 89% rename from src/Umbraco.Core/Cookie/ICookieManager.cs rename to src/Umbraco.Core/Web/ICookieManager.cs index 0eced07b37..dc5d3f65c2 100644 --- a/src/Umbraco.Core/Cookie/ICookieManager.cs +++ b/src/Umbraco.Core/Web/ICookieManager.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Core.Cookie +namespace Umbraco.Web { public interface ICookieManager { diff --git a/src/Umbraco.Core/Request/IRequestAccessor.cs b/src/Umbraco.Core/Web/IRequestAccessor.cs similarity index 91% rename from src/Umbraco.Core/Request/IRequestAccessor.cs rename to src/Umbraco.Core/Web/IRequestAccessor.cs index 63a8de6b1e..60f8ccbc40 100644 --- a/src/Umbraco.Core/Request/IRequestAccessor.cs +++ b/src/Umbraco.Core/Web/IRequestAccessor.cs @@ -1,7 +1,7 @@ using System; using Umbraco.Web.Routing; -namespace Umbraco.Core.Request +namespace Umbraco.Web { public interface IRequestAccessor { diff --git a/src/Umbraco.Core/Session/ISessionManager.cs b/src/Umbraco.Core/Web/ISessionManager.cs similarity index 84% rename from src/Umbraco.Core/Session/ISessionManager.cs rename to src/Umbraco.Core/Web/ISessionManager.cs index f3a47202ee..fdcebbb05a 100644 --- a/src/Umbraco.Core/Session/ISessionManager.cs +++ b/src/Umbraco.Core/Web/ISessionManager.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Core.Session +namespace Umbraco.Web { public interface ISessionManager { diff --git a/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs index 70b79fbeb0..fa76fb6f11 100644 --- a/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs +++ b/src/Umbraco.Infrastructure/BatchedDatabaseServerMessenger.cs @@ -11,7 +11,6 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Scoping; using Umbraco.Core.Hosting; -using Umbraco.Core.Request; namespace Umbraco.Web { diff --git a/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs b/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs index 6c745f3877..fdc672c534 100644 --- a/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs +++ b/src/Umbraco.Infrastructure/Compose/DatabaseServerRegistrarAndMessengerComponent.cs @@ -4,7 +4,6 @@ using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Hosting; using Umbraco.Core.Logging; -using Umbraco.Core.Request; using Umbraco.Core.Services; using Umbraco.Core.Services.Changes; using Umbraco.Core.Sync; diff --git a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs index cf4b174cde..3825768d97 100644 --- a/src/Umbraco.Infrastructure/Intall/InstallHelper.cs +++ b/src/Umbraco.Infrastructure/Intall/InstallHelper.cs @@ -5,7 +5,6 @@ using System.Net.Http; using System.Threading.Tasks; using Umbraco.Core; using Umbraco.Core.Configuration; -using Umbraco.Core.Cookie; using Umbraco.Core.Logging; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Models; diff --git a/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs b/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs index 4f176c797f..3a91fc3369 100644 --- a/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs +++ b/src/Umbraco.Infrastructure/Migrations/PostMigrations/ClearCsrfCookies.cs @@ -1,5 +1,4 @@ using Umbraco.Core; -using Umbraco.Core.Cookie; using Umbraco.Core.Migrations; namespace Umbraco.Web.Migrations.PostMigrations diff --git a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs index 30d0bc7e4a..3c58cbbde7 100644 --- a/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs +++ b/src/Umbraco.Infrastructure/Scheduling/SchedulerComponent.cs @@ -9,7 +9,6 @@ using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Hosting; using Umbraco.Core.IO; using Umbraco.Core.Logging; -using Umbraco.Core.Request; using Umbraco.Core.Scoping; using Umbraco.Core.Services; using Umbraco.Core.Sync; diff --git a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs index ee1e056aff..d3c820d239 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByIdTests.cs @@ -1,8 +1,7 @@ using NUnit.Framework; using Umbraco.Core; -using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.Request; using Umbraco.Tests.TestHelpers; +using Umbraco.Web; using Umbraco.Web.Routing; namespace Umbraco.Tests.Routing diff --git a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs index d18353eb87..405572334c 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByPageIdQueryTests.cs @@ -1,6 +1,5 @@ using Moq; using NUnit.Framework; -using Umbraco.Core.Request; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.Routing; diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs index 24dcb229c9..d78d700de1 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs @@ -1,5 +1,4 @@ -using System; -using System.Linq; +using System.Linq; using System.Threading; using Moq; using NUnit.Framework; @@ -7,17 +6,11 @@ using Umbraco.Core; using Umbraco.Core.Composing; using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Logging; -using Umbraco.Core.Models; using Umbraco.Core.Models.PublishedContent; -using Umbraco.Core.PropertyEditors; -using Umbraco.Core.Request; using Umbraco.Core.Services; -using Umbraco.Core.Services.Implement; -using Umbraco.Core.Strings; using Umbraco.Tests.Common; using Umbraco.Tests.PublishedContent; using Umbraco.Tests.TestHelpers.Stubs; -using Umbraco.Tests.Testing.Objects.Accessors; using Umbraco.Web; using Umbraco.Web.Composing; using Umbraco.Web.Models.PublishedContent; diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs index b635e63e94..901192c609 100644 --- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs +++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs @@ -14,7 +14,6 @@ using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; -using Umbraco.Core.Configuration.UmbracoSettings; using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.IO.MediaPathSchemes; @@ -51,10 +50,8 @@ using Umbraco.Web.Templates; using Umbraco.Web.PropertyEditors; using Umbraco.Core.Dictionary; using Umbraco.Net; -using Umbraco.Core.Request; using Umbraco.Core.Security; using Umbraco.Core.Services; -using Umbraco.Tests.LegacyXmlPublishedCache; using Umbraco.Web.AspNet; using Umbraco.Web.Install; using Umbraco.Web.Security; diff --git a/src/Umbraco.Web/AspNet/AspNetCookieManager.cs b/src/Umbraco.Web/AspNet/AspNetCookieManager.cs index d8fcefa0e1..917647bbe0 100644 --- a/src/Umbraco.Web/AspNet/AspNetCookieManager.cs +++ b/src/Umbraco.Web/AspNet/AspNetCookieManager.cs @@ -1,5 +1,4 @@ using System.Web; -using Umbraco.Core.Cookie; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs b/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs index 72bde75dc8..a82c5cab63 100644 --- a/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs +++ b/src/Umbraco.Web/AspNet/AspNetRequestAccessor.cs @@ -1,5 +1,4 @@ using System; -using Umbraco.Core.Request; using Umbraco.Web.Routing; namespace Umbraco.Web.AspNet diff --git a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs index f81daadb0a..0e91fe7b5b 100644 --- a/src/Umbraco.Web/AspNet/AspNetSessionManager.cs +++ b/src/Umbraco.Web/AspNet/AspNetSessionManager.cs @@ -1,6 +1,5 @@ using System.Web; using Umbraco.Net; -using Umbraco.Core.Session; namespace Umbraco.Web.AspNet { diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs index 45aa8a4295..c501323200 100644 --- a/src/Umbraco.Web/Editors/PreviewController.cs +++ b/src/Umbraco.Web/Editors/PreviewController.cs @@ -6,10 +6,7 @@ using System.Web.UI; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.Cookie; using Umbraco.Core.Hosting; -using Umbraco.Core.IO; -using Umbraco.Core.Runtime; using Umbraco.Core.Services; using Umbraco.Core.WebAssets; using Umbraco.Web.Composing; diff --git a/src/Umbraco.Web/HttpCookieExtensions.cs b/src/Umbraco.Web/HttpCookieExtensions.cs index 26490771cd..d30827be65 100644 --- a/src/Umbraco.Web/HttpCookieExtensions.cs +++ b/src/Umbraco.Web/HttpCookieExtensions.cs @@ -5,7 +5,6 @@ using System.Net.Http.Headers; using System.Web; using Microsoft.Owin; using Umbraco.Core; -using Umbraco.Core.Cookie; namespace Umbraco.Web { diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs index fdec5bfa2e..d93fd3a131 100644 --- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs @@ -11,7 +11,6 @@ using Umbraco.Core.Migrations.Install; using Umbraco.Core.Services; using Umbraco.Web.Install.Models; using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.Cookie; namespace Umbraco.Web.Install.InstallSteps { diff --git a/src/Umbraco.Web/Macros/MacroRenderer.cs b/src/Umbraco.Web/Macros/MacroRenderer.cs index 624395049e..de1d82be7d 100644 --- a/src/Umbraco.Web/Macros/MacroRenderer.cs +++ b/src/Umbraco.Web/Macros/MacroRenderer.cs @@ -6,16 +6,13 @@ using System.Text; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Configuration.UmbracoSettings; -using Umbraco.Core.Cookie; using Umbraco.Core.Events; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Macros; using Umbraco.Core.Models.PublishedContent; -using Umbraco.Core.Request; using Umbraco.Core.Security; using Umbraco.Core.Services; -using Umbraco.Core.Session; namespace Umbraco.Web.Macros { diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs index 29baba8592..4d5d4198b6 100644 --- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs +++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs @@ -6,7 +6,6 @@ using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; -using Umbraco.Core.Cookie; using Umbraco.Core.Dictionary; using Umbraco.Core.Events; using Umbraco.Core.Hosting; @@ -45,8 +44,6 @@ using Umbraco.Web.WebApi; using Umbraco.Web.PropertyEditors; using Umbraco.Examine; using Umbraco.Net; -using Umbraco.Core.Request; -using Umbraco.Core.Session; using Umbraco.Web.AspNet; using Umbraco.Core.Media; using Umbraco.Infrastructure.Media; diff --git a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs index 435396cac9..73c143afd4 100644 --- a/src/Umbraco.Web/Security/BackOfficeCookieManager.cs +++ b/src/Umbraco.Web/Security/BackOfficeCookieManager.cs @@ -20,7 +20,7 @@ namespace Umbraco.Web.Security /// Umbraco's back office cookie needs to be read on two paths: /umbraco and /install and /base therefore we cannot just set the cookie path to be /umbraco, /// instead we'll specify our own cookie manager and return null if the request isn't for an acceptable path. /// - internal class BackOfficeCookieManager : ChunkingCookieManager, ICookieManager + internal class BackOfficeCookieManager : ChunkingCookieManager, Microsoft.Owin.Infrastructure.ICookieManager { private readonly IUmbracoContextAccessor _umbracoContextAccessor; private readonly IRuntimeState _runtime; @@ -52,7 +52,7 @@ namespace Umbraco.Web.Security /// /// /// - string ICookieManager.GetRequestCookie(IOwinContext context, string key) + string Microsoft.Owin.Infrastructure.ICookieManager.GetRequestCookie(IOwinContext context, string key) { if (_umbracoContextAccessor.UmbracoContext == null || context.Request.Uri.IsClientSideRequest()) { diff --git a/src/Umbraco.Web/Security/SessionIdValidator.cs b/src/Umbraco.Web/Security/SessionIdValidator.cs index cd3dd457d0..37d86f7052 100644 --- a/src/Umbraco.Web/Security/SessionIdValidator.cs +++ b/src/Umbraco.Web/Security/SessionIdValidator.cs @@ -47,7 +47,7 @@ namespace Umbraco.Web.Security public static async Task ValidateSessionAsync( TimeSpan validateInterval, IOwinContext owinCtx, - ICookieManager cookieManager, + Microsoft.Owin.Infrastructure.ICookieManager cookieManager, ISystemClock systemClock, DateTimeOffset? authTicketIssueDate, ClaimsIdentity currentIdentity, diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs index 24b302bbbe..ae1cf885b3 100644 --- a/src/Umbraco.Web/UmbracoContext.cs +++ b/src/Umbraco.Web/UmbracoContext.cs @@ -2,9 +2,7 @@ using System; using System.Web; using Umbraco.Core; using Umbraco.Core.Configuration; -using Umbraco.Core.Cookie; using Umbraco.Core.Hosting; -using Umbraco.Core.IO; using Umbraco.Core.Models.PublishedContent; using Umbraco.Web.Composing; using Umbraco.Web.PublishedCache; diff --git a/src/Umbraco.Web/UmbracoContextFactory.cs b/src/Umbraco.Web/UmbracoContextFactory.cs index 73c4877747..118ccd2901 100644 --- a/src/Umbraco.Web/UmbracoContextFactory.cs +++ b/src/Umbraco.Web/UmbracoContextFactory.cs @@ -2,9 +2,7 @@ using System.IO; using System.Text; using Umbraco.Core.Configuration; -using Umbraco.Core.Cookie; using Umbraco.Core.Hosting; -using Umbraco.Core.IO; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Services; using Umbraco.Web.PublishedCache;