lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Make logout Button in dashboard menu context path aware. (#930)

Browse Source 
Signed-off-by: Brandon Schmitt <Brandon.Schmitt@kiwigrid.com>
This commit is contained in:
Brandon Schmitt
2020-02-06 10:27:54 +01:00
committed by GitHub
parent 6c162b2e93
commit b5f46b8b5d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
View File

@@ -28,6 +28,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider;
import org.eclipse.hawkbit.ui.utils.VaadinMessageSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
import org.springframework.web.util.UriComponentsBuilder;
import com.vaadin.server.FontAwesome;
@@ -217,7 +218,7 @@ public final class DashboardMenu extends CustomComponent {
}
private static String generateLogoutUrl() {
final UriComponentsBuilder logout = UriComponentsBuilder.fromPath(LOGOUT_BASE);
final UriComponentsBuilder logout = ServletUriComponentsBuilder.fromCurrentContextPath().path(LOGOUT_BASE);
UserDetailsFormatter.getCurrentTenant().ifPresent(tenant -> logout.queryParam("login",
UriComponentsBuilder.fromPath(LOGIN_BASE).queryParam("tenant", tenant).build().toUriString()));