Adding recaptcha

Tesla changed to use re-captcha so this code uses new recaptcha solver and applies it to authorize call

Author: fkhera

README.md

@@ -50,4 +50,4 @@ crontab -e
 # About code
 * powerwallDriver.py - main driver file
 * powerwallBackup.py  - runs back up for given account (set reserve to 100%) forces charge
-* powerwallTimeOfUser.py - runs time of use given account (set reserve to 0%) forces discharge
+* powerwallTimeOfUse.py - runs time of use given account (set reserve to 0%) forces discharge

captcha.png

@@ -11,7 +11,7 @@
 # The link above allows you to create a acount with 2captcha which is what we use
 # If you know me we can share API key, just reach out to me  thanks
 # Appreciate donations to keep 2captcha going, anything helps
-API_KEY = '8041550c5164a06259d450ef3256ee5d'  # Your 2captcha API KEY
+API_KEY = ''  # Your 2captcha API KEY
 CAPTCHA_ENABLE = True
 
 def main(session, headers):

captcha.svg

@@ -32,7 +32,7 @@
 import random
 import string
 
-import captchasolver
+import recaptchasolver
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -59,7 +59,7 @@ def main(emailItem, passwordItem):
 
     attempts = 0
     tpw = powerwall_site(gateway_host, password, email)  
-    while 'fail' in tpw.token and attempts < 6:
+    while 'fail' in tpw.token and attempts < 5:
         print ("attempts count: ", attempts)
         try:
             attempts = attempts + 1 
@@ -143,19 +143,22 @@ def authenticate(self):
             print "authenticate method"
             auth_url = self.authUrl();
 
-            headers = {
-                'User-Agent' : 'PowerwallDarwinManager' 
-            }
-            #headers = {}
+            #headers = {
+            #    #'User-Agent' : 'PowerwallDarwinManager' 
+            #}
+            headers = {}
             resp = session.get(auth_url, headers=headers)
+            #print (resp.text)
 
-            csrf = re.search(r'name="_csrf".+value="([^"]+)"', resp.text).group(1)
-            transaction_id = re.search(r'name="transaction_id".+value="([^"]+)"', resp.text).group(1)
 
+            recaptcha_site_key = re.search(r".*sitekey.* : '(.*)'", resp.text).group(1)
+            print ('captcha sitekey: ' + recaptcha_site_key)
+            print ('auth url: ' + auth_url)
 
 
-            captchacode = captchasolver.main(session, headers)
-            print("captchacode: ", captchacode)
+            csrf = re.search(r'name="_csrf".+value="([^"]+)"', resp.text).group(1)
+            transaction_id = re.search(r'name="transaction_id".+value="([^"]+)"', resp.text).group(1)
+            captchacode = recaptchasolver.main(recaptcha_site_key, auth_url)
 
             data = {
                 "_csrf": csrf,
@@ -165,8 +168,11 @@ def authenticate(self):
                 "cancel": "",
                 "identity": self.email,
                 "credential": self.password,
-                "captcha" : captchacode
+                "g-recaptcha-response:": captchacode,
+                "recaptcha": captchacode
             }
+            
+            #print(data)
             print "Opening session with login"
             # Important to say redirects false cause this will result in 302 and need to see next data
             resp = session.post(auth_url, headers=headers, data=data, allow_redirects=False)
@@ -253,7 +259,14 @@ def authenticate(self):
 
             # If not MFA This code plays instead , which is parising location
             print "Coming to non MFA flow:"
+            #print (resp)
+            #print ("response text: ==================================")
+            #print (resp.text)
+            #print ("response headers: ----------------------------------------")
+            #print (resp.headers)
+
             code_url = resp.headers["location"]
+            print("location header: " + str(code_url))
             parsed = urlparse.urlparse(code_url)
             code = urlparse.parse_qs(parsed.query)['code']
 

captchasolver.py

@@ -32,7 +32,7 @@
 import random
 import string
 
-import captchasolver
+import recaptchasolver
 
 
 
@@ -142,19 +142,19 @@ def authenticate(self):
             print "authenticate method"
             auth_url = self.authUrl();
 
-            headers = {
-                'User-Agent' : 'PowerwallDarwinManager' 
-            }
-            # headers = {}
+            headers = {}
             resp = session.get(auth_url, headers=headers)
+            #print (resp.text)
 
-            csrf = re.search(r'name="_csrf".+value="([^"]+)"', resp.text).group(1)
-            transaction_id = re.search(r'name="transaction_id".+value="([^"]+)"', resp.text).group(1)
 
+            recaptcha_site_key = re.search(r".*sitekey.* : '(.*)'", resp.text).group(1)
+            print ('captcha sitekey: ' + recaptcha_site_key)
+            print ('auth url: ' + auth_url)
 
 
-            captchacode = captchasolver.main(session, headers)
-            print("captchacode: ", captchacode)
+            csrf = re.search(r'name="_csrf".+value="([^"]+)"', resp.text).group(1)
+            transaction_id = re.search(r'name="transaction_id".+value="([^"]+)"', resp.text).group(1)
+            captchacode = recaptchasolver.main(recaptcha_site_key, auth_url)
 
             data = {
                 "_csrf": csrf,
@@ -164,8 +164,10 @@ def authenticate(self):
                 "cancel": "",
                 "identity": self.email,
                 "credential": self.password,
-                "captcha" : captchacode
+                "g-recaptcha-response:": captchacode,
+                "recaptcha": captchacode
             }
+
             print "Opening session with login"
             # Important to say redirects false cause this will result in 302 and need to see next data
             resp = session.post(auth_url, headers=headers, data=data, allow_redirects=False)