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

Few more NRT tweaks (#12323)

Browse Source 
* Amended GetAll() on IDataTypeService to return an empty collection rather than null.

* Added a ClearSessionValue method to ISessionManager (given you can no longer set a value to null).

* Allow for null values in a StatefulNotification.

* Removed obsoletion of synchronous messages on TreeControllerBase.

* Fixed further CS8620 warnings in core project.

* Further fix to nullable warning.

* Aligned nullablility of retreiving tree nodes and menus, synchronously or asynchronously (such that we no longer can get null values, always empty collection objects).
This commit is contained in:
Andy Butland
2022-05-01 08:18:09 +02:00
committed by GitHub
parent d47ae6868b
commit 96d33201aa
31 changed files with 102 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Umbraco.Web.Common/AspNetCore/AspNetCoreSessionManager.cs
View File

@@ -1,4 +1,4 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Umbraco.Cms.Core.Net;
using Umbraco.Cms.Core.Web;
@@ -14,7 +14,6 @@ namespace Umbraco.Cms.Web.Common.AspNetCore
_httpContextAccessor = httpContextAccessor;
}
/// <summary>
/// If session isn't enabled this will throw an exception so we check
/// </summary>
@@ -24,7 +23,7 @@ namespace Umbraco.Cms.Web.Common.AspNetCore
{
get
{
var httpContext = _httpContextAccessor?.HttpContext;
HttpContext? httpContext = _httpContextAccessor?.HttpContext;
return IsSessionsAvailable
? httpContext?.Session?.Id
@@ -32,17 +31,35 @@ namespace Umbraco.Cms.Web.Common.AspNetCore
}
}
public string? GetSessionValue(string sessionName)
public string? GetSessionValue(string key)
{
if(!IsSessionsAvailable) return null;
return _httpContextAccessor.HttpContext?.Session.GetString(sessionName);
if (!IsSessionsAvailable)
{
return null;
}
return _httpContextAccessor.HttpContext?.Session.GetString(key);
}
public void SetSessionValue(string sessionName, string value)
public void SetSessionValue(string key, string value)
{
if(!IsSessionsAvailable) return;
_httpContextAccessor.HttpContext?.Session.SetString(sessionName, value);
if (!IsSessionsAvailable)
{
return;
}
_httpContextAccessor.HttpContext?.Session.SetString(key, value);
}
public void ClearSessionValue(string key)
{
if (!IsSessionsAvailable)
{
return;
}
_httpContextAccessor.HttpContext?.Session.Remove(key);
}
}
}