Skip to content

Send access token via auth header #165

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
sorenlouv merged 1 commit into from
Feb 10, 2020
Merged

Send access token via auth header #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/options/options.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ describe('getOptions', () => {
it('should check whether access token is valid', () => {
expect(axiosHeadSpy).toHaveBeenCalledTimes(1);
expect(axiosHeadSpy).toHaveBeenCalledWith(
'https://api.github.com/repos/elastic/kibana?access_token=myAccessToken'
'https://api.github.com/repos/elastic/kibana',
{ auth: { password: 'myAccessToken', username: 'sqren' } }
);
});

Expand Down
6 changes: 5 additions & 1 deletion src/services/github/__snapshots__/fetchCommitBySha.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
exports[`fetchCommitBySha should return single commit with pull request 1`] = `
Array [
Array [
"https://api.github.com/search/commits?q=hash:sha123456789%20repo:elastic/kibana&per_page=1&access_token=myAccessToken",
"https://api.github.com/search/commits?q=hash:sha123456789%20repo:elastic/kibana&per_page=1",
Object {
"auth": Object {
"password": "myAccessToken",
"username": "sqren",
},
"headers": Object {
"Accept": "application/vnd.github.cloak-preview",
},
Expand Down
12 changes: 9 additions & 3 deletions src/services/github/addLabelsToPullRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,22 @@ import { handleGithubError } from './handleGithubError';
import { logger } from '../logger';

export async function addLabelsToPullRequest(
{ apiHostname, repoName, repoOwner, accessToken }: BackportOptions,
{ apiHostname, repoName, repoOwner, accessToken, username }: BackportOptions,
pullNumber: number,
labels: string[]
) {
logger.info(`Adding label "${labels}" to #${pullNumber}`);

try {
return await axios.post(
`https://${apiHostname}/repos/${repoOwner}/${repoName}/issues/${pullNumber}/labels?access_token=${accessToken}`,
labels
`https://${apiHostname}/repos/${repoOwner}/${repoName}/issues/${pullNumber}/labels`,
labels,
{
auth: {
username: username,
password: accessToken
}
}
);
} catch (e) {
throw handleGithubError(e);
Expand Down
12 changes: 9 additions & 3 deletions src/services/github/createPullRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { handleGithubError } from './handleGithubError';
import { logger } from '../logger';

export async function createPullRequest(
{ apiHostname, repoName, repoOwner, accessToken }: BackportOptions,
{ apiHostname, repoName, repoOwner, accessToken, username }: BackportOptions,
payload: {
title: string;
body: string;
Expand All @@ -19,8 +19,14 @@ export async function createPullRequest(

try {
const res: AxiosResponse<GithubIssue> = await axios.post(
`https://${apiHostname}/repos/${repoOwner}/${repoName}/pulls?access_token=${accessToken}`,
payload
`https://${apiHostname}/repos/${repoOwner}/${repoName}/pulls`,
payload,
{
auth: {
username: username,
password: accessToken
}
}
);
return {
html_url: res.data.html_url,
Expand Down
15 changes: 13 additions & 2 deletions src/services/github/fetchCommitBySha.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,22 @@ import { getFormattedCommitMessage } from './commitFormatters';
export async function fetchCommitBySha(
options: BackportOptions & { sha: string }
): Promise<CommitSelected> {
const { apiHostname, repoName, repoOwner, sha, accessToken } = options;
const {
apiHostname,
repoName,
repoOwner,
sha,
accessToken,
username
} = options;
try {
const res = await axios.get<GithubSearch<GithubCommit>>(
`https://${apiHostname}/search/commits?q=hash:${sha}%20repo:${repoOwner}/${repoName}&per_page=1&access_token=${accessToken}`,
`https://${apiHostname}/search/commits?q=hash:${sha}%20repo:${repoOwner}/${repoName}&per_page=1`,
{
auth: {
username: username,
password: accessToken
},
headers: {
Accept: 'application/vnd.github.cloak-preview'
}
Expand Down
3 changes: 2 additions & 1 deletion src/services/github/verifyAccessToken.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ describe('verifyAccessToken', () => {
await verifyAccessToken(getDefaultOptions(options));

expect(spy).toHaveBeenCalledWith(
'https://api.github.com/repos/elastic/kibana?access_token=myAccessToken'
'https://api.github.com/repos/elastic/kibana',
{ auth: { password: 'myAccessToken', username: 'sqren' } }
);
});

Expand Down
9 changes: 8 additions & 1 deletion src/services/github/verifyAccessToken.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,21 @@ function getSSOAuthUrl(error: GithubApiError) {
}

export async function verifyAccessToken({
username,
accessToken,
apiHostname,
repoName,
repoOwner
}: ReturnType<typeof validateRequiredOptions>) {
try {
return await axios.head(
`https://${apiHostname}/repos/${repoOwner}/${repoName}?access_token=${accessToken}`
`https://${apiHostname}/repos/${repoOwner}/${repoName}`,
{
auth: {
username: username,
password: accessToken
}
}
);
} catch (e) {
const error = e as GithubApiError;
Expand Down
8 changes: 4 additions & 4 deletions src/ui/cherrypickAndCreatePullRequest.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ describe('cherrypickAndCreatePullRequest', () => {
expect(axiosPostMock).toHaveBeenCalledTimes(2);
const [apiEndpoint, payload] = axiosPostMock.mock.calls[0];
expect(apiEndpoint).toBe(
'https://api.github.com/repos/elastic/kibana/pulls?access_token=undefined'
'https://api.github.com/repos/elastic/kibana/pulls'
);
expect(payload.title).toBe(
'[6.x] myCommitMessage (#1000) | myOtherCommitMessage (#2000)'
Expand All @@ -95,7 +95,7 @@ myPrSuffix`
const [apiEndpoint, labels] = axiosPostMock.mock.calls[1];

expect(apiEndpoint).toBe(
'https://api.github.com/repos/elastic/kibana/issues/1337/labels?access_token=undefined'
'https://api.github.com/repos/elastic/kibana/issues/1337/labels'
);
expect(labels).toEqual(['backport']);
});
Expand Down Expand Up @@ -126,7 +126,7 @@ myPrSuffix`
expect(axiosPostMock).toHaveBeenCalledTimes(2);
const [apiEndpoint, payload] = axiosPostMock.mock.calls[0];
expect(apiEndpoint).toBe(
'https://api.github.com/repos/elastic/kibana/pulls?access_token=undefined'
'https://api.github.com/repos/elastic/kibana/pulls'
);
expect(payload.title).toBe('[6.x] myCommitMessage (mySha)');
expect(payload.body).toBe(
Expand All @@ -141,7 +141,7 @@ myPrSuffix`
const [apiEndpoint, labels] = axiosPostMock.mock.calls[1];

expect(apiEndpoint).toBe(
'https://api.github.com/repos/elastic/kibana/issues/1337/labels?access_token=undefined'
'https://api.github.com/repos/elastic/kibana/issues/1337/labels'
);
expect(labels).toEqual(['backport']);
});
Expand Down
9 changes: 7 additions & 2 deletions src/ui/getCommitBySha.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ describe('getCommitBySha', () => {
it('should return a single commit without PR', async () => {
const axiosSpy = mockCommitItems([commitByShaMock]);
const commit = await getCommitBySha({
username: 'sqren',
accessToken: 'myAccessToken',
repoOwner: 'elastic',
repoName: 'kibana',
sha: 'myCommitSha',
Expand All @@ -24,8 +26,11 @@ describe('getCommitBySha', () => {
});

expect(axiosSpy).toHaveBeenCalledWith(
'https://api.github.com/search/commits?q=hash:myCommitSha%20repo:elastic/kibana&per_page=1&access_token=undefined',
{ headers: { Accept: 'application/vnd.github.cloak-preview' } }
'https://api.github.com/search/commits?q=hash:myCommitSha%20repo:elastic/kibana&per_page=1',
{
headers: { Accept: 'application/vnd.github.cloak-preview' },
auth: { password: 'myAccessToken', username: 'sqren' }
}
);
});

Expand Down