Skip to content

Fix GitHub repository provider when providing token with auth property #6662

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

Merged
bentsherman merged 2 commits into from
Dec 15, 2025
Merged

Fix GitHub repository provider when providing token with auth property #6662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29c0b58
fix usage of token in github repository provider
jorgee Dec 9, 2025
91b02a4
Add auth test
jorgee Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/nextflow/src/main/groovy/nextflow/scm/GithubRepositoryProvider.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ class GithubRepositoryProvider extends RepositoryProvider {

@Override
String getUser() {
super.getUser() ?: SysEnv.get('GITHUB_TOKEN')
super.getUser() ?: getToken() ?: SysEnv.get('GITHUB_TOKEN')
}

@Override
String getPassword() {
super.getPassword() ?: (SysEnv.containsKey('GITHUB_TOKEN') ? 'x-oauth-basic' : null)
super.getPassword() ?: ( (getToken() || SysEnv.containsKey('GITHUB_TOKEN')) ? 'x-oauth-basic' : null)
}

/** {@inheritDoc} */
Expand Down
15 changes: 15 additions & 0 deletions modules/nextflow/src/test/groovy/nextflow/scm/GithubRepositoryProviderTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,21 @@ class GithubRepositoryProviderTest extends Specification {
SysEnv.pop()
}

def 'should user specified token instead of github token as creds' () {
given:
SysEnv.push(['GITHUB_TOKEN': '1234567890'])
and:
def config = new ProviderConfig('github', [auth: '987654321'])
def provider = Spy(new GithubRepositoryProvider('foo/bar', config))

expect:
provider.getUser() == '987654321'
provider.getPassword() == 'x-oauth-basic'

cleanup:
SysEnv.pop()
}

def 'should user from config' () {
given:
SysEnv.push(['GITHUB_TOKEN': '1234567890'])
Expand Down
Loading