NapoleonDynamite/munera-vaadin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: hid UsersView to normal users

Browse source
This commit is contained in:
effe 2024-09-13 14:38:25 -04:00
parent dc95b06c6e
commit 8187115de2
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/com/application/munera/views/MainLayout.java
View file

@ -2,6 +2,7 @@ package com.application.munera.views;
import com.application.munera.services.CSVService; import com.application.munera.services.CSVService;
import com.application.munera.services.ExpenseService; import com.application.munera.services.ExpenseService;
import com.application.munera.services.UserService;
import com.application.munera.views.categories.CategoriesView; import com.application.munera.views.categories.CategoriesView;
import com.application.munera.views.dashboard.DashboardView; import com.application.munera.views.dashboard.DashboardView;
import com.application.munera.views.events.EventsView; import com.application.munera.views.events.EventsView;
@ -22,6 +23,7 @@ import com.vaadin.flow.router.PageTitle;
import com.vaadin.flow.server.StreamResource; import com.vaadin.flow.server.StreamResource;
import com.vaadin.flow.spring.security.AuthenticationContext; import com.vaadin.flow.spring.security.AuthenticationContext;
import com.vaadin.flow.theme.lumo.LumoUtility; import com.vaadin.flow.theme.lumo.LumoUtility;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.vaadin.lineawesome.LineAwesomeIcon; import org.vaadin.lineawesome.LineAwesomeIcon;
/** /**
@ -34,11 +36,13 @@ public class MainLayout extends AppLayout {
private final transient AuthenticationContext authContext; private final transient AuthenticationContext authContext;
private final CSVService csvService; private final CSVService csvService;
private final ExpenseService expenseService; private final ExpenseService expenseService;
private final UserService userService;
public MainLayout(AuthenticationContext authContext, CSVService csvService, ExpenseService expenseService) { public MainLayout(AuthenticationContext authContext, CSVService csvService, ExpenseService expenseService, UserService userService) {
this.authContext = authContext; this.authContext = authContext;
this.csvService = csvService; this.csvService = csvService;
this.expenseService = expenseService; this.expenseService = expenseService;
this.userService = userService;
setPrimarySection(Section.DRAWER); setPrimarySection(Section.DRAWER);
addDrawerContent(); addDrawerContent();
addHeaderContent(); addHeaderContent();
@ -112,18 +116,26 @@ public class MainLayout extends AppLayout {
private SideNav createNavigation() { private SideNav createNavigation() {
SideNav nav = new SideNav(); SideNav nav = new SideNav();
// Common menu items
nav.addItem(new SideNavItem("Expenses", ExpensesView.class, LineAwesomeIcon.MONEY_BILL_SOLID.create())); nav.addItem(new SideNavItem("Expenses", ExpensesView.class, LineAwesomeIcon.MONEY_BILL_SOLID.create()));
nav.addItem(new SideNavItem("Categories", CategoriesView.class, LineAwesomeIcon.FOLDER.create())); nav.addItem(new SideNavItem("Categories", CategoriesView.class, LineAwesomeIcon.FOLDER.create()));
nav.addItem(new SideNavItem("People", PeopleView.class, LineAwesomeIcon.USER.create())); nav.addItem(new SideNavItem("People", PeopleView.class, LineAwesomeIcon.USER.create()));
nav.addItem(new SideNavItem("Events", EventsView.class, LineAwesomeIcon.BANDCAMP.create())); nav.addItem(new SideNavItem("Events", EventsView.class, LineAwesomeIcon.BANDCAMP.create()));
nav.addItem(new SideNavItem("Dashboard", DashboardView.class, LineAwesomeIcon.CHART_LINE_SOLID.create())); nav.addItem(new SideNavItem("Dashboard", DashboardView.class, LineAwesomeIcon.CHART_LINE_SOLID.create()));
nav.addItem(new SideNavItem("Users", UsersView.class, LineAwesomeIcon.USER_LOCK_SOLID.create()));
nav.addItem(new SideNavItem("Settings", SettingsView.class, LineAwesomeIcon.COG_SOLID.create()));
// Check user roles before adding sensitive menu items
if (isUserAdmin())
nav.addItem(new SideNavItem("Users", UsersView.class, LineAwesomeIcon.USER_LOCK_SOLID.create()));
nav.addItem(new SideNavItem("Settings", SettingsView.class, LineAwesomeIcon.COG_SOLID.create()));
return nav; return nav;
} }
private boolean isUserAdmin() {
final var user = userService.getLoggedInUser().orElseThrow(() -> new UsernameNotFoundException("User not found"));
return user.getRoles().contains("ROLE_ADMIN");
}
private Footer createFooter() { private Footer createFooter() {
return new Footer(); return new Footer();
} }
@ -138,7 +150,6 @@ public class MainLayout extends AppLayout {
exportToCSVButton.setVisible(isExpensesView); exportToCSVButton.setVisible(isExpensesView);
} }
private String getCurrentPageTitle() { private String getCurrentPageTitle() {
PageTitle title = getContent().getClass().getAnnotation(PageTitle.class); PageTitle title = getContent().getClass().getAnnotation(PageTitle.class);
return title == null ? "" : title.value(); return title == null ? "" : title.value();