Added TOTP support

README.md

@@ -209,6 +209,7 @@ from TwitchChannelPointsMiner.classes.entities.Streamer import Streamer, Streame
 
 twitch_miner = TwitchChannelPointsMiner(
     username="your-twitch-username",
+    otp_secret="",
     password="write-your-secure-psw",           # If no password will be provided, the script will ask interactively
     claim_drops_startup=False,                  # If you want to auto claim all drops from Twitch inventory on the startup
     priority=[                                  # Custom priority in this case for example:

TwitchChannelPointsMiner/TwitchChannelPointsMiner.py

@@ -51,6 +51,7 @@
 class TwitchChannelPointsMiner:
     __slots__ = [
         "username",
+        "otp_secret",
         "twitch",
         "claim_drops_startup",
         "enable_analytics",
@@ -71,6 +72,7 @@ class TwitchChannelPointsMiner:
     def __init__(
         self,
         username: str,
+        otp_secret: str,
         password: str = None,
         claim_drops_startup: bool = False,
         enable_analytics: bool = False,
@@ -105,7 +107,7 @@ def __init__(
         Settings.streamer_settings = streamer_settings
 
         user_agent = get_user_agent("FIREFOX")
-        self.twitch = Twitch(self.username, user_agent, password)
+        self.twitch = Twitch(self.username, user_agent, otp_secret,password)
 
         self.claim_drops_startup = claim_drops_startup
         self.priority = priority if isinstance(priority, list) else [priority]

TwitchChannelPointsMiner/classes/Twitch.py

@@ -62,7 +62,7 @@ class Twitch(object):
         "twilight_build_id_pattern",
     ]
 
-    def __init__(self, username, user_agent, password=None):
+    def __init__(self, username, user_agent, otp_secret,password=None):
         cookies_path = os.path.join(Path().absolute(), "cookies")
         Path(cookies_path).mkdir(parents=True, exist_ok=True)
         self.cookies_file = os.path.join(cookies_path, f"{username}.pkl")
@@ -71,7 +71,7 @@ def __init__(self, username, user_agent, password=None):
             choice(string.ascii_letters + string.digits) for _ in range(32)
         )
         self.twitch_login = TwitchLogin(
-            CLIENT_ID, self.device_id, username, self.user_agent, password=password
+            CLIENT_ID, self.device_id, username, self.user_agent, otp_secret,password=password
         )
         self.running = True
         self.integrity = None

TwitchChannelPointsMiner/classes/TwitchLogin.py

@@ -7,6 +7,7 @@
 import logging
 import os
 import pickle
+import pyotp
 
 import requests
 
@@ -41,12 +42,13 @@ class TwitchLogin(object):
         "session",
         "username",
         "password",
+        "otp_secret",
         "user_id",
         "email",
         "cookies"
     ]
 
-    def __init__(self, client_id, device_id, username, user_agent, password=None):
+    def __init__(self, client_id, device_id, username, user_agent, otp_secret,password=None):
         self.client_id = client_id
         self.device_id = device_id
         self.token = None
@@ -57,6 +59,7 @@ def __init__(self, client_id, device_id, username, user_agent, password=None):
         )
         self.username = username
         self.password = password
+        self.otp_secret = otp_secret
         self.user_id = None
         self.email = None
 
@@ -95,11 +98,16 @@ def login_flow(self):
                     err_code = login_response["error_code"]
                     if err_code in [3011, 3012]:  # missing 2fa token
                         if err_code == 3011:
-                            logger.info(
+                            if self.otp_secret == "":
+                                logger.info(
                                 "Two factor authentication enabled, please enter token below."
-                            )
+                                )
+                            else:
+                                post_data["authy_token"] = pyotp.TOTP(self.otp_secret).now() #HIER MAX
+                                continue
                         else:
                             logger.info("Invalid two factor token, please try again.")
+
 
                         twofa = input("2FA token: ")
                         post_data["authy_token"] = twofa.strip()

requirements.txt

@@ -9,3 +9,4 @@ colorama
 flask
 irc
 pandas
+pyotp