diff options
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]) } } |