fix: Correctly insert/update player uuids in converters

Author: Xephi

authme-core/src/main/java/fr/xephi/authme/datasource/PostgreSqlDataSource.java

@@ -457,6 +457,8 @@ public boolean setTotpKey(String user, String totpKey) {
     private PlayerAuth buildAuthFromResultSet(ResultSet row) throws SQLException {
         String salt = col.SALT.isEmpty() ? null : row.getString(col.SALT);
         int group = col.GROUP.isEmpty() ? -1 : row.getInt(col.GROUP);
+        UUID uuid = col.PLAYER_UUID.isEmpty()
+            ? null : UuidUtils.parseUuidSafely(row.getString(col.PLAYER_UUID));
         UUID premiumUuid = col.PREMIUM_UUID.isEmpty()
             ? null : UuidUtils.parseUuidSafely(row.getString(col.PREMIUM_UUID));
         return PlayerAuth.builder()
@@ -476,6 +478,7 @@ private PlayerAuth buildAuthFromResultSet(ResultSet row) throws SQLException {
             .locZ(row.getDouble(col.LASTLOC_Z))
             .locYaw(row.getFloat(col.LASTLOC_YAW))
             .locPitch(row.getFloat(col.LASTLOC_PITCH))
+            .uuid(uuid)
             .premiumUuid(premiumUuid)
             .build();
     }

authme-core/src/main/java/fr/xephi/authme/datasource/SQLite.java

@@ -378,6 +378,8 @@ public synchronized boolean setTotpKey(String user, String totpKey) {
 
     private PlayerAuth buildAuthFromResultSet(ResultSet row) throws SQLException {
         String salt = !col.SALT.isEmpty() ? row.getString(col.SALT) : null;
+        UUID uuid = col.PLAYER_UUID.isEmpty()
+            ? null : UuidUtils.parseUuidSafely(row.getString(col.PLAYER_UUID));
         UUID premiumUuid = col.PREMIUM_UUID.isEmpty()
             ? null : UuidUtils.parseUuidSafely(row.getString(col.PREMIUM_UUID));
 
@@ -397,6 +399,7 @@ private PlayerAuth buildAuthFromResultSet(ResultSet row) throws SQLException {
             .locWorld(row.getString(col.LASTLOC_WORLD))
             .locYaw(row.getFloat(col.LASTLOC_YAW))
             .locPitch(row.getFloat(col.LASTLOC_PITCH))
+            .uuid(uuid)
             .premiumUuid(premiumUuid)
             .build();
     }

authme-core/src/main/java/fr/xephi/authme/datasource/converter/AbstractDataSourceConverter.java

@@ -66,6 +66,9 @@ public void execute(CommandSender sender) {
                 destination.saveAuth(auth);
                 destination.updateSession(auth);
                 destination.updateQuitLoc(auth);
+                if (auth.getPremiumUuid() != null) {
+                    destination.updatePremiumUuid(auth);
+                }
             }
         }
 

authme-core/src/test/java/fr/xephi/authme/datasource/SQLiteIntegrationTest.java

@@ -18,8 +18,13 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import java.util.List;
+import java.util.UUID;
+
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -47,6 +52,7 @@ static void initializeSettings() throws IOException, ClassNotFoundException {
         TestHelper.returnDefaultsForAllProperties(settings);
         set(DatabaseSettings.MYSQL_DATABASE, "sqlite-test");
         set(DatabaseSettings.MYSQL_TABLE, "authme");
+        set(DatabaseSettings.MYSQL_COL_PLAYER_UUID, "playerUUID");
         TestHelper.setupLogger();
 
         Path sqlInitFile = TestHelper.getJarPath(TestHelper.PROJECT_ROOT + "datasource/sql-initialize.sql");
@@ -111,6 +117,24 @@ void shouldCreateMissingColumns() throws SQLException {
         assertThat(sqLite.getAllAuths(), hasSize(1));
     }
 
+    @Test
+    void shouldReadPlayerUuidFromGetAllAuths() {
+        // given
+        SQLite sqLite = new SQLite(settings, null, con);
+
+        // when
+        List<PlayerAuth> auths = sqLite.getAllAuths();
+
+        // then - bobby has playerUUID set in test data, user does not
+        PlayerAuth bobby = auths.stream().filter(a -> "bobby".equals(a.getNickname())).findFirst().orElse(null);
+        assertThat(bobby, notNullValue());
+        assertThat(bobby.getUuid(), equalTo(UUID.fromString("a8674b3e-7c1a-4cfa-8f37-1c6e7d2b9f44")));
+
+        PlayerAuth user = auths.stream().filter(a -> "user".equals(a.getNickname())).findFirst().orElse(null);
+        assertThat(user, notNullValue());
+        assertThat(user.getUuid(), equalTo(null));
+    }
+
     @Override
     protected DataSource getDataSource(String saltColumn) {
         when(settings.getProperty(DatabaseSettings.MYSQL_COL_SALT)).thenReturn(saltColumn);

authme-core/src/test/resources/fr/xephi/authme/datasource/sql-initialize.sql

@@ -20,10 +20,11 @@ CREATE TABLE authme (
     realname VARCHAR(255) NOT NULL DEFAULT 'Player',
     salt varchar(255),
     hasSession INT NOT NULL DEFAULT '0',
-    premiumUUID VARCHAR(36)
+    premiumUUID VARCHAR(36),
+    playerUUID VARCHAR(36)
 );
 
-INSERT INTO authme (username, password, ip, lastlogin, x, y, z, world, yaw, pitch, email, isLogged, realname, salt, regdate, regip, totp)
-VALUES ('bobby','$SHA$11aa0706173d7272$dbba966','123.45.67.89',1449136800,1.05,2.1,4.2,'world',-0.44,2.77,'your@email.com',0,'Bobby',NULL,1436778723,'127.0.4.22','JBSWY3DPEHPK3PXP');
+INSERT INTO authme (username, password, ip, lastlogin, x, y, z, world, yaw, pitch, email, isLogged, realname, salt, regdate, regip, totp, playerUUID)
+VALUES ('bobby','$SHA$11aa0706173d7272$dbba966','123.45.67.89',1449136800,1.05,2.1,4.2,'world',-0.44,2.77,'your@email.com',0,'Bobby',NULL,1436778723,'127.0.4.22','JBSWY3DPEHPK3PXP','a8674b3e-7c1a-4cfa-8f37-1c6e7d2b9f44');
 INSERT INTO authme (username, password, ip, lastlogin, x, y, z, world, yaw, pitch, email, isLogged, realname, salt, regdate)
 VALUES ('user','b28c32f624a4eb161d6adc9acb5bfc5b','34.56.78.90',1453242857,124.1,76.3,-127.8,'nether',0.23,4.88,'user@example.org',0,'user','f750ba32',0);