10000 Handling logged-in user with no roles by AlexisSouquiere · Pull Request #1589 · tchiotludo/akhq · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Handling logged-in user with no roles #1589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2023
Merged

Handling logged-in user with no roles #1589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file 8000
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions client/src/containers/Login/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,22 @@ class Login extends Form {
const currentUserData = res.data;

if (currentUserData.logged) {
sessionStorage.setItem('login', true);
sessionStorage.setItem('user', currentUserData.username);
sessionStorage.setItem('roles', organizeRoles(currentUserData.roles));

const returnTo = sessionStorage.getItem('returnTo');
sessionStorage.removeItem('returnTo');

this.props.history.push({
pathname: returnTo || '/ui'
});

window.location.reload(true);
if (currentUserData.roles) {
sessionStorage.setItem('login', true);
sessionStorage.setItem('user', currentUserData.username);
sessionStorage.setItem('roles', organizeRoles(currentUserData.roles));

const returnTo = sessionStorage.getItem('returnTo');
sessionStorage.removeItem('returnTo');

this.props.history.push({
pathname: returnTo || '/ui'
});

window.location.reload(true);
} else {
toast.error('User logged in but no roles assigned');
}
} else {
toast.error('Wrong Username or Password!');
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/akhq/controllers/AbstractController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ protected List<Group> getUserGroups() {
.collect(Collectors.toList());

// Add the default group if there is one
if (groupBindings.isEmpty() && StringUtils.isNotEmpty(securityProperties.getDefaultGroup())) {
if (groupBindings.isEmpty() && StringUtils.isNotEmpty(securityProperties.getDefaultGroup())
&& securityProperties.getGroups().get(securityProperties.getDefaultGroup()) != null) {
groupBindings.addAll(securityProperties.getGroups().get(securityProperties.getDefaultGroup()));
}

Expand Down
0