Add NRT to Csla-Core library

Source/Csla.AspNetCore/Blazor/ApplicationContextManagerBlazor.cs

@@ -130,10 +130,7 @@ public IPrincipal GetUser()
       return CurrentPrincipal;
     }
 
-    /// <summary>
-    /// Not supported in Blazor.
-    /// </summary>
-    /// <param name="principal">Principal object.</param>
+    /// <inheritdoc />
     public virtual void SetUser(IPrincipal principal)
     {
       ArgumentNullException.ThrowIfNull(principal);

Source/Csla.AspNetCore/Blazor/ApplicationContextManagerInMemory.cs

@@ -129,13 +129,11 @@ public IPrincipal GetUser()
       return CurrentPrincipal;
     }
 
-    /// <summary>
-    /// Attempts to set the current principal on the registered
-    /// IHostEnvironmentAuthenticationStateProvider service.
-    /// </summary>
-    /// <param name="principal">Principal object.</param>
+    /// <inheritdoc />
     public virtual void SetUser(IPrincipal principal)
     {
+      ArgumentNullException.ThrowIfNull(principal);
+
       if (!ReferenceEquals(CurrentPrincipal, principal))
       {
         if (ActiveCircuitState.CircuitExists)
@@ -151,7 +149,11 @@ public virtual void SetUser(IPrincipal principal)
         }
         else if (HttpContext is not null)
         {
-          HttpContext.User = (ClaimsPrincipal)principal;
+          if (principal is not ClaimsPrincipal claimsPrincipal)
+          {
+            throw new ArgumentException("typeof(principal) != ClaimsPrincipal");
+          }
+          HttpContext.User = claimsPrincipal;
         }
         else
         {

Source/Csla.AspNetCore/Blazor/State/StateController.cs

@@ -11,6 +11,8 @@
 using Csla.Security;
 using Csla.Blazor.State.Messages;
 using Csla.Serialization;
+using System.Runtime.Serialization;
+using Csla.Properties;
 
 namespace Csla.AspNetCore.Blazor.State
 {
@@ -45,8 +47,7 @@ public virtual StateResult Get(long lastTouched)
       }
       else
       {
-        var message = (SessionMessage)applicationContext.CreateInstanceDI(typeof(SessionMessage));
-        message.Session = session;
+        var message = applicationContext.CreateInstanceDI<SessionMessage>(session);
         if (FlowUserIdentityToWebAssembly)
         {
           message.Principal = applicationContext.Principal;
@@ -73,7 +74,11 @@ public virtual void Put(byte[] updatedSessionData)
       {
         Position = 0
       };
-      var session = (Session)formatter.Deserialize(buffer);
+      if (formatter.Deserialize(buffer) is not Session session)
+      {
+        throw new SerializationException(string.Format(Resources.DeserializationFailedDueToWrongData, nameof(Session)));
+      }
+
       sessionManager.UpdateSession(session);
     }
   }

Source/Csla.AspNetCore/ConfigurationExtensions.cs

@@ -13,6 +13,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Csla.Core;
 using Csla.AspNetCore;
+using Csla.Web.Mvc;
 
 namespace Csla.Configuration
 {
@@ -45,6 +46,9 @@ public static CslaOptions AddAspNetCore(this CslaOptions config, Action<AspNetCo
 #if NET8_0_OR_GREATER
       config.Services.AddScoped<ActiveCircuitState>();
       config.Services.AddScoped(typeof(CircuitHandler), typeof(ActiveCircuitHandler));
+#endif
+#if NETSTANDARD2_0 || NET8_0_OR_GREATER 
+      config.Services.AddMvcCore(opt => opt.ModelBinderProviders.Insert(0, new CslaModelBinderProvider()));
 #endif
       config.Services.AddScoped(typeof(IContextManager), typeof(ApplicationContextManagerHttpContext));
       return config;

Source/Csla.AspNetCore/Mvc/TagHelpers/CslaErrorsTagHelper.cs

@@ -5,6 +5,7 @@
 // </copyright>
 // <summary>Razor tag helper</summary>
 //-----------------------------------------------------------------------
+using Csla.Properties;
 using Csla.Rules;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
@@ -39,7 +40,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
       var propertyName = parts[parts.Length - 1];
       object source = model;
       for (int i = 0; i < parts.Length - 1; i++)
-        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]);
+        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]) ?? throw new InvalidOperationException(string.Format(Resources.TagHelperPropertyInPathHasNullValue, parts[i], CslaErrorsFor.Name));
       var result = string.Empty;
       if (source is Core.BusinessBase obj)
         result = obj.BrokenRulesCollection.ToString(",", RuleSeverity.Error, propertyName);

Source/Csla.AspNetCore/Mvc/TagHelpers/CslaInformationTagHelper.cs

@@ -5,6 +5,7 @@
 // </copyright>
 // <summary>Razor tag helper</summary>
 //-----------------------------------------------------------------------
+using Csla.Properties;
 using Csla.Rules;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
@@ -39,7 +40,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
       var propertyName = parts[parts.Length - 1];
       object source = model;
       for (int i = 0; i < parts.Length - 1; i++)
-        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]);
+        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]) ?? throw new InvalidOperationException(string.Format(Resources.TagHelperPropertyInPathHasNullValue, parts[i], CslaInformationFor.Name));
       var result = string.Empty;
       if (source is Core.BusinessBase obj)
         result = obj.BrokenRulesCollection.ToString(",", RuleSeverity.Information, propertyName);

Source/Csla.AspNetCore/Mvc/TagHelpers/CslaWarningsTagHelper.cs

@@ -5,6 +5,7 @@
 // </copyright>
 // <summary>Razor tag helper</summary>
 //-----------------------------------------------------------------------
+using Csla.Properties;
 using Csla.Rules;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
@@ -39,7 +40,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
       var propertyName = parts[parts.Length - 1];
       object source = model;
       for (int i = 0; i < parts.Length - 1; i++)
-        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]);
+        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]) ?? throw new InvalidOperationException(string.Format(Resources.TagHelperPropertyInPathHasNullValue, parts[i], CslaWarningsFor.Name));
       var result = string.Empty;
       if (source is Core.BusinessBase obj)
         result = obj.BrokenRulesCollection.ToString(",", RuleSeverity.Warning, propertyName);

Source/Csla.Blazor.WebAssembly.Tests/SessionManagerTests.cs

@@ -32,10 +32,9 @@ public void Initialize()
     var provider = services.BuildServiceProvider();
     var _applicationContext = provider.GetRequiredService<ApplicationContext>();
 
-    _sessionValue = new SessionMessage
+    _sessionValue = new SessionMessage([])
     {
-      Principal = new ClaimsPrincipal() { },
-      Session = []
+      Principal = new ClaimsPrincipal()
     };
 
     _sessionManager = new SessionManager(_applicationContext, GetHttpClient(_sessionValue, _applicationContext), new BlazorWebAssemblyConfigurationOptions { SyncContextWithServer = true });

Source/Csla.Channels.Grpc/Csla.Channels.Grpc.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\Directory.Package.props" />
 
   <PropertyGroup>

Source/Csla.Channels.Grpc/GrpcPortal.cs

@@ -6,8 +6,10 @@
 // <summary>Exposes server-side DataPortal functionality</summary>
 //-----------------------------------------------------------------------
 
+using System.Runtime.Serialization;
 using System.Security.Principal;
 using Csla.Core;
+using Csla.Properties;
 using Csla.Serialization;
 using Csla.Serialization.Mobile;
 using Csla.Server;
@@ -109,21 +111,19 @@ protected virtual async Task<ResponseMessage> RouteMessage(string operation, str
 
     private async Task<ResponseMessage> InvokePortal(string operation, ByteString requestData)
     {
-      var result = _applicationContext.CreateInstanceDI<DataPortalResponse>();
-      DataPortalErrorInfo? errorData = null;
+      var result = new DataPortalResponse();
       try
       {
-        var request = _applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(requestData.ToByteArray());
-        result = await CallPortal(operation, request);
+        var request = Deserialize<object>(requestData.ToByteArray());
+        var callResult = await CallPortal(operation, request);
+        result.ObjectData = callResult.ObjectData;
       }
       catch (Exception ex)
       {
-        errorData = _applicationContext.CreateInstanceDI<DataPortalErrorInfo>(ex);
+        result.ErrorData = _applicationContext.CreateInstanceDI<DataPortalErrorInfo>(ex);
       }
-      var portalResult = _applicationContext.CreateInstanceDI<DataPortalResponse>();
-      portalResult.ErrorData = errorData;
-      portalResult.ObjectData = result.ObjectData;
-      var buffer = _applicationContext.GetRequiredService<ISerializationFormatter>().Serialize(portalResult);
+
+      var buffer = _applicationContext.GetRequiredService<ISerializationFormatter>().Serialize(result);
       return new ResponseMessage { Body = ByteString.CopyFrom(buffer) };
     }
 
@@ -149,25 +149,25 @@ public async Task<DataPortalResponse> Create(CriteriaRequest request)
       if (request is null)
         throw new ArgumentNullException(nameof(request));
 
-      var result = _applicationContext.CreateInstanceDI<DataPortalResponse>();
+      var result = new DataPortalResponse();
       try
       {
         request = ConvertRequest(request);
 
         // unpack criteria data into object
-        object? criteria = GetCriteria(_applicationContext, request.CriteriaData);
+        object criteria = GetCriteria(_applicationContext, request.CriteriaData);
         if (criteria is DataPortalClient.PrimitiveCriteria primitiveCriteria)
         {
           criteria = primitiveCriteria.Value;
         }
 
-        var objectType = Reflection.MethodCaller.GetType(AssemblyNameTranslator.GetAssemblyQualifiedName(request.TypeName), true);
+        var objectType = Reflection.MethodCaller.GetType(AssemblyNameTranslator.GetAssemblyQualifiedName(request.TypeName));
         var context = new DataPortalContext(
-          _applicationContext, (IPrincipal)_applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(request.Principal),
+          _applicationContext, Deserialize<IPrincipal>(request.Principal),
           true,
           request.ClientCulture,
           request.ClientUICulture,
-          (IContextDictionary)_applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(request.ClientContext));
+          Deserialize<IContextDictionary>(request.ClientContext));
 
         var dpr = await dataPortalServer.Create(objectType, criteria, context, true);
 
@@ -197,25 +197,25 @@ public async Task<DataPortalResponse> Fetch(CriteriaRequest request)
       if (request is null)
         throw new ArgumentNullException(nameof(request));
 
-      var result = _applicationContext.CreateInstanceDI<DataPortalResponse>();
+      var result = new DataPortalResponse();
       try
       {
         request = ConvertRequest(request);
 
         // unpack criteria data into object
-        object? criteria = GetCriteria(_applicationContext, request.CriteriaData);
+        object criteria = GetCriteria(_applicationContext, request.CriteriaData);
         if (criteria is DataPortalClient.PrimitiveCriteria primitiveCriteria)
         {
           criteria = primitiveCriteria.Value;
         }
 
-        var objectType = Reflection.MethodCaller.GetType(AssemblyNameTranslator.GetAssemblyQualifiedName(request.TypeName), true);
+        var objectType = Reflection.MethodCaller.GetType(AssemblyNameTranslator.GetAssemblyQualifiedName(request.TypeName));
         var context = new DataPortalContext(
-          _applicationContext, (IPrincipal)_applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(request.Principal),
+          _applicationContext, Deserialize<IPrincipal>(request.Principal),
           true,
           request.ClientCulture,
           request.ClientUICulture,
-          (IContextDictionary)_applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(request.ClientContext));
+          Deserialize<IContextDictionary>(request.ClientContext));
 
         var dpr = await dataPortalServer.Fetch(objectType, criteria, context, true);
 
@@ -245,19 +245,19 @@ public async Task<DataPortalResponse> Update(UpdateRequest request)
       if (request is null)
         throw new ArgumentNullException(nameof(request));
 
-      var result = _applicationContext.CreateInstanceDI<DataPortalResponse>();
+      var result = new DataPortalResponse();
       try
       {
         request = ConvertRequest(request);
         // unpack object
-        object? obj = GetCriteria(_applicationContext, request.ObjectData);
+        object obj = GetCriteria(_applicationContext, request.ObjectData) ?? throw new InvalidOperationException(Resources.ObjectToBeUpdatedCouldNotBeDeserialized);
 
         var context = new DataPortalContext(
-          _applicationContext, (IPrincipal)_applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(request.Principal),
+          _applicationContext, Deserialize<IPrincipal>(request.Principal),
           true,
           request.ClientCulture,
           request.ClientUICulture,
-          (IContextDictionary)_applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(request.ClientContext));
+          Deserialize<IContextDictionary>(request.ClientContext));
 
         var dpr = await dataPortalServer.Update(obj, context, true);
 
@@ -288,25 +288,25 @@ public async Task<DataPortalResponse> Delete(CriteriaRequest request)
       if (request is null)
         throw new ArgumentNullException(nameof(request));
 
-      var result = _applicationContext.CreateInstanceDI<DataPortalResponse>();
+      var result = new DataPortalResponse();
       try
       {
         request = ConvertRequest(request);
 
         // unpack criteria data into object
-        object? criteria = GetCriteria(_applicationContext, request.CriteriaData);
+        object criteria = GetCriteria(_applicationContext, request.CriteriaData);
         if (criteria is DataPortalClient.PrimitiveCriteria primitiveCriteria)
         {
           criteria = primitiveCriteria.Value;
         }
 
-        var objectType = Reflection.MethodCaller.GetType(AssemblyNameTranslator.GetAssemblyQualifiedName(request.TypeName), true);
+        var objectType = Reflection.MethodCaller.GetType(AssemblyNameTranslator.GetAssemblyQualifiedName(request.TypeName));
         var context = new DataPortalContext(
-          _applicationContext, (IPrincipal)_applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(request.Principal),
+          _applicationContext, Deserialize<IPrincipal>(request.Principal),
           true,
           request.ClientCulture,
           request.ClientUICulture,
-          (IContextDictionary)_applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(request.ClientContext));
+          Deserialize<IContextDictionary>(request.ClientContext));
 
         var dpr = await dataPortalServer.Delete(objectType, criteria, context, true);
 
@@ -328,12 +328,9 @@ public async Task<DataPortalResponse> Delete(CriteriaRequest request)
 
     #region Criteria
 
-    private static object? GetCriteria(ApplicationContext applicationContext, byte[]? criteriaData)
+    private static object GetCriteria(ApplicationContext applicationContext, byte[] criteriaData)
     {
-      object? criteria = null;
-      if (criteriaData != null)
-        criteria = applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(criteriaData);
-      return criteria;
+      return applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(criteriaData) ?? throw new SerializationException(Resources.ServerSideDataPortalRequestDeserializationFailed);
     }
 
     #endregion Criteria
@@ -371,5 +368,16 @@ protected virtual DataPortalResponse ConvertResponse(DataPortalResponse response
     }
 
     #endregion Extention Method for Requests
+
+    private T Deserialize<T>(byte[] data)
+    {
+      var deserializedData = _applicationContext.GetRequiredService<ISerializationFormatter>().Deserialize(data) ?? throw new SerializationException(Resources.ServerSideDataPortalRequestDeserializationFailed);
+      if (deserializedData is not T castedData)
+      {
+        throw new SerializationException(string.Format(Resources.DeserializationFailedDueToWrongData, typeof(T).FullName));
+      }
+
+      return castedData;
+    }
   }
 }

Source/Csla.Channels.Grpc/GrpcProxy.cs

@@ -46,6 +46,9 @@ public GrpcProxy(ApplicationContext applicationContext, GrpcChannel channel, Grp
     private static GrpcChannel? _defaultChannel;
     private string? _versionRoutingTag;
 
+    /// <inheritdoc />
+    public override string DataPortalUrl { get; }
+
     /// <summary>
     /// Gets the GrpcChannel used by the gRPC client.
     /// </summary>
@@ -91,7 +94,7 @@ protected virtual GrpcService.GrpcServiceClient GetGrpcClient()
     /// <param name="routingToken">Routing Tag for server</param>
     /// <param name="isSync">True if the client-side proxy should synchronously invoke the server.</param>
     /// <returns>Serialized response from server</returns>
-    protected override async Task<byte[]> CallDataPortalServer(byte[] serialized, string operation, string routingToken, bool isSync)
+    protected override async Task<byte[]> CallDataPortalServer(byte[] serialized, string operation, string? routingToken, bool isSync)
     {
       ByteString outbound = ByteString.CopyFrom(serialized);
       var request = new RequestMessage
@@ -112,7 +115,7 @@ internal async Task<ResponseMessage> RouteMessage(RequestMessage request)
       return await GetGrpcClient().InvokeAsync(request);
     }
 
-    private string CreateOperationTag(string operation, string? versionToken, string routingToken)
+    private string CreateOperationTag(string operation, string? versionToken, string? routingToken)
     {
       if (!string.IsNullOrWhiteSpace(versionToken) || !string.IsNullOrWhiteSpace(routingToken))
         return $"{operation}/{routingToken}-{versionToken}";

Source/Csla.Channels.RabbitMq/Csla.Channels.RabbitMq.csproj

@@ -17,6 +17,13 @@
     <PackageReference Include="RabbitMQ.Client" Version="7.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
+    <PackageReference Include="Polyfill" Version="7.4.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Csla\Csla.csproj" />
   </ItemGroup>