diff --git a/TIAM.Services.Server/MessageSenderService.cs b/TIAM.Services.Server/MessageSenderService.cs index 5b8f0bcb..9df20132 100644 --- a/TIAM.Services.Server/MessageSenderService.cs +++ b/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)) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor index 3c1ad166..4f4bb46c 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/CarGridComponent.razor @@ -50,7 +50,7 @@ - + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 0a77047f..8dec11ea 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -78,16 +78,6 @@ Click="ColumnChooserButton_Click" /> -@* - - *@ UserData { get; set; } - bool PopupVisible { get; set; } + bool PopupVisible { get; set; } = false; IGrid Grid { get; set; } //object? MasterGridData { get; set; } @@ -169,28 +169,31 @@ public List IgnoreList = [ "ReceiverEmailAddress", - "ReceiverId", - "SenderEmailAddress", - "SenderId", - "ContextId" + "ReceiverFullName", + "ReceiverId", + "SenderEmailAddress", + "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); - _logger.Info($"Sending mail to {user.UserDto.EmailAddress}"); + //var bela = item; + //var user = await UserDataService.GetUserDetailByIdAsync(item.Id); + _logger.Info($"Sending mail to {item.UserDto.EmailAddress}"); - MessageWizardModel.ReceiverId = user.Id; - MessageWizardModel.ReceiverEmailAddress = user.UserDto.EmailAddress; + MessageWizardModel.ReceiverId = item.Id; + MessageWizardModel.ReceiverEmailAddress = item.UserDto.EmailAddress; MessageWizardModel.SenderId = SessionService.User.UserId; - MessageWizardModel.SenderEmailAddress = SessionService.User.Email; - - _logger.Info($"Sending mail to {MessageWizardModel.ReceiverEmailAddress} from {MessageWizardModel.SenderId}"); + MessageWizardModel.SenderEmailAddress = "info@anataworld.com"; + // _logger.Info($"Sending mail to {MessageWizardModel.ReceiverEmailAddress} from {MessageWizardModel.SenderId}"); PopupVisible = true; + } void CancelCreateClick() diff --git a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs index e5ad0bc8..4ce09625 100644 --- a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs +++ b/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 user = JsonConvert.DeserializeObject(result); + //var result = await response.Content.ReadAsStringAsync(); + var result = await response.Content.ReadFromJsonAsync(); + //var user = JsonConvert.DeserializeObject(result); - return user; + return result; } public async Task RefreshToken() diff --git a/TIAMWebApp/Server/Controllers/MessageAPIController.cs b/TIAMWebApp/Server/Controllers/MessageAPIController.cs index bea3c9a2..1196c964 100644 --- a/TIAMWebApp/Server/Controllers/MessageAPIController.cs +++ b/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}"); @@ -98,6 +98,7 @@ namespace TIAMWebApp.Server.Controllers return messages.ToJson(); } + [NonAction] [SignalR(SignalRTags.UpdateMessage)] public async Task UpdateMessages([FromBody] EmailMessage message) { diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index 2fc8cb90..7e7746a5 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -375,11 +375,12 @@ namespace TIAMWebApp.Server.Controllers [AllowAnonymous] [HttpPost] - [Route("GetUserDetailById")] - public Task GetUserDetailById([FromBody] Guid id) + [Route(APIUrls.GetUserDetailByIdRouteName)] + public async Task GetUserDetailById([FromBody] Guid id) { _logger.Info($"GetUserDetailById called with id: {id}"); - return _userDal.GetUserModelDtoByIdAsync(id, true); + var result = await _userDal.GetUserModelDtoByIdAsync(id, true); + return result; } } } \ No newline at end of file diff --git a/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs b/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs index ffd93343..81d80f8e 100644 --- a/TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs +++ b/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))); - return result.Content.ToString(); + var result = (string)(await response.Content.ReadAsStringAsync()); + return result; }