MM-10757: Default roles from scheme should be keyed by name not ID. (#8894)

* MM-10757: Default roles from scheme should be keyed by name not ID.

* Update permissions import/export.

8 files changed, 104 insertions, 73 deletions

diff --git a/api4/scheme_test.go b/api4/scheme_test.go
index 67cfda4fc..21a94ca69 100644
--- a/api4/scheme_test.go
+++ b/api4/scheme_test.go
@@ -44,13 +44,13 @@ func TestCreateScheme(t *testing.T) {
 	assert.NotZero(t, len(s1.DefaultChannelUserRole))
 
 	// Check the default roles have been created.
-	_, roleRes1 := th.SystemAdminClient.GetRole(s1.DefaultTeamAdminRole)
+	_, roleRes1 := th.SystemAdminClient.GetRoleByName(s1.DefaultTeamAdminRole)
 	CheckNoError(t, roleRes1)
-	_, roleRes2 := th.SystemAdminClient.GetRole(s1.DefaultTeamUserRole)
+	_, roleRes2 := th.SystemAdminClient.GetRoleByName(s1.DefaultTeamUserRole)
 	CheckNoError(t, roleRes2)
-	_, roleRes3 := th.SystemAdminClient.GetRole(s1.DefaultChannelAdminRole)
+	_, roleRes3 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelAdminRole)
 	CheckNoError(t, roleRes3)
-	_, roleRes4 := th.SystemAdminClient.GetRole(s1.DefaultChannelUserRole)
+	_, roleRes4 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelUserRole)
 	CheckNoError(t, roleRes4)
 
 	// Basic Test of a Channel scheme.
@@ -77,9 +77,9 @@ func TestCreateScheme(t *testing.T) {
 	assert.NotZero(t, len(s2.DefaultChannelUserRole))
 
 	// Check the default roles have been created.
-	_, roleRes5 := th.SystemAdminClient.GetRole(s2.DefaultChannelAdminRole)
+	_, roleRes5 := th.SystemAdminClient.GetRoleByName(s2.DefaultChannelAdminRole)
 	CheckNoError(t, roleRes5)
-	_, roleRes6 := th.SystemAdminClient.GetRole(s2.DefaultChannelUserRole)
+	_, roleRes6 := th.SystemAdminClient.GetRoleByName(s2.DefaultChannelUserRole)
 	CheckNoError(t, roleRes6)
 
 	// Try and create a scheme with an invalid scope.
@@ -590,13 +590,13 @@ func TestDeleteScheme(t *testing.T) {
 		CheckNoError(t, r1)
 
 		// Retrieve the roles and check they are not deleted.
-		role1, roleRes1 := th.SystemAdminClient.GetRole(s1.DefaultTeamAdminRole)
+		role1, roleRes1 := th.SystemAdminClient.GetRoleByName(s1.DefaultTeamAdminRole)
 		CheckNoError(t, roleRes1)
-		role2, roleRes2 := th.SystemAdminClient.GetRole(s1.DefaultTeamUserRole)
+		role2, roleRes2 := th.SystemAdminClient.GetRoleByName(s1.DefaultTeamUserRole)
 		CheckNoError(t, roleRes2)
-		role3, roleRes3 := th.SystemAdminClient.GetRole(s1.DefaultChannelAdminRole)
+		role3, roleRes3 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelAdminRole)
 		CheckNoError(t, roleRes3)
-		role4, roleRes4 := th.SystemAdminClient.GetRole(s1.DefaultChannelUserRole)
+		role4, roleRes4 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelUserRole)
 		CheckNoError(t, roleRes4)
 
 		assert.Zero(t, role1.DeleteAt)
@@ -620,13 +620,13 @@ func TestDeleteScheme(t *testing.T) {
 		CheckNoError(t, r3)
 
 		// Check the roles were deleted.
-		role1, roleRes1 = th.SystemAdminClient.GetRole(s1.DefaultTeamAdminRole)
+		role1, roleRes1 = th.SystemAdminClient.GetRoleByName(s1.DefaultTeamAdminRole)
 		CheckNoError(t, roleRes1)
-		role2, roleRes2 = th.SystemAdminClient.GetRole(s1.DefaultTeamUserRole)
+		role2, roleRes2 = th.SystemAdminClient.GetRoleByName(s1.DefaultTeamUserRole)
 		CheckNoError(t, roleRes2)
-		role3, roleRes3 = th.SystemAdminClient.GetRole(s1.DefaultChannelAdminRole)
+		role3, roleRes3 = th.SystemAdminClient.GetRoleByName(s1.DefaultChannelAdminRole)
 		CheckNoError(t, roleRes3)
-		role4, roleRes4 = th.SystemAdminClient.GetRole(s1.DefaultChannelUserRole)
+		role4, roleRes4 = th.SystemAdminClient.GetRoleByName(s1.DefaultChannelUserRole)
 		CheckNoError(t, roleRes4)
 
 		assert.NotZero(t, role1.DeleteAt)
@@ -657,9 +657,9 @@ func TestDeleteScheme(t *testing.T) {
 		CheckNoError(t, r1)
 
 		// Retrieve the roles and check they are not deleted.
-		role3, roleRes3 := th.SystemAdminClient.GetRole(s1.DefaultChannelAdminRole)
+		role3, roleRes3 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelAdminRole)
 		CheckNoError(t, roleRes3)
-		role4, roleRes4 := th.SystemAdminClient.GetRole(s1.DefaultChannelUserRole)
+		role4, roleRes4 := th.SystemAdminClient.GetRoleByName(s1.DefaultChannelUserRole)
 		CheckNoError(t, roleRes4)
 
 		assert.Zero(t, role3.DeleteAt)
@@ -681,9 +681,9 @@ func TestDeleteScheme(t *testing.T) {
 		CheckNoError(t, r3)
 
 		// Check the roles were deleted.
-		role3, roleRes3 = th.SystemAdminClient.GetRole(s1.DefaultChannelAdminRole)
+		role3, roleRes3 = th.SystemAdminClient.GetRoleByName(s1.DefaultChannelAdminRole)
 		CheckNoError(t, roleRes3)
-		role4, roleRes4 = th.SystemAdminClient.GetRole(s1.DefaultChannelUserRole)
+		role4, roleRes4 = th.SystemAdminClient.GetRoleByName(s1.DefaultChannelUserRole)
 		CheckNoError(t, roleRes4)
 
 		assert.NotZero(t, role3.DeleteAt)
diff --git a/app/apptestlib.go b/app/apptestlib.go
index d4a79bdcc..39e05a16e 100644
--- a/app/apptestlib.go
+++ b/app/apptestlib.go
@@ -330,7 +330,7 @@ func (me *TestHelper) CreateScheme() (*model.Scheme, []*model.Role) {
 		panic(err)
 	}
 
-	roleIDs := []string{
+	roleNames := []string{
 		scheme.DefaultTeamAdminRole,
 		scheme.DefaultTeamUserRole,
 		scheme.DefaultChannelAdminRole,
@@ -338,8 +338,8 @@ func (me *TestHelper) CreateScheme() (*model.Scheme, []*model.Role) {
 	}
 
 	var roles []*model.Role
-	for _, roleID := range roleIDs {
-		role, err := me.App.GetRole(roleID)
+	for _, roleName := range roleNames {
+		role, err := me.App.GetRoleByName(roleName)
 		if err != nil {
 			panic(err)
 		}
diff --git a/app/permissions.go b/app/permissions.go
index 46090070e..5b1b49de2 100644
--- a/app/permissions.go
+++ b/app/permissions.go
@@ -57,7 +57,7 @@ func (a *App) ExportPermissions(w io.Writer) error {
 
 		for _, scheme := range schemeBatch {
 
-			roleIDs := []string{
+			roleNames := []string{
 				scheme.DefaultTeamAdminRole,
 				scheme.DefaultTeamUserRole,
 				scheme.DefaultChannelAdminRole,
@@ -65,11 +65,11 @@ func (a *App) ExportPermissions(w io.Writer) error {
 			}
 
 			roles := []*model.Role{}
-			for _, roleID := range roleIDs {
-				if len(roleID) == 0 {
+			for _, roleName := range roleNames {
+				if len(roleName) == 0 {
 					continue
 				}
-				role, err := a.GetRole(roleID)
+				role, err := a.GetRoleByName(roleName)
 				if err != nil {
 					return err
 				}
@@ -125,18 +125,18 @@ func (a *App) ImportPermissions(jsonl io.Reader) error {
 		createdSchemeIDs = append(createdSchemeIDs, schemeCreated.Id)
 
 		schemeIn := schemeConveyor.Scheme()
-		roleIDTuples := [][]string{
+		roleNameTuples := [][]string{
 			{schemeCreated.DefaultTeamAdminRole, schemeIn.DefaultTeamAdminRole},
 			{schemeCreated.DefaultTeamUserRole, schemeIn.DefaultTeamUserRole},
 			{schemeCreated.DefaultChannelAdminRole, schemeIn.DefaultChannelAdminRole},
 			{schemeCreated.DefaultChannelUserRole, schemeIn.DefaultChannelUserRole},
 		}
-		for _, roleIDTuple := range roleIDTuples {
-			if len(roleIDTuple[0]) == 0 || len(roleIDTuple[1]) == 0 {
+		for _, roleNameTuple := range roleNameTuples {
+			if len(roleNameTuple[0]) == 0 || len(roleNameTuple[1]) == 0 {
 				continue
 			}
 
-			err = updateRole(a, schemeConveyor, roleIDTuple[0], roleIDTuple[1])
+			err = updateRole(a, schemeConveyor, roleNameTuple[0], roleNameTuple[1])
 			if err != nil {
 				// Delete the new Schemes. The new Roles are deleted automatically.
 				for _, schemeID := range createdSchemeIDs {
@@ -154,23 +154,22 @@ func (a *App) ImportPermissions(jsonl io.Reader) error {
 	return nil
 }
 
-func updateRole(a *App, sc *model.SchemeConveyor, roleCreatedID, defaultRoleID string) error {
+func updateRole(a *App, sc *model.SchemeConveyor, roleCreatedName, defaultRoleName string) error {
 	var err *model.AppError
 
-	roleCreated, err := a.GetRole(roleCreatedID)
+	roleCreated, err := a.GetRoleByName(roleCreatedName)
 	if err != nil {
 		return errors.New(err.Message)
 	}
 
 	var roleIn *model.Role
 	for _, role := range sc.Roles {
-		if role.Id == defaultRoleID {
+		if role.Name == defaultRoleName {
 			roleIn = role
 			break
 		}
 	}
 
-	roleCreated.Name = roleIn.Name
 	roleCreated.DisplayName = roleIn.DisplayName
 	roleCreated.Description = roleIn.Description
 	roleCreated.Permissions = roleIn.Permissions
diff --git a/app/permissions_test.go b/app/permissions_test.go
index 575e21429..3c70dc026 100644
--- a/app/permissions_test.go
+++ b/app/permissions_test.go
@@ -53,10 +53,10 @@ func TestExportPermissions(t *testing.T) {
 		t.Error(err)
 	}
 
-	getRoleByID := func(id string) string {
+	getRoleByName := func(name string) string {
 		for _, role := range roles {
-			if role.Id == id {
-				return role.Id
+			if role.Name == name {
+				return role.Name
 			}
 		}
 		return ""
@@ -67,10 +67,10 @@ func TestExportPermissions(t *testing.T) {
 		scheme.Name:                    func(str string) string { return row["name"].(string) },
 		scheme.Description:             func(str string) string { return row["description"].(string) },
 		scheme.Scope:                   func(str string) string { return row["scope"].(string) },
-		scheme.DefaultTeamAdminRole:    func(str string) string { return getRoleByID(str) },
-		scheme.DefaultTeamUserRole:     func(str string) string { return getRoleByID(str) },
-		scheme.DefaultChannelAdminRole: func(str string) string { return getRoleByID(str) },
-		scheme.DefaultChannelUserRole:  func(str string) string { return getRoleByID(str) },
+		scheme.DefaultTeamAdminRole:    func(str string) string { return getRoleByName(str) },
+		scheme.DefaultTeamUserRole:     func(str string) string { return getRoleByName(str) },
+		scheme.DefaultChannelAdminRole: func(str string) string { return getRoleByName(str) },
+		scheme.DefaultChannelUserRole:  func(str string) string { return getRoleByName(str) },
 	}
 
 	for key, valF := range expectations {
@@ -105,7 +105,7 @@ func TestImportPermissions(t *testing.T) {
 		}
 		beforeCount = len(results)
 
-		json := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"yzfx3g9xjjfw8cqo6bpn33xr7o","default_channel_user_role":"a7s3cp4n33dfxbsrmyh9djao3a","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","use_slash_commands","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2)
+		json := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"%v","default_channel_user_role":"%v","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","use_slash_commands","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2, roleName1, roleName2)
 		r := strings.NewReader(json)
 
 		err := th.App.ImportPermissions(r)
@@ -127,12 +127,12 @@ func TestImportPermissions(t *testing.T) {
 
 	newScheme := results[0]
 
-	channelAdminRole, appErr := th.App.GetRole(newScheme.DefaultChannelAdminRole)
+	channelAdminRole, appErr := th.App.GetRoleByName(newScheme.DefaultChannelAdminRole)
 	if appErr != nil {
 		t.Error(appErr)
 	}
 
-	channelUserRole, appErr := th.App.GetRole(newScheme.DefaultChannelUserRole)
+	channelUserRole, appErr := th.App.GetRoleByName(newScheme.DefaultChannelUserRole)
 	if appErr != nil {
 		t.Error(appErr)
 	}
@@ -144,8 +144,8 @@ func TestImportPermissions(t *testing.T) {
 		newScheme.Scope:                scope,
 		newScheme.DefaultTeamAdminRole: "",
 		newScheme.DefaultTeamUserRole:  "",
-		channelAdminRole.Name:          roleName1,
-		channelUserRole.Name:           roleName2,
+		channelAdminRole.Name:          newScheme.DefaultChannelAdminRole,
+		channelUserRole.Name:           newScheme.DefaultChannelUserRole,
 	}
 
 	for actual, expected := range expectations {
@@ -167,7 +167,7 @@ func TestImportPermissions_idempotentScheme(t *testing.T) {
 	roleName1 := model.NewId()
 	roleName2 := model.NewId()
 
-	json := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"yzfx3g9xjjfw8cqo6bpn33xr7o","default_channel_user_role":"a7s3cp4n33dfxbsrmyh9djao3a","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","use_slash_commands","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2)
+	json := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"%v","default_channel_user_role":"%v","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","use_slash_commands","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2, roleName1, roleName2)
 	jsonl := strings.Repeat(json+"\n", 4)
 	r := strings.NewReader(jsonl)
 
@@ -206,11 +206,11 @@ func TestImportPermissions_schemeDeletedOnRoleFailure(t *testing.T) {
 	name := model.NewId()
 	displayName := model.NewId()
 	description := "my test description"
-	scope := model.SCHEME_SCOPE_CHANNEL
+	scope := "invalid scope"
 	roleName1 := model.NewId()
-	roleName2 := "some invalid role name"
+	roleName2 := model.NewId()
 
-	jsonl := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"yzfx3g9xjjfw8cqo6bpn33xr7o","default_channel_user_role":"a7s3cp4n33dfxbsrmyh9djao3a","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","use_slash_commands","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2)
+	jsonl := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"%v","default_channel_user_role":"%v","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","use_slash_commands","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2, roleName1, roleName2)
 	r := strings.NewReader(jsonl)
 
 	var results []*model.Scheme
diff --git a/store/sqlstore/scheme_supplier.go b/store/sqlstore/scheme_supplier.go
index f272040a6..326fb45e6 100644
--- a/store/sqlstore/scheme_supplier.go
+++ b/store/sqlstore/scheme_supplier.go
@@ -109,7 +109,7 @@ func (s *SqlSupplier) createScheme(ctx context.Context, scheme *model.Scheme, tr
 			result.Err = saveRoleResult.Err
 			return result
 		} else {
-			scheme.DefaultTeamAdminRole = saveRoleResult.Data.(*model.Role).Id
+			scheme.DefaultTeamAdminRole = saveRoleResult.Data.(*model.Role).Name
 		}
 
 		// Team User Role
@@ -124,7 +124,7 @@ func (s *SqlSupplier) createScheme(ctx context.Context, scheme *model.Scheme, tr
 			result.Err = saveRoleResult.Err
 			return result
 		} else {
-			scheme.DefaultTeamUserRole = saveRoleResult.Data.(*model.Role).Id
+			scheme.DefaultTeamUserRole = saveRoleResult.Data.(*model.Role).Name
 		}
 	}
 	if scheme.Scope == model.SCHEME_SCOPE_TEAM || scheme.Scope == model.SCHEME_SCOPE_CHANNEL {
@@ -140,7 +140,7 @@ func (s *SqlSupplier) createScheme(ctx context.Context, scheme *model.Scheme, tr
 			result.Err = saveRoleResult.Err
 			return result
 		} else {
-			scheme.DefaultChannelAdminRole = saveRoleResult.Data.(*model.Role).Id
+			scheme.DefaultChannelAdminRole = saveRoleResult.Data.(*model.Role).Name
 		}
 
 		// Channel User Role
@@ -155,7 +155,7 @@ func (s *SqlSupplier) createScheme(ctx context.Context, scheme *model.Scheme, tr
 			result.Err = saveRoleResult.Err
 			return result
 		} else {
-			scheme.DefaultChannelUserRole = saveRoleResult.Data.(*model.Role).Id
+			scheme.DefaultChannelUserRole = saveRoleResult.Data.(*model.Role).Name
 		}
 	}
 
@@ -231,16 +231,16 @@ func (s *SqlSupplier) SchemeDelete(ctx context.Context, schemeId string, hints .
 	}
 
 	// Delete the roles belonging to the scheme.
-	roleIds := []string{scheme.DefaultChannelUserRole, scheme.DefaultChannelAdminRole}
+	roleNames := []string{scheme.DefaultChannelUserRole, scheme.DefaultChannelAdminRole}
 	if scheme.Scope == model.SCHEME_SCOPE_TEAM {
-		roleIds = append(roleIds, scheme.DefaultTeamUserRole, scheme.DefaultTeamAdminRole)
+		roleNames = append(roleNames, scheme.DefaultTeamUserRole, scheme.DefaultTeamAdminRole)
 	}
 
 	var inQueryList []string
 	queryArgs := make(map[string]interface{})
-	for i, roleId := range roleIds {
-		inQueryList = append(inQueryList, fmt.Sprintf(":RoleId%v", i))
-		queryArgs[fmt.Sprintf("RoleId%v", i)] = roleId
+	for i, roleId := range roleNames {
+		inQueryList = append(inQueryList, fmt.Sprintf(":RoleName%v", i))
+		queryArgs[fmt.Sprintf("RoleName%v", i)] = roleId
 	}
 	inQuery := strings.Join(inQueryList, ", ")
 
@@ -248,7 +248,7 @@ func (s *SqlSupplier) SchemeDelete(ctx context.Context, schemeId string, hints .
 	queryArgs["UpdateAt"] = time
 	queryArgs["DeleteAt"] = time
 
-	if _, err := s.GetMaster().Exec("UPDATE Roles SET UpdateAt = :UpdateAt, DeleteAt = :DeleteAt WHERE Id IN ("+inQuery+")", queryArgs); err != nil {
+	if _, err := s.GetMaster().Exec("UPDATE Roles SET UpdateAt = :UpdateAt, DeleteAt = :DeleteAt WHERE Name IN ("+inQuery+")", queryArgs); err != nil {
 		result.Err = model.NewAppError("SqlSchemeStore.Delete", "store.sql_scheme.delete.role_update.app_error", nil, "Id="+schemeId+", "+err.Error(), http.StatusInternalServerError)
 		return result
 	}
diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go
index f8d76bba1..fe4c09175 100644
--- a/store/sqlstore/team_store.go
+++ b/store/sqlstore/team_store.go
@@ -440,8 +440,8 @@ func (s SqlTeamStore) AnalyticsTeamCount() store.StoreChannel {
 var TEAM_MEMBERS_WITH_SCHEME_SELECT_QUERY = `
 	SELECT
 		TeamMembers.*,
-		TeamScheme.DefaultChannelUserRole TeamSchemeDefaultUserRole,
-		TeamScheme.DefaultChannelAdminRole TeamSchemeDefaultAdminRole
+		TeamScheme.DefaultTeamUserRole TeamSchemeDefaultUserRole,
+		TeamScheme.DefaultTeamAdminRole TeamSchemeDefaultAdminRole
 	FROM 
 		TeamMembers
 	LEFT JOIN
diff --git a/store/storetest/scheme_store.go b/store/storetest/scheme_store.go
index 39920c109..eb4e8efa0 100644
--- a/store/storetest/scheme_store.go
+++ b/store/storetest/scheme_store.go
@@ -87,25 +87,25 @@ func testSchemeStoreSave(t *testing.T, ss store.Store) {
 	assert.Len(t, d1.DefaultChannelUserRole, 26)
 
 	// Check the default roles were created correctly.
-	roleRes1 := <-ss.Role().Get(d1.DefaultTeamAdminRole)
+	roleRes1 := <-ss.Role().GetByName(d1.DefaultTeamAdminRole)
 	assert.Nil(t, roleRes1.Err)
 	role1 := roleRes1.Data.(*model.Role)
 	assert.Equal(t, role1.Permissions, []string{"edit_others_posts", "delete_others_posts"})
 	assert.True(t, role1.SchemeManaged)
 
-	roleRes2 := <-ss.Role().Get(d1.DefaultTeamUserRole)
+	roleRes2 := <-ss.Role().GetByName(d1.DefaultTeamUserRole)
 	assert.Nil(t, roleRes2.Err)
 	role2 := roleRes2.Data.(*model.Role)
 	assert.Equal(t, role2.Permissions, []string{"view_team", "add_user_to_team"})
 	assert.True(t, role2.SchemeManaged)
 
-	roleRes3 := <-ss.Role().Get(d1.DefaultChannelAdminRole)
+	roleRes3 := <-ss.Role().GetByName(d1.DefaultChannelAdminRole)
 	assert.Nil(t, roleRes3.Err)
 	role3 := roleRes3.Data.(*model.Role)
 	assert.Equal(t, role3.Permissions, []string{"manage_public_channel_members", "manage_private_channel_members"})
 	assert.True(t, role3.SchemeManaged)
 
-	roleRes4 := <-ss.Role().Get(d1.DefaultChannelUserRole)
+	roleRes4 := <-ss.Role().GetByName(d1.DefaultChannelUserRole)
 	assert.Nil(t, roleRes4.Err)
 	role4 := roleRes4.Data.(*model.Role)
 	assert.Equal(t, role4.Permissions, []string{"read_channel", "create_post"})
@@ -274,25 +274,25 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
 	assert.Len(t, d1.DefaultChannelUserRole, 26)
 
 	// Check the default roles were created correctly.
-	roleRes1 := <-ss.Role().Get(d1.DefaultTeamAdminRole)
+	roleRes1 := <-ss.Role().GetByName(d1.DefaultTeamAdminRole)
 	assert.Nil(t, roleRes1.Err)
 	role1 := roleRes1.Data.(*model.Role)
 	assert.Equal(t, role1.Permissions, []string{"edit_others_posts", "delete_others_posts"})
 	assert.True(t, role1.SchemeManaged)
 
-	roleRes2 := <-ss.Role().Get(d1.DefaultTeamUserRole)
+	roleRes2 := <-ss.Role().GetByName(d1.DefaultTeamUserRole)
 	assert.Nil(t, roleRes2.Err)
 	role2 := roleRes2.Data.(*model.Role)
 	assert.Equal(t, role2.Permissions, []string{"view_team", "add_user_to_team"})
 	assert.True(t, role2.SchemeManaged)
 
-	roleRes3 := <-ss.Role().Get(d1.DefaultChannelAdminRole)
+	roleRes3 := <-ss.Role().GetByName(d1.DefaultChannelAdminRole)
 	assert.Nil(t, roleRes3.Err)
 	role3 := roleRes3.Data.(*model.Role)
 	assert.Equal(t, role3.Permissions, []string{"manage_public_channel_members", "manage_private_channel_members"})
 	assert.True(t, role3.SchemeManaged)
 
-	roleRes4 := <-ss.Role().Get(d1.DefaultChannelUserRole)
+	roleRes4 := <-ss.Role().GetByName(d1.DefaultChannelUserRole)
 	assert.Nil(t, roleRes4.Err)
 	role4 := roleRes4.Data.(*model.Role)
 	assert.Equal(t, role4.Permissions, []string{"read_channel", "create_post"})
@@ -307,22 +307,22 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
 	assert.NotZero(t, d2.DeleteAt)
 
 	// Check that the roles are deleted too.
-	roleRes5 := <-ss.Role().Get(d1.DefaultTeamAdminRole)
+	roleRes5 := <-ss.Role().GetByName(d1.DefaultTeamAdminRole)
 	assert.Nil(t, roleRes5.Err)
 	role5 := roleRes5.Data.(*model.Role)
 	assert.NotZero(t, role5.DeleteAt)
 
-	roleRes6 := <-ss.Role().Get(d1.DefaultTeamUserRole)
+	roleRes6 := <-ss.Role().GetByName(d1.DefaultTeamUserRole)
 	assert.Nil(t, roleRes6.Err)
 	role6 := roleRes6.Data.(*model.Role)
 	assert.NotZero(t, role6.DeleteAt)
 
-	roleRes7 := <-ss.Role().Get(d1.DefaultChannelAdminRole)
+	roleRes7 := <-ss.Role().GetByName(d1.DefaultChannelAdminRole)
 	assert.Nil(t, roleRes7.Err)
 	role7 := roleRes7.Data.(*model.Role)
 	assert.NotZero(t, role7.DeleteAt)
 
-	roleRes8 := <-ss.Role().Get(d1.DefaultChannelUserRole)
+	roleRes8 := <-ss.Role().GetByName(d1.DefaultChannelUserRole)
 	assert.Nil(t, roleRes8.Err)
 	role8 := roleRes8.Data.(*model.Role)
 	assert.NotZero(t, role8.DeleteAt)
diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go
index b209b48c4..346b55c18 100644
--- a/store/storetest/team_store.go
+++ b/store/storetest/team_store.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/mattermost/mattermost-server/model"
 	"github.com/mattermost/mattermost-server/store"
+	"github.com/stretchr/testify/require"
 )
 
 func TestTeamStore(t *testing.T, ss store.Store) {
@@ -823,6 +824,37 @@ func testGetTeamMember(t *testing.T, ss store.Store) {
 	if r := <-ss.Team().GetMember("", m1.UserId); r.Err == nil {
 		t.Fatal("empty team id - should have failed")
 	}
+
+	// Test with a custom team scheme.
+	s2 := &model.Scheme{
+		Name:        model.NewId(),
+		DisplayName: model.NewId(),
+		Description: model.NewId(),
+		Scope:       model.SCHEME_SCOPE_TEAM,
+	}
+	s2 = (<-ss.Scheme().Save(s2)).Data.(*model.Scheme)
+	t.Log(s2)
+
+	t2 := store.Must(ss.Team().Save(&model.Team{
+		DisplayName: "DisplayName",
+		Name:        "z-z-z" + model.NewId() + "b",
+		Type:        model.TEAM_OPEN,
+		SchemeId:    &s2.Id,
+	})).(*model.Team)
+
+	defer func() {
+		<-ss.Team().PermanentDelete(t2.Id)
+	}()
+
+	m2 := &model.TeamMember{TeamId: t2.Id, UserId: model.NewId(), SchemeUser: true}
+	store.Must(ss.Team().SaveMember(m2, -1))
+
+	r2 := <-ss.Team().GetMember(m2.TeamId, m2.UserId)
+	require.Nil(t, r2.Err)
+	m3 := r2.Data.(*model.TeamMember)
+	t.Log(m3)
+
+	assert.Equal(t, s2.DefaultTeamUserRole, m3.Roles)
 }
 
 func testGetTeamMembersByIds(t *testing.T, ss store.Store) {