From f0b77cb52a010e8b3fa0106c117fbf3cde768090 Mon Sep 17 00:00:00 2001
From: rdavydov <15850461+rdavydov@users.noreply.github.com>
Date: Tue, 15 Nov 2022 23:57:24 +0300
Subject: [PATCH] add checks to fix 'ERR_BADAUTH'

---
 TwitchChannelPointsMiner/TwitchChannelPointsMiner.py |  7 +++++++
 TwitchChannelPointsMiner/classes/TwitchLogin.py      | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py
index 941d4a1..5541b8f 100644
--- a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py
+++ b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py
@@ -287,6 +287,13 @@ class TwitchChannelPointsMiner:
 
             # Subscribe to community-points-user. Get update for points spent or gains
             user_id = self.twitch.twitch_login.get_user_id()
+            #print(f"!!!!!!!!!!!!!! USER_ID: {user_id}")
+            
+            # Fixes 'ERR_BADAUTH'
+            if not user_id:
+                logger.error("No user_id, exiting...")
+                self.end(0, 0)
+
             self.ws_pool.submit(
                 PubsubTopic(
                     "community-points-user-v1",
diff --git a/TwitchChannelPointsMiner/classes/TwitchLogin.py b/TwitchChannelPointsMiner/classes/TwitchLogin.py
index 30d89f7..4e7b2fd 100644
--- a/TwitchChannelPointsMiner/classes/TwitchLogin.py
+++ b/TwitchChannelPointsMiner/classes/TwitchLogin.py
@@ -207,15 +207,19 @@ class TwitchLogin(object):
         input()
 
         logger.info("Extracting cookies...")
-
         self.cookies = driver.get_cookies()
+        #print(self.cookies)
+        #driver.close()
         driver.quit()
         self.username = self.get_cookie_value("login")
+        #print(f"self.username: {self.username}")
+
+        if not self.username:
+            logger.error("Couldn't extract login, probably bad cookies.")
+            return False
 
         return self.get_cookie_value("auth-token")
 
-
-
     def check_login(self):
         if self.login_check_result:
             return self.login_check_result