Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

TIAM.Services.Server/MessageSenderService.cs

@@ -50,7 +50,7 @@ namespace TIAM.Services.Server
 
             var senderUser = adminDal.GetUserById(message.SenderId.Value);            
 
-            if (senderUser != null) return HttpStatusCode.BadRequest;
+            if (senderUser == null) return HttpStatusCode.BadRequest;
             
             var apiKey = configuration["SendGrid:Key"];
             var client = new SendGridClient(apiKey);
@@ -95,6 +95,7 @@ namespace TIAM.Services.Server
             }
             catch(Exception ex) 
             { 
+                Console.WriteLine(ex.ToString() );
             }
 
             if (responses.Any(response => !response.IsSuccessStatusCode))

TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor

@@ -78,16 +78,6 @@
                                               Click="ColumnChooserButton_Click" />
                                 </div>
 
-@*                                 <TiamGrid TDataItem="Transfer"
-                                          Logger="_logger"
-                                          SignalRClient="AdminSignalRClient"
-
-                                          GetAllMessageTag="SignalRTags.GetTransfersAsync"
-                                          AddMessageTag="SignalRTags.AddTransferAsync"
-                                          UpdateMessageTag="SignalRTags.UpdateTransferAsync"
-                                          RemoveMessageTag="SignalRTags.RemoveTransferAsync">
-                                </TiamGrid>
- *@
                                 <TransferGrid @ref="_gridTransfer"
                                           Logger="_logger"
                                           SignalRClient="AdminSignalRClient"

TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor

@@ -161,7 +161,7 @@
 
     public List<UserModelDtoDetail> UserData { get; set; }
 
-    bool PopupVisible { get; set; }
+    bool PopupVisible { get; set; } = false;
 
     IGrid Grid { get; set; }
     //object? MasterGridData { get; set; }
@@ -170,28 +170,31 @@
     public List<string> IgnoreList =
     [
         "ReceiverEmailAddress",
-        "ReceiverId",
+    "ReceiverFullName",
-        "SenderEmailAddress",
+    "ReceiverId",
-        "SenderId",
+    "SenderEmailAddress",
-        "ContextId"
+    "SenderFullName",
+    "SenderId",
+    "ContextId"
     ];
 
     public MessageWizardModel MessageWizardModel = new MessageWizardModel();
 
 
-    async void SendMail(UserModelDtoDetail item)
+    async Task SendMail(UserModelDtoDetail item)
     {
-        var user = await UserDataService.GetUserDetailByIdAsync(item.Id);
+        //var bela = item;
-        _logger.Info($"Sending mail to {user.UserDto.EmailAddress}");
+        //var user = await UserDataService.GetUserDetailByIdAsync(item.Id);
+        _logger.Info($"Sending mail to {item.UserDto.EmailAddress}");
 
-        MessageWizardModel.ReceiverId = user.Id;
+        MessageWizardModel.ReceiverId = item.Id;
-        MessageWizardModel.ReceiverEmailAddress = user.UserDto.EmailAddress;
+        MessageWizardModel.ReceiverEmailAddress = item.UserDto.EmailAddress;
         MessageWizardModel.SenderId = SessionService.User.UserId;
-        MessageWizardModel.SenderEmailAddress = SessionService.User.Email;
+        MessageWizardModel.SenderEmailAddress = "info@anataworld.com";
-
-        _logger.Info($"Sending mail to {MessageWizardModel.ReceiverEmailAddress} from {MessageWizardModel.SenderId}");
 
+        // _logger.Info($"Sending mail to {MessageWizardModel.ReceiverEmailAddress} from {MessageWizardModel.SenderId}");
         PopupVisible = true;
+
     }
 
     void CancelCreateClick()

TIAMWebApp/Client/Services/UserDataServiceWeb.cs

@@ -218,10 +218,11 @@ namespace TIAMWebApp.Client.Services
             _logger.Info("GetUserDetailByIdAsync url: " + url + ", " + id.ToString());
 
             var response = await http.PostAsJsonAsync(url, id);
-            var result = await response.Content.ReadAsStringAsync();
+            //var result = await response.Content.ReadAsStringAsync();
-            var user = JsonConvert.DeserializeObject<UserModelDtoDetail>(result);
+            var result = await response.Content.ReadFromJsonAsync<UserModelDtoDetail>();
+            //var user = JsonConvert.DeserializeObject<UserModelDtoDetail>(result);
 
-            return user;
+            return result;
         }
 
         public async Task<bool> RefreshToken()

TIAMWebApp/Server/Controllers/MessageAPIController.cs

@@ -54,10 +54,10 @@ namespace TIAMWebApp.Server.Controllers
 
                 var messageElement = message.Message;
                 _logger.Debug(message.Message.Subject);
+                messageElement.EmailAddress = "noreply@anataworld.com";
 
                 var result = await _messageSenderService.SendMessageAsync(messageElement, (int)message.MessageType);
                 //_adminDal.AddEmailMessageAsync((TIAM.Entities.Emails.EmailMessage)SerializedMessageSenderModel.Message);
-                messageElement.EmailAddress = "noreply@anataworld.com";
 
                 await _adminDal.AddEmailMessageAsync(messageElement);
                 _logger.Debug($"SendEmail result: {result}");

TIAMWebApp/Server/Controllers/UserAPIController.cs

@@ -375,11 +375,12 @@ namespace TIAMWebApp.Server.Controllers
 
         [AllowAnonymous]
         [HttpPost]
-        [Route("GetUserDetailById")]
+        [Route(APIUrls.GetUserDetailByIdRouteName)]
-        public Task<UserModelDtoDetail?> GetUserDetailById([FromBody] Guid id)
+        public async Task<UserModelDtoDetail?> GetUserDetailById([FromBody] Guid id)
         {
             _logger.Info($"GetUserDetailById called with id: {id}");
-            return _userDal.GetUserModelDtoByIdAsync<UserModelDtoDetail>(id, true);
+            var result = await _userDal.GetUserModelDtoByIdAsync<UserModelDtoDetail>(id, true);
+            return result;
         }
     }
 }

TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs

@@ -49,8 +49,8 @@ namespace TIAMWebApp.Shared.Application.Services
                     if (!response.IsSuccessStatusCode)
                         return null;
 
-                    var result = (HttpResponseMessage)(await response.Content.ReadFromJsonAsync(typeof(HttpResponseMessage)));
+                    var result = (string)(await response.Content.ReadAsStringAsync());
-                    return result.Content.ToString();
+                    return result;
 
                 }