Skip to content

Commit

Permalink
[#4210]Bug/Double PR ICLA
Browse files Browse the repository at this point in the history
- Resolved use case for 2 PRs for unsigned ICLA

Signed-off-by: Harold Wanyama <[email protected]>
  • Loading branch information
nickmango committed Jan 15, 2024
1 parent 1c5d595 commit fa96333
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cla-backend-go/v2/sign/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,6 @@ func (s *service) RequestIndividualSignature(ctx context.Context, input *models.
}

log.WithFields(f).Debugf("signature callback url: %s", callBackURL)
log.WithFields(f).Debugf("latest signature: %+v", latestSignature)

var acl string
if strings.ToLower(input.ReturnURLType) == utils.GitHubType {
Expand Down Expand Up @@ -907,12 +906,12 @@ func (s *service) RequestIndividualSignature(ctx context.Context, input *models.
SignedOn: latestSignature.SignedOn,
SignatureReturnURL: string(input.ReturnURL),
SignatureReturnURLType: input.ReturnURLType,
SignatureCallbackURL: latestSignature.SignatureCallbackURL,
SignatureCallbackURL: callBackURL,
SignatureACL: []string{acl},
SignatureDocumentMajorVersion: majorVersion,
SignatureDocumentMinorVersion: minorVersion,
}
signURL, signErr := s.populateSignURL(ctx, &itemSignature, latestSignature.SignatureCallbackURL, "", "", false, "", "", defaultValues, preferredEmail)
signURL, signErr := s.populateSignURL(ctx, &itemSignature, callBackURL, "", "", false, "", "", defaultValues, preferredEmail)
if signErr != nil {
log.WithFields(f).WithError(err).Warnf("unable to populate sign url for user: %s", *input.UserID)
return nil, signErr
Expand Down Expand Up @@ -1154,6 +1153,7 @@ func (s *service) populateSignURL(ctx context.Context,
"authorityOrSignatoryName": authorityOrSignatoryName,
"authorityOrSignatoryEmail": authorityOrSignatoryEmail,
"preferredEmail": preferredEmail,
"callbackURL": callbackURL,
}
log.WithFields(f).Debugf("populating sign url...")
signatureReferenceType := latestSignature.SignatureReferenceType
Expand Down

0 comments on commit fa96333

Please sign in to comment.