Readable Email 2FA Required error + updated example (#7)

* Remove patch code to create new patch

* Include Email 2FA in 2FA Readable Patch

* Include Email 2FA Verification in example

Author: Katistic

README.md

@@ -31,6 +31,7 @@ import vrchatapi
 from vrchatapi.api import authentication_api
 from vrchatapi.exceptions import UnauthorizedException
 from vrchatapi.models.two_factor_auth_code import TwoFactorAuthCode
+from vrchatapi.models.two_factor_email_code import TwoFactorEmailCode
 
 configuration = vrchatapi.Configuration(
     username = 'username',
@@ -50,9 +51,13 @@ with vrchatapi.ApiClient(configuration) as api_client:
         # Step 3. Calling getCurrentUser on Authentication API logs you in if the user isn't already logged in.
         current_user = auth_api.get_current_user()
     except UnauthorizedException as e:
-        if UnauthorizedException.status == 200:
-            # Step 3.5. Calling verify2fa if the account has 2FA enabled
-            auth_api.verify2_fa(two_factor_auth_code=TwoFactorAuthCode(input("2FA Code: ")))
+        if e.status == 200:
+            if "Email 2 Factor Authentication" in e.reason:
+                # Step 3.5. Calling email verify2fa if the account has 2FA disabled
+                auth_api.verify2_fa_email_code(two_factor_email_code=TwoFactorEmailCode(input("Email 2FA Code: ")))
+            elif "2 Factor Authentication" in e.reason:
+                # Step 3.5. Calling verify2fa if the account has 2FA enabled
+                auth_api.verify2_fa(two_factor_auth_code=TwoFactorAuthCode(input("2FA Code: ")))
             current_user = auth_api.get_current_user()
         else:
             print("Exception when calling API: %s\n", e)

patches/error_2fa_verify_readable.patch

@@ -1,14 +1,17 @@
-diff --git a/vrchatapi/rest.py b/vrchatapi/rest.py
-index aac58f3..703ae1b 100644
---- a/vrchatapi/rest.py
-+++ b/vrchatapi/rest.py
-@@ -239,6 +239,10 @@ class RESTClientObject(object):
+diff --git a/./rest.py b/./restpatch.py
+index 3702266e..c19c578c 100644
+--- a/./rest.py
++++ b/./restpatch.py
+@@ -245,6 +245,13 @@ class RESTClientObject(object):
 
              raise ApiException(http_resp=r)
 
 +        if re.match(b'{"\w{21}":\["totp","otp"]}', r.data) is not None:
 +            r.reason = "2 Factor Authentication verification is required"
 +            raise UnauthorizedException(http_resp=r)
++        elif re.match(b'{"\w{21}":\["emailOtp"]}', r.data) is not None:
++            r.reason = "Email 2 Factor Authentication verification is required"
++            raise UnauthorizedException(http_resp=r)
 +
          return r
 

vrchatapi/rest.py

@@ -248,6 +248,9 @@ def request(self, method, url, query_params=None, headers=None,
         if re.match(b'{"\w{21}":\["totp","otp"]}', r.data) is not None:
             r.reason = "2 Factor Authentication verification is required"
             raise UnauthorizedException(http_resp=r)
+        elif re.match(b'{"\w{21}":\["emailOtp"]}', r.data) is not None:
+            r.reason = "Email 2 Factor Authentication verification is required"
+            raise UnauthorizedException(http_resp=r)
 
         return r