Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Loretta 2024-06-25 06:48:06 +02:00
parent 7c25243fc1 35b26bd5be
commit 0651a8c06a
7 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TIAM.Services.Server/MessageSenderService.cs
View File

@ -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))

10
TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
View File

@ -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"

29
TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
View File

@ -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",
"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()

7
TIAMWebApp/Client/Services/UserDataServiceWeb.cs
View File

@ -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<UserModelDtoDetail>(result);
//var result = await response.Content.ReadAsStringAsync();
var result = await response.Content.ReadFromJsonAsync<UserModelDtoDetail>();
//var user = JsonConvert.DeserializeObject<UserModelDtoDetail>(result);
return user;
return result;
}
public async Task<bool> RefreshToken()

2
TIAMWebApp/Server/Controllers/MessageAPIController.cs
View File

@ -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}");

7
TIAMWebApp/Server/Controllers/UserAPIController.cs
View File

@ -375,11 +375,12 @@ namespace TIAMWebApp.Server.Controllers
[AllowAnonymous]
[HttpPost]
[Route("GetUserDetailById")]
public Task<UserModelDtoDetail?> GetUserDetailById([FromBody] Guid id)
[Route(APIUrls.GetUserDetailByIdRouteName)]
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;
}
}
}

4
TIAMWebApp/Shared/Services/ClientNoticeSenderService.cs
View File

@ -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;
}