revert: fix: prefix git auth url with "x-access-token:" when run in a GitHub Action
This reverts commit cb2c506d8b6545b90587b6b5b7bf979c3f2b40b6.
This commit is contained in:
parent
3f0a37944d
commit
f67a667bcb
@ -3,6 +3,16 @@ const {isNil} = require('lodash');
|
|||||||
const hostedGitInfo = require('hosted-git-info');
|
const hostedGitInfo = require('hosted-git-info');
|
||||||
const {verifyAuth} = require('./git');
|
const {verifyAuth} = require('./git');
|
||||||
|
|
||||||
|
const GIT_TOKENS = {
|
||||||
|
GIT_CREDENTIALS: undefined,
|
||||||
|
GH_TOKEN: undefined,
|
||||||
|
GITHUB_TOKEN: undefined,
|
||||||
|
GL_TOKEN: 'gitlab-ci-token:',
|
||||||
|
GITLAB_TOKEN: 'gitlab-ci-token:',
|
||||||
|
BB_TOKEN: 'x-token-auth:',
|
||||||
|
BITBUCKET_TOKEN: 'x-token-auth:',
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine the the git repository URL to use to push, either:
|
* Determine the the git repository URL to use to push, either:
|
||||||
* - The `repositoryUrl` as is if allowed to push
|
* - The `repositoryUrl` as is if allowed to push
|
||||||
@ -15,18 +25,6 @@ const {verifyAuth} = require('./git');
|
|||||||
* @return {String} The formatted Git repository URL.
|
* @return {String} The formatted Git repository URL.
|
||||||
*/
|
*/
|
||||||
module.exports = async ({cwd, env, branch, options: {repositoryUrl}}) => {
|
module.exports = async ({cwd, env, branch, options: {repositoryUrl}}) => {
|
||||||
const GIT_TOKENS = {
|
|
||||||
GIT_CREDENTIALS: undefined,
|
|
||||||
GH_TOKEN: undefined,
|
|
||||||
// GitHub Actions require the "x-access-token:" prefix for git access
|
|
||||||
// https://developer.github.com/apps/building-github-apps/authenticating-with-github-apps/#http-based-git-access-by-an-installation
|
|
||||||
GITHUB_TOKEN: isNil(env.GITHUB_ACTION) ? undefined : 'x-access-token:',
|
|
||||||
GL_TOKEN: 'gitlab-ci-token:',
|
|
||||||
GITLAB_TOKEN: 'gitlab-ci-token:',
|
|
||||||
BB_TOKEN: 'x-token-auth:',
|
|
||||||
BITBUCKET_TOKEN: 'x-token-auth:',
|
|
||||||
};
|
|
||||||
|
|
||||||
const info = hostedGitInfo.fromUrl(repositoryUrl, {noGitPlus: true});
|
const info = hostedGitInfo.fromUrl(repositoryUrl, {noGitPlus: true});
|
||||||
const {protocol, ...parsed} = parse(repositoryUrl);
|
const {protocol, ...parsed} = parse(repositoryUrl);
|
||||||
|
|
||||||
|
@ -273,19 +273,6 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "BITB
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('Return the "https" formatted URL if "GITHUB_ACTION" is set', async t => {
|
|
||||||
const {cwd} = await gitRepo();
|
|
||||||
|
|
||||||
t.is(
|
|
||||||
await getAuthUrl({
|
|
||||||
cwd,
|
|
||||||
env: {...env, GITHUB_ACTION: 'foo', GITHUB_TOKEN: 'token'},
|
|
||||||
options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
|
|
||||||
}),
|
|
||||||
'https://x-access-token:token@host.null/owner/repo.git'
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Handle "https" URL with group and subgroup, with "GIT_CREDENTIALS"', async t => {
|
test('Handle "https" URL with group and subgroup, with "GIT_CREDENTIALS"', async t => {
|
||||||
const {cwd} = await gitRepo();
|
const {cwd} = await gitRepo();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user