Skip to content
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

fix: labels creation when install #107

Merged
merged 1 commit into from
Feb 23, 2021
Merged

fix: labels creation when install #107

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
41 changes: 6 additions & 35 deletions api/__test__/policies.isGithubAuth.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,11 @@ jest.mock('../../config/github', () => ({
}));

const testId = '410939550';
const testOrgName = 'SSOEnabledOrg';

process.env.TOKEN_ORGS = testOrgName;
process.env.PERSONAL_ACCESS_TOKEN = 'personalAccessToken123';

const req = {
body: {
installation: {
id: testId
},
repository: {
full_name: 'testOrg/testRepo'
}
}
};

const SSOReq = {
body: {
installation: {
id: testId
},
repository: {
full_name: testOrgName + '/testRepo'
}
}
};
Expand All @@ -68,13 +50,6 @@ describe('isGithubAuth policy', () => {
auth: expect.any(Function)
});
});
it('should call Octokit using peronsal access token for SSO Org', () => {
Octokit.mockReset();
isGithubAuth(SSOReq, res, next);
expect(Octokit).toHaveBeenCalledWith({
auth: process.env.PERSONAL_ACCESS_TOKEN
});
});
it('should attach octokitClient to req', () => {
Octokit.mockReset();
Octokit.mockImplementation(() => {
Expand All @@ -92,16 +67,12 @@ describe('isGithubAuth policy', () => {
isGithubAuth(req, res, next);
expect(next).toHaveBeenCalled();
});
it('should respond with 401 status when getInstallationAccessToken rejects', async () => {
App.mockImplementation(() => {
return {
getInstallationAccessToken: jest.fn(() => Promise.reject())
};
});
Octokit.mockImplementation(async ({ auth }) => {
return await auth();
it('should call Octokit using peronsal access token for SSO Org', () => {
Octokit.mockReset();
process.env.PERSONAL_ACCESS_TOKEN = 'personalAccessToken123';
isGithubAuth(req, res, next);
expect(Octokit).toHaveBeenCalledWith({
auth: process.env.PERSONAL_ACCESS_TOKEN
});
await isGithubAuth(req, res, next);
expect(res.status).toHaveBeenCalledWith(401);
});
});
18 changes: 4 additions & 14 deletions api/policies/isGithubAuth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,15 @@ try {
`);
}

function shouldUsePersonalToken(fullName) {
const orgName = fullName.split('/')[0];
if (process.env.TOKEN_ORGS) {
const tokenOrgs = process.env.TOKEN_ORGS.split(',');
return tokenOrgs.some(tokenOrgName => tokenOrgName === orgName);
}
return false;
}

module.exports = async function isGithubAuth(req, res, next) {
const { installation, repository, repositories } = req.body;
const PERSONAL_ACCESS_TOKEN = process.env.PERSONAL_ACCESS_TOKEN;
const { installation } = req.body;
const app = new App({
id: github.appId,
privateKey: cert
});
const repositoryName = (repositories && repositories[0] && repositories[0].full_name) ? repositories[0].full_name : repository.full_name;
// pretier-ignore
const octokitClient = (repository && shouldUsePersonalToken(repositoryName))
? new Octokit({ auth: process.env.PERSONAL_ACCESS_TOKEN })
const octokitClient = PERSONAL_ACCESS_TOKEN
? new Octokit({ auth: PERSONAL_ACCESS_TOKEN })
: new Octokit({
async auth() {
let installationAccessToken;
Expand Down