From bc7b67ff6a6a3c10025882547edce9eb0e54587c Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 12:03:49 +0200
Subject: [PATCH] [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 ddca09fb021637474c19b0dd28549a62880c66aa)

Co-authored-by: Daniel-Davies <33356828+Daniel-Davies@users.noreply.github.com>
---
 pkg/login/social/connectors/generic_oauth.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg/login/social/connectors/generic_oauth.go b/pkg/login/social/connectors/generic_oauth.go
index 5d85302dd40..ee6879e0201 100644
--- 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) {