DungTT/ManagerAccount
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update role

Browse Source
This commit is contained in:
Tran Tien Dung
2026-04-02 13:34:11 +07:00
parent c823549458
commit 6c2e89dc93
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
public/js/app.js
View File

@@ -77,12 +77,29 @@ class AccountManager {
return detected ?? 1; return detected ?? 1;
} }
getCurrentUserRoleRaw() {
return this.currentUser?.Role
?? this.currentUser?.role
?? this.currentUser?.RoleName
?? this.currentUser?.user?.Role
?? this.currentUser?.user?.role
?? '';
}
getCurrentUserRole() {
return String(this.getCurrentUserRoleRaw() || '').trim().toLowerCase();
}
isCurrentUserAdmin() {
return this.getCurrentUserRole() === 'admin';
}
async init() { async init() {
await this.fetchApplications(); await this.fetchApplications();
await this.fetchAccounts(); await this.fetchAccounts();
// Check if user is admin and fetch users/roles // Check if user is admin and fetch users/roles
if (this.currentUser?.Role === 'admin') { if (this.isCurrentUserAdmin()) {
await this.fetchUsers(); await this.fetchUsers();
await this.fetchRoles(); await this.fetchRoles();
// Show Users menu // Show Users menu
@@ -121,7 +138,7 @@ class AccountManager {
this.setupAccountPagerListeners(); this.setupAccountPagerListeners();
} else if (page === 'users') { } else if (page === 'users') {
// Check if user is admin // Check if user is admin
if (this.currentUser?.Role !== 'admin') { if (!this.isCurrentUserAdmin()) {
mainContent.innerHTML = this.renderDashboard(); mainContent.innerHTML = this.renderDashboard();
} else { } else {
mainContent.innerHTML = this.getUsersContent(); mainContent.innerHTML = this.getUsersContent();
@@ -306,7 +323,7 @@ class AccountManager {
const roleEl = document.getElementById('accountRole'); const roleEl = document.getElementById('accountRole');
if (usernameEl) usernameEl.textContent = this.currentUser?.username || this.currentUser?.Username || 'User'; if (usernameEl) usernameEl.textContent = this.currentUser?.username || this.currentUser?.Username || 'User';
if (roleEl) roleEl.textContent = this.currentUser?.role || this.currentUser?.Role || 'Guest'; if (roleEl) roleEl.textContent = this.getCurrentUserRoleRaw() || 'Guest';
} }
getFilteredAccounts() { getFilteredAccounts() {
@@ -1601,7 +1618,7 @@ class AccountManager {
try { try {
const response = await fetch(url, { const response = await fetch(url, {
method, method,
headers: { 'Content-Type': 'application/json', 'x-user-role': this.currentUser?.Role }, headers: { 'Content-Type': 'application/json', 'x-user-role': this.getCurrentUserRole() },
body: JSON.stringify(payload) body: JSON.stringify(payload)
}); });
@@ -1626,7 +1643,7 @@ class AccountManager {
async viewUserDetails(userId) { async viewUserDetails(userId) {
try { try {
const response = await fetch(`${this.apiBase}/users/${userId}`, { const response = await fetch(`${this.apiBase}/users/${userId}`, {
headers: { 'x-user-role': this.currentUser?.Role } headers: { 'x-user-role': this.getCurrentUserRole() }
}); });
const data = await response.json(); const data = await response.json();
@@ -1787,7 +1804,7 @@ class AccountManager {
try { try {
const response = await fetch(`${this.apiBase}/users/${userId}`, { const response = await fetch(`${this.apiBase}/users/${userId}`, {
method: 'DELETE', method: 'DELETE',
headers: { 'x-user-role': this.currentUser?.Role } headers: { 'x-user-role': this.getCurrentUserRole() }
}); });
const data = await response.json(); const data = await response.json();