From 8520369071f65e773e3413420e6f2a738a0cfe9e Mon Sep 17 00:00:00 2001 From: freya02 <41875020+freya022@users.noreply.github.com> Date: Sun, 23 Oct 2022 17:40:39 +0200 Subject: [PATCH] Check for empty token in AuthorizationConfig, instead of JDAImpl (#2230) --- src/main/java/net/dv8tion/jda/internal/JDAImpl.java | 3 --- .../dv8tion/jda/internal/utils/config/AuthorizationConfig.java | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/dv8tion/jda/internal/JDAImpl.java b/src/main/java/net/dv8tion/jda/internal/JDAImpl.java index fee8316045..0e19aa3a2e 100644 --- a/src/main/java/net/dv8tion/jda/internal/JDAImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/JDAImpl.java @@ -293,10 +293,7 @@ public int login(String gatewayUrl, ShardInfo shardInfo, Compression compression this.gatewayUrl = gatewayUrl == null ? getGateway() : gatewayUrl; Checks.notNull(this.gatewayUrl, "Gateway URL"); - String token = authConfig.getToken(); setStatus(Status.LOGGING_IN); - if (token == null || token.isEmpty()) - throw new InvalidTokenException("Provided token was null or empty!"); Map previousContext = null; ConcurrentMap contextMap = metaConfig.getMdcContextMap(); diff --git a/src/main/java/net/dv8tion/jda/internal/utils/config/AuthorizationConfig.java b/src/main/java/net/dv8tion/jda/internal/utils/config/AuthorizationConfig.java index 399b36792a..e980488e7f 100644 --- a/src/main/java/net/dv8tion/jda/internal/utils/config/AuthorizationConfig.java +++ b/src/main/java/net/dv8tion/jda/internal/utils/config/AuthorizationConfig.java @@ -27,7 +27,8 @@ public final class AuthorizationConfig public AuthorizationConfig(@Nonnull String token) { - Checks.notNull(token, "Token"); + Checks.notEmpty(token, "Token"); + Checks.noWhitespace(token, "Token"); setToken(token); }