Compare commits

...

2 Commits

View File

@ -182,23 +182,24 @@ namespace MarcoBMS.Services.Controllers
/* Identity user Exists - Create/update employee Employee */
// Update Employee record
var existingEmployee = await _context.Employees.FirstOrDefaultAsync(e => e.ApplicationUserId == existingUser.Id || e.Email == model.Email || e.Id == model.Id);
var existingEmployee = await _context.Employees.FirstOrDefaultAsync(e => e.Email == model.Email && e.Id == model.Id);
if (existingEmployee != null)
{
existingEmployee = GetUpdateEmployeeModel(model, existingEmployee, existingUser);
_context.Employees.Update(existingEmployee);
await _context.SaveChangesAsync();
responsemessage = "User updated successfully.";
}
else
{
// Create Employee record if missing
Employee newEmployee = GetNewEmployeeModel(model, TenantId, existingUser.Id);
_context.Employees.Add(newEmployee);
//Employee newEmployee = GetNewEmployeeModel(model, TenantId, existingUser.Id);
//_context.Employees.Add(newEmployee);
return BadRequest("You cannot use this email");
}
await _context.SaveChangesAsync();
responsemessage = "User updated successfully.";
}
else
{
@ -225,7 +226,7 @@ namespace MarcoBMS.Services.Controllers
var resetLink = $"{_configuration["AppSettings:WebFrontendUrl"]}/reset-password?token={WebUtility.UrlEncode(token)}";
await _emailSender.SendResetPasswordEmailOnRegister(user.Email, newEmployee.FirstName, resetLink);
responsemessage = "User created successfully. PAssword reset link is sent to registered email";
responsemessage = "User created successfully. Password reset link is sent to registered email";
}
}
else