Skip to content

Commit

Permalink
users permissions werent checked if they already existed and were active
Browse files Browse the repository at this point in the history
  • Loading branch information
Tiago Posse committed Sep 28, 2023
1 parent 91f4646 commit c2c8556
Showing 1 changed file with 22 additions and 9 deletions.
31 changes: 22 additions & 9 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ async function execute() {
leftOverUsers.splice(leftOverUsers.indexOf(email), 1)
}


// check which users need to be removed or activate
for (const email of leftOverUsers) {
if (!gitlabScimUsers[email].active) {
Expand Down Expand Up @@ -148,6 +147,7 @@ async function execute() {
continue
}

const leftOverMembership = Object.assign({}, expectedMembership);
for (const item of currentMembership) {
if (expectedMembership[item.source_full_name] === undefined) {
const userDefaultMembership = getGroupPrivilege(DEFAULT_MEMBERSHIP_ROLE, item.source_full_name, expectedMembership)
Expand All @@ -161,16 +161,29 @@ async function execute() {
notes: email,
})
}
} else if (expectedMembership[item.source_full_name] !== item.access_level.integer_value) {
membershipUpdates.push({
user: gitlabUsers[email].id,
group: item.source_full_name,
role: expectedMembership[item.source_full_name],
op: shouldDelete(item.source_full_name, expectedMembership[item.source_full_name]),
notes: email,
})
} else {
delete leftOverMembership[item.source_full_name]
if (expectedMembership[item.source_full_name] !== item.access_level.integer_value) {
membershipUpdates.push({
user: gitlabUsers[email].id,
group: item.source_full_name,
role: expectedMembership[item.source_full_name],
op: shouldDelete(item.source_full_name, expectedMembership[item.source_full_name]),
notes: email,
})
}
}
}

for (const key of Object.keys(leftOverMembership)) {
membershipUpdates.push({
user: email,
group: key,
role: leftOverMembership[key],
op: GitlabAccessUpdateOperation.ADD,
notes: email,
})
}
}

logger.info(`User updates:`)
Expand Down

0 comments on commit c2c8556

Please sign in to comment.