claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2026-07-08 17:57:08 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Update admin role checks to use "Admin" instead of "Administrator"

Browse Source
This commit is contained in:
Natalia Portillo
2026-05-15 15:57:22 +01:00
parent 3fe2f7f8f8
commit f0f91c9f20
19 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marechai.App/Presentation/ViewModels/Admin/AdminBooksViewModel.cs
View File

@@ -213,8 +213,8 @@ public partial class AdminBooksViewModel : ObservableObject, IRegionAware
string token = _tokenService.GetToken();
if(string.IsNullOrWhiteSpace(token)) { IsAdmin = false; return; }
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch { IsAdmin = false; }
}

4
Marechai.App/Presentation/ViewModels/Admin/AdminCompaniesViewModel.cs
View File

@@ -291,8 +291,8 @@ public partial class AdminCompaniesViewModel : ObservableObject, IRegionAware
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch
{

4
Marechai.App/Presentation/ViewModels/Admin/AdminCompanyLogosViewModel.cs
View File

@@ -139,8 +139,8 @@ public partial class AdminCompanyLogosViewModel : ObservableObject, IRegionAware
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch
{

4
Marechai.App/Presentation/ViewModels/Admin/AdminDocumentsViewModel.cs
View File

@@ -179,8 +179,8 @@ public partial class AdminDocumentsViewModel : ObservableObject, IRegionAware
string token = _tokenService.GetToken();
if(string.IsNullOrWhiteSpace(token)) { IsAdmin = false; return; }
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch { IsAdmin = false; }
}

4
Marechai.App/Presentation/ViewModels/Admin/AdminGpusViewModel.cs
View File

@@ -179,8 +179,8 @@ public partial class AdminGpusViewModel : ObservableObject, IRegionAware
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch
{

4
Marechai.App/Presentation/ViewModels/Admin/AdminInstructionSetExtensionsViewModel.cs
View File

@@ -122,8 +122,8 @@ public partial class AdminInstructionSetExtensionsViewModel : ObservableObject,
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch
{

4
Marechai.App/Presentation/ViewModels/Admin/AdminInstructionSetsViewModel.cs
View File

@@ -125,8 +125,8 @@ public partial class AdminInstructionSetsViewModel : ObservableObject, IRegionAw
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch
{

2
Marechai.App/Presentation/ViewModels/Admin/AdminMachineFamiliesViewModel.cs
View File

@@ -90,7 +90,7 @@ public partial class AdminMachineFamiliesViewModel : ObservableObject, IRegionAw
if(string.IsNullOrWhiteSpace(token)) { IsAdmin = false; return; }
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch { IsAdmin = false; }
}

4
Marechai.App/Presentation/ViewModels/Admin/AdminMachinePhotosViewModel.cs
View File

@@ -137,8 +137,8 @@ public partial class AdminMachinePhotosViewModel : ObservableObject, IRegionAwar
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch
{

2
Marechai.App/Presentation/ViewModels/Admin/AdminMachinesViewModel.cs
View File

@@ -211,7 +211,7 @@ public partial class AdminMachinesViewModel : ObservableObject, IRegionAware
if(string.IsNullOrWhiteSpace(token)) { IsAdmin = false; return; }
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch { IsAdmin = false; }
}

4
Marechai.App/Presentation/ViewModels/Admin/AdminMagazinesViewModel.cs
View File

@@ -182,8 +182,8 @@ public partial class AdminMagazinesViewModel : ObservableObject, IRegionAware
string token = _tokenService.GetToken();
if(string.IsNullOrWhiteSpace(token)) { IsAdmin = false; return; }
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch { IsAdmin = false; }
}

4
Marechai.App/Presentation/ViewModels/Admin/AdminPeopleViewModel.cs
View File

@@ -153,8 +153,8 @@ public partial class AdminPeopleViewModel : ObservableObject, IRegionAware
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch
{

4
Marechai.App/Presentation/ViewModels/Admin/AdminProcessorsViewModel.cs
View File

@@ -226,8 +226,8 @@ public partial class AdminProcessorsViewModel : ObservableObject, IRegionAware
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch
{

4
Marechai.App/Presentation/ViewModels/Admin/AdminResolutionsViewModel.cs
View File

@@ -128,8 +128,8 @@ public partial class AdminResolutionsViewModel : ObservableObject, IRegionAware
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch
{

4
Marechai.App/Presentation/ViewModels/Admin/AdminScreensViewModel.cs
View File

@@ -109,8 +109,8 @@ public partial class AdminScreensViewModel : ObservableObject, IRegionAware
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch { IsAdmin = false; }
}

4
Marechai.App/Presentation/ViewModels/Admin/AdminSoftwareScreenshotsViewModel.cs
View File

@@ -162,8 +162,8 @@ public partial class AdminSoftwareScreenshotsViewModel : ObservableObject, IRegi
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch
{

2
Marechai.App/Presentation/ViewModels/Admin/AdminSoundSynthsViewModel.cs
View File

@@ -122,7 +122,7 @@ public partial class AdminSoundSynthsViewModel : ObservableObject, IRegionAware
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdmin = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
catch { IsAdmin = false; }
}

4
Marechai.App/Presentation/ViewModels/MainViewModel.cs
View File

@@ -199,8 +199,8 @@ public partial class MainViewModel : ObservableObject
{
IEnumerable<string> roles = _jwtService.GetRoles(token);
IsAdminUser = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Administrator", StringComparer.OrdinalIgnoreCase);
IsAdminUser = roles.Contains("Uberadmin", StringComparer.OrdinalIgnoreCase) ||
roles.Contains("Admin", StringComparer.OrdinalIgnoreCase);
}
else
{

2
Marechai.Database/Models/ApplicationRole.cs
View File

@@ -40,7 +40,7 @@ public class ApplicationRole : IdentityRole
public const string RolePhysicalCurator = "PhysicalCurator";
public const string RoleTechnician = "Technician";
public const string RoleSuperTechnician = "SuperTechnician";
public const string RoleAdmin = "Administrator";
public const string RoleAdmin = "Admin";
public const string RoleNone = "NormalUser";
public ApplicationRole() => Created = DateTime.UtcNow;