From 6d63f5703c1849b688aaef6570e9b366b70eefab Mon Sep 17 00:00:00 2001
From: Yi EungJun <eungjun.yi@navercorp.com>
Date: Tue, 1 Dec 2015 16:39:27 +0900
Subject: Make the Gitlab SSO Support compatible with Github Enterprise

See doc/integrations/Single-Sign-On/Github.md for the usage.

Note: I thought it should work also with Github.com but it failed with "Bad
token type" error.
---
 model/gitlab.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'model')

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]
-- 
cgit v1.2.3-1-g7c22