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

forgot, change password fixes

This commit is contained in:
Loretta 2024-08-10 19:32:04 +02:00
parent 82b198702b
commit 18e83707f4
2 changed files with 27 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
TIAMSharedUI/Pages/User/CardComponents/UserCardComponent.razor
View File

@ -88,13 +88,12 @@
get => _newPassword;
set
{
if (_newPassword != value)
{
if (_newPassword == value) return;
_newPassword = value;
OnPasswordSet(value);
}
}
}
public string OldPassword { get; set; }
@ -104,13 +103,12 @@
get => _confirmNewPassword;
set
{
if (value != null && _confirmNewPassword != value)
{
if (value == null || _confirmNewPassword == value) return;
_confirmNewPassword = value;
OnPasswordConfirmed(value);
}
}
}
string msg;
private bool isSaveActive = false;
@ -119,6 +117,7 @@
{
msg = $"Password to set: {NewPassword}";
PasswordNotSet = false;
StateHasChanged();
}
@ -134,62 +133,37 @@
isSaveActive = false;
msg = "Password and confirmation not matching!";
}
}
protected async Task SetPassword()
{
bool isSuccess = false;
if (!IsForgotten)
{
bool isSuccess;
isSaveActive = false;
var changePasswordDto = new ChangePasswordDto(Context.Id, OldPassword, NewPassword);
//var changePasswordDto = new ChangePasswordDto(Context.Id, "Asdasd123456", NewPassword);
var result = await AdminSignalRClient.PostDataAsync<ChangePasswordDto, UserModelDtoDetail>(SignalRTags.UserChangePassword, changePasswordDto);
if (result != null)
if (IsForgotten)
{
msg = $"Password saved";
StateHasChanged();
}
else
{
msg = "Some error occured during saving, please try again later";
}
}
else
{
isSaveActive = false;
var forgotPasswordDto = new ForgotPasswordDto(Context.UserDto.EmailAddress, NewPassword);
//var changePasswordDto = new ChangePasswordDto(Context.Id, "Asdasd123456", NewPassword);
var result = await AdminSignalRClient.PostDataAsync<ForgotPasswordDto, UserModelDtoDetail>(SignalRTags.UserForgotPassword, forgotPasswordDto);
if (result != null)
{
isSuccess = true;
msg = $"Password saved";
StateHasChanged();
isSuccess = await AdminSignalRClient.PostDataAsync<ForgotPasswordDto, UserModelDtoDetail>(SignalRTags.UserForgotPassword, forgotPasswordDto) != null;
}
else
{
isSuccess = false;
msg = "Some error occured during saving, please try again later";
}
var changePasswordDto = new ChangePasswordDto(Context.Id, OldPassword, NewPassword);
isSuccess = await AdminSignalRClient.PostDataAsync<ChangePasswordDto, UserModelDtoDetail>(SignalRTags.UserChangePassword, changePasswordDto) != null;
}
msg = isSuccess ? $"Password saved" : "Some error occured during saving, please try again later";
StateHasChanged();
await DataChanged.InvokeAsync(isSuccess);
}
protected override async Task OnInitializedAsync()
{
await base.OnInitializedAsync();
}
protected override async Task OnParametersSetAsync()
{
await base.OnParametersSetAsync();
}

6
Tiam.Services.Client.Tests/SignalRClientTest.cs
View File

@ -7,6 +7,8 @@ using Azure;
using DevExpress.Data.Filtering;
using DevExpress.Data.Linq;
using DevExpress.Data.Linq.Helpers;
using Newtonsoft.Json;
using SkiaSharp;
using TIAM.Core.Consts;
using TIAM.Core.Enums;
using TIAM.Core.Loggers;
@ -258,6 +260,10 @@ namespace Tiam.Services.Client.Tests
[DataRow("")]
public async Task GetAllCarsAndDriversByProductIdAsyncTest_ReturnCarsAndDrivers_WhenHasCarsAndDrivers(string productIdString)
{
//var json = JsonConvert.SerializeObject(5);
//var number = JsonConvert.DeserializeObject<int>(json);
//Assert.IsTrue(number == 5);
var cars = new List<Car>();
var drivers = new List<UserProductMapping>();
var productId = TiamConstClient.TransferProductId; //Guid.Parse(productIdString);