diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-28 09:14:37 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-28 09:14:37 -0400 |
| commit | 75af5d4536cc414d171c2fe6dca78e455eb18b37 (patch) | |
| tree | 4e00cf97b5f4f570b1901093bfa4e208749932a0 /model/google.go | |
| parent | d107b392a6309a41eac6cd7d07d720a21968eb56 (diff) | |
| parent | f5fec3a157e6c9146a0c4e28dd5f70e6c066affd (diff) | |
| download | chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.tar.gz chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.tar.bz2 chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.zip | |
Merge pull request #496 from mattermost/mm-2015
MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up.
Diffstat (limited to 'model/google.go')
| -rw-r--r-- | model/google.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/model/google.go b/model/google.go index 2a1eb3caa..bc65d0817 100644 --- a/model/google.go +++ b/model/google.go @@ -23,11 +23,6 @@ type GoogleUser struct { func UserFromGoogleUser(gu *GoogleUser) *User { user := &User{} - if len(gu.Nickname) > 0 { - user.Username = gu.Nickname - } else { - user.Username = strings.ToLower(strings.Replace(gu.DisplayName, " ", "", -1)) - } user.FirstName = gu.Names["givenName"] user.LastName = gu.Names["familyName"] user.Nickname = gu.Nickname @@ -35,6 +30,7 @@ func UserFromGoogleUser(gu *GoogleUser) *User { for _, e := range gu.Emails { if e["type"] == "account" { user.Email = e["value"] + user.Username = CleanUsername(strings.Split(user.Email, "@")[0]) } } |