Verified Commit e1ca262b authored by Timo Furrer's avatar Timo Furrer ☕ Committed by GitLab
Browse files

Merge branch 'use-unauthenticated-auth-source' into 'main' 

refactor: use unauthenticated auth source from GitLab client-go

See merge request gitlab-org/cli!2843



Merged-by: Timo Furrer's avatarTimo Furrer <tfurrer@gitlab.com>
Approved-by: Tomas Vik's avatarTomas Vik <tvik@gitlab.com>
Approved-by: default avatarFilip Aleksic <faleksic@gitlab.com>
parents caf8b84e 61e07344

go.mod

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ require ( 
	github.com/survivorbat/huhtest v0.0.2

	github.com/tidwall/pretty v1.2.1

	github.com/zalando/go-keyring v0.2.6

	gitlab.com/gitlab-org/api/client-go v1.32.0

	gitlab.com/gitlab-org/api/client-go v1.33.0

	go.uber.org/goleak v1.3.0

	go.uber.org/mock v0.6.0

	golang.org/x/crypto v0.48.0

go.sum

+2 −2
Original line number Diff line number Diff line
@@ -310,8 +310,8 @@ github.com/yuin/goldmark-emoji v1.0.5 h1:EMVWyCGPlXJfUXBXpuMu+ii3TIaxbVBnEX9uaDC 
github.com/yuin/goldmark-emoji v1.0.5/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=

github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s=

github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=

gitlab.com/gitlab-org/api/client-go v1.32.0 h1:qbpzX6SMkgbR7x2AWVJNBS/aguFlS9GtnEnN85qBD8M=

gitlab.com/gitlab-org/api/client-go v1.32.0/go.mod h1:1LZ/6Q075HHVa1u9GBQjt8StFwFTRvfjo596slHmDbo=

gitlab.com/gitlab-org/api/client-go v1.33.0 h1:2sWpc3WLEaIeZFJAAocefVWr3oP0kRV7csVo636qto0=

gitlab.com/gitlab-org/api/client-go v1.33.0/go.mod h1:1LZ/6Q075HHVa1u9GBQjt8StFwFTRvfjo596slHmDbo=

go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=

go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=

go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=

internal/api/auth_sources.go

+1 −14
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@ import ( 
	gitlab "gitlab.com/gitlab-org/api/client-go"

)



var (

	_ gitlab.AuthSource = (*oauth2AccessTokenOnlyAuthSource)(nil)

	_ gitlab.AuthSource = (*UnauthenticatedAuthSource)(nil)

)

var _ gitlab.AuthSource = (*oauth2AccessTokenOnlyAuthSource)(nil)



type oauth2AccessTokenOnlyAuthSource struct {

	token string
@@ -22,13 +19,3 @@ func (as oauth2AccessTokenOnlyAuthSource) Init(context.Context, *gitlab.Client) 
func (as oauth2AccessTokenOnlyAuthSource) Header(_ context.Context) (string, string, error) {

	return "Authorization", "Bearer " + as.token, nil

}
 


type UnauthenticatedAuthSource struct{}



func (as UnauthenticatedAuthSource) Init(context.Context, *gitlab.Client) error {

	return nil

}



func (as UnauthenticatedAuthSource) Header(_ context.Context) (string, string, error) {

	return gitlab.AccessTokenHeaderName, "", nil

}

internal/api/client.go

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ func NewClientFromConfig(repoHost string, cfg config.Config, isGraphQL bool, use 
	default:

		// NOTE: use an unauthenticated client.

		newAuthSource = func(*http.Client) (gitlab.AuthSource, error) {

			return UnauthenticatedAuthSource{}, nil

			return gitlab.Unauthenticated{}, nil

		}

	}

internal/commands/auth/credentialhelper/credentialhelper.go

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ func (o *options) run() responseType { 
				Token: as.Token,

			},

		}

	case api.UnauthenticatedAuthSource:

	case gitlab.Unauthenticated:

		return errorResponse{Message: "glab is not authenticated. Use glab auth login to authenticate"}

	default:

		return errorResponse{Message: "unable to determine token"}