diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-12-02 08:08:27 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-12-02 08:08:27 -0500 |
| commit | 7678d4aafa17a27da897925a169931d1c2cb07fc (patch) | |
| tree | 0189eeea0754ca2d1d80e85c891f992db5eacc6e /model | |
| parent | 5925d3118019da6ead1494ed38f6243cde297b43 (diff) | |
| parent | ff664e44ec13f64e6848a466eca37eb85de694a0 (diff) | |
| download | chat-7678d4aafa17a27da897925a169931d1c2cb07fc.tar.gz chat-7678d4aafa17a27da897925a169931d1c2cb07fc.tar.bz2 chat-7678d4aafa17a27da897925a169931d1c2cb07fc.zip | |
Merge pull request #1556 from npcode/sso-github-ent
Make the Gitlab SSO Support compatible with Github Enterprise
Diffstat (limited to 'model')
| -rw-r--r-- | model/gitlab.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/model/gitlab.go b/model/gitlab.go index 9f86c7b72..2a8756807 100644 --- a/model/gitlab.go +++ b/model/gitlab.go @@ -17,13 +17,18 @@ const ( type GitLabUser struct { Id int64 `json:"id"` Username string `json:"username"` + Login string `json:"login"` Email string `json:"email"` Name string `json:"name"` } func UserFromGitLabUser(glu *GitLabUser) *User { user := &User{} - user.Username = CleanUsername(glu.Username) + username := glu.Username + if username == "" { + username = glu.Login + } + user.Username = CleanUsername(username) splitName := strings.Split(glu.Name, " ") if len(splitName) == 2 { user.FirstName = splitName[0] |