Merge pull request #1085 from ITfoxtec/test

Test
ITfoxtec · Dec 13, 2024 · fa77a9b · fa77a9b
2 parents 1634c22 + 478c777
commit fa77a9b
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 20 deletions.
diff --git a/src/FoxIDs.Control/FoxIDs.Control.csproj b/src/FoxIDs.Control/FoxIDs.Control.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.5</Version>
+		<Version>1.14.6</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Control/appsettings.json b/src/FoxIDs.Control/appsettings.json
@@ -24,7 +24,6 @@
       "AddressLine1": "xxx",
       "PostalCode": "xxx",
       "City": "xxx",
-      "StateRegion": "xxx",
       "Country": "xxx"
     },
     "Options": {

diff --git a/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj b/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.5</Version>
+		<Version>1.14.6</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj b/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.5</Version>
+		<Version>1.14.6</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/FoxIDs.Shared.csproj b/src/FoxIDs.Shared/FoxIDs.Shared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.5</Version>
+		<Version>1.14.6</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.Shared/Logic/SendEmailLogic.cs b/src/FoxIDs.Shared/Logic/SendEmailLogic.cs
@@ -14,7 +14,6 @@
 using System.Net;
 using System.Net.Mime;
 using System.Threading.Tasks;
-using System.Web;
 
 namespace FoxIDs.Logic
 {
@@ -113,7 +112,7 @@ table td {{
       </tbody>
     </table>
   </body>
-</html>", emailContent.ParentCulture, BodyHtmlEncode(emailContent.Body), BodyHtmlEncode(GetInfoHtml(emailContent.Info)), emailContent.Address); 
+</html>", emailContent.ParentCulture, emailContent.Body, GetInfoHtml(emailContent.Info), emailContent.Address); 
             return bodyHtml;
         }
 
@@ -133,18 +132,10 @@ private string GetInfoHtml(string info)
                         {0}
                       </div>
                     </td>
-                  </tr>", info);
+                  </tr>", infoWithLinks);
             return infoHtml;
         }
 
-        private string BodyHtmlEncode(string body)
-        {
-            //body = HttpUtility.HtmlEncode(body);
-            //body = body.Replace("&lt;", "<");
-            //body = body.Replace("&gt;", ">");
-            return body;
-        }
-
         private async Task SendEmailWithSendgridAsync(SendEmail emailSettings, MailboxAddress toEmail, string subject, string body)
         {
             Debug.WriteLine($"HTML: '{body}'");

diff --git a/src/FoxIDs.Shared/Models/Master/Resources/EmbeddedResource.json b/src/FoxIDs.Shared/Models/Master/Resources/EmbeddedResource.json
@@ -13989,7 +13989,7 @@
         },
         {
           "culture": "en",
-          "value": "{0}Reset password",
+          "value": "{0}Reset Password",
           "edit_level": 100
         },
         {

diff --git a/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj b/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.5</Version>
+		<Version>1.14.6</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/FoxIDs.csproj b/src/FoxIDs/FoxIDs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.14.5</Version>
+		<Version>1.14.6</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/appsettings.json b/src/FoxIDs/appsettings.json
@@ -22,7 +22,6 @@
       "AddressLine1": "xxx",
       "PostalCode": "xxx",
       "City": "xxx",
-      "StateRegion": "xxx",
       "Country": "xxx"
     },
     "Options": {