Re-implement some error handling

Author: Katistic

vrcpy/client.py

@@ -309,15 +309,15 @@ async def login(self, username, password, mfa=None):
 
         b64 = base64.b64encode((username+":"+password).encode()).decode()
 
-        resp = await self.request.get("/auth/user", headers={"Authorization": "Basic "+b64})
-        if "requiresTwoFactorAuth" in resp["data"]:
+        try:
+            resp = await self.request.get("/auth/user", headers={"Authorization": "Basic "+b64})
+            self.me = CurrentUser(self, resp["data"], self.loop)
+        except ClientErrors.MfaRequired:
             if mfa is None:
                 raise ClientErrors.MfaRequired("Account login requires mfa")
             else:
                 await self.verify_mfa(mfa)
                 await self.fetch_me()
-        else:
-            self.me = CurrentUser(self, resp["data"], self.loop)
 
         await self._pre_loop()
 
@@ -359,10 +359,13 @@ async def verify_mfa(self, mfa: str):
         if type(mfa) is not str or not (len(mfa) == 6 or len(mfa) == 8):
             raise ClientErrors.MfaInvalid("{} is not a valid MFA code".format(mfa))
 
-        await self.request.post("/auth/twofactorauth/{}/verify".format(
+        resp = await self.request.post("/auth/twofactorauth/{}/verify".format(
             "totp" if len(mfa) == 6 else "otp"
         ), json={"code": mfa})
 
+        if not resp["data"]["verified"]:
+            raise ClientErrors.MfaInvalid(f"{mfa} is not a valid MFA code")
+
     async def logout(self, unauth=True):
         '''
         Closes client session and logs out VRC user

vrcpy/request.py

@@ -57,6 +57,7 @@ async def _call(self, method, path, *args, **kwargs):
                         "{} ({} retries)".format(e, self.request_retries)
                     )
 
+        self.raise_for_errors(resp)
         return resp
 
     async def close_session(self):
@@ -80,4 +81,16 @@ async def delete(self, path, *args, **kwargs):
 
     async def patch(self, path, *args, **kwargs):
         resp = await self._call("PATCH", path, *args, **kwargs)
-        return resp
+        return resp
+
+    def raise_for_errors(self, resp):
+        def on_200():
+            if "requiresTwoFactorAuth" in resp["data"]:
+                raise ClientErrors.MfaRequired("Account login requires mfa")
+
+        switch = {
+            200: on_200
+        }
+
+        if resp["status"] in switch:
+            switch[resp["status"]]()