Add missing type hints and fix most type errors except for Optionals.

mautrix_telegram/web/common/auth_api.py

@@ -23,7 +23,7 @@ from telethon.errors import *
 
 from ...commands.auth import enter_password
 from ...util import format_duration
-from ...puppet import Puppet
+from ...puppet import Puppet, PuppetError
 from ...user import User
 
 
@@ -51,12 +51,13 @@ class AuthAPI(abc.ABC):
                                                     "account.", errcode="already-logged-in")
 
         resp = await puppet.switch_mxid(token, user.mxid)
-        if resp == 2:
+        if resp == PuppetError.OnlyLoginSelf:
             return self.get_mx_login_response(status=403, errcode="only-login-self",
                                               error="You can only log in as your own Matrix user.")
-        elif resp == 1:
+        elif resp == PuppetError.InvalidAccessToken:
             return self.get_mx_login_response(status=401, errcode="invalid-access-token",
                                               error="Failed to verify access token.")
+        assert resp == PuppetError.Success, "Encountered an unhandled PuppetError."
 
         return self.get_mx_login_response(mxid=user.mxid, status=200, state="logged-in")
 

mautrix_telegram/web/provisioning/__init__.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 from aiohttp import web
-from typing import Tuple, Optional, Callable, Awaitable, TYPE_CHECKING
+from typing import Awaitable, Callable, Dict, Optional, Tuple, TYPE_CHECKING
 import asyncio
 import logging
 import json
@@ -24,6 +24,7 @@ from telethon.utils import get_peer_id, resolve_id
 from telethon.tl.types import ChatForbidden, ChannelForbidden, TypeChat
 from mautrix_appservice import AppService, MatrixRequestError, IntentError
 
+from ...types import MatrixUserId
 from ...user import User
 from ...portal import Portal
 from ...commands.portal import user_has_power_level, get_initial_state
@@ -36,7 +37,7 @@ if TYPE_CHECKING:
 class ProvisioningAPI(AuthAPI):
     log = logging.getLogger("mau.web.provisioning")
 
-    def __init__(self, context: "Context"):
+    def __init__(self, context: "Context") -> None:
         super().__init__(context.loop)
         self.secret = context.config["appservice.provisioning.shared_secret"]
         self.az = context.az  # type: AppService
@@ -411,7 +412,7 @@ class ProvisioningAPI(AuthAPI):
         except json.JSONDecodeError:
             return None
 
-    async def get_user(self, mxid: str, expect_logged_in: Optional[bool] = False,
+    async def get_user(self, mxid: MatrixUserId, expect_logged_in: Optional[bool] = False,
                        require_puppeting: bool = True, require_user: bool = True
                        ) -> Tuple[Optional[User], Optional[web.Response]]:
         if not mxid:
@@ -439,7 +440,7 @@ class ProvisioningAPI(AuthAPI):
                                     expect_logged_in: Optional[bool] = False,
                                     require_puppeting: bool = False,
                                     want_data: bool = True,
-                                    ) -> (Tuple[Optional[dict],
+                                    ) -> (Tuple[Optional[Dict],
                                                 Optional[User],
                                                 Optional[web.Response]]):
         err = self.check_authorization(request)