Skip to content

Commit eca2f52

Browse files
LielAmarLielAmar
authored
Merge pull request #72 from LielAmar/dev
Updated h2, fixed a legacy enum problem
2 parents b3cb3bb + e4a0852 commit eca2f52

16 files changed

Lines changed: 68 additions & 41 deletions

File tree

‎pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.lielamar</groupId>
88
<artifactId>2fa</artifactId>
9-
<version>1.5.6</version>
9+
<version>1.5.7</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -39,7 +39,7 @@
3939
<version.googleauth>1.5.0</version.googleauth>
4040
<version.commons-codec>1.15</version.commons-codec>
4141
<version.hikari-cp>4.0.3</version.hikari-cp>
42-
<version.h2>2.0.206</version.h2>
42+
<version.h2>2.1.210</version.h2>
4343
<version.mysql>8.0.26</version.mysql>
4444
<version.maria-db>2.7.3</version.maria-db>
4545
<version.postgres>42.3.1</version.postgres>
@@ -157,6 +157,13 @@
157157
<scope>compile</scope>
158158
</dependency>
159159

160+
<!-- <dependency>-->
161+
<!-- <groupId>org.spigotmc</groupId>-->
162+
<!-- <artifactId>spigot-api</artifactId>-->
163+
<!-- <version>1.8.8-R0.1-SNAPSHOT</version>-->
164+
<!-- <scope>provided</scope>-->
165+
<!-- </dependency>-->
166+
160167
<dependency>
161168
<groupId>org.spigotmc</groupId>
162169
<artifactId>spigot-api</artifactId>

‎src/main/java/com/lielamar/auth/bukkit/TwoFactorAuthentication.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.lielamar.auth.bukkit;
22

3-
import com.lielamar.auth.bukkit.handlers.*;
4-
import com.lielamar.auth.shared.handlers.PluginMessagingHandler;
5-
import com.lielamar.auth.shared.storage.StorageHandler;
6-
import com.lielamar.lielsutils.bstats.MetricsSpigot;
73
import com.lielamar.auth.bukkit.commands.CommandHandler;
4+
import com.lielamar.auth.bukkit.handlers.*;
85
import com.lielamar.auth.bukkit.listeners.DisabledEvents;
96
import com.lielamar.auth.bukkit.listeners.OnAuthStateChange;
107
import com.lielamar.auth.bukkit.listeners.OnPlayerConnection;
8+
import com.lielamar.auth.shared.handlers.PluginMessagingHandler;
9+
import com.lielamar.auth.shared.storage.StorageHandler;
10+
import com.lielamar.lielsutils.bstats.MetricsSpigot;
1111
import com.lielamar.lielsutils.files.FileManager;
1212
import com.lielamar.lielsutils.update.UpdateChecker;
1313
import org.bukkit.Bukkit;

‎src/main/java/com/lielamar/auth/bukkit/commands/subcommands/CancelCommand.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
import org.bukkit.command.CommandSender;
88
import org.bukkit.entity.Player;
99

10-
import java.util.ArrayList;
11-
import java.util.List;
12-
1310
public class CancelCommand extends Command {
1411

1512
private final TwoFactorAuthentication main;

‎src/main/java/com/lielamar/auth/bukkit/commands/subcommands/DisableForOthersCommand.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package com.lielamar.auth.bukkit.commands.subcommands;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
import java.util.UUID;
6-
import java.util.stream.Collectors;
7-
3+
import com.lielamar.auth.bukkit.TwoFactorAuthentication;
4+
import com.lielamar.auth.shared.handlers.MessageHandler;
5+
import com.lielamar.auth.shared.utils.AuthUtils;
86
import com.lielamar.lielsutils.commands.Command;
97
import com.lielamar.lielsutils.modules.Pair;
10-
import org.bukkit.entity.Player;
11-
import com.lielamar.auth.shared.utils.AuthUtils;
128
import org.bukkit.Bukkit;
13-
import org.bukkit.command.CommandSender;
149
import org.bukkit.ChatColor;
15-
import com.lielamar.auth.shared.handlers.MessageHandler;
16-
import com.lielamar.auth.bukkit.TwoFactorAuthentication;
10+
import org.bukkit.command.CommandSender;
11+
import org.bukkit.entity.Player;
12+
13+
import java.util.ArrayList;
14+
import java.util.List;
15+
import java.util.UUID;
16+
import java.util.stream.Collectors;
1717

1818
public class DisableForOthersCommand extends Command {
1919

‎src/main/java/com/lielamar/auth/bukkit/handlers/AuthHandler.java‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,14 @@
1111
import com.lielamar.auth.shared.utils.hash.SHA512;
1212
import com.lielamar.lielsutils.ColorUtils;
1313
import com.lielamar.lielsutils.SpigotUtils;
14-
import net.md_5.bungee.api.chat.*;
15-
import org.bukkit.*;
14+
import net.md_5.bungee.api.chat.ClickEvent;
15+
import net.md_5.bungee.api.chat.ComponentBuilder;
16+
import net.md_5.bungee.api.chat.HoverEvent;
17+
import net.md_5.bungee.api.chat.TextComponent;
18+
import org.bukkit.Bukkit;
19+
import org.bukkit.ChatColor;
20+
import org.bukkit.Material;
21+
import org.bukkit.World;
1622
import org.bukkit.entity.Player;
1723
import org.bukkit.inventory.ItemStack;
1824
import org.bukkit.inventory.meta.ItemMeta;
@@ -24,7 +30,9 @@
2430
import java.io.UnsupportedEncodingException;
2531
import java.net.URLEncoder;
2632
import java.nio.charset.StandardCharsets;
27-
import java.util.*;
33+
import java.util.HashMap;
34+
import java.util.Map;
35+
import java.util.UUID;
2836

2937
public class AuthHandler extends com.lielamar.auth.shared.handlers.AuthHandler {
3038

@@ -354,13 +362,22 @@ public void run() {
354362
}
355363
}
356364

357-
sendClickableMessage(player,
358-
ColorUtils.translateAlternateColorCodes('&', MessageHandler.TwoFAMessages.PREFIX.getMessage() + MessageHandler.TwoFAMessages.CLICK_TO_OPEN_QR.getMessage()),
359-
url.replaceAll("128x128", "256x256"));
360-
361-
sendHoverMessage(player,
362-
ColorUtils.translateAlternateColorCodes('&', MessageHandler.TwoFAMessages.PREFIX.getMessage() + MessageHandler.TwoFAMessages.USE_QR_CODE_TO_SETUP_2FA.getMessage()),
363-
ColorUtils.translateAlternateColorCodes('&', "&7Key: &b" + getPendingKey(player.getUniqueId())));
365+
// If the player's key is not null we want to send him the hover and clickable messages
366+
// with the key and the link to the QR image.
367+
// otherwise, we would want to completely void the player's key data, remove the QRItem and also send him a message about the issue.
368+
if (getPendingKey(player.getUniqueId()) != null) {
369+
sendClickableMessage(player,
370+
ColorUtils.translateAlternateColorCodes('&', MessageHandler.TwoFAMessages.PREFIX.getMessage() + MessageHandler.TwoFAMessages.CLICK_TO_OPEN_QR.getMessage()),
371+
url.replaceAll("128x128", "256x256"));
372+
373+
sendHoverMessage(player,
374+
ColorUtils.translateAlternateColorCodes('&', MessageHandler.TwoFAMessages.PREFIX.getMessage() + MessageHandler.TwoFAMessages.USE_QR_CODE_TO_SETUP_2FA.getMessage()),
375+
ColorUtils.translateAlternateColorCodes('&', "&7Key: &b" + getPendingKey(player.getUniqueId())));
376+
} else {
377+
removeQRItem(player);
378+
resetKey(player.getUniqueId());
379+
main.getMessageHandler().sendMessage(player, MessageHandler.TwoFAMessages.NULL_KEY);
380+
}
364381
} catch (IOException | NumberFormatException exception) {
365382
exception.printStackTrace();
366383
player.sendMessage(ChatColor.RED + "An error occurred! Is the URL correct?");

‎src/main/java/com/lielamar/auth/bukkit/handlers/BungeecordMessageHandler.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.google.common.io.ByteArrayDataInput;
44
import com.google.common.io.ByteArrayDataOutput;
55
import com.google.common.io.ByteStreams;
6-
76
import com.lielamar.auth.bukkit.TwoFactorAuthentication;
87
import com.lielamar.auth.shared.handlers.AuthHandler;
98
import com.lielamar.auth.shared.handlers.Callback;

‎src/main/java/com/lielamar/auth/bukkit/handlers/DependencyHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.bukkit.ChatColor;
88
import org.bukkit.plugin.Plugin;
99

10-
import java.io.*;
10+
import java.io.IOException;
1111
import java.util.Properties;
1212

1313
public class DependencyHandler {
@@ -58,7 +58,7 @@ private void loadDependencies(Plugin plugin, Properties properties) {
5858
String googleAuthVersion = properties.getProperty("version_google_auth", "1.5.0");
5959
String commonsCodecVersion = properties.getProperty("version_commons_codec", "1.15");
6060
String hikariCpVersion = properties.getProperty("version_hikari_cp", "4.0.3");
61-
String h2Version = properties.getProperty("version_h2", "2.0.204");
61+
String h2Version = properties.getProperty("version_h2", "2.1.210");
6262
String mysqlVersion = properties.getProperty("version_mysql", "8.0.26");
6363
String mariaDBVersion = properties.getProperty("version_maria_db", "2.7.3");
6464
String postgresVersion = properties.getProperty("version_postgres", "42.3.1");

‎src/main/java/com/lielamar/auth/bukkit/listeners/DisabledEvents.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
import com.lielamar.auth.shared.utils.Constants;
66
import org.bukkit.entity.ItemFrame;
77
import org.bukkit.entity.Player;
8-
import org.bukkit.event.*;
8+
import org.bukkit.event.EventHandler;
9+
import org.bukkit.event.EventPriority;
10+
import org.bukkit.event.Listener;
911
import org.bukkit.event.block.BlockBreakEvent;
1012
import org.bukkit.event.block.BlockPlaceEvent;
1113
import org.bukkit.event.entity.EntityDamageByEntityEvent;

‎src/main/java/com/lielamar/auth/bukkit/utils/ImageRender.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.awt.image.BufferedImage;
1313
import java.io.IOException;
1414
import java.lang.ref.SoftReference;
15-
1615
import java.net.URL;
1716

1817
public class ImageRender extends MapRenderer {

‎src/main/java/com/lielamar/auth/bungee/handlers/MessageHandler.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.lielamar.auth.bungee.TwoFactorAuthentication;
44
import com.lielamar.lielsutils.ColorUtils;
5-
import net.md_5.bungee.api.ChatColor;
65
import net.md_5.bungee.api.ChatMessageType;
76
import net.md_5.bungee.api.chat.TextComponent;
87
import net.md_5.bungee.api.connection.ProxiedPlayer;

0 commit comments

Comments
 (0)