diff options
Diffstat (limited to 'model')
-rw-r--r-- | model/gitlab/gitlab.go | 27 | ||||
-rw-r--r-- | model/version.go | 1 | ||||
-rw-r--r-- | model/version_test.go | 15 |
3 files changed, 31 insertions, 12 deletions
diff --git a/model/gitlab/gitlab.go b/model/gitlab/gitlab.go index 8b96c64f6..3ca499976 100644 --- a/model/gitlab/gitlab.go +++ b/model/gitlab/gitlab.go @@ -67,6 +67,18 @@ func gitLabUserFromJson(data io.Reader) *GitLabUser { } } +func (glu *GitLabUser) IsValid() bool { + if glu.Id == 0 { + return false + } + + if len(glu.Email) == 0 { + return false + } + + return true +} + func (glu *GitLabUser) getAuthData() string { return strconv.FormatInt(glu.Id, 10) } @@ -76,9 +88,20 @@ func (m *GitLabProvider) GetIdentifier() string { } func (m *GitLabProvider) GetUserFromJson(data io.Reader) *model.User { - return userFromGitLabUser(gitLabUserFromJson(data)) + glu := gitLabUserFromJson(data) + if glu.IsValid() { + return userFromGitLabUser(glu) + } + + return &model.User{} } func (m *GitLabProvider) GetAuthDataFromJson(data io.Reader) string { - return gitLabUserFromJson(data).getAuthData() + glu := gitLabUserFromJson(data) + + if glu.IsValid() { + return glu.getAuthData() + } + + return "" } diff --git a/model/version.go b/model/version.go index 69529e7a1..8fbd65d03 100644 --- a/model/version.go +++ b/model/version.go @@ -13,6 +13,7 @@ import ( // It should be maitained in chronological order with most current // release at the front of the list. var versions = []string{ + "2.0.0", "1.4.0", "1.3.0", "1.2.1", diff --git a/model/version_test.go b/model/version_test.go index d73273ce5..e0346c43a 100644 --- a/model/version_test.go +++ b/model/version_test.go @@ -83,28 +83,23 @@ func TestIsCurrentVersion(t *testing.T) { func TestIsPreviousVersionsSupported(t *testing.T) { - // 1.4.0 CURRENT RELEASED VERSION - if !IsPreviousVersionsSupported(versions[0]) { + if !IsPreviousVersionsSupported(versionsWithoutHotFixes[0]) { t.Fatal() } - // 1.3.0 - if !IsPreviousVersionsSupported(versions[1]) { + if !IsPreviousVersionsSupported(versionsWithoutHotFixes[1]) { t.Fatal() } - // 1.2.1 - if !IsPreviousVersionsSupported(versions[2]) { + if !IsPreviousVersionsSupported(versionsWithoutHotFixes[2]) { t.Fatal() } - // 1.2.0 - if !IsPreviousVersionsSupported(versions[3]) { + if IsPreviousVersionsSupported(versionsWithoutHotFixes[4]) { t.Fatal() } - // 1.1.0 NOT SUPPORTED - if IsPreviousVersionsSupported(versions[4]) { + if IsPreviousVersionsSupported(versionsWithoutHotFixes[5]) { t.Fatal() } } |