sh-edraft.de/sh_discord_bot
4
1
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

Merge pull request 'Fixed permission check' (#396) from dev into master
Some checks reported warnings
Deploy dev on push / on-push-deploy_sh-edraft (push) Has been cancelled
Details

Browse Source 
Reviewed-on: sh-edraft.de/kd_discord_bot#396
This commit is contained in:
Sven Heidemann 2023-10-02 16:33:05 +02:00
commit 34d83a472c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kdb-web/src/app/modules/view/server/profile/profile.component.ts
View File

@ -48,7 +48,7 @@ export class ProfileComponent implements OnInit, OnDestroy {
let authUser = await this.auth.getLoggedInUser(); let authUser = await this.auth.getLoggedInUser();
this.spinner.showSpinner(); this.spinner.showSpinner();
let user: UserDTO | null = authUser?.users?.find(u => u.server == server.id) ?? null; let user: UserDTO | null = authUser?.users?.find(u => u.server == server.id) ?? null;
if (!user || user?.id != params["memberId"] && !user?.isModerator) { if (!user || user?.id != params["memberId"] && !user?.isModerator && !user.isModerator) {
this.toast.error(this.translate.instant("view.server.profile.permission_denied"), this.translate.instant("view.server.profile.permission_denied_d")); this.toast.error(this.translate.instant("view.server.profile.permission_denied"), this.translate.instant("view.server.profile.permission_denied_d"));
this.spinner.hideSpinner(); this.spinner.hideSpinner();
await this.router.navigate(["/server", server.id]); await this.router.navigate(["/server", server.id]);

10
kdb-web/src/app/services/sidebar/sidebar.service.ts
View File

@ -200,11 +200,11 @@ export class SidebarService {
if (this.server) { if (this.server) {
this.serverMenu.visible = true; this.serverMenu.visible = true;
this.serverMembers.visible = isTechnician || user?.isModerator; this.serverMembers.visible = this.hasFeature("TechnicianFullAccess") && isTechnician || user?.isModerator;
this.serverAutoRoles.visible = isTechnician || this.hasFeature("AutoRoleModule") && user?.isModerator; this.serverAutoRoles.visible = this.hasFeature("TechnicianFullAccess") && isTechnician || this.hasFeature("AutoRoleModule") && user?.isModerator;
this.serverLevels.visible = isTechnician || this.hasFeature("LevelModule") && user?.isModerator; this.serverLevels.visible = this.hasFeature("TechnicianFullAccess") && isTechnician || this.hasFeature("LevelModule") && user?.isModerator;
this.serverAchievements.visible = isTechnician || this.hasFeature("AchievementsModule") && user?.isModerator; this.serverAchievements.visible = this.hasFeature("TechnicianFullAccess") && isTechnician || this.hasFeature("AchievementsModule") && user?.isModerator;
this.serverShortRoleNames.visible = isTechnician || this.hasFeature("ShortRoleName") && user?.isAdmin; this.serverShortRoleNames.visible = this.hasFeature("TechnicianFullAccess") && isTechnician || this.hasFeature("ShortRoleName") && user?.isAdmin;
this.serverConfig.visible = isTechnician || user?.isAdmin; this.serverConfig.visible = isTechnician || user?.isAdmin;
} else { } else {