From 58358ddd7cd0152bf16a7326e1d595524fb51246 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 8 Dec 2015 13:38:43 -0500 Subject: Some refactoring --- model/gitlab.go | 62 --------------------------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 model/gitlab.go (limited to 'model/gitlab.go') diff --git a/model/gitlab.go b/model/gitlab.go deleted file mode 100644 index 2a8756807..000000000 --- a/model/gitlab.go +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -package model - -import ( - "encoding/json" - "io" - "strconv" - "strings" -) - -const ( - USER_AUTH_SERVICE_GITLAB = "gitlab" -) - -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{} - 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] - user.LastName = splitName[1] - } else if len(splitName) >= 2 { - user.FirstName = splitName[0] - user.LastName = strings.Join(splitName[1:], " ") - } else { - user.FirstName = glu.Name - } - user.Email = glu.Email - user.AuthData = strconv.FormatInt(glu.Id, 10) - user.AuthService = USER_AUTH_SERVICE_GITLAB - - return user -} - -func GitLabUserFromJson(data io.Reader) *GitLabUser { - decoder := json.NewDecoder(data) - var glu GitLabUser - err := decoder.Decode(&glu) - if err == nil { - return &glu - } else { - return nil - } -} - -func (glu *GitLabUser) GetAuthData() string { - return strconv.FormatInt(glu.Id, 10) -} -- cgit v1.2.3-1-g7c22