Merge pull request #612 from kurusugawa-computer/af-update

MFA有効化ユーザーに対するエラーの出し方を変更

annofabapi/__init__.py

@@ -2,7 +2,6 @@
 from annofabapi.api2 import AnnofabApi2
 from annofabapi.wrapper import Wrapper
 from annofabapi.resource import build, build_from_netrc, build_from_env, Resource
-from annofabapi.exceptions import NotSupportedUserError
 
 from .__version__ import __version__
 
@@ -14,6 +13,5 @@
     "build_from_netrc",
     "build_from_env",
     "Resource",
-    "NotSupportedUserError",
     "__version__",
 ]

annofabapi/api.py

@@ -11,7 +11,7 @@
 from requests.auth import AuthBase
 from requests.cookies import RequestsCookieJar
 
-from annofabapi.exceptions import NotLoggedInError, NotSupportedUserError
+from annofabapi.exceptions import MfaEnabledUserExecutionError, NotLoggedInError
 from annofabapi.generated_api import AbstractAnnofabApi
 
 logger = logging.getLogger(__name__)
@@ -638,9 +638,7 @@ def login(self) -> Tuple[Dict[str, Any], requests.Response]:
         response = self._execute_http_request("post", url, json=login_info)
         json_obj = response.json()
         if "token" not in json_obj:
-            raise NotSupportedUserError(
-                f"ユーザー(ユーザーID: {self.login_user_id})はMFAが有効です。" "MFAが有効なユーザーは、annofab-api-python-clientを利用できません。"
-            )
+            raise MfaEnabledUserExecutionError(self.login_user_id)
         self.token_dict = json_obj["token"]
 
         logger.debug("Logged in successfully. user_id = %s", self.login_user_id)

annofabapi/exceptions.py

@@ -68,10 +68,11 @@ def __init__(self, message: str, uploaded_data_hash: str, response_etag: str):
         super().__init__(message)
 
 
-class NotSupportedUserError(Exception):
+class MfaEnabledUserExecutionError(Exception):
     """
-    annofab-api-python-clientでサポートされていないユーザが実行した際のエラー
+    MFAが有効化されたユーザーが実行したことを示すエラー
     """
 
-    def __init__(self, message: str):
+    def __init__(self, user_id: str):
+        message = f"User (User ID: {user_id}) cannot use annofab-api-python-client because MFA is enabled."
         super().__init__(message)