RaythaHQ · apexdodge · Dec 11, 2023 · Nov 23, 2023 · Nov 25, 2023 · Nov 23, 2023
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 *.suo
 *.user
 *.sln.docstates
+.idea/
 
 # Build results
 
@@ -225,7 +226,6 @@ out
 
 # Nuxt.js build / generate output
 .nuxt
-dist
 
 # Gatsby files
 .cache/
@@ -275,3 +275,9 @@ user-uploads/
 
 # Azure publish file
 src/Raytha.Web/Properties/ServiceDependencies/*
+
+# Raytha javascript and theme files
+src/Raytha.Web/wwwroot/raytha_admin/**/*.map
+src/Raytha.Web/wwwroot/raytha_admin/**/*.ts
+src/Raytha.Web/wwwroot/raytha_admin/**/*.scss
+src/Raytha.Web/wwwroot/raytha_admin/**/*.txt
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,15 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS publish
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS publish
 WORKDIR /src
 
-RUN apt install -y curl
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
-RUN apt-get install -y nodejs
+RUN apt update
+RUN apt install -y curl ca-certificates curl gnupg
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt update
+RUN apt install -y nodejs
 
 COPY ["src/Raytha.Domain/Raytha.Domain.csproj", "src/Raytha.Domain/"]
 COPY ["src/Raytha.Application/Raytha.Application.csproj", "src/Raytha.Application/"]
@@ -14,13 +18,9 @@ COPY ["src/Raytha.Web/Raytha.Web.csproj", "src/Raytha.Web/"]
 COPY ["tests/Raytha.Domain.UnitTests/Raytha.Domain.UnitTests.csproj", "tests/Raytha.Domain.UnitTests/"]
 COPY ["Raytha.sln", ""]
 
-ARG DOTNET_RESTORE_CLI_ARGS=
-RUN dotnet restore "Raytha.sln" $DOTNET_RESTORE_CLI_ARGS
-
 COPY . .
-RUN dotnet build "Raytha.sln" -c Release --no-restore
 
-RUN dotnet publish -c Release --no-build -o /app "src/Raytha.Web/Raytha.Web.csproj"
+RUN dotnet publish -c Release -o /app "src/Raytha.Web/Raytha.Web.csproj"
 
 FROM base AS final
 WORKDIR /app

diff --git a/docfx_project/articles/installation.md b/docfx_project/articles/installation.md
@@ -2,7 +2,7 @@
 
 A priority of Raytha is to keep the technology footprint small for getting up and running as quickly as possible. However, you do need the minimum requirements listed below:
 
-* .NET 6+
+* .NET 8+
 * npm for compiling javascript
 * SQL Server Express
 * [SMTP](/articles/smtp.md)

diff --git a/src/Raytha.Application/Login/Commands/CompleteForgotPassword.cs b/src/Raytha.Application/Login/Commands/CompleteForgotPassword.cs
@@ -30,7 +30,7 @@ public Validator(IRaythaDbContext db)
             RuleFor(x => x.Id).NotEmpty();
             RuleFor(x => x).Custom((request, context) =>
             {
-                if (request.NewPassword.Length < PasswordUtility.PASSWORD_MIN_CHARACTER_LENGTH)
+                if (string.IsNullOrEmpty(request.NewPassword) || request.NewPassword.Length < PasswordUtility.PASSWORD_MIN_CHARACTER_LENGTH)
                 {
                     context.AddFailure("NewPassword", $"Password must be at least {PasswordUtility.PASSWORD_MIN_CHARACTER_LENGTH} characters.");
                     return;

diff --git a/src/Raytha.Application/Login/Commands/CreateUser.cs b/src/Raytha.Application/Login/Commands/CreateUser.cs
@@ -36,7 +36,7 @@ public Validator(IRaythaDbContext db)
             RuleFor(x => x.EmailAddress).NotEmpty().EmailAddress();
             RuleFor(x => x).Custom((request, context) =>
             {
-                if (request.Password.Length < PasswordUtility.PASSWORD_MIN_CHARACTER_LENGTH)
+                if (string.IsNullOrEmpty(request.Password) || request.Password.Length < PasswordUtility.PASSWORD_MIN_CHARACTER_LENGTH)
                 {
                     context.AddFailure("Password", $"Password must be at least {PasswordUtility.PASSWORD_MIN_CHARACTER_LENGTH} characters.");
                     return;

diff --git a/src/Raytha.Application/Raytha.Application.csproj b/src/Raytha.Application/Raytha.Application.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<RootNamespace>Raytha.Application</RootNamespace>
 	<AssemblyName>Raytha.Application</AssemblyName>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -18,15 +18,15 @@
     <PackageReference Include="CsvExport" Version="2.0.0" />
     <PackageReference Include="LumenWorksCsvReader2" Version="4.3.0" />
     <PackageReference Include="MediatR" Version="11.1.0" />
-	<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-	<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.4.0" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.1" />
-	<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.1" />
-	<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.0" />
-	<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.0" />
-	<PackageReference Include="TimeZoneConverter" Version="6.0.1" />
-	<PackageReference Include="TimeZoneNames" Version="6.0.0" />
+    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.4.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.7" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0" />
+    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+    <PackageReference Include="TimeZoneNames" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Raytha.Domain/Raytha.Domain.csproj b/src/Raytha.Domain/Raytha.Domain.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<RootNamespace>Raytha.Domain</RootNamespace>
     <AssemblyName>Raytha.Domain</AssemblyName>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Raytha.Infrastructure/Raytha.Infrastructure.csproj b/src/Raytha.Infrastructure/Raytha.Infrastructure.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<RootNamespace>Raytha.Infrastructure</RootNamespace>
 	<AssemblyName>Raytha.Infrastructure</AssemblyName>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -17,10 +17,10 @@
 	<PackageReference Include="AWSSDK.S3" Version="3.7.101.50" />
 	<PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
 	<PackageReference Include="Dapper.SqlBuilder" Version="2.0.78" />
-	<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="6.0.13" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1" />
-	<PackageReference Include="Microsoft.OData.Core" Version="7.13.0" />
-	<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.0.12" />
+	<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.0" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+	<PackageReference Include="Microsoft.OData.Core" Version="7.20.0" />
+	<PackageReference Include="Microsoft.AspNetCore.OData" Version="8.2.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Raytha.Infrastructure/Services/Emailer.cs b/src/Raytha.Infrastructure/Services/Emailer.cs
@@ -25,6 +25,10 @@ public void SendEmail(EmailMessage message)
         int smtpPort;
         string smtpPassword;
         string smtpUsername;
+        string smtpFromName;
+        string smtpFromAddress;
+        string smtpReplyToName;
+        string smtpReplyToAddress;
         if (entity.SmtpOverrideSystem)
         {
             smtpHost = entity.SmtpHost;
@@ -40,6 +44,11 @@ public void SendEmail(EmailMessage message)
             smtpPassword = _configuration["SMTP_PASSWORD"];
         }
 
+        smtpFromAddress = _configuration["SMTP_FROM_ADDRESS"].IfNullOrEmpty(entity.SmtpDefaultFromAddress);
+        smtpFromName = _configuration["SMTP_FROM_NAME"].IfNullOrEmpty(entity.SmtpDefaultFromName);
+        smtpReplyToName = message.FromName.IfNullOrEmpty(entity.SmtpDefaultFromName);
+        smtpReplyToAddress = message.FromEmailAddress.IfNullOrEmpty(entity.SmtpDefaultFromAddress);
+
         using (var smtpClient = new SmtpClient(smtpHost)
         {
             Port = smtpPort,
@@ -48,8 +57,8 @@ public void SendEmail(EmailMessage message)
         })
         {
             var messageToSend = new MailMessage();
-            messageToSend.From = new MailAddress(message.FromEmailAddress.IfNullOrEmpty(entity.SmtpDefaultFromAddress),
-                                        message.FromName.IfNullOrEmpty(entity.SmtpDefaultFromName));
+            messageToSend.From = new MailAddress(smtpFromAddress, smtpFromName);
+            messageToSend.ReplyToList.Add(new MailAddress(smtpReplyToAddress, smtpReplyToName));
 
             foreach (var to in message.To)
             {

diff --git a/src/Raytha.Web/Areas/Admin/Controllers/UserGroupsController.cs b/src/Raytha.Web/Areas/Admin/Controllers/UserGroupsController.cs
@@ -5,7 +5,6 @@
 using Raytha.Application.UserGroups.Queries;
 using Raytha.Domain.Entities;
 using Raytha.Domain.ValueObjects;
-using Raytha.Web.Areas.Admin.Views.Roles;
 using Raytha.Web.Areas.Admin.Views.Shared.ViewModels;
 using Raytha.Web.Areas.Admin.Views.UserGroups;
 using Raytha.Web.Filters;
@@ -90,7 +89,7 @@ public async Task<IActionResult> Edit(string id)
     [Route(RAYTHA_ROUTE_PREFIX + "/users/groups/edit/{id}", Name = "usergroupsedit")]
     [HttpPost]
     [ValidateAntiForgeryToken]
-    public async Task<IActionResult> Edit(EditRole_ViewModel model, string id)
+    public async Task<IActionResult> Edit(EditUserGroup_ViewModel model, string id)
     {
         var input = new EditUserGroup.Command
         {

diff --git a/src/Raytha.Web/Areas/Admin/Views/Configuration/Index.cshtml b/src/Raytha.Web/Areas/Admin/Views/Configuration/Index.cshtml
@@ -45,7 +45,7 @@
                     </div>
                     <hr/>
                     <h5>Default email settings</h5>
-                    <p>When the platform sends emails out, the email will appear to come from the name and email address specified below. You will have the opportunity to override these settings on each individual email template.</p>
+                    <p>When your platform sends emails, choose the name people see when they hit 'Reply' and the email where the replies will land. It helps control the conversation flow when recipients respond to your emails.</p>
                     <div class="col-lg-12">
                         <div class="mb-3">
                             <label class="form-label raytha-required" asp-for="SmtpDefaultFromName"></label>

diff --git a/src/Raytha.Web/Areas/Admin/Views/Setup/Index.cshtml b/src/Raytha.Web/Areas/Admin/Views/Setup/Index.cshtml
@@ -100,9 +100,7 @@
                             </div>
                             <hr />
                             <h5>Default email settings</h5>
-                            <p>When the platform sends emails out, the email will appear to come from the name and email
-                                address specified below. You will have the opportunity to override these settings on
-                                each individual email template.</p>
+                            <p>When your platform sends emails, choose the name people see when they hit 'Reply' and the email where the replies will land. It helps control the conversation flow when recipients respond to your emails.</p>
                             <div class="col-lg-12">
                                 <div class="mb-3">
                                     <label class="form-label raytha-required" asp-for="SmtpDefaultFromName"></label>

diff --git a/src/Raytha.Web/Areas/Admin/Views/Shared/Error.cshtml b/src/Raytha.Web/Areas/Admin/Views/Shared/Error.cshtml
@@ -17,7 +17,8 @@
                             @ViewData["ErrorMessage"]
                         </div>
                     }
+                </div>
             </div>
         </div>
     </div>
-</section>
+</section>
diff --git a/src/Raytha.Web/Areas/Admin/Views/Shared/Forbidden.cshtml b/src/Raytha.Web/Areas/Admin/Views/Shared/Forbidden.cshtml
@@ -17,7 +17,8 @@
                             @ViewData["ErrorMessage"]
                         </div>
                     }
+                </div>
             </div>
         </div>
     </div>
-</section>
+</section>
diff --git a/src/Raytha.Web/Areas/Admin/Views/Templates/Email/Index.cshtml b/src/Raytha.Web/Areas/Admin/Views/Templates/Email/Index.cshtml
@@ -51,7 +51,7 @@
             <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse justify-content-end" id="navbarSupportedContent">
-            <form class="d-flex" asp-action="EmailTemplatesIndex" method="get">
+            <form class="d-flex" asp-route="EmailTemplatesIndex" method="get">
                 <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search" name="search" value="@Model.Search">
                 <button class="btn btn-outline-success" type="submit">Search</button>
             </form>
@@ -106,4 +106,4 @@
             <partial name="_TablePagination" model="@Model" />
         </div>
     </div>
-</div>
+</div>
diff --git a/src/Raytha.Web/Program.cs b/src/Raytha.Web/Program.cs
@@ -1,3 +1,4 @@
+//Force build and push
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
@@ -18,4 +19,4 @@ public static void Main(string[] args)
             {
                 webBuilder.UseStartup<Startup>();
             });
-}
+}
diff --git a/src/Raytha.Web/Raytha.Web.csproj b/src/Raytha.Web/Raytha.Web.csproj
@@ -1,28 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>7e3df06b-f996-4ba5-8631-62cd855692f8</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <Configurations>Debug;Release;Debug without JS</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EFCore.BulkExtensions" Version="6.6.5" />
+    <PackageReference Include="EFCore.BulkExtensions" Version="8.0.0" />
     <PackageReference Include="MediatR" Version="11.1.0" />
-    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.9" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="6.0.13" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.4.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1">
+    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
-    <PackageReference Include="Fluid.Core" Version="2.3.1" />
-    <PackageReference Include="Fluid.ViewEngine" Version="2.3.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+    <PackageReference Include="Fluid.Core" Version="2.5.0" />
+    <PackageReference Include="Fluid.ViewEngine" Version="2.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.Core" Version="5.6.0" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
@@ -84,7 +86,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="BuildJsAppDebug" BeforeTargets="BeforeBuild" DependsOnTargets="RestoreNpmPackages" Inputs="@(JsApplicationSourceFiles)" Outputs="$(JsApplicationBundleFile)" Condition="'$(Configuration)' == 'Debug'">
+  <Target Name="BuildJsAppDebug" BeforeTargets="BeforeBuild" DependsOnTargets="RestoreNpmPackages" Inputs="@(JsApplicationSourceFiles)" Outputs="$(JsApplicationBundleFile)" Condition="'$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Release'">
     <Message Importance="high" Text="Building javascript application..." />
     <Exec WorkingDirectory="$(JsApplicationRoot)" Command="npm run build" />
   </Target>

diff --git a/src/Raytha.Web/Services/CurrentVersion.cs b/src/Raytha.Web/Services/CurrentVersion.cs
@@ -3,5 +3,5 @@ namespace Raytha.Web.Services;
 
 public class CurrentVersion : ICurrentVersion
 {
-    public string Version => "1.1.3";
+    public string Version => "1.1.4";
 }
diff --git a/src/Raytha.Web/appsettings.json b/src/Raytha.Web/appsettings.json
@@ -22,6 +22,8 @@
   "SMTP_PORT": 25,
   "SMTP_USERNAME": "",
   "SMTP_PASSWORD": "",
+  "SMTP_FROM_NAME": "", //optional, if you want to always use this value regardless of what is specified in org settings.
+  "SMTP_FROM_ADDRESS": "", //optional, if you want to always use this value regardless of what is specified in org settings.
 
   //File storage settings
   //Local storage should only be used for low traffic sites with small files (< 20 mb)

diff --git a/src/Raytha.Web/wwwroot/raytha_admin/js/dist/288.main.js b/src/Raytha.Web/wwwroot/raytha_admin/js/dist/288.main.js