public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OAuth: Return SocialError on membership check failure (#98330)

Browse Source 
use socialerror
This commit is contained in:
Daniel-Davies
2025-01-13 11:39:31 +02:00
committed by GitHub
parent 5922015fec
commit ddca09fb02
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/login/social/connectors/generic_oauth.go
+2 -3
View File
@@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"context" "context"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"net/http" "net/http"
"net/mail" "net/mail"
@@ -320,11 +319,11 @@ func (s *SocialGenericOAuth) UserInfo(ctx context.Context, client *http.Client,
} }
if !s.isTeamMember(ctx, client) { if !s.isTeamMember(ctx, client) {
return nil, errors.New("user not a member of one of the required teams") return nil, &SocialError{"User not a member of one of the required teams"}
} }
if !s.isOrganizationMember(ctx, client) { if !s.isOrganizationMember(ctx, client) {
return nil, errors.New("user not a member of one of the required organizations") return nil, &SocialError{"User not a member of one of the required organizations"}
} }
if !s.isGroupMember(userInfo.Groups) { if !s.isGroupMember(userInfo.Groups) {