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

Temporarily removed test and non netcore executable projects.

Browse Source
This commit is contained in:
Andy Butland
2020-08-21 15:27:06 +01:00
parent 510bd92e78
commit 52a65caf88
12 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.BackOffice/Security/BackOfficeSessionIdValidator.cs
View File

@@ -1,16 +1,14 @@

using System;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using System;
using System.Collections.Generic;
using System.Security.Claims;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Umbraco.Core;
using Umbraco.Core.BackOffice;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Extensions;
@@ -37,14 +35,14 @@ namespace Umbraco.Web.BackOffice.Security
{
public const string CookieName = "UMB_UCONTEXT_C";
private readonly ISystemClock _systemClock;
private readonly IGlobalSettings _globalSettings;
private readonly GlobalSettings _globalSettings;
private readonly IHostingEnvironment _hostingEnvironment;
private readonly BackOfficeUserManager _userManager;
public BackOfficeSessionIdValidator(ISystemClock systemClock, IGlobalSettings globalSettings, IHostingEnvironment hostingEnvironment, BackOfficeUserManager userManager)
public BackOfficeSessionIdValidator(ISystemClock systemClock, IOptionsSnapshot<GlobalSettings> globalSettings, IHostingEnvironment hostingEnvironment, BackOfficeUserManager userManager)
{
_systemClock = systemClock;
_globalSettings = globalSettings;
_globalSettings = globalSettings.Value;
_hostingEnvironment = hostingEnvironment;
_userManager = userManager;
}

7
src/Umbraco.Web.BackOffice/Security/PreviewAuthenticationMiddleware.cs
View File

@@ -6,6 +6,7 @@ using System;
using System.Threading.Tasks;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Hosting;
using Umbraco.Extensions;
@@ -16,14 +17,14 @@ namespace Umbraco.Web.BackOffice.Security
/// </summary>
public class PreviewAuthenticationMiddleware : IMiddleware
{
private readonly IGlobalSettings _globalSettings;
private readonly GlobalSettings _globalSettings;
private readonly IHostingEnvironment _hostingEnvironment;
public PreviewAuthenticationMiddleware(
IGlobalSettings globalSettings,
IOptionsSnapshot<GlobalSettings> globalSettings,
IHostingEnvironment hostingEnvironment)
{
_globalSettings = globalSettings;
_globalSettings = globalSettings.Value;
_hostingEnvironment = hostingEnvironment;
}

9
src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
View File

@@ -20,6 +20,8 @@ using Umbraco.Web.Common.Attributes;
using Umbraco.Web.Common.Exceptions;
using Umbraco.Web.Security;
using Umbraco.Web.WebApi;
using Umbraco.Core.Configuration.Models;
using Microsoft.Extensions.Options;
namespace Umbraco.Web.Trees
{
@@ -40,7 +42,7 @@ namespace Umbraco.Web.Trees
{
private readonly UmbracoTreeSearcher _treeSearcher;
private readonly ActionCollection _actions;
private readonly IGlobalSettings _globalSettings;
private readonly GlobalSettings _globalSettings;
private readonly IMenuItemCollectionFactory _menuItemCollectionFactory;
private readonly IWebSecurity _webSecurity;
private readonly IContentService _contentService;
@@ -49,7 +51,6 @@ namespace Umbraco.Web.Trees
private readonly IUserService _userService;
private readonly ILocalizationService _localizationService;
public ContentTreeController(
ILocalizedTextService localizedTextService,
UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
@@ -62,7 +63,7 @@ namespace Umbraco.Web.Trees
IDataTypeService dataTypeService,
UmbracoTreeSearcher treeSearcher,
ActionCollection actions,
IGlobalSettings globalSettings,
IOptionsSnapshot<GlobalSettings> globalSettings,
IContentService contentService,
IPublicAccessService publicAccessService,
ILocalizationService localizationService)
@@ -70,7 +71,7 @@ namespace Umbraco.Web.Trees
{
_treeSearcher = treeSearcher;
_actions = actions;
_globalSettings = globalSettings;
_globalSettings = globalSettings.Value;
_menuItemCollectionFactory = menuItemCollectionFactory;
_webSecurity = webSecurity;
_contentService = contentService;