Merge branch 'master' into non_blocking_push

Author: harminius

examples/README.md

@@ -5,10 +5,10 @@ Here you can find some tailored Jupyter Notebooks examples on how to interact wi
 These examples are split into scenarios in order to highlight some of the core capabilities of the Mergin Maps API.
 
 ## [Scenario 1](01_users.ipynb) - Users Management
-On this scenario you'll create some random users from an existing CSV into Mergin Maps, change user's `ROLE` on a `WORKSPACE` and `PROJECT` perspective as well remove user's from a specific project.
+In this scenario you'll create some random users from an existing CSV into Mergin Maps, change user's `ROLE` on a `WORKSPACE` and `PROJECT` perspective as well remove a user from a specific project.
 
-## [Scenario 2](02_sync.ipynb) - Synchronization
-On this scenario you'll learn on how to do basic synchronisation (`PUSH`, `PULL`) of projects with the Mergin Maps Python API client.
+## [Scenario 2](02_sync.ipynb) - Synchronisation
+In this scenario you'll learn how to do basic synchronisation (`PUSH`, `PULL`) of projects with the Mergin Maps Python API client.
 
 ## [Scenario 3](03_projects.ipynb) - Projects Management
-On this scenario you'll learn how to manage project with the Mergin Maps Python API client, namely how to clone projects and how to separate team members in isolated projects from the cloned template.
+In this scenario you'll learn how to manage projects with Mergin Maps Python API client, namely how to clone projects and how to separate team members in isolated projects from the cloned template.

mergin/client.py

@@ -45,6 +45,10 @@ class TokenError(Exception):
     pass
 
 
+class AuthTokenExpiredError(Exception):
+    pass
+
+
 class ServerType(Enum):
     OLD = auto()  # Server is old and does not support workspaces
     CE = auto()  # Server is Community Edition
@@ -80,7 +84,15 @@ class MerginClient:
         Currently, only HTTP proxies are supported.
     """
 
-    def __init__(self, url=None, auth_token=None, login=None, password=None, plugin_version=None, proxy_config=None):
+    def __init__(
+        self,
+        url=None,
+        auth_token=None,
+        login=None,
+        password=None,
+        plugin_version=None,
+        proxy_config=None,
+    ):
         self.url = (url if url is not None else MerginClient.default_url()).rstrip("/") + "/"
         self._auth_params = None
         self._auth_session = None
@@ -190,11 +202,19 @@ def wrapper(self, *args):
                     delta = self._auth_session["expire"] - datetime.now(timezone.utc)
                     if delta.total_seconds() < 5:
                         self.log.info("Token has expired - refreshing...")
-                        self.login(self._auth_params["login"], self._auth_params["password"])
+                        if self._auth_params.get("login", None) and self._auth_params.get("password", None):
+                            self.log.info("Token has expired - refreshing...")
+                            self.login(self._auth_params["login"], self._auth_params["password"])
+                        else:
+                            raise AuthTokenExpiredError("Token has expired - please re-login")
                 else:
                     # Create a new authorization token
                     self.log.info(f"No token - login user: {self._auth_params['login']}")
-                    self.login(self._auth_params["login"], self._auth_params["password"])
+                    if self._auth_params.get("login", None) and self._auth_params.get("password", None):
+                        self.login(self._auth_params["login"], self._auth_params["password"])
+                    else:
+                        raise ClientError("Missing login or password")
+
             return f(self, *args)
 
         return wrapper

mergin/test/test_client.py

@@ -2878,3 +2878,18 @@ def server_config(self):
 
     with pytest.raises(ClientError, match="The requested URL was not found on the server"):
         mc.send_logs(logs_path)
+
+
+def test_mc_without_login():
+
+    # client without login should be able to access server config
+    mc = MerginClient(SERVER_URL)
+    config = mc.server_config()
+    assert config
+    assert isinstance(config, dict)
+    assert "server_configured" in config
+    assert config["server_configured"]
+
+    # without login should not be able to access workspaces
+    with pytest.raises(ClientError, match="Authentication information is missing or invalid."):
+        mc.workspaces_list()