From 630a8ed8aa2508adc14453fab8b7cf04aeab7e59 Mon Sep 17 00:00:00 2001
From: Dan Cech <dcech@raintank.io>
Date: Tue, 20 Sep 2016 12:36:36 -0400
Subject: [PATCH] support setting default org role when adding user via
 grafana.net auth

---
 pkg/api/login_oauth.go         |  9 +++++----
 pkg/models/user.go             | 19 ++++++++++---------
 pkg/services/sqlstore/user.go  |  6 +++++-
 pkg/social/grafananet_oauth.go |  2 ++
 pkg/social/social.go           |  1 +
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index eab8d869951..07cf70a96e3 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -83,10 +83,11 @@ func OAuthLogin(ctx *middleware.Context) {
 			return
 		}
 		cmd := m.CreateUserCommand{
-			Login:   userInfo.Email,
-			Email:   userInfo.Email,
-			Name:    userInfo.Name,
-			Company: userInfo.Company,
+			Login:          userInfo.Email,
+			Email:          userInfo.Email,
+			Name:           userInfo.Name,
+			Company:        userInfo.Company,
+			DefaultOrgRole: userInfo.Role,
 		}
 
 		if err = bus.Dispatch(&cmd); err != nil {
diff --git a/pkg/models/user.go b/pkg/models/user.go
index a231156b7b0..d2dcdf0a5c9 100644
--- a/pkg/models/user.go
+++ b/pkg/models/user.go
@@ -44,15 +44,16 @@ func (u *User) NameOrFallback() string {
 // COMMANDS
 
 type CreateUserCommand struct {
-	Email         string
-	Login         string
-	Name          string
-	Company       string
-	OrgName       string
-	Password      string
-	EmailVerified bool
-	IsAdmin       bool
-	SkipOrgSetup  bool
+	Email          string
+	Login          string
+	Name           string
+	Company        string
+	OrgName        string
+	Password       string
+	EmailVerified  bool
+	IsAdmin        bool
+	SkipOrgSetup   bool
+	DefaultOrgRole string
 
 	Result User
 }
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 3dc685cd7e5..bbf21296519 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -128,7 +128,11 @@ func CreateUser(cmd *m.CreateUserCommand) error {
 			}
 
 			if setting.AutoAssignOrg && !user.IsAdmin {
-				orgUser.Role = m.RoleType(setting.AutoAssignOrgRole)
+				if len(cmd.DefaultOrgRole) > 0 {
+					orgUser.Role = m.RoleType(cmd.DefaultOrgRole)
+				} else {
+					orgUser.Role = m.RoleType(setting.AutoAssignOrgRole)
+				}
 			}
 
 			if _, err = sess.Insert(&orgUser); err != nil {
diff --git a/pkg/social/grafananet_oauth.go b/pkg/social/grafananet_oauth.go
index 05cc7c1f397..80c1aaedb45 100644
--- a/pkg/social/grafananet_oauth.go
+++ b/pkg/social/grafananet_oauth.go
@@ -83,6 +83,7 @@ func (s *SocialGrafanaNet) UserInfo(token *oauth2.Token) (*BasicUserInfo, error)
 		Id    int    `json:"id"`
 		Name  string `json:"login"`
 		Email string `json:"email"`
+		Role  string `json:"role"`
 	}
 
 	var err error
@@ -102,6 +103,7 @@ func (s *SocialGrafanaNet) UserInfo(token *oauth2.Token) (*BasicUserInfo, error)
 		Identity: strconv.Itoa(data.Id),
 		Name:     data.Name,
 		Email:    data.Email,
+		Role:     data.Role,
 	}
 
 	if !s.IsOrganizationMember(client) {
diff --git a/pkg/social/social.go b/pkg/social/social.go
index 83e5aa19b43..fc29fe9c5d2 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -15,6 +15,7 @@ type BasicUserInfo struct {
 	Email    string
 	Login    string
 	Company  string
+	Role     string
 }
 
 type SocialConnector interface {