Change 'committer' field from UserID to Email, when Email is available #6912
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nopcoder
suggested changes
Oct 31, 2023
pkg/api/controller.go
Outdated
| @@ -3941,6 +3938,15 @@ func (c *Controller) MergeIntoBranch(w http.ResponseWriter, r *http.Request, bod | |||
| }) | |||
| } | |||
|
|
|||
| func getCommitter(user *model.User) string { | |||
There was a problem hiding this comment.
- Can we make it a method on the model
- We should have email verification before user's creation - we should assume that email is valid. You can keep the null and empty check before return the value.
- Need to verify ldap integration as which value we keep for username, not sure email is populated in this case and maybe we need too apply the friendly name in this case. Alternative, open a specific issue for external auth with ldap.
There was a problem hiding this comment.
- changing
- I know, but still we are getting the email from an external service, thought it's better to stay safe than have unknown strings in the committer, @nopcoder WDYT?
- Even if that is the case, will we prefer the friendly name that is editable to the username?
There was a problem hiding this comment.
My concern is that if the case the user's email is not an actual email, have a problem in some place else and we don't want to move this problem (and verify it) every time we use information from user model.
Prefer the username.
There was a problem hiding this comment.
Thanks! Changed PTAL
Closed
guy-har
added
the
include-changelog
guy-har
changed the title
nopcoder
suggested changes
Oct 31, 2023
pkg/auth/model/model.go
Outdated
Comment on lines
126
to
127
| if u.Email != nil { | ||
| return *u.Email |
There was a problem hiding this comment.
can you also verify the value is not empty string?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.