Skip to content

Commit ba3cf1e

Browse files
committed
[NAE-2169] User flag for internal or external
- code cleanup
1 parent e22f3fe commit ba3cf1e

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

application-engine/src/main/java/com/netgrif/application/engine/auth/service/RegistrationService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public void encodeUserPassword(User user) {
117117

118118
@Override
119119
public boolean stringMatchesUserPassword(User user, String passwordToCompare) {
120-
return passwordEncoder.matches(passwordToCompare, user.getPassword());
120+
String encoded = user.getPassword();
121+
return encoded != null && passwordEncoder.matches(passwordToCompare, encoded);
121122
}
122123

123124
@Override

application-engine/src/main/java/com/netgrif/application/engine/impersonation/service/ImpersonationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public User reloadImpersonatedUserRoles(User impersonated, String impersonatorId
153153

154154
@Override
155155
public User applyRolesAndAuthorities(User impersonated, String impersonatorId, List<Case> configs) {
156-
if ((Boolean) userService.findById(impersonatorId, null).getAuthoritySet().contains(new AuthorityImpl(Authority.admin))) {
156+
if (userService.findById(impersonatorId, null).isAdmin()) {
157157
return impersonated;
158158
}
159159
List<Authority> authorities = impersonationAuthorizationService.getAuthorities(configs, impersonated);

application-engine/src/main/java/com/netgrif/application/engine/startup/runner/SuperCreatorRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void run(ApplicationArguments strings) {
4646
createSuperUser();
4747
}
4848

49-
private AbstractUser createSuperUser() {
49+
private User createSuperUser() {
5050
Authority adminAuthority = authorityService.getOrCreate(Authority.admin);
5151
Authority systemAuthority = authorityService.getOrCreate(Authority.systemAdmin);
5252
Set<Authority> authorities = new HashSet<>();

nae-user-common/src/main/java/com/netgrif/application/engine/auth/service/GroupService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package com.netgrif.application.engine.auth.service;
22

3-
import com.netgrif.application.engine.objects.auth.domain.AbstractUser;
43
import com.netgrif.application.engine.objects.auth.domain.Group;
54
import com.netgrif.application.engine.objects.auth.domain.User;
65
import com.netgrif.application.engine.objects.auth.dto.GroupSearchDto;
7-
import org.springframework.data.mongodb.core.query.Query;
86
import com.querydsl.core.types.Predicate;
97
import org.springframework.data.domain.Page;
108
import org.springframework.data.domain.Pageable;
9+
import org.springframework.data.mongodb.core.query.Query;
1110
import org.springframework.data.util.Pair;
1211

1312
import java.util.Collection;
14-
import java.util.Optional;
1513
import java.util.List;
14+
import java.util.Optional;
1615

1716
/**
1817
* Service interface for managing user groups in the application.

0 commit comments

Comments
 (0)