Merge branch 'release/FixSmtpRelay'

GPW.CORE.Api/Controllers/ProjCheckController.cs

@@ -110,7 +110,14 @@ namespace GPW.CORE.Api.Controllers
             List<string> emailDestList = emailRaw.Split(",").ToList();
             foreach (var dest in emailDestList)
             {
-                await _emailSender.SendEmailAsync(dest, subject, message);
+                try
+                {
+                    await _emailSender.SendEmailAsync(dest, subject, message);
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante invio email:{Environment.NewLine}dest: {dest} | subject {subject}{Environment.NewLine}{exc}");
+                }
             }
         }
 

GPW.CORE.Api/appsettings.json

@@ -13,11 +13,11 @@
   "ExternalProviders": {
     "MailKit": {
       "SMTP": {
-        "Address": "smtp.gmail.com",
-        "Port": "465",
-        "Account": "steamwarebot@gmail.com",
-        "Password": "drmfsls16",
-        "SenderEmail": "steamwarebot@gmail.com",
+        "Address": "smtp-mail.outlook.com",
+        "Port": "587",
+        "Account": "steamwarebot@outlook.it",
+        "Password": "siamoInViaNazionale93",
+        "SenderEmail": "steamwarebot@outlook.it",
         "SenderName": "Steamware Email BOT"
       }
     }

GPW.CORE.Data/DataValidator.cs

@@ -0,0 +1,72 @@
+using GPW.CORE.Data.DbModels;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace GPW.CORE.Data
+{
+    /// <summary>
+    /// Classe validazione valori
+    /// </summary>
+    public class DataValidator
+    {
+        #region Public Constructors
+
+        public DataValidator(DipendentiModel? currRigaDip)
+        {
+            rigaDip = currRigaDip;
+        }
+
+        #endregion Public Constructors
+
+        #region Public Properties
+
+        /// <summary>
+        /// Restituisce HASH del codice impiego = payload utente
+        /// </summary>
+        /// <returns></returns>
+        public string HashDip
+        {
+            get => calcHashDip;
+        }
+
+        #endregion Public Properties
+
+        #region Private Fields
+
+        private DipendentiModel? rigaDip = null;
+
+        #endregion Private Fields
+
+        #region Private Properties
+
+        /// <summary>
+        /// Calcola HASH del codice impiego = payload utente
+        /// </summary>
+        /// <returns></returns>
+        private string calcHashDip
+        {
+            get
+            {
+                string hash = "";
+                string buffData = "";
+                if (rigaDip != null)
+                {
+                    buffData = $"{rigaDip.IdxDipendente}|{rigaDip.Cognome}.{rigaDip.Nome}|{rigaDip.Cf}|{rigaDip.DataAssunzione:yyyyMMdd}|{rigaDip.Email}|{rigaDip.Matricola}";
+                }
+                if (!string.IsNullOrEmpty(buffData))
+                {
+                    // hashing!
+                    using (var md5 = MD5.Create())
+                    {
+                        byte[] InputBytes = Encoding.UTF8.GetBytes(buffData);
+                        var byteHash = md5.ComputeHash(InputBytes);
+                        hash = BitConverter.ToString(byteHash).Replace("-", "").ToLowerInvariant();
+                    }
+                }
+                return hash;
+            }
+        }
+
+        #endregion Private Properties
+    }
+}

GPW.CORE.WRKLOG/Data/MessageService.cs

@@ -1,4 +1,5 @@
-using GPW.CORE.Data.DbModels;
+using GPW.CORE.Data;
+using GPW.CORE.Data.DbModels;
 using System.Security.Cryptography;
 using System.Text;
 
@@ -48,19 +49,8 @@ namespace GPW.CORE.WRKLOG.Data
         {
             get
             {
-                string hash = "";
-                string answ = "";
-                if (_rigaDip != null)
-                {
-                    answ = $"{_rigaDip.IdxDipendente}|{_rigaDip.Cognome}.{_rigaDip.Nome}|{_rigaDip.Cf}|{_rigaDip.DataAssunzione:yyyyMMdd}|{_rigaDip.Email}|{_rigaDip.Matricola}";
-                }
-                // hashing!
-                using (var md5 = MD5.Create())
-                {
-                    byte[] InputBytes = Encoding.UTF8.GetBytes(answ);
-                    var byteHash = md5.ComputeHash(InputBytes);
-                    hash = BitConverter.ToString(byteHash).Replace("-", "").ToLowerInvariant();
-                }
+                DataValidator cDV = new DataValidator(_rigaDip);
+                string hash = cDV.HashDip;
                 return hash;
             }
         }

GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-		<Version>3.0.2206.0617</Version>
+		<Version>3.0.2206.0720</Version>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>

Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>GPW - Gestione Presenze Web</i>
-    <h4>Versione: 3.0.2206.0617</h4>
+    <h4>Versione: 3.0.2206.0720</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

Resources/VersNum.txt

@@ -1 +1 @@
-3.0.2206.0617
+3.0.2206.0720

Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>3.0.2206.0617</version>
+  <version>3.0.2206.0720</version>
   <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>