fix: add picture claim key

pipe-cd · Jul 5, 2024 · 126d268 · 126d268
1 parent d13a66b
commit 126d268
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/pkg/oauth/oidc/oidc.go b/pkg/oauth/oidc/oidc.go
@@ -31,6 +31,9 @@ const (
 	listPerPage = 100
 )
 
+var usernameKeys = []string{"username", "name", "preferred_username", "cognito:username"}
+var avatarUrlKey = []string{"picture", "avatar_url"}
+
 // OAuthClient is a oauth client for OIDC.
 type OAuthClient struct {
 	*oidc.Provider
@@ -178,8 +181,6 @@ func (c *OAuthClient) decideRole(claims jwt.MapClaims) (role *model.Role, err er
 }
 
 func (c *OAuthClient) decideUserInfos(claims jwt.MapClaims) (username, avatarUrl string, err error) {
-	usernameKeys := []string{"username", "name", "preferred_username", "cognito:username"}
-	avatarUrlKey := "avatar_url"
 
 	username = ""
 	for _, key := range usernameKeys {
@@ -198,10 +199,12 @@ func (c *OAuthClient) decideUserInfos(claims jwt.MapClaims) (username, avatarUrl
 	}
 
 	avatarUrl = ""
-	val, ok := claims[avatarUrlKey]
-	if ok && val != nil {
-		if str, ok := val.(string); ok && str != "" {
-			avatarUrl = str
+	for _, key := range avatarUrlKey {
+		val, ok := claims[key]
+		if ok && val != nil {
+			if str, ok := val.(string); ok && str != "" {
+				avatarUrl = str
+			}
 		}
 	}