From 6e3cb2e3edfe0c77820627d4e90bde8e4883f710 Mon Sep 17 00:00:00 2001 From: Karl Persson Date: Thu, 17 Nov 2022 15:03:15 +0100 Subject: [PATCH] Oauth: Remove unused function for oauth implementations (#58887) * Oauth: remove unused function * Oauth: remove unused Oauth types --- pkg/login/social/azuread_oauth.go | 5 ----- pkg/login/social/generic_oauth.go | 5 ----- pkg/login/social/github_oauth.go | 6 ------ pkg/login/social/gitlab_oauth.go | 6 ------ pkg/login/social/google_oauth.go | 6 ------ pkg/login/social/grafana_com_oauth.go | 5 ----- pkg/login/social/okta_oauth.go | 5 ----- pkg/login/social/social.go | 1 - pkg/models/models.go | 14 -------------- 9 files changed, 53 deletions(-) delete mode 100644 pkg/models/models.go diff --git a/pkg/login/social/azuread_oauth.go b/pkg/login/social/azuread_oauth.go index 942530b8410..df6c94ca4eb 100644 --- a/pkg/login/social/azuread_oauth.go +++ b/pkg/login/social/azuread_oauth.go @@ -8,7 +8,6 @@ import ( "net/http" "strings" - "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/org" "golang.org/x/oauth2" @@ -46,10 +45,6 @@ type azureAccessClaims struct { 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) { idToken := token.Extra("id_token") if idToken == nil { diff --git a/pkg/login/social/generic_oauth.go b/pkg/login/social/generic_oauth.go index dd7b8376a69..69a47ccef22 100644 --- a/pkg/login/social/generic_oauth.go +++ b/pkg/login/social/generic_oauth.go @@ -13,7 +13,6 @@ import ( "regexp" "strconv" - "github.com/grafana/grafana/pkg/models" "golang.org/x/oauth2" ) @@ -32,10 +31,6 @@ type SocialGenericOAuth struct { teamIds []string } -func (s *SocialGenericOAuth) Type() int { - return int(models.GENERIC) -} - func (s *SocialGenericOAuth) IsTeamMember(client *http.Client) bool { if len(s.teamIds) == 0 { return true diff --git a/pkg/login/social/github_oauth.go b/pkg/login/social/github_oauth.go index 1636a5918ff..a43610f09af 100644 --- a/pkg/login/social/github_oauth.go +++ b/pkg/login/social/github_oauth.go @@ -7,8 +7,6 @@ import ( "net/http" "regexp" - "github.com/grafana/grafana/pkg/models" - "golang.org/x/oauth2" ) @@ -33,10 +31,6 @@ var ( 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 { if len(s.teamIds) == 0 { return true diff --git a/pkg/login/social/gitlab_oauth.go b/pkg/login/social/gitlab_oauth.go index abb12ed46a0..c7cd9d51d13 100644 --- a/pkg/login/social/gitlab_oauth.go +++ b/pkg/login/social/gitlab_oauth.go @@ -6,8 +6,6 @@ import ( "net/http" "regexp" - "github.com/grafana/grafana/pkg/models" - "golang.org/x/oauth2" ) @@ -17,10 +15,6 @@ type SocialGitlab struct { apiUrl string } -func (s *SocialGitlab) Type() int { - return int(models.GITLAB) -} - func (s *SocialGitlab) IsGroupMember(groups []string) bool { if len(s.allowedGroups) == 0 { return true diff --git a/pkg/login/social/google_oauth.go b/pkg/login/social/google_oauth.go index e15834a45fb..0c0a1d256dd 100644 --- a/pkg/login/social/google_oauth.go +++ b/pkg/login/social/google_oauth.go @@ -5,8 +5,6 @@ import ( "fmt" "net/http" - "github.com/grafana/grafana/pkg/models" - "golang.org/x/oauth2" ) @@ -16,10 +14,6 @@ type SocialGoogle struct { apiUrl string } -func (s *SocialGoogle) Type() int { - return int(models.GOOGLE) -} - func (s *SocialGoogle) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) { var data struct { Id string `json:"id"` diff --git a/pkg/login/social/grafana_com_oauth.go b/pkg/login/social/grafana_com_oauth.go index 95f08f29ed7..24391871645 100644 --- a/pkg/login/social/grafana_com_oauth.go +++ b/pkg/login/social/grafana_com_oauth.go @@ -5,7 +5,6 @@ import ( "fmt" "net/http" - "github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/services/org" "golang.org/x/oauth2" @@ -21,10 +20,6 @@ type OrgRecord struct { Login string `json:"login"` } -func (s *SocialGrafanaCom) Type() int { - return int(models.GRAFANA_COM) -} - func (s *SocialGrafanaCom) IsEmailAllowed(email string) bool { return true } diff --git a/pkg/login/social/okta_oauth.go b/pkg/login/social/okta_oauth.go index a7863518915..6eda8afab24 100644 --- a/pkg/login/social/okta_oauth.go +++ b/pkg/login/social/okta_oauth.go @@ -6,7 +6,6 @@ import ( "fmt" "net/http" - "github.com/grafana/grafana/pkg/models" "golang.org/x/oauth2" "gopkg.in/square/go-jose.v2/jwt" ) @@ -44,10 +43,6 @@ func (claims *OktaClaims) extractEmail() string { return claims.Email } -func (s *SocialOkta) Type() int { - return int(models.OKTA) -} - func (s *SocialOkta) UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) { idToken := token.Extra("id_token") if idToken == nil { diff --git a/pkg/login/social/social.go b/pkg/login/social/social.go index 788593f7fb4..217f2606a19 100644 --- a/pkg/login/social/social.go +++ b/pkg/login/social/social.go @@ -240,7 +240,6 @@ func (b *BasicUserInfo) String() string { } type SocialConnector interface { - Type() int UserInfo(client *http.Client, token *oauth2.Token) (*BasicUserInfo, error) IsEmailAllowed(email string) bool IsSignupAllowed() bool diff --git a/pkg/models/models.go b/pkg/models/models.go deleted file mode 100644 index 777c5297b6c..00000000000 --- a/pkg/models/models.go +++ /dev/null @@ -1,14 +0,0 @@ -package models - -type OAuthType int - -const ( - GITHUB OAuthType = iota + 1 - GOOGLE - TWITTER - GENERIC - GRAFANA_COM - GITLAB - AZUREAD - OKTA -)