Skip to content

Commit

Permalink
Merge pull request #9 from Keeper-Security/release
Browse files Browse the repository at this point in the history
Destruct mode parse error
  • Loading branch information
craiglurey authored Feb 10, 2024
2 parents da686ac + 79f0d1e commit 60cb0fd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions scim/google_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,18 +214,17 @@ func (ge *googleEndpoint) Populate() (err error) {
}
membershipCache[gId] = memberIds
}
var u *User
var g *Group
for _, mId := range memberIds {
var u *User
if u, ok = userLookup[mId]; ok {
u.Groups = append(u.Groups, groupId)
if _, ok = ge.users[u.Id]; !ok {
ge.users[u.Id] = u
}
} else {
if !queuedIds.Has(g.Id) {
groupIds = append(groupIds, g.Id)
queuedIds.Add(g.Id)
if !queuedIds.Has(mId) {
groupIds = append(groupIds, mId)
queuedIds.Add(mId)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion scim/ksm_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func LoadScimParametersFromRecord(scimRecord *ksm.Record) (ka *ScimEndpointParam
if av, ok = value.([]any); ok {
if len(av) > 0 && av[0] != nil {
if sv, ok = av[0].(string); ok {
if iv, er1 := strconv.Atoi(sv); er1 != nil {
if iv, er1 := strconv.Atoi(sv); er1 == nil {
ka.Destructive = int32(iv)
} else {
ka.Destructive = -1
Expand Down

0 comments on commit 60cb0fd

Please sign in to comment.