[v11.2.x] OAuth: Return SocialError on membership check failure (#98859)

OAuth: Return SocialError on membership check failure (#98330) use socialerror (cherry picked from commit ddca09f) Co-authored-by: Daniel-Davies <33356828+Daniel-Davies@users.noreply.github.com>
grafana · Jan 13, 2025 · bc7b67f · bc7b67f
1 parent de68050
commit bc7b67f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/pkg/login/social/connectors/generic_oauth.go b/pkg/login/social/connectors/generic_oauth.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/http"
 	"net/mail"
@@ -320,11 +319,11 @@ func (s *SocialGenericOAuth) UserInfo(ctx context.Context, client *http.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) {
-		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) {