fix(helix): avoid NPE from user passing null client id (#804)

twitch4j · Jul 1, 2023 · 42d5bfc · 42d5bfc
1 parent 974c93f
commit 42d5bfc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/rest-helix/src/main/java/com/github/twitch4j/helix/interceptor/TwitchHelixTokenManager.java b/rest-helix/src/main/java/com/github/twitch4j/helix/interceptor/TwitchHelixTokenManager.java
@@ -13,6 +13,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.time.Duration;
+import java.util.Objects;
 
 @Slf4j
 public final class TwitchHelixTokenManager {
@@ -62,7 +63,7 @@ public TwitchHelixTokenManager(String clientId, String clientSecret, OAuth2Crede
         this.defaultAuthToken = defaultAuthToken;
 
         if (defaultAuthToken != null) {
-            this.defaultClientId = defaultAuthToken.getContext().getOrDefault(CLIENT_ID_CONTEXT, clientId).toString();
+            this.defaultClientId = Objects.toString(defaultAuthToken.getContext().getOrDefault(CLIENT_ID_CONTEXT, clientId), null);
             twitchIdentityProvider.getAdditionalCredentialInformation(defaultAuthToken).ifPresent(oauth -> {
                 populateCache(oauth);
                 this.defaultClientId = extractClientId(oauth);