Skip to content

Commit d27b122

Browse files
committed
fix: Suggested changes
1 parent 219e0f3 commit d27b122

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

examples/with-fastapi/with-thirdpartyemailpassword/main.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
emailverification,
2020
session,
2121
thirdpartyemailpassword,
22+
usermetadata,
2223
)
2324
from supertokens_python.recipe.session import SessionContainer
2425
from supertokens_python.recipe.session.framework.fastapi import verify_session
@@ -54,6 +55,7 @@ def get_website_domain():
5455
session.init(),
5556
dashboard.init(),
5657
emailverification.init("REQUIRED"),
58+
usermetadata.init(),
5759
thirdpartyemailpassword.init(
5860
providers=[
5961
thirdpartyemailpassword.ProviderInput(

supertokens_python/recipe/dashboard/utils.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ def from_user(
8888
self.last_name = last_name
8989

9090
self.user_id = user.user_id
91+
# from_user() is called in /api/users (note extra s)
92+
# here we DashboardUsersGetResponse() doesn't maintain
93+
# recipe id for each user on its own. That's why we need
94+
# to set self.recipe_id here.
9195
self.recipe_id = user.recipe_id
9296
self.time_joined = user.time_joined
9397
self.email = user.email
@@ -109,7 +113,11 @@ def from_dict(
109113
self.last_name = last_name
110114

111115
self.user_id = user_obj_dict["user_id"]
112-
# self.recipe_id = user_obj_dict.get("recipe_id")
116+
# from_dict() is used in `/api/user` where
117+
# recipe_id is already passed seperately to
118+
# GetUserForRecipeIdResult object
119+
# So we set recipe_id to None here
120+
self.recipe_id = None
113121
self.time_joined = user_obj_dict["time_joined"]
114122
self.tenant_ids = user_obj_dict.get("tenant_ids", [])
115123

supertokens_python/recipe/session/framework/fastapi/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ def verify_session(
4343
) -> Callable[..., Coroutine[Any, Any, Union[SessionContainer, None]]]:
4444
_ = user_context
4545

46-
from fastapi import Request # pylint: disable=reimported
47-
4846
async def func(request: Request) -> Union[SessionContainer, None]:
4947
nonlocal user_context
5048
base_req = FastApiRequest(request)

supertokens_python/recipe/thirdparty/providers/boxy_saml.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ def BoxySAML(input: ProviderInput) -> Provider: # pylint: disable=redefined-bui
5656
if input.config.user_info_map is None:
5757
input.config.user_info_map = UserInfoMap(UserFields(), UserFields())
5858

59-
if input.config.user_info_map.from_user_info_api is None:
60-
input.config.user_info_map.from_user_info_api = UserFields()
6159
if input.config.user_info_map.from_id_token_payload is None:
6260
input.config.user_info_map.from_id_token_payload = UserFields()
6361

supertokens_python/recipe/thirdparty/providers/discord.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ def Discord(input: ProviderInput) -> Provider: # pylint: disable=redefined-buil
5858

5959
if input.config.user_info_map.from_user_info_api is None:
6060
input.config.user_info_map.from_user_info_api = UserFields()
61-
if input.config.user_info_map.from_id_token_payload is None:
62-
input.config.user_info_map.from_id_token_payload = UserFields()
6361

6462
if input.config.user_info_map.from_user_info_api.user_id is None:
6563
input.config.user_info_map.from_user_info_api.user_id = "id"

supertokens_python/recipe/thirdparty/providers/facebook.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ def Facebook(input: ProviderInput) -> Provider: # pylint: disable=redefined-bui
7575

7676
if input.config.user_info_map.from_user_info_api is None:
7777
input.config.user_info_map.from_user_info_api = UserFields()
78-
if input.config.user_info_map.from_id_token_payload is None:
79-
input.config.user_info_map.from_id_token_payload = UserFields()
8078

8179
if input.config.user_info_map.from_user_info_api.user_id is None:
8280
input.config.user_info_map.from_user_info_api.user_id = "id"

supertokens_python/recipe/thirdparty/providers/linkedin.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ def Linkedin(input: ProviderInput) -> Provider: # pylint: disable=redefined-bui
105105

106106
if input.config.user_info_map.from_user_info_api is None:
107107
input.config.user_info_map.from_user_info_api = UserFields()
108-
if input.config.user_info_map.from_id_token_payload is None:
109-
input.config.user_info_map.from_id_token_payload = UserFields()
110108

111109
if input.config.user_info_map.from_user_info_api.user_id is None:
112110
input.config.user_info_map.from_user_info_api.user_id = "id"

0 commit comments

Comments
 (0)