From f712d2204b0824ee7d1599d9fdec107a307ddc81 Mon Sep 17 00:00:00 2001
From: Michael de Sa <mjdesa@gmail.com>
Date: Thu, 12 Oct 2017 16:59:18 -0400
Subject: [PATCH] Add roles to boltdb UsersStore

Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
---
 bolt/roles.go      |  4 ++--
 bolt/users_test.go | 35 ++++++++++++++++++++++++++++++++---
 chronograf.go      |  8 ++++----
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/bolt/roles.go b/bolt/roles.go
index 7f950b4836..a44fcfec1b 100644
--- a/bolt/roles.go
+++ b/bolt/roles.go
@@ -26,8 +26,8 @@ func newRolesStore(u *UsersStore) *RolesStore {
 		roles:      map[string]chronograf.Role{},
 	}
 
-	for _, role := range chronograf.DefaultUserRoles {
-		s.roles[role.Name] = role
+	for name, role := range chronograf.DefaultUserRoles {
+		s.roles[name] = role
 	}
 
 	return s
diff --git a/bolt/users_test.go b/bolt/users_test.go
index 0dfaf1dbbb..e1ecac8a6e 100644
--- a/bolt/users_test.go
+++ b/bolt/users_test.go
@@ -5,7 +5,6 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
 	"github.com/influxdata/chronograf"
 )
 
@@ -70,12 +69,18 @@ func TestUsersStore_Add(t *testing.T) {
 					Name:     "docbrown",
 					Provider: "GitHub",
 					Scheme:   "OAuth2",
+					Roles: []chronograf.Role{
+						chronograf.DefaultUserRoles[chronograf.EditorRole],
+					},
 				},
 			},
 			want: &chronograf.User{
 				Name:     "docbrown",
 				Provider: "GitHub",
 				Scheme:   "OAuth2",
+				Roles: []chronograf.Role{
+					chronograf.DefaultUserRoles[chronograf.EditorRole],
+				},
 			},
 		},
 	}
@@ -108,8 +113,17 @@ func TestUsersStore_Add(t *testing.T) {
 		if got.Scheme != tt.want.Scheme {
 			t.Errorf("%q. UsersStore.Add() .Scheme:\ngot %v, want %v", tt.name, got.Scheme, tt.want.Scheme)
 		}
-		if len(got.Roles) > 0 && len(tt.want.Roles) > 0 && !cmp.Equal(got.Roles, tt.want.Roles) {
+		if len(got.Roles) != len(tt.want.Roles) {
 			t.Errorf("%q. UsersStore.Add() .Roles:\ngot %v, want %v", tt.name, got.Roles, tt.want.Roles)
+			continue
+		}
+		if len(got.Roles) > 0 && len(tt.want.Roles) > 0 {
+			for i, gotRole := range got.Roles {
+				wantRole := tt.want.Roles[i]
+				if wantRole.Name != gotRole.Name {
+					t.Errorf("%q. UsersStore.Add() .Roles[%d]:\ngot %v, want %v", tt.name, i, gotRole, wantRole)
+				}
+			}
 		}
 	}
 }
@@ -237,11 +251,17 @@ func TestUsersStore_All(t *testing.T) {
 					Name:     "howdy",
 					Provider: "GitHub",
 					Scheme:   "OAuth2",
+					Roles: []chronograf.Role{
+						chronograf.DefaultUserRoles[chronograf.ViewerRole],
+					},
 				},
 				{
 					Name:     "doody",
 					Provider: "GitHub",
 					Scheme:   "OAuth2",
+					Roles: []chronograf.Role{
+						chronograf.DefaultUserRoles[chronograf.EditorRole],
+					},
 				},
 			},
 			addFirst: true,
@@ -279,8 +299,17 @@ func TestUsersStore_All(t *testing.T) {
 			if got.Scheme != want.Scheme {
 				t.Errorf("%q. UsersStore.All() .Scheme:\ngot %v, want %v", tt.name, got.Scheme, want.Scheme)
 			}
-			if len(got.Roles) > 0 && len(want.Roles) > 0 && !cmp.Equal(got.Roles, want.Roles) {
+			if len(got.Roles) != len(want.Roles) {
 				t.Errorf("%q. UsersStore.All() .Roles:\ngot %v, want %v", tt.name, got.Roles, want.Roles)
+				continue
+			}
+			if len(got.Roles) > 0 && len(want.Roles) > 0 {
+				for i, gotRole := range got.Roles {
+					wantRole := want.Roles[i]
+					if wantRole.Name != gotRole.Name {
+						t.Errorf("%q. UsersStore.All() .Roles[%d]:\ngot %v, want %v", tt.name, i, gotRole, wantRole)
+					}
+				}
 			}
 		}
 	}
diff --git a/chronograf.go b/chronograf.go
index 6fc7d2183a..94444793e4 100644
--- a/chronograf.go
+++ b/chronograf.go
@@ -73,8 +73,8 @@ var (
 )
 
 // Default roles for chronograf Users
-var DefaultUserRoles = [5]Role{
-	{
+var DefaultUserRoles = map[string]Role{
+	ViewerRole: {
 		Name: ViewerRole,
 		Permissions: Permissions{
 			ReadDashboardsPermission,
@@ -82,7 +82,7 @@ var DefaultUserRoles = [5]Role{
 			ReadRulesPermission,
 		},
 	},
-	{
+	EditorRole: {
 		Name: EditorRole,
 		Permissions: Permissions{
 			ReadDashboardsPermission,
@@ -93,7 +93,7 @@ var DefaultUserRoles = [5]Role{
 			WriteRulesPermission,
 		},
 	},
-	{
+	AdminRole: {
 		Name: AdminRole,
 		Permissions: Permissions{
 			ReadDashboardsPermission,