mirror of
https://github.com/LD-Reborn/Berufsschule_HAM.git
synced 2025-12-20 06:51:55 +00:00
Added user password validation, Fixed new user localization issue
This commit is contained in:
@@ -63,6 +63,10 @@ public class UsersController : Controller
|
|||||||
[HttpPost("Create")]
|
[HttpPost("Create")]
|
||||||
public async Task<UsersCreateResponseModel> Create([FromBody] UsersCreateRequestModel requestModel)
|
public async Task<UsersCreateResponseModel> Create([FromBody] UsersCreateRequestModel requestModel)
|
||||||
{
|
{
|
||||||
|
if (requestModel is null)
|
||||||
|
{
|
||||||
|
return new() { Success = false, Exception = "The request model is null" };
|
||||||
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string? jpegPhoto = requestModel.JpegPhoto;
|
string? jpegPhoto = requestModel.JpegPhoto;
|
||||||
|
|||||||
@@ -127,4 +127,7 @@
|
|||||||
<data name="Confirm Delete" xml:space="preserve">
|
<data name="Confirm Delete" xml:space="preserve">
|
||||||
<value>Löschen bestätigen</value>
|
<value>Löschen bestätigen</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Password must be at least 8 characters long and include upper, lower, number, and special character" xml:space="preserve">
|
||||||
|
<value>Passwörter müssen mindestens 8 Zeichen lang sein und Groß- und Kleinbuchstaben, sowie mindestens eine Zahl und mindestens ein Sonderzeichen enthalten</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
|
|||||||
@@ -112,10 +112,8 @@
|
|||||||
deleteModal.addEventListener('show.bs.modal', event => {
|
deleteModal.addEventListener('show.bs.modal', event => {
|
||||||
currentButton = event.relatedTarget; // Button that triggered the modal
|
currentButton = event.relatedTarget; // Button that triggered the modal
|
||||||
const userId = currentButton.getAttribute('data-user-id');
|
const userId = currentButton.getAttribute('data-user-id');
|
||||||
const userName = currentButton.getAttribute('data-user-name');
|
|
||||||
|
|
||||||
deleteModal.querySelector('#userId').textContent = userId;
|
deleteModal.querySelector('#userId').textContent = userId;
|
||||||
deleteModal.querySelector('#userName').textContent = userName;
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -123,7 +121,6 @@
|
|||||||
const deleteForm = document.getElementById('deleteForm');
|
const deleteForm = document.getElementById('deleteForm');
|
||||||
deleteForm.addEventListener('submit', async e => {
|
deleteForm.addEventListener('submit', async e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
console.log(deleteForm);
|
|
||||||
const userId = deleteModal.querySelector('#userId').textContent;
|
const userId = deleteModal.querySelector('#userId').textContent;
|
||||||
const url = `/Users/Delete?uid=${userId}`;
|
const url = `/Users/Delete?uid=${userId}`;
|
||||||
|
|
||||||
@@ -298,6 +295,12 @@
|
|||||||
|
|
||||||
updateForm.addEventListener('submit', async e => {
|
updateForm.addEventListener('submit', async e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
|
const password = updateForm.querySelector('input[name="UserPassword"]').value;
|
||||||
|
if (password.length > 0 && !validatePassword(password)) {
|
||||||
|
showToast('@T["Password must be at least 8 characters long and include upper, lower, number, and special character"]', 'danger');
|
||||||
|
return;
|
||||||
|
}
|
||||||
var dataFromEntries = Object.fromEntries(new FormData(updateForm).entries());
|
var dataFromEntries = Object.fromEntries(new FormData(updateForm).entries());
|
||||||
var data = unflatten(dataFromEntries);
|
var data = unflatten(dataFromEntries);
|
||||||
data.Description.Groups = Array.from(updateForm.querySelector('#updateGroups').selectedOptions).map(option => option.value);
|
data.Description.Groups = Array.from(updateForm.querySelector('#updateGroups').selectedOptions).map(option => option.value);
|
||||||
@@ -543,6 +546,13 @@
|
|||||||
// Submit create form
|
// Submit create form
|
||||||
createForm.addEventListener('submit', async e => {
|
createForm.addEventListener('submit', async e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
|
const password = createForm.querySelector('input[name="UserPassword"]').value;
|
||||||
|
if (password == null || !validatePassword(password)) {
|
||||||
|
showToast('@T["Password must be at least 8 characters long and include upper, lower, number, and special character"]', 'danger');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const dataFromEntries = Object.fromEntries(new FormData(createForm).entries());
|
const dataFromEntries = Object.fromEntries(new FormData(createForm).entries());
|
||||||
const data = unflatten(dataFromEntries);
|
const data = unflatten(dataFromEntries);
|
||||||
data.Description.Groups = Array.from(createGroupsSelect.selectedOptions).map(o => o.value);
|
data.Description.Groups = Array.from(createGroupsSelect.selectedOptions).map(o => o.value);
|
||||||
@@ -564,7 +574,7 @@
|
|||||||
const newRow = document.createElement('tr');
|
const newRow = document.createElement('tr');
|
||||||
newRow.innerHTML = `
|
newRow.innerHTML = `
|
||||||
<td><img class="rounded-circle user-icon" src="data:image/jpeg;base64,${data.JpegPhoto || ''}" alt="Photo" style="max-width:300px;" /></td>
|
<td><img class="rounded-circle user-icon" src="data:image/jpeg;base64,${data.JpegPhoto || ''}" alt="Photo" style="max-width:300px;" /></td>
|
||||||
<td>${result.NewUid || ''}</td>
|
<td>${result.Uid || ''}</td>
|
||||||
<td>${data.Title || ''}</td>
|
<td>${data.Title || ''}</td>
|
||||||
<td>${data.Cn || ''}</td>
|
<td>${data.Cn || ''}</td>
|
||||||
<td>${data.Sn || ''}</td>
|
<td>${data.Sn || ''}</td>
|
||||||
@@ -580,14 +590,14 @@
|
|||||||
data-user-groups='${JSON.stringify(data.Description?.Groups || [])}'
|
data-user-groups='${JSON.stringify(data.Description?.Groups || [])}'
|
||||||
data-bs-toggle="modal"
|
data-bs-toggle="modal"
|
||||||
data-bs-target="#updateModal">
|
data-bs-target="#updateModal">
|
||||||
Update
|
@T["Update"]
|
||||||
</button>
|
</button>
|
||||||
<button class="btn btn-sm btn-danger btn-delete"
|
<button class="btn btn-sm btn-danger btn-delete"
|
||||||
data-user-id="${result.NewUid || ''}"
|
data-user-id="${result.NewUid || ''}"
|
||||||
data-user-name="${data.Cn || ''}"
|
data-user-name="${data.Cn || ''}"
|
||||||
data-bs-toggle="modal"
|
data-bs-toggle="modal"
|
||||||
data-bs-target="#deleteModal">
|
data-bs-target="#deleteModal">
|
||||||
Delete
|
@T["Delete"]
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -188,3 +188,10 @@ async function loadUsersIntoSelect(selectElement, selectedValue = null) {
|
|||||||
showToast(appTranslations.errorLoadingUsers, 'danger');
|
showToast(appTranslations.errorLoadingUsers, 'danger');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function validatePassword(password) {
|
||||||
|
// Regex: min 8 chars, one uppercase, one lowercase, one number, one special char
|
||||||
|
const strongPasswordRegex =
|
||||||
|
/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_\-+=\[{\]};:'",<.>/?\\|`~]).{8,}$/;
|
||||||
|
return strongPasswordRegex.test(password);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user