IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Oauth: Remove unused function for oauth implementations (#58887)

Browse Source 
* Oauth: remove unused function

* Oauth: remove unused Oauth types
This commit is contained in:
Karl Persson 2022-11-17 15:03:15 +01:00 committed by GitHub
parent 7e9d94cfda
commit 6e3cb2e3ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/login/social/azuread_oauth.go
View File

@ -8,7 +8,6 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/org"
"golang.org/x/oauth2" "golang.org/x/oauth2"
@ -46,10 +45,6 @@ type azureAccessClaims struct {
TenantID string `json:"tid"` TenantID string `json:"tid"`
} }
func (s *SocialAzureAD) Type() int {
return int(models.AZUREAD)
}
func (s *SocialAzureAD) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) { func (s *SocialAzureAD) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) {
idToken := token.Extra("id_token") idToken := token.Extra("id_token")
if idToken == nil { if idToken == nil {

5
pkg/login/social/generic_oauth.go
View File

@ -13,7 +13,6 @@ import (
"regexp" "regexp"
"strconv" "strconv"
"github.com/grafana/grafana/pkg/models"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
@ -32,10 +31,6 @@ type SocialGenericOAuth struct {
teamIds []string teamIds []string
} }
func (s *SocialGenericOAuth) Type() int {
return int(models.GENERIC)
}
func (s *SocialGenericOAuth) IsTeamMember(client *http.Client) bool { func (s *SocialGenericOAuth) IsTeamMember(client *http.Client) bool {
if len(s.teamIds) == 0 { if len(s.teamIds) == 0 {
return true return true

6
pkg/login/social/github_oauth.go
View File

@ -7,8 +7,6 @@ import (
"net/http" "net/http"
"regexp" "regexp"
"github.com/grafana/grafana/pkg/models"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
@ -33,10 +31,6 @@ var (
ErrMissingOrganizationMembership = Error{"user not a member of one of the required organizations"} ErrMissingOrganizationMembership = Error{"user not a member of one of the required organizations"}
) )
func (s *SocialGithub) Type() int {
return int(models.GITHUB)
}
func (s *SocialGithub) IsTeamMember(client *http.Client) bool { func (s *SocialGithub) IsTeamMember(client *http.Client) bool {
if len(s.teamIds) == 0 { if len(s.teamIds) == 0 {
return true return true

6
pkg/login/social/gitlab_oauth.go
View File

@ -6,8 +6,6 @@ import (
"net/http" "net/http"
"regexp" "regexp"
"github.com/grafana/grafana/pkg/models"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
@ -17,10 +15,6 @@ type SocialGitlab struct {
apiUrl string apiUrl string
} }
func (s *SocialGitlab) Type() int {
return int(models.GITLAB)
}
func (s *SocialGitlab) IsGroupMember(groups []string) bool { func (s *SocialGitlab) IsGroupMember(groups []string) bool {
if len(s.allowedGroups) == 0 { if len(s.allowedGroups) == 0 {
return true return true

6
pkg/login/social/google_oauth.go
View File

@ -5,8 +5,6 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"github.com/grafana/grafana/pkg/models"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
@ -16,10 +14,6 @@ type SocialGoogle struct {
apiUrl string apiUrl string
} }
func (s *SocialGoogle) Type() int {
return int(models.GOOGLE)
}
func (s *SocialGoogle) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) { func (s *SocialGoogle) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) {
var data struct { var data struct {
Id string `json:"id"` Id string `json:"id"`

5
pkg/login/social/grafana_com_oauth.go
View File

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/org" "github.com/grafana/grafana/pkg/services/org"
"golang.org/x/oauth2" "golang.org/x/oauth2"
@ -21,10 +20,6 @@ type OrgRecord struct {
Login string `json:"login"` Login string `json:"login"`
} }
func (s *SocialGrafanaCom) Type() int {
return int(models.GRAFANA_COM)
}
func (s *SocialGrafanaCom) IsEmailAllowed(email string) bool { func (s *SocialGrafanaCom) IsEmailAllowed(email string) bool {
return true return true
} }

5
pkg/login/social/okta_oauth.go
View File

@ -6,7 +6,6 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"github.com/grafana/grafana/pkg/models"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2/jwt" "gopkg.in/square/go-jose.v2/jwt"
) )
@ -44,10 +43,6 @@ func (claims *OktaClaims) extractEmail() string {
return claims.Email return claims.Email
} }
func (s *SocialOkta) Type() int {
return int(models.OKTA)
}
func (s *SocialOkta) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) { func (s *SocialOkta) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) {
idToken := token.Extra("id_token") idToken := token.Extra("id_token")
if idToken == nil { if idToken == nil {

1
pkg/login/social/social.go
View File

@ -240,7 +240,6 @@ func (b *BasicUserInfo) String() string {
} }
type SocialConnector interface { type SocialConnector interface {
Type() int
UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error)
IsEmailAllowed(email string) bool IsEmailAllowed(email string) bool
IsSignupAllowed() bool IsSignupAllowed() bool

14
pkg/models/models.go
View File

@ -1,14 +0,0 @@
package models
type OAuthType int
const (
GITHUB OAuthType = iota + 1
GOOGLE
TWITTER
GENERIC
GRAFANA_COM
GITLAB
AZUREAD
OKTA
)