Make 2fa required error readable (#2)

Author: Katistic

generate.sh

@@ -38,4 +38,7 @@ sed -i 's/abcdefvrc//g' ./setup.py
 sed -i '/license/a long_description_content_type="text/markdown",' ./setup.py
 
 # Remove messily pasted markdown at top of every file
-find vrchatapi -type f -exec sed -i '/VRChat API Banner/d' {} \;
+find vrchatapi -type f -exec sed -i '/VRChat API Banner/d' {} \;
+
+# Make 2fa required error readable
+patch ./vrchatapi/rest.py < ./patches/error_2fa_verify_readable.patch

patches/error_2fa_verify_readable.patch

@@ -0,0 +1,15 @@
+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):
+ 
+             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)
++
+         return r
+ 
+     def GET(self, url, headers=None, query_params=None, _preload_content=True,

vrchatapi/rest.py

@@ -239,6 +239,10 @@ def request(self, method, url, query_params=None, headers=None,
 
             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)
+
         return r
 
     def GET(self, url, headers=None, query_params=None, _preload_content=True,