Skip to content

Commit 96868ad

Browse files
committed
feat(users): not keeping UUIDs of existing users in white/ops list
1 parent 1a7997f commit 96868ad

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

src/main/java/me/itzg/helpers/users/ManageUsersCommand.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,6 @@ private JavaUser resolveJavaUserId(SharedFetch sharedFetch, List<? extends JavaU
233233
return getOfflineUUID(user.getName());
234234
}
235235

236-
// ...or username
237-
for (final JavaUser existingUser : existing) {
238-
if (existingUser.getName().equalsIgnoreCase(user.getName())) {
239-
log.debug("Resolved '{}' from existing user entry by name: {}", user.getName(), existingUser);
240-
return existingUser;
241-
}
242-
}
243-
244236
final Path userCacheFile = outputDirectory.resolve("usercache.json");
245237
if (Files.exists(userCacheFile)) {
246238
try {

src/test/java/me/itzg/helpers/users/ManageUsersCommandTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ void givenNamesAndAllExist(WireMockRuntimeInfo wmInfo) throws IOException {
112112
)
113113
);
114114

115-
verify(0, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user1")));
116-
verify(0, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user2")));
115+
verify(1, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user1")));
116+
verify(1, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user2")));
117117
}
118118

119119
@Test
@@ -230,7 +230,7 @@ void oneLessInList(WireMockRuntimeInfo wmInfo) throws IOException {
230230
)
231231
);
232232

233-
verify(0, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user1")));
233+
verify(1, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user1")));
234234
verify(0, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user2")));
235235
}
236236

@@ -604,7 +604,7 @@ void changeOnlineToOffline(WireMockRuntimeInfo wmInfo) throws IOException {
604604
);
605605

606606
verify(0, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user1")));
607-
verify(0, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user2")));
607+
verify(1, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user2")));
608608
}
609609

610610
@Test
@@ -650,8 +650,8 @@ void changeOfflineToOnline(WireMockRuntimeInfo wmInfo) throws IOException {
650650
)
651651
);
652652

653-
verify(0, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user1")));
654-
verify(0, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user2")));
653+
verify(1, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user1")));
654+
verify(1, getRequestedFor(urlEqualTo("/users/profiles/minecraft/user2")));
655655
}
656656

657657
}

0 commit comments

Comments
 (0)