Skip to content

Commit 9ab203c

Browse files
committed
feat: remove PassageError error message prefixes
1 parent 19b09ca commit 9ab203c

File tree

3 files changed

+14
-26
lines changed

3 files changed

+14
-26
lines changed

passageidentity/auth.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,4 @@ def create_magic_link(self, args: MagicLinkArgs, options: MagicLinkOptions | Non
9494
_headers=self.request_headers,
9595
).magic_link
9696
except ApiException as e:
97-
msg = "Could not create a magic link for this app"
98-
raise PassageError.from_response_error(e, msg) from e
97+
raise PassageError.from_response_error(e) from e

passageidentity/errors.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,18 @@ def __str__(self) -> str:
2020
return self.message
2121

2222
@classmethod
23-
def from_response_error(cls, response_error: ApiException, message: str | None = None) -> PassageError:
23+
def from_response_error(cls, response_error: ApiException) -> PassageError:
2424
"""Initialize the error with a response body and optional message."""
2525
if response_error.data is not None:
2626
data_dict = response_error.data.to_dict()
2727
error_code = data_dict.get("code")
2828
error_msg = data_dict.get("error")
29-
msg = ": ".join(filter(None, [message, error_msg]))
3029
else:
3130
error_code = None
32-
msg = str(response_error.body)
31+
error_msg = str(response_error.body)
3332

3433
psg_error = cls()
35-
psg_error.message = msg
34+
psg_error.message = error_msg
3635
psg_error.status_code = response_error.status
3736
psg_error.error_code = error_code
3837

passageidentity/user.py

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ def get(self, user_id: str) -> PassageUser:
4343
try:
4444
return self.users_api.get_user(self.app_id, user_id, _headers=self.request_headers).user
4545
except ApiException as e:
46-
msg = "Could not fetch user"
47-
raise PassageError.from_response_error(e, msg) from e
46+
raise PassageError.from_response_error(e) from e
4847

4948
def get_by_identifier(self, identifier: str) -> PassageUser:
5049
"""Get a user's object using their user identifier."""
@@ -60,8 +59,7 @@ def get_by_identifier(self, identifier: str) -> PassageUser:
6059
_headers=self.request_headers,
6160
).users
6261
except ApiException as e:
63-
msg = "Could not fetch user by identifier"
64-
raise PassageError.from_response_error(e, msg) from e
62+
raise PassageError.from_response_error(e) from e
6563

6664
if len(users) == 0:
6765
raise PassageError.from_response_error(
@@ -79,8 +77,7 @@ def activate(self, user_id: str) -> PassageUser:
7977
try:
8078
return self.users_api.activate_user(self.app_id, user_id, _headers=self.request_headers).user
8179
except ApiException as e:
82-
msg = "Could not activate user"
83-
raise PassageError.from_response_error(e, msg) from e
80+
raise PassageError.from_response_error(e) from e
8481

8582
def deactivate(self, user_id: str) -> PassageUser:
8683
"""Deactivate a user using their user ID."""
@@ -91,8 +88,7 @@ def deactivate(self, user_id: str) -> PassageUser:
9188
try:
9289
return self.users_api.deactivate_user(self.app_id, user_id, _headers=self.request_headers).user
9390
except ApiException as e:
94-
msg = "Could not deactivate user"
95-
raise PassageError.from_response_error(e, msg) from e
91+
raise PassageError.from_response_error(e) from e
9692

9793
def update(self, user_id: str, options: UpdateUserArgs) -> PassageUser:
9894
"""Update a user."""
@@ -103,8 +99,7 @@ def update(self, user_id: str, options: UpdateUserArgs) -> PassageUser:
10399
try:
104100
return self.users_api.update_user(self.app_id, user_id, options, _headers=self.request_headers).user
105101
except ApiException as e:
106-
msg = "Could not update user"
107-
raise PassageError.from_response_error(e, msg) from e
102+
raise PassageError.from_response_error(e) from e
108103

109104
def create(self, args: CreateUserArgs) -> PassageUser:
110105
"""Create a user."""
@@ -115,8 +110,7 @@ def create(self, args: CreateUserArgs) -> PassageUser:
115110
try:
116111
return self.users_api.create_user(self.app_id, args, _headers=self.request_headers).user
117112
except ApiException as e:
118-
msg = "Could not create user"
119-
raise PassageError.from_response_error(e, msg) from e
113+
raise PassageError.from_response_error(e) from e
120114

121115
def delete(self, user_id: str) -> None:
122116
"""Delete a user using their user ID."""
@@ -127,8 +121,7 @@ def delete(self, user_id: str) -> None:
127121
try:
128122
self.users_api.delete_user(self.app_id, user_id, _headers=self.request_headers)
129123
except ApiException as e:
130-
msg = "Could not delete user"
131-
raise PassageError.from_response_error(e, msg) from e
124+
raise PassageError.from_response_error(e) from e
132125

133126
def list_devices(self, user_id: str) -> list[WebAuthnDevices]:
134127
"""Get a user's devices using their user ID."""
@@ -139,8 +132,7 @@ def list_devices(self, user_id: str) -> list[WebAuthnDevices]:
139132
try:
140133
return self.user_devices_api.list_user_devices(self.app_id, user_id, _headers=self.request_headers).devices
141134
except ApiException as e:
142-
msg = "Could not fetch user's devices"
143-
raise PassageError.from_response_error(e, msg) from e
135+
raise PassageError.from_response_error(e) from e
144136

145137
def revoke_device(self, user_id: str, device_id: str) -> None:
146138
"""Revoke a user's device using their user ID and the device ID."""
@@ -155,8 +147,7 @@ def revoke_device(self, user_id: str, device_id: str) -> None:
155147
try:
156148
self.user_devices_api.delete_user_devices(self.app_id, user_id, device_id, _headers=self.request_headers)
157149
except ApiException as e:
158-
msg = "Could not revoke user's device"
159-
raise PassageError.from_response_error(e, msg) from e
150+
raise PassageError.from_response_error(e) from e
160151

161152
def revoke_refresh_tokens(self, user_id: str) -> None:
162153
"""Revokes all of a user's Refresh Tokens using their User ID."""
@@ -167,5 +158,4 @@ def revoke_refresh_tokens(self, user_id: str) -> None:
167158
try:
168159
self.tokens_api.revoke_user_refresh_tokens(self.app_id, user_id, _headers=self.request_headers)
169160
except ApiException as e:
170-
msg = "Could not revoke user's refresh tokens"
171-
raise PassageError.from_response_error(e, msg) from e
161+
raise PassageError.from_response_error(e) from e

0 commit comments

Comments
 (0)