#4182 Fix context manager accessor

MarimerLLC · Oct 2, 2024 · c929053 · c929053
1 parent 879648c
commit c929053
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 17 deletions.
diff --git a/Source/Csla.AspNetCore/Blazor/ApplicationContextManagerBlazor.cs b/Source/Csla.AspNetCore/Blazor/ApplicationContextManagerBlazor.cs
@@ -116,7 +116,11 @@ private void AuthenticationStateProvider_AuthenticationStateChanged(Task<Authent
  /// </summary>
  public bool IsValid
  {
- get { return ActiveCircuitState.CircuitExists; }
+ get
+ {
+ var result = ActiveCircuitState.CircuitExists;
+ return result;
+ }
  }
 
  /// <summary>
@@ -137,19 +141,33 @@ public IPrincipal GetUser()
  /// Not supported in Blazor.
  /// </summary>
  /// <param name="principal">Principal object.</param>
- public virtual void SetUser(IPrincipal principal) { /* noop */ } // => throw new NotSupportedException(nameof(SetUser));
+ public virtual void SetUser(IPrincipal principal)
+ {
+ ArgumentNullException.ThrowIfNull(principal);
+ if (HttpContext != null)
+ {
+ HttpContext.User = (ClaimsPrincipal)principal;
+ }
+ else
+ {
+ throw new NotSupportedException(nameof(SetUser));
+ }
+ }
+
+ private const string _localContextName = "Csla.LocalContext";
+ private const string _clientContextName = "Csla.ClientContext";
 
  /// <summary>
  /// Gets the local context.
  /// </summary>
  /// <exception cref="InvalidOperationException"><see cref="ApplicationContext"/> is <see langword="null"/>.</exception>
- public IContextDictionary GetLocalContext()
+ public IContextDictionary? GetLocalContext()
  {
  ThrowIfApplicationContextIsNull();
- IContextDictionary localContext;
+ IContextDictionary? localContext;
  var sessionManager = ApplicationContext.GetRequiredService<ISessionManager>();
  var session = sessionManager.GetSession();
- session.TryGetValue("localContext", out var result);
+ session.TryGetValue(_localContextName, out var result);
  if (result is IContextDictionary context)
  {
  localContext = context;
@@ -172,7 +190,7 @@ public void SetLocalContext(IContextDictionary? localContext)
  ThrowIfApplicationContextIsNull();
  var sessionManager = ApplicationContext.GetRequiredService<ISessionManager>();
  var session = sessionManager.GetSession();
- session["localContext"] = localContext;
+ session[_localContextName] = localContext;
  }
 
  /// <summary>
@@ -186,7 +204,7 @@ public IContextDictionary GetClientContext(ApplicationContext.ExecutionLocations
  IContextDictionary clientContext;
  var sessionManager = ApplicationContext.GetRequiredService<ISessionManager>();
  var session = sessionManager.GetSession();
- session.TryGetValue("clientContext", out var result);
+ session.TryGetValue(_clientContextName, out var result);
  if (result is IContextDictionary context)
  {
  clientContext = context;
@@ -202,15 +220,15 @@ public IContextDictionary GetClientContext(ApplicationContext.ExecutionLocations
  /// <summary>
  /// Sets the client context.
  /// </summary>
- /// <param name="clientContext">Client context.</param>
+ /// <param name="clientContext"></param>
  /// <param name="executionLocation"></param>
  /// <exception cref="InvalidOperationException"><see cref="ApplicationContext"/> is <see langword="null"/>.</exception>
  public void SetClientContext(IContextDictionary? clientContext, ApplicationContext.ExecutionLocations executionLocation)
  {
  ThrowIfApplicationContextIsNull();
  var sessionManager = ApplicationContext.GetRequiredService<ISessionManager>();
  var session = sessionManager.GetSession();
- session["clientContext"] = clientContext;
+ session[_clientContextName] = clientContext;
  }
 
  /// <summary>

diff --git a/Source/Csla.AspNetCore/Blazor/State/SessionIdManager.cs b/Source/Csla.AspNetCore/Blazor/State/SessionIdManager.cs
@@ -50,8 +50,9 @@ public string GetSessionId()
  else
  {
  result = Guid.NewGuid().ToString();
- httpContext.Response.Cookies.Append(sessionIdName, result);
  httpContext.Items[sessionIdName] = result;
+ if (!httpContext.Response.HasStarted)
+ httpContext.Response.Cookies.Append(sessionIdName, result);
  }
 
  return result ?? throw new InvalidOperationException(Csla.Properties.Resources.SessionIdManagerIdMustBeNotNull);

diff --git a/Source/Csla.test/AppContext/AppContextTests.cs b/Source/Csla.test/AppContext/AppContextTests.cs
@@ -34,7 +34,6 @@ public void Initialize()
  }
 
  [TestMethod]
- [ExpectedException(typeof(InvalidOperationException))]
  public void UseDefaultApplicationContextManager()
  {
  var services = new ServiceCollection();
@@ -45,6 +44,7 @@ public void UseDefaultApplicationContextManager()
  var serviceProvider = services.BuildServiceProvider();
 
  var applicationContext = serviceProvider.GetRequiredService<ApplicationContext>();
+ Assert.IsInstanceOfType(applicationContext.ContextManager, typeof(ApplicationContextManagerAsyncLocal));
  }
 
  [TestMethod]

diff --git a/Source/Csla/Core/ApplicationContextAccessor.cs b/Source/Csla/Core/ApplicationContextAccessor.cs
@@ -5,6 +5,7 @@
 // </copyright>
 // <summary>Provides access to the correct current application</summary>
 //-----------------------------------------------------------------------
+#nullable enable
 
 using Csla.Runtime;
 using Microsoft.Extensions.DependencyInjection;
@@ -40,14 +41,10 @@ public ApplicationContextAccessor(
  break;
  }
  }
- if (ContextManager is null)
- {
- throw new InvalidOperationException("ContextManager == null");
- }
  }
 
  internal IServiceProvider ServiceProvider { get; }
- private IContextManager ContextManager { get; set; }
+ private IContextManager? ContextManager { get; set; }
  private IContextManager LocalContextManager { get; set; }
 
  /// <summary>
@@ -57,7 +54,7 @@ public ApplicationContextAccessor(
  public IContextManager GetContextManager()
  {
  var runtimeInfo = ServiceProvider.GetRequiredService<IRuntimeInfo>();
- if (!runtimeInfo.LocalProxyNewScopeExists)
+ if (ContextManager != null && !runtimeInfo.LocalProxyNewScopeExists)
  return ContextManager;
  else
  return LocalContextManager;