Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(auth/oauth2adapt): adapt Token Types to be translated #9801

Merged
merged 3 commits into from
Apr 18, 2024
+32 −19
Merged

fix(auth/oauth2adapt): adapt Token Types to be translated #9801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c855609
fix(auth/oauth2adapt): adapt Token Types to be translated
codyoss Apr 18, 2024
1ac4e23
update go.mod
codyoss Apr 18, 2024
9e47e5a
Merge branch 'main' into type-adapt-tok
codyoss Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions auth/oauth2adapt/oauth2adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ func (tp *tokenProviderAdapter) Token(context.Context) (*auth.Token, error) {
}
return &auth.Token{
Value: tok.AccessToken,
Type: tok.Type(),
Expiry: tok.Expiry,
}, nil
}
Expand Down Expand Up @@ -77,6 +78,7 @@ func (ts *tokenSourceAdapter) Token() (*oauth2.Token, error) {
}
return &oauth2.Token{
AccessToken: tok.Value,
TokenType: tok.Type,
Expiry: tok.Expiry,
}, nil
}
Expand Down
43 changes: 27 additions & 16 deletions auth/oauth2adapt/oauth2adapt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ import (
func TestTokenProviderFromTokenSource(t *testing.T) {
tests := []struct {
name string
token string
token *oauth2.Token
err error
}{
{
name: "working token",
token: "fakeToken",
token: &oauth2.Token{AccessToken: "fakeToken", TokenType: "Basic"},
err: nil,
},
{
Expand Down Expand Up @@ -72,8 +72,11 @@ func TestTokenProviderFromTokenSource(t *testing.T) {
}
return
}
if tok.Value != tt.token {
t.Errorf("got %q, want %q", tok.Value, tt.token)
if tok.Value != tt.token.AccessToken {
t.Errorf("got %q, want %q", tok.Value, tt.token.AccessToken)
}
if tok.Type != tt.token.TokenType {
t.Errorf("got %q, want %q", tok.Type, tt.token.TokenType)
}
})
}
Expand All @@ -82,13 +85,16 @@ func TestTokenProviderFromTokenSource(t *testing.T) {
func TestTokenSourceFromTokenProvider(t *testing.T) {
tests := []struct {
name string
token string
token *auth.Token
err error
}{
{
name: "working token",
token: "fakeToken",
err: nil,
name: "working token",
token: &auth.Token{
Value: "fakeToken",
Type: "Basic",
},
err: nil,
},
{
name: "coverts err",
Expand Down Expand Up @@ -134,8 +140,11 @@ func TestTokenSourceFromTokenProvider(t *testing.T) {
}
return
}
if tok.AccessToken != tt.token {
t.Errorf("got %q, want %q", tok.AccessToken, tt.token)
if tok.AccessToken != tt.token.Value {
t.Errorf("got %q, want %q", tok.AccessToken, tt.token.Value)
}
if tok.TokenType != tt.token.Type {
t.Errorf("got %q, want %q", tok.TokenType, tt.token.Type)
}
})
}
Expand All @@ -145,7 +154,7 @@ func TestAuthCredentialsFromOauth2Credentials(t *testing.T) {
ctx := context.Background()
inputCreds := &google.Credentials{
ProjectID: "test_project",
TokenSource: tokenSource{token: "token"},
TokenSource: tokenSource{token: &oauth2.Token{AccessToken: "token"}},
JSON: []byte("json"),
UniverseDomainProvider: func() (string, error) {
return "domain", nil
Expand Down Expand Up @@ -197,7 +206,7 @@ func TestOauth2CredentialsFromAuthCredentials(t *testing.T) {
ProjectIDProvider: auth.CredentialsPropertyFunc(func(ctx context.Context) (string, error) {
return "project", nil
}),
TokenProvider: tokenProvider{token: "token"},
TokenProvider: tokenProvider{token: &auth.Token{Value: "token"}},
JSON: []byte("json"),
UniverseDomainProvider: auth.CredentialsPropertyFunc(func(ctx context.Context) (string, error) {
return "domain", nil
Expand Down Expand Up @@ -244,7 +253,7 @@ func TestOauth2CredentialsFromAuthCredentials(t *testing.T) {
}

type tokenSource struct {
token string
token *oauth2.Token
err error
}

Expand All @@ -253,12 +262,13 @@ func (ts tokenSource) Token() (*oauth2.Token, error) {
return nil, ts.err
}
return &oauth2.Token{
AccessToken: ts.token,
AccessToken: ts.token.AccessToken,
TokenType: ts.token.TokenType,
}, nil
}

type tokenProvider struct {
token string
token *auth.Token
err error
}

Expand All @@ -267,6 +277,7 @@ func (tp tokenProvider) Token(context.Context) (*auth.Token, error) {
return nil, tp.err
}
return &auth.Token{
Value: tp.token,
Value: tp.token.Value,
Type: tp.token.Type,
}, nil
}