From 0850f43b05ebe0a91d217ec0a8cc5c098481d41b Mon Sep 17 00:00:00 2001
From: Valentin Buira <valentin.buira@gmail.com>
Date: Tue, 3 Dec 2024 13:22:52 +0100
Subject: [PATCH 1/2] * Remove deprecated "user_service" function * Use
 ClientError syntax for "workspace_service"

---
 mergin/client.py | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/mergin/client.py b/mergin/client.py
index 4cd7ef39..7582f6a8 100644
--- a/mergin/client.py
+++ b/mergin/client.py
@@ -336,24 +336,6 @@ def username(self):
             return None  # not authenticated
         return self._user_info["username"]
 
-    def user_service(self):
-        """
-        Requests information about user from /user/service endpoint if such exists in self.url server.
-
-        Returns response from server as JSON dict or None if endpoint is not found
-        This can be removed once our SaaS server is upgraded to support workspaces
-        """
-
-        try:
-            response = self.get("/v1/user/service")
-        except ClientError as e:
-            self.log.debug("Unable to query for /user/service endpoint")
-            return
-
-        response = json.loads(response.read())
-
-        return response
-
     def workspace_service(self, workspace_id):
         """
         This Requests information about a workspace service from /workspace/{id}/service endpoint,
@@ -365,8 +347,8 @@ def workspace_service(self, workspace_id):
         try:
             response = self.get(f"/v1/workspace/{workspace_id}/service")
         except ClientError as e:
-            self.log.debug(f"Unable to query for /workspace/{workspace_id}/service endpoint")
-            return
+            e.extra = f"Unable to query for /workspace/{workspace_id}/service endpoint"
+            raise e
 
         response = json.loads(response.read())
 

From 2d521a1fdd9c393903eafb6757611a1ea1b81702 Mon Sep 17 00:00:00 2001
From: Valentin Buira <valentin.buira@gmail.com>
Date: Tue, 3 Dec 2024 15:11:04 +0100
Subject: [PATCH 2/2] Superflous raise client error since it's already handled
 by self.get

---
 mergin/client.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/mergin/client.py b/mergin/client.py
index 7582f6a8..4c0b9af8 100644
--- a/mergin/client.py
+++ b/mergin/client.py
@@ -343,16 +343,8 @@ def workspace_service(self, workspace_id):
 
         Returns response from server as JSON dict or None if endpoint is not found
         """
-
-        try:
-            response = self.get(f"/v1/workspace/{workspace_id}/service")
-        except ClientError as e:
-            e.extra = f"Unable to query for /workspace/{workspace_id}/service endpoint"
-            raise e
-
-        response = json.loads(response.read())
-
-        return response
+        resp = self.get(f"/v1/workspace/{workspace_id}/service")
+        return json.loads(resp)
 
     def server_type(self):
         """