Skip to content

Commit 0850f43

Browse files
committed
* Remove deprecated "user_service" function
* Use ClientError syntax for "workspace_service"
1 parent 74222e4 commit 0850f43

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

mergin/client.py

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -336,24 +336,6 @@ def username(self):
336336
return None # not authenticated
337337
return self._user_info["username"]
338338

339-
def user_service(self):
340-
"""
341-
Requests information about user from /user/service endpoint if such exists in self.url server.
342-
343-
Returns response from server as JSON dict or None if endpoint is not found
344-
This can be removed once our SaaS server is upgraded to support workspaces
345-
"""
346-
347-
try:
348-
response = self.get("/v1/user/service")
349-
except ClientError as e:
350-
self.log.debug("Unable to query for /user/service endpoint")
351-
return
352-
353-
response = json.loads(response.read())
354-
355-
return response
356-
357339
def workspace_service(self, workspace_id):
358340
"""
359341
This Requests information about a workspace service from /workspace/{id}/service endpoint,
@@ -365,8 +347,8 @@ def workspace_service(self, workspace_id):
365347
try:
366348
response = self.get(f"/v1/workspace/{workspace_id}/service")
367349
except ClientError as e:
368-
self.log.debug(f"Unable to query for /workspace/{workspace_id}/service endpoint")
369-
return
350+
e.extra = f"Unable to query for /workspace/{workspace_id}/service endpoint"
351+
raise e
370352

371353
response = json.loads(response.read())
372354

0 commit comments

Comments
 (0)