From 8d29f8f58b68b13ecbc5d5766105de34885a2333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Thu, 14 Jun 2018 19:26:32 +0200
Subject: [PATCH 1/2] MM-10767: Adding ordering to the system-admin list all
 teams (#8950)

---
 store/sqlstore/team_store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go
index 22f0bdb295..95b73e5424 100644
--- a/store/sqlstore/team_store.go
+++ b/store/sqlstore/team_store.go
@@ -342,7 +342,7 @@ func (s SqlTeamStore) GetAll() store.StoreChannel {
 func (s SqlTeamStore) GetAllPage(offset int, limit int) store.StoreChannel {
 	return store.Do(func(result *store.StoreResult) {
 		var data []*model.Team
-		if _, err := s.GetReplica().Select(&data, "SELECT * FROM Teams LIMIT :Limit OFFSET :Offset", map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
+		if _, err := s.GetReplica().Select(&data, "SELECT * FROM Teams ORDER BY DisplayName LIMIT :Limit OFFSET :Offset", map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil {
 			result.Err = model.NewAppError("SqlTeamStore.GetAllTeams", "store.sql_team.get_all.app_error", nil, err.Error(), http.StatusInternalServerError)
 		}
 

From 85a75526c7c03fca1d14a39cfb3f2638d98d3fe1 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 14 Jun 2018 13:27:00 -0400
Subject: [PATCH 2/2] Add more oauth logging and note about GitLab ToS for
 login (#8949)

---
 app/oauth.go | 15 ++++++++++++++-
 i18n/en.json |  4 ++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/oauth.go b/app/oauth.go
index 13fbd5a730..477c0aeaf4 100644
--- a/app/oauth.go
+++ b/app/oauth.go
@@ -8,6 +8,7 @@ import (
 	b64 "encoding/base64"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
@@ -690,10 +691,13 @@ func (a *App) AuthorizeOAuthUser(w http.ResponseWriter, r *http.Request, service
 	if resp, err := a.HTTPClient(true).Do(req); err != nil {
 		return nil, "", stateProps, model.NewAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.token_failed.app_error", nil, err.Error(), http.StatusInternalServerError)
 	} else {
+		bodyBytes, _ = ioutil.ReadAll(resp.Body)
+		resp.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes))
+
 		ar = model.AccessResponseFromJson(resp.Body)
 		consumeAndClose(resp)
 
-		if ar == nil {
+		if ar == nil || resp.StatusCode != http.StatusOK {
 			return nil, "", stateProps, model.NewAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.bad_response.app_error", nil, "response_body="+string(bodyBytes), http.StatusInternalServerError)
 		}
 	}
@@ -717,6 +721,15 @@ func (a *App) AuthorizeOAuthUser(w http.ResponseWriter, r *http.Request, service
 	if resp, err := a.HTTPClient(true).Do(req); err != nil {
 		return nil, "", stateProps, model.NewAppError("AuthorizeOAuthUser", "api.user.authorize_oauth_user.service.app_error", map[string]interface{}{"Service": service}, err.Error(), http.StatusInternalServerError)
 	} else {
+		bodyBytes, _ = ioutil.ReadAll(resp.Body)
+		if resp.StatusCode != http.StatusOK {
+			bodyString := string(bodyBytes)
+			mlog.Error("Error getting OAuth user: " + bodyString)
+			if service == model.SERVICE_GITLAB && resp.StatusCode == http.StatusForbidden && strings.Contains(bodyString, "Terms of Service") {
+				return nil, "", stateProps, model.NewAppError("AuthorizeOAuthUser", "oauth.gitlab.tos.error", nil, "", http.StatusBadRequest)
+			}
+		}
+		resp.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes))
 		return resp.Body, teamId, stateProps, nil
 	}
 
diff --git a/i18n/en.json b/i18n/en.json
index 4df6982948..0613d12cd0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2842,6 +2842,10 @@
     "id": "api.user.complete_switch_with_oauth.blank_email.app_error",
     "translation": "Blank email"
   },
+  {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
   {
     "id": "api.user.complete_switch_with_oauth.parse.app_error",
     "translation": "Could not parse auth data out of {{.Service}} user object"