introduce env MAPILLARY_TOOLS__DISABLE_AUTH_VERIFICATION

Author: ptpt

mapillary_tools/authenticate.py

@@ -64,7 +64,7 @@ def authenticate(
 
         if jwt:
             user_items: types.UserItem = {"user_upload_token": jwt}
-            user_items = _authenticate_profile(_validate_profile(user_items))
+            user_items = _verify_user_auth(_validate_profile(user_items))
         else:
             user_items = _prompt_login(
                 user_email=user_email, user_password=user_password
@@ -128,7 +128,7 @@ def fetch_user_items(
 
     assert profile_name is not None, "profile_name should be set"
 
-    user_items = _authenticate_profile(_validate_profile(user_items))
+    user_items = _verify_user_auth(_validate_profile(user_items))
 
     LOG.info(
         'Uploading to profile "%s": %s', profile_name, api_v4._sanitize(user_items)
@@ -164,7 +164,13 @@ def _validate_profile(user_items: types.UserItem) -> types.UserItem:
     return user_items
 
 
-def _authenticate_profile(user_items: types.UserItem) -> types.UserItem:
+def _verify_user_auth(user_items: types.UserItem) -> types.UserItem:
+    """
+    Verify that the user access token is valid
+    """
+    if constants._DISABLE_AUTH_VERIFICATION:
+        return user_items
+
     try:
         resp = api_v4.fetch_user_or_me(
             user_access_token=user_items["user_upload_token"]

mapillary_tools/constants.py

@@ -61,3 +61,11 @@
     "TRUE",
     "YES",
 ]
+
+_DISABLE_AUTH_VERIFICATION = os.getenv(
+    _ENV_PREFIX + "_DISABLE_AUTH_VERIFICATION", "NO"
+).upper() in [
+    "1",
+    "TRUE",
+    "YES",
+]

tests/integration/fixtures.py

@@ -28,6 +28,7 @@
 def setup_config(tmpdir: py.path.local):
     config_path = tmpdir.mkdir("configs").join("CLIENT_ID")
     os.environ["MAPILLARY_CONFIG_PATH"] = str(config_path)
+    os.environ["MAPILLARY_TOOLS__DISABLE_AUTH_VERIFICATION"] = "YES"
     x = subprocess.run(
         f"{EXECUTABLE} authenticate --user_name {USERNAME} --jwt test_user_token",
         shell=True,
@@ -36,7 +37,8 @@ def setup_config(tmpdir: py.path.local):
     yield config_path
     if tmpdir.check():
         tmpdir.remove(ignore_errors=True)
-    del os.environ["MAPILLARY_CONFIG_PATH"]
+    os.environ.pop("MAPILLARY_CONFIG_PATH", None)
+    os.environ.pop("MAPILLARY_TOOLS__DISABLE_AUTH_VERIFICATION", None)
 
 
 @pytest.fixture
@@ -53,15 +55,17 @@ def setup_data(tmpdir: py.path.local):
 def setup_upload(tmpdir: py.path.local):
     upload_dir = tmpdir.mkdir("mapillary_public_uploads")
     os.environ["MAPILLARY_UPLOAD_PATH"] = str(upload_dir)
+    os.environ["MAPILLARY_TOOLS__DISABLE_AUTH_VERIFICATION"] = "YES"
     os.environ["MAPILLARY__ENABLE_UPLOAD_HISTORY_FOR_DRY_RUN"] = "YES"
     history_path = tmpdir.join("history")
     os.environ["MAPILLARY_UPLOAD_HISTORY_PATH"] = str(history_path)
     yield upload_dir
     if tmpdir.check():
         tmpdir.remove(ignore_errors=True)
-    del os.environ["MAPILLARY_UPLOAD_PATH"]
-    del os.environ["MAPILLARY_UPLOAD_HISTORY_PATH"]
-    del os.environ["MAPILLARY__ENABLE_UPLOAD_HISTORY_FOR_DRY_RUN"]
+    os.environ.pop("MAPILLARY_UPLOAD_PATH", None)
+    os.environ.pop("MAPILLARY_UPLOAD_HISTORY_PATH", None)
+    os.environ.pop("MAPILLARY_TOOLS__DISABLE_AUTH_VERIFICATION", None)
+    os.environ.pop("MAPILLARY__ENABLE_UPLOAD_HISTORY_FOR_DRY_RUN", None)
 
 
 def _ffmpeg_installed():