Skip to content

Commit a36acea

Browse files
committed
Add username claim from OAuth provider. (closes #287)
Signed-off-by: Jason Volk <jason@zemos.net>
1 parent d9f92e3 commit a36acea

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/api/client/session/sso.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,11 @@ async fn decide_user_id(
601601
.as_deref()
602602
.map(str::to_lowercase)
603603
.filter(|_| allowed("preferred_username")),
604+
userinfo
605+
.username
606+
.as_deref()
607+
.map(str::to_lowercase)
608+
.filter(|_| allowed("username")),
604609
userinfo
605610
.nickname
606611
.as_deref()

src/service/oauth/user_info.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ pub struct UserInfo {
1616
/// The login username we first consider when defined.
1717
pub preferred_username: Option<String>,
1818

19+
/// The login username considered.
20+
pub username: Option<String>,
21+
1922
/// The login username considered if none preferred.
2023
pub nickname: Option<String>,
2124

0 commit comments

Comments
 (0)