Skip to content

Commit 2d070d9

Browse files
committed
Code review fixes
1 parent 4ea8e5f commit 2d070d9

File tree

3 files changed

+16
-30
lines changed

3 files changed

+16
-30
lines changed

src/auth0_server_python/auth_server/my_account_client.py

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
CompleteConnectAccountResponse,
77
ConnectAccountRequest,
88
ConnectAccountResponse,
9-
ConnectParams,
109
)
1110
from auth0_server_python.error import (
1211
ApiError,
@@ -38,23 +37,16 @@ async def connect_account(
3837
if response.status_code != 201:
3938
error_data = response.json()
4039
raise MyAccountApiError(
41-
title=error_data.get("title"),
42-
type=error_data.get("type"),
43-
detail=error_data.get("detail"),
44-
status=error_data.get("status"),
40+
title=error_data.get("title", None),
41+
type=error_data.get("type", None),
42+
detail=error_data.get("detail", None),
43+
status=error_data.get("status", None),
4544
validation_errors=error_data.get("validation_errors", None)
4645
)
4746

4847
data = response.json()
4948

50-
return ConnectAccountResponse(
51-
auth_session=data["auth_session"],
52-
connect_uri=data["connect_uri"],
53-
connect_params=ConnectParams(
54-
ticket=data["connect_params"]["ticket"]
55-
),
56-
expires_in=data["expires_in"]
57-
)
49+
return ConnectAccountResponse.model_validate(data)
5850

5951
except Exception as e:
6052
if isinstance(e, MyAccountApiError):
@@ -81,22 +73,16 @@ async def complete_connect_account(
8173
if response.status_code != 201:
8274
error_data = response.json()
8375
raise MyAccountApiError(
84-
title=error_data.get("title"),
85-
type=error_data.get("type"),
86-
detail=error_data.get("detail"),
87-
status=error_data.get("status"),
88-
validation_errors=error_data.get("validation_errors")
76+
title=error_data.get("title", None),
77+
type=error_data.get("type", None),
78+
detail=error_data.get("detail", None),
79+
status=error_data.get("status", None),
80+
validation_errors=error_data.get("validation_errors", None)
8981
)
9082

9183
data = response.json()
9284

93-
return CompleteConnectAccountResponse(
94-
id=data["id"],
95-
connection=data["connection"],
96-
access_type=data["access_type"],
97-
scopes=data["scopes"],
98-
created_at=data["created_at"]
99-
)
85+
return CompleteConnectAccountResponse.model_validate(data)
10086

10187
except Exception as e:
10288
if isinstance(e, MyAccountApiError):

src/auth0_server_python/auth_server/server_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ async def start_connect_account(
13391339
code_verifier = PKCE.generate_code_verifier()
13401340
code_challenge = PKCE.generate_code_challenge(code_verifier)
13411341

1342-
state = PKCE.generate_random_string(32)
1342+
state= PKCE.generate_random_string(32)
13431343

13441344
connect_request = ConnectAccountRequest(
13451345
connection=options.connection,

src/auth0_server_python/error/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ class MyAccountApiError(Auth0Error):
6464

6565
def __init__(
6666
self,
67-
title: str,
68-
type: str,
69-
detail: str,
70-
status: int,
67+
title: Optional[str],
68+
type: Optional[str],
69+
detail: Optional[str],
70+
status: Optional[int],
7171
validation_errors: Optional[list[dict[str, str]]] = None
7272
):
7373
super().__init__(detail)

0 commit comments

Comments
 (0)