diff options
Diffstat (limited to 'modules/migrations')
| -rw-r--r-- | modules/migrations/gitlab.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/migrations/gitlab.go b/modules/migrations/gitlab.go index e6529af9de..7ed3d5645f 100644 --- a/modules/migrations/gitlab.go +++ b/modules/migrations/gitlab.go @@ -76,9 +76,10 @@ type GitlabDownloader struct { func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, username, password, token string) (*GitlabDownloader, error) { var gitlabClient *gitlab.Client var err error - if token != "" { - gitlabClient, err = gitlab.NewClient(token, gitlab.WithBaseURL(baseURL)) - } else { + gitlabClient, err = gitlab.NewClient(token, gitlab.WithBaseURL(baseURL)) + // Only use basic auth if token is blank and password is NOT + // Basic auth will fail with empty strings, but empty token will allow anonymous public API usage + if token == "" && password != "" { gitlabClient, err = gitlab.NewBasicAuthClient(username, password, gitlab.WithBaseURL(baseURL)) } |