Skip to content

Commit c86a9b6

Browse files
authored
861 bug when preferred username is not the email (#862)
* add field preferred username to db creation * adding preferred username * undo changes * using email instead of preferred username
1 parent bedb957 commit c86a9b6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

backend/app/keycloak_auth.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ async def get_token(
9696
ListenerAPIKeyDB.key == payload["key"],
9797
)
9898
) is not None:
99-
return {"preferred_username": payload["user"]}
99+
return {"email": payload["user"]}
100100
elif (
101101
key := await UserAPIKeyDB.find_one(
102102
UserAPIKeyDB.user == payload["user"],
@@ -113,7 +113,7 @@ async def get_token(
113113
headers={"WWW-Authenticate": "Bearer"},
114114
)
115115
else:
116-
return {"preferred_username": payload["user"]}
116+
return {"email": payload["user"]}
117117
else:
118118
raise HTTPException(
119119
status_code=401,
@@ -136,7 +136,7 @@ async def get_token(
136136

137137
async def get_user(identity: Json = Depends(get_token)):
138138
"""Retrieve the user email from keycloak token."""
139-
return identity["preferred_username"]
139+
return identity["email"]
140140

141141

142142
async def get_current_user(
@@ -233,7 +233,7 @@ async def get_current_username(
233233
if token:
234234
try:
235235
userinfo = keycloak_openid.userinfo(token)
236-
return userinfo["preferred_username"]
236+
return userinfo["email"]
237237
# expired token
238238
except KeycloakAuthenticationError as e:
239239
raise HTTPException(
@@ -245,7 +245,7 @@ async def get_current_username(
245245
if token_cookie:
246246
try:
247247
userinfo = keycloak_openid.userinfo(token_cookie.removeprefix("Bearer%20"))
248-
return userinfo["preferred_username"]
248+
return userinfo["email"]
249249
# expired token
250250
except KeycloakAuthenticationError as e:
251251
raise HTTPException(

0 commit comments

Comments
 (0)