Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

fix: handle case of missing member in "Add User to Repository" flow #109

Merged
merged 1 commit into from
Sep 8, 2023
Merged

fix: handle case of missing member in "Add User to Repository" flow #109

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
19 changes: 15 additions & 4 deletions services/GitlabService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,17 @@ async function getRepository(user, repoURL) {
async function addUserToRepository(copilot, repository, user, accessLevel) {
const refreshedCopilot = await _refreshGitlabUserAccessToken(copilot);
const gitlab = await _authenticate(refreshedCopilot.accessToken);
const member = await gitlab.ProjectMembers.show(repository.id, user.userProviderId);
const member = await new Promise((resolve, reject) => {
gitlab.ProjectMembers.show(repository.id, user.userProviderId)
.then((result) => resolve(result))
.catch((err) => {
// eslint-disable-next-line no-magic-numbers
if (_.get(err, 'cause.response.status') === 404) {
return resolve(null);
}
return reject(err);
});
});
if (!member) {
await gitlab.ProjectMembers.add(repository.id, user.userProviderId, accessLevel);
return;
Expand Down Expand Up @@ -386,16 +396,17 @@ async function _refreshGitlabUserAccessToken(copilot) {
.end();
// save user token data
const expiresIn = refreshTokenResult.body.expires_in || config.GITLAB_ACCESS_TOKEN_DEFAULT_EXPIRATION;
return await dbHelper.update(models.User, copilot.id, {
const updates = {
accessToken: refreshTokenResult.body.access_token,
accessTokenExpiration: new Date(new Date().getTime() + expiresIn * MS_PER_SECOND),
refreshToken: refreshTokenResult.body.refresh_token
});
};
copilot = _.assign(copilot, updates);
return await dbHelper.update(models.User, copilot.id, updates);
}
return copilot;
}


module.exports = {
createComment,
updateIssue,
Expand Down