AppStd/DigitalData.StaffDBServer
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Benutzerrollen und JWT-Konfiguration aktualisieren

Browse Source 
- Benutzerrollen-Enums im Frontend aktualisiert, um die neuen Namenskonventionen für 'sDigital Data'-Rollen zu reflektieren.
- Neue Rollen in `JwtGlobals` für Digital Data-Administratoren und Benutzer hinzugefügt.
- Die Rolleneinstellungen in `LdapUser` erweitert, um neue Digital Data-Rollen einzubeziehen.
- `JwtMiddlewareOptionsHelper` modifiziert, um zusätzliche Rollen zu unterstützen und die JWT-Rollenliste entsprechend strukturiert.
This commit is contained in:
Developer 02 2024-08-27 11:58:50 +02:00
parent 1d8ae2c371
commit c362cb30e1
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ClientApp/staff-db-ui/src/app/shared/core/models/coreuser.ts
View File

@ -8,9 +8,9 @@ export interface UserRole {
export const enum EN_UserRoles {
User = 'user',
Master = 'master',
Admin = 'admin',
User = 'sDigital Data - IIM-Benutzer',
Master = 'sDigital Data - IIM-Administratoren',
Admin = 'sDigital Data - IIM-Administratoren',
DepartmentMaster = 'departmentmaster',
DepartmentUser = 'departmentuser'
}
@ -50,6 +50,7 @@ export class CoreUser extends BaseEntity {
public isInRolle(role: string): boolean {
role = role?.toLowerCase();
return this.roleList.toLowerCase().includes(role);
return (this.roleList && ((',' + this.roleList.replace(' ', '') + ',').toLowerCase().indexOf(',' + role + ',') > -1))
|| (this.webAppRoleList && ((',' + this.webAppRoleList.replace(' ', '') + ',').toLowerCase().indexOf(',' + role + ',') > -1));
}

3
HRD.LDAPService/JWT/JwtGlobals.cs
View File

@ -1,5 +1,6 @@
namespace HRD.LDAPService.JWT
{
//TODO: get this from config file (etc. appsettings.json)
public static class JwtGlobals
{
public const string HttpContextItem_LdapUser = "ldapuser";
@ -15,5 +16,7 @@
public const string ROLE_DEPARTMENTMASTER = "DepartmentMaster";
public const string ROLE_MASTER = "Master";
public const string ROLE_ADMIN = "Admin";
public const string ROLE_DD_ADMIN = "sDigital Data - IIM-Administratoren";
public const string ROLE_DD_USER = "sDigital Data - IIM-Benutzer";
}
}

4
HRD.LDAPService/Ldap/LdapUser.cs
View File

@ -145,11 +145,13 @@ namespace HRD.LDAPService
public static bool IsJwtGlobalsRole(string roleName)
{
//TODO: Import them from db or config (etc. appsettigns.json)
return string.Equals(roleName, JwtGlobals.ROLE_USER, StringComparison.OrdinalIgnoreCase)
|| string.Equals(roleName, JwtGlobals.ROLE_DEPARTMENTUSER, StringComparison.OrdinalIgnoreCase)
|| string.Equals(roleName, JwtGlobals.ROLE_DEPARTMENTMASTER, StringComparison.OrdinalIgnoreCase)
|| string.Equals(roleName, JwtGlobals.ROLE_MASTER, StringComparison.OrdinalIgnoreCase)
|| string.Equals(roleName, JwtGlobals.ROLE_ADMIN, StringComparison.OrdinalIgnoreCase);
|| string.Equals(roleName, JwtGlobals.ROLE_ADMIN, StringComparison.OrdinalIgnoreCase)
|| string.Equals(roleName, JwtGlobals.ROLE_DD_ADMIN, StringComparison.OrdinalIgnoreCase);
}
public void AddExtendedAttribute(string key, string value)

3
StaffDBServer/Extends/JwtMiddlewareOptionsHelper.cs
View File

@ -16,11 +16,14 @@ namespace StaffDBServer.Extends
//Admin Role
list.Add(new JwtRole(JwtGlobals.ROLE_ADMIN, "GG_WebApp" + ADGroupPrefix + "_StaffDB_Admin"));
//TODO: get roles from db
//Core RoleList
list.Add(new JwtRole(JwtGlobals.ROLE_USER, "GG_WebApp" + ADGroupPrefix + "_StaffDB_User")); //(RO) nur eigene
list.Add(new JwtRole(JwtGlobals.ROLE_MASTER, "GG_WebApp" + ADGroupPrefix + "_StaffDB_Master")); //RW ALLE Abteilungen
list.Add(new JwtRole(JwtGlobals.ROLE_DEPARTMENTUSER, "GG_WebApp" + ADGroupPrefix + "_StaffDB_DepartmentUser")); //(RW) auch andere aus eigener Abteilung
list.Add(new JwtRole(JwtGlobals.ROLE_DEPARTMENTMASTER, "GG_WebApp" + ADGroupPrefix + "_StaffDB_DepartmentMaster")); //(RW) auch andere aus eigener Abteilung
list.Add(new JwtRole(JwtGlobals.ROLE_DD_ADMIN, JwtGlobals.ROLE_DD_ADMIN)); //(RW) auch andere aus eigener Abteilung
list.Add(new JwtRole(JwtGlobals.ROLE_DD_USER, JwtGlobals.ROLE_DD_USER));
JwtMiddlewareOptions options = new JwtMiddlewareOptions()
{

1
StaffDBServer/Program.cs
View File

@ -116,6 +116,7 @@ try
opts => opts.CommandTimeout((int)TimeSpan.FromMinutes(dbTimeoutInMin).TotalSeconds));
});
// Add repositories in DAL
builder.Services.AddStaffDBRepositories();
builder.Services.AddScoped<WebAppUserHelper>();
builder.Services.AddJwtManagerWithLdap(configuration.GetSection("LdapOptions"));