adding captcha handling

Author: RuslanUC

README.md

@@ -38,9 +38,16 @@ async def on_cancel():
 @c.event("on_timeout")
 async def on_timeout():
     print(f"Timeout")
-    
+
+@c.event("on_captcha")
+async def on_captcha(captcha_data):
+    # captcha_data contains captcha_sitekey, captcha_service (hcaptcha), captcha_rqdata and captcha_rqtoken
+    print(f"Captcha!")
+    captcha_key = ... # Solve captcha and get captcha_key
+    return captcha_key
+
 @c.event("on_error")
-async def on_timeout(exc, client):
+async def on_error(exc, client):
     print(f"Error: {exc.__class__.__name__}")
     if client.retries == 1:
         await client.run_task()

example.py

@@ -3,13 +3,11 @@
 
 c = RemoteAuthClient()
 
-
 @c.event("on_fingerprint")
 async def on_fingerprint(data):
     print(f"Fingerprint: {data}")
     print(f"QrCode url: https://api.qrserver.com/v1/create-qr-code/?size=256x256&data={data}")
 
-
 @c.event("on_userdata")
 async def on_userdata(user):
     print(f"ID: {user.id}")
@@ -19,27 +17,29 @@ async def on_userdata(user):
     print(f"Name: {user.getName()}")
     print(f"Avatar URL: {user.getAvatarURL()}")
 
-
 @c.event("on_token")
 async def on_token(token):
     print(f"Token: {token}")
 
-
 @c.event("on_cancel")
 async def on_cancel():
     print(f"Auth canceled!")
 
-
 @c.event("on_timeout")
 async def on_timeout():
     print(f"Timeout")
 
+@c.event("on_captcha")
+async def on_captcha(captcha_data):
+    # captcha_data contains captcha_sitekey, captcha_service (hcaptcha), captcha_rqdata and captcha_rqtoken
+    print(f"Captcha!")
+    captcha_key = ... # Solve captcha and get captcha_key
+    return captcha_key
 
 @c.event("on_error")
-async def on_timeout(exc, client):
+async def on_error(exc, client):
     print(f"Error: {exc.__class__.__name__}")
     if client.retries == 1:
         await client.run_task()
 
-
 run(c.run())

remoteauthclient/remoteauthclient.py

@@ -119,9 +119,9 @@ async def _getToken(self, ticket: str, captcha_key: Optional[str]=None) -> Optio
             j = await resp.json()
             log.debug(f"Response code: {resp.status}")
             log.debug(f"Response body: {j}")
-            # I'm not sure about captcha response
-            if "encrypted_token" not in j and captcha_key is None:
-                captcha_key = await self._event("captcha")
+            if "encrypted_token" not in j and captcha_key is None and j.get("captcha_key") == "captcha-required":
+                del j["captcha_key"]
+                captcha_key = await self._event("captcha", captcha_data=j)
                 if not captcha_key:
                     return
                 return await self._getToken(ticket, captcha_key)

setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import setup
 from os.path import join, dirname
 
 requirements = [
@@ -9,7 +9,7 @@
 
 setup(
     name='remoteauthclient',
-    version='1.3',
+    version='1.4.0b',
     packages=["remoteauthclient"],
     long_description=open(join(dirname(__file__), 'README.md')).read(),
     long_description_content_type="text/markdown",