From 8600d79ff55d637d1f8e92efed9a20803b617308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anderson=20Val=C3=A9rio?= Date: Mon, 2 Dec 2024 14:39:15 -0300 Subject: [PATCH] reverting formatting changes --- providers/azure.go | 1 + providers/github.go | 5 ++++- providers/gitlab.go | 1 + providers/nextcloud.go | 1 + providers/oidc_test.go | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/providers/azure.go b/providers/azure.go index fd824561..5ae68d93 100644 --- a/providers/azure.go +++ b/providers/azure.go @@ -12,6 +12,7 @@ import ( "golang.org/x/exp/slices" "github.com/bitly/go-simplejson" + "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger" diff --git a/providers/github.go b/providers/github.go index 08bf7760..27c5cdf6 100644 --- a/providers/github.go +++ b/providers/github.go @@ -227,11 +227,14 @@ func (p *GitHubProvider) hasRepoAccess(ctx context.Context, accessToken string) Pull bool `json:"pull"` Push bool `json:"push"` } + type repository struct { Permissions permissions `json:"permissions"` Private bool `json:"private"` } + endpoint := p.makeGitHubAPIEndpoint("/repos/"+p.Repo, nil) + var repo repository err := requests.New(endpoint.String()). WithContext(ctx). @@ -309,6 +312,7 @@ func (p *GitHubProvider) getEmail(ctx context.Context, s *sessions.SessionState) } endpoint := p.makeGitHubAPIEndpoint("/user/emails", nil) + err := requests.New(endpoint.String()). WithContext(ctx). WithHeaders(makeGitHubHeader(s.AccessToken)). @@ -359,7 +363,6 @@ func (p *GitHubProvider) getUser(ctx context.Context, s *sessions.SessionState) return nil } -// isVerifiedUser func (p *GitHubProvider) isVerifiedUser(username string) bool { for _, u := range p.Users { if username == u { diff --git a/providers/gitlab.go b/providers/gitlab.go index 227c8210..1f5cfa16 100644 --- a/providers/gitlab.go +++ b/providers/gitlab.go @@ -35,6 +35,7 @@ func NewGitLabProvider(p *ProviderData, opts options.Provider) (*GitLabProvider, p.setProviderDefaults(providerDefaults{ name: gitlabProviderName, }) + if p.Scope == "" { p.Scope = gitlabDefaultScope } diff --git a/providers/nextcloud.go b/providers/nextcloud.go index 7c6c00e9..6c791d27 100644 --- a/providers/nextcloud.go +++ b/providers/nextcloud.go @@ -24,6 +24,7 @@ func NewNextcloudProvider(p *ProviderData) *NextcloudProvider { p.setProviderDefaults(providerDefaults{ name: nextCloudProviderName, }) + p.getAuthorizationHeaderFunc = makeOIDCHeader if p.EmailClaim == options.OIDCEmailClaim { // This implies the email claim has not been overridden, we should set a default diff --git a/providers/oidc_test.go b/providers/oidc_test.go index 831feb19..f8629b6f 100644 --- a/providers/oidc_test.go +++ b/providers/oidc_test.go @@ -137,6 +137,7 @@ func TestOIDCProviderRedeem(t *testing.T) { RefreshToken: refreshToken, IDToken: idToken, }) + server, provider := newTestOIDCSetup(body, []byte(`{}`), []byte(`{}`)) defer server.Close()