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

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

@ -88,11 +88,10 @@
get => _newPassword; get => _newPassword;
set set
{ {
if (_newPassword != value) if (_newPassword == value) return;
{
_newPassword = value; _newPassword = value;
OnPasswordSet(value); OnPasswordSet(value);
}
} }
} }
@ -104,11 +103,10 @@
get => _confirmNewPassword; get => _confirmNewPassword;
set set
{ {
if (value != null && _confirmNewPassword != value) if (value == null || _confirmNewPassword == value) return;
{
_confirmNewPassword = value; _confirmNewPassword = value;
OnPasswordConfirmed(value); OnPasswordConfirmed(value);
}
} }
} }
@ -119,6 +117,7 @@
{ {
msg = $"Password to set: {NewPassword}"; msg = $"Password to set: {NewPassword}";
PasswordNotSet = false; PasswordNotSet = false;
StateHasChanged(); StateHasChanged();
} }
@ -134,62 +133,37 @@
isSaveActive = false; isSaveActive = false;
msg = "Password and confirmation not matching!"; msg = "Password and confirmation not matching!";
} }
} }
protected async Task SetPassword() protected async Task SetPassword()
{ {
bool isSuccess = false; bool isSuccess;
if (!IsForgotten) isSaveActive = false;
if (IsForgotten)
{ {
isSaveActive = false; var forgotPasswordDto = new ForgotPasswordDto(Context.UserDto.EmailAddress, NewPassword);
isSuccess = await AdminSignalRClient.PostDataAsync<ForgotPasswordDto, UserModelDtoDetail>(SignalRTags.UserForgotPassword, forgotPasswordDto) != null;
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)
{
msg = $"Password saved";
StateHasChanged();
}
else
{
msg = "Some error occured during saving, please try again later";
}
} }
else else
{ {
isSaveActive = false; var changePasswordDto = new ChangePasswordDto(Context.Id, OldPassword, NewPassword);
var forgotPasswordDto = new ForgotPasswordDto(Context.UserDto.EmailAddress, NewPassword); isSuccess = await AdminSignalRClient.PostDataAsync<ChangePasswordDto, UserModelDtoDetail>(SignalRTags.UserChangePassword, changePasswordDto) != null;
//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();
}
else
{
isSuccess = false;
msg = "Some error occured during saving, please try again later";
}
} }
msg = isSuccess ? $"Password saved" : "Some error occured during saving, please try again later";
StateHasChanged();
await DataChanged.InvokeAsync(isSuccess); await DataChanged.InvokeAsync(isSuccess);
} }
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
await base.OnInitializedAsync(); await base.OnInitializedAsync();
} }
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
await base.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.Filtering;
using DevExpress.Data.Linq; using DevExpress.Data.Linq;
using DevExpress.Data.Linq.Helpers; using DevExpress.Data.Linq.Helpers;
using Newtonsoft.Json;
using SkiaSharp;
using TIAM.Core.Consts; using TIAM.Core.Consts;
using TIAM.Core.Enums; using TIAM.Core.Enums;
using TIAM.Core.Loggers; using TIAM.Core.Loggers;
@ -258,6 +260,10 @@ namespace Tiam.Services.Client.Tests
[DataRow("")] [DataRow("")]
public async Task GetAllCarsAndDriversByProductIdAsyncTest_ReturnCarsAndDrivers_WhenHasCarsAndDrivers(string productIdString) 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 cars = new List<Car>();
var drivers = new List<UserProductMapping>(); var drivers = new List<UserProductMapping>();
var productId = TiamConstClient.TransferProductId; //Guid.Parse(productIdString); var productId = TiamConstClient.TransferProductId; //Guid.Parse(productIdString);