diff --git a/goofy-server/src/main/java/de/itvsh/goofy/JwtTokenUtil.java b/goofy-server/src/main/java/de/itvsh/goofy/JwtTokenUtil.java
index 32d1635401ae7ddc7a012bf40b0c43cc470adb6d..ac0bb5d7018b758d167081e698511277bd574f07 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/JwtTokenUtil.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/JwtTokenUtil.java
@@ -41,7 +41,7 @@ import com.auth0.jwt.exceptions.JWTVerificationException;
import de.itvsh.goofy.common.binaryfile.FileId;
import de.itvsh.goofy.common.downloadtoken.DownloadTokenProperties;
-import de.itvsh.goofy.common.user.GoofyUser;
+import de.itvsh.goofy.common.user.UserProfile;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
@@ -96,7 +96,7 @@ public class JwtTokenUtil {
return organisationseinheitIds;
}
- public String generateToken(FileId fileId, GoofyUser user) {
+ public String generateToken(FileId fileId, UserProfile user) {
var claims = new HashMap<String, Object>();
claims.put(USERID_CLAIM, user.getId().toString());
claims.put(FIRSTNAME_CLAIM, user.getFirstName());
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/binaryfile/GoofyUserWithFileId.java b/goofy-server/src/main/java/de/itvsh/goofy/common/binaryfile/GoofyUserWithFileId.java
index 490dc6dd3ba22ec7219f7779a02c3b04563a14c1..f3156b59eacd6b043ba29455e99b8716c2368972 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/binaryfile/GoofyUserWithFileId.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/binaryfile/GoofyUserWithFileId.java
@@ -29,14 +29,14 @@ import java.util.Objects;
import org.springframework.security.core.GrantedAuthority;
-import de.itvsh.goofy.common.user.GoofyUser;
+import de.itvsh.goofy.common.user.UserProfile;
import lombok.Builder;
import lombok.Getter;
@Builder
@Getter
public class GoofyUserWithFileId {
- private GoofyUser user;
+ private UserProfile user;
private FileId fileId;
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/downloadtoken/DownloadTokenService.java b/goofy-server/src/main/java/de/itvsh/goofy/common/downloadtoken/DownloadTokenService.java
index 39bc779a5f9ac8c6fbdd2decf6f0b3f3ba174b66..e4b234bac54a3eb29c511d494394f0f1c9eeb0c0 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/downloadtoken/DownloadTokenService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/downloadtoken/DownloadTokenService.java
@@ -43,7 +43,7 @@ import de.itvsh.goofy.JwtTokenUtil;
import de.itvsh.goofy.common.binaryfile.FileId;
import de.itvsh.goofy.common.binaryfile.GoofyUserWithFileId;
import de.itvsh.goofy.common.user.CurrentUserService;
-import de.itvsh.goofy.common.user.GoofyUser;
+import de.itvsh.goofy.common.user.UserProfile;
import de.itvsh.goofy.common.user.UserId;
import de.itvsh.kop.common.errorhandling.TechnicalException;
import io.jsonwebtoken.Claims;
@@ -90,7 +90,7 @@ class DownloadTokenService {
Optional<Claims> claimsOptional = jwtTokenUtil.getAllClaimsFromToken(token);
var downloadUserBuilder = GoofyUserWithFileId.builder();
claimsOptional.ifPresent(claims -> downloadUserBuilder.user(
- GoofyUser.builder()
+ UserProfile.builder()
.id(UserId.from(claims.get(USERID_CLAIM, String.class)))
.firstName(claims.get(FIRSTNAME_CLAIM, String.class))
.lastName(claims.get(LASTNAME_CLAIM, String.class))
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/user/CurrentUserService.java b/goofy-server/src/main/java/de/itvsh/goofy/common/user/CurrentUserService.java
index 0b8347c0e71a29e4dbf65ff7ac733e8607dbea54..d1692e4371ca85fbb6778655cf4befe325a81c86 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/user/CurrentUserService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/user/CurrentUserService.java
@@ -53,7 +53,7 @@ public class CurrentUserService {
return Collections.unmodifiableCollection(new HashSet<GrantedAuthority>(CurrentUserHelper.getAuthentication().getAuthorities()));
}
- public GoofyUser getUser() {
+ public UserProfile getUser() {
var dlUser = getDownloadUser();
if (dlUser.isPresent()) {
return dlUser.get();
@@ -61,7 +61,7 @@ public class CurrentUserService {
Optional<AccessToken> token = getCurrentSecurityToken();
- var userBuilder = GoofyUser.builder()
+ var userBuilder = UserProfile.builder()
.id(getUserId())
.authorities(getAuthorities());
@@ -83,7 +83,7 @@ public class CurrentUserService {
.stream().map(Object::toString).collect(Collectors.toList());
}
- private Optional<GoofyUser> getDownloadUser() {
+ private Optional<UserProfile> getDownloadUser() {
return Optional.of(CurrentUserHelper.getAuthentication().getPrincipal())
.filter(GoofyUserWithFileId.class::isInstance)
.map(GoofyUserWithFileId.class::cast)
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/user/GoofyUser.java b/goofy-server/src/main/java/de/itvsh/goofy/common/user/UserProfile.java
similarity index 98%
rename from goofy-server/src/main/java/de/itvsh/goofy/common/user/GoofyUser.java
rename to goofy-server/src/main/java/de/itvsh/goofy/common/user/UserProfile.java
index 3f0485edbce1e088b605f002845fc02b2c5f2c13..d53b318add4bda1b9af0ec95f4a880c1cbe68f95 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/user/GoofyUser.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/user/UserProfile.java
@@ -38,7 +38,7 @@ import lombok.Singular;
@Builder
@Getter
@AllArgsConstructor
-public class GoofyUser {
+public class UserProfile {
@JsonIgnore
private UserId id;
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/user/UserRemoteService.java b/goofy-server/src/main/java/de/itvsh/goofy/common/user/UserRemoteService.java
index bdcb42cc28e7181a3e706bd500cedf85487960aa..e9000a152dc06d12a0801f5f934e31ec6eba2aa0 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/user/UserRemoteService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/user/UserRemoteService.java
@@ -68,7 +68,7 @@ public class UserRemoteService {
}
}
- public Optional<GoofyUser> getUser(UserId userId) {
+ public Optional<UserProfile> getUser(UserId userId) {
return executeHandlingException(() -> getUserById(userId));
}
@@ -83,7 +83,7 @@ public class UserRemoteService {
}
}
- <T> GoofyUser getUserById(UserId userId) {
+ <T> UserProfile getUserById(UserId userId) {
return buildUser(getBodyMap(doExchange(userId)));
}
@@ -111,8 +111,8 @@ public class UserRemoteService {
return (LinkedHashMap<String, Object>) responseEntity.getBody();
}
- GoofyUser buildUser(LinkedHashMap<String, Object> bodyMap) {
- return GoofyUser.builder()
+ UserProfile buildUser(LinkedHashMap<String, Object> bodyMap) {
+ return UserProfile.builder()
.firstName((String) bodyMap.getOrDefault(FIRST_NAME_KEY, StringUtils.EMPTY))
.lastName((String) bodyMap.getOrDefault(LAST_NAME_KEY, StringUtils.EMPTY))
.build();
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/user/UserService.java b/goofy-server/src/main/java/de/itvsh/goofy/common/user/UserService.java
index 19f64d7ac157a1729bf3ee5a7a59057edecc54ae..80d16167164f249df9b11e6a1103dff2f7c67dfc 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/user/UserService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/user/UserService.java
@@ -11,7 +11,7 @@ public class UserService {
@Autowired
private UserRemoteService remoteService;
- public Optional<GoofyUser> getById(UserId userId) {
+ public Optional<UserProfile> getById(UserId userId) {
return remoteService.getUser(userId);
}
}
\ No newline at end of file
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/common/downloadtoken/DownloadTokenServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/common/downloadtoken/DownloadTokenServiceTest.java
index 780c244e10df6314437b71f5a34a8aa74f58eec5..bf9d88ebc233f3c1a16d8602a443717ba3ca3069 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/common/downloadtoken/DownloadTokenServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/common/downloadtoken/DownloadTokenServiceTest.java
@@ -47,7 +47,7 @@ import com.auth0.jwt.exceptions.JWTVerificationException;
import de.itvsh.goofy.JwtTokenUtil;
import de.itvsh.goofy.common.binaryfile.FileId;
import de.itvsh.goofy.common.user.CurrentUserService;
-import de.itvsh.goofy.common.user.GoofyUser;
+import de.itvsh.goofy.common.user.UserProfile;
import de.itvsh.goofy.common.user.UserProfileTestFactory;
import de.itvsh.kop.common.errorhandling.TechnicalException;
import io.jsonwebtoken.Claims;
@@ -73,7 +73,7 @@ class DownloadTokenServiceTest {
final FileId fileId = FileId.createNew();
- final GoofyUser user = UserProfileTestFactory.create();
+ final UserProfile user = UserProfileTestFactory.create();
@BeforeEach
void mockUserService() {
@@ -111,7 +111,7 @@ class DownloadTokenServiceTest {
void shouldGetUserFromTokenWithoutUserFirstname() {
mockClaims(null, FIRSTNAME_CLAIM);
- GoofyUser user = service.getUserFromToken(FAKE_TOKEN).getUser();
+ UserProfile user = service.getUserFromToken(FAKE_TOKEN).getUser();
assertThat(user).isNotNull();
}
@@ -120,7 +120,7 @@ class DownloadTokenServiceTest {
void shouldGetUserFromTokenWithoutUserLastname() {
mockClaims(FIRSTNAME_CLAIM, null);
- GoofyUser user = service.getUserFromToken(FAKE_TOKEN).getUser();
+ UserProfile user = service.getUserFromToken(FAKE_TOKEN).getUser();
assertThat(user).isNotNull();
}
@@ -129,7 +129,7 @@ class DownloadTokenServiceTest {
void shouldGetOrganisationseinheitIdsFromToken() {
mockClaims(FIRSTNAME_CLAIM, LASTNAME_CLAIM);
- GoofyUser user = service.getUserFromToken(FAKE_TOKEN).getUser();
+ UserProfile user = service.getUserFromToken(FAKE_TOKEN).getUser();
assertThat(user.getOrganisationseinheitIds()).isEqualTo(ORGE_IDS);
}
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/common/user/UserProfileTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/common/user/UserProfileTestFactory.java
index 4e31f6e68ae2caf2eaffaf40798bcdbbe9b134c2..226531aa45a4892e63c5adb9ba073c150a8d017b 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/common/user/UserProfileTestFactory.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/common/user/UserProfileTestFactory.java
@@ -40,12 +40,12 @@ public class UserProfileTestFactory {
public static final String ROLE = "TEST_USER";
public static final GrantedAuthority AUTHORITY = new SimpleGrantedAuthority(ROLE);
- public static GoofyUser create() {
+ public static UserProfile create() {
return createBuilder().build();
}
- public static GoofyUser.GoofyUserBuilder createBuilder() {
- return GoofyUser.builder()
+ public static UserProfile.UserProfileBuilder createBuilder() {
+ return UserProfile.builder()
.id(ID)
.firstName(FIRSTNAME)
.lastName(LASTNAME)