Remove RawUsers from DataStore

mocks/store.go

@@ -32,11 +32,6 @@ func (s *Store) Users(ctx context.Context) chronograf.UsersStore {
 	return s.UsersStore
 }
 
-// TODO: remove me and put logic into Users Call
-func (s *Store) RawUsers(ctx context.Context) chronograf.UsersStore {
-	return s.UsersStore
-}
-
 func (s *Store) Organizations(ctx context.Context) chronograf.OrganizationsStore {
 	return s.OrganizationsStore
 }

server/me.go

@@ -188,8 +188,10 @@ func (s *Service) Me(w http.ResponseWriter, r *http.Request) {
 	// TODO: add real implementation
 	ctx = context.WithValue(ctx, "organizationID", p.Organization)
 
-	// TODO: Change RawUsers to Users
+	// TODO: add real implementation
-	usr, err := s.Store.RawUsers(ctx).Get(ctx, chronograf.UserQuery{
+	ctx = context.WithValue(ctx, "superadmin", true)
+
+	usr, err := s.Store.Users(ctx).Get(ctx, chronograf.UserQuery{
 		Name:     &p.Subject,
 		Provider: &p.Issuer,
 		Scheme:   &scheme,
@@ -216,7 +218,10 @@ func (s *Service) Me(w http.ResponseWriter, r *http.Request) {
 		Scheme: scheme,
 	}
 
-	newUser, err := s.Store.RawUsers(ctx).Add(ctx, user)
+	// TODO: add real implementation
+	ctx = context.WithValue(ctx, "superadmin", true)
+
+	newUser, err := s.Store.Users(ctx).Add(ctx, user)
 	if err != nil {
 		msg := fmt.Errorf("error storing user %s: %v", user.Name, err)
 		unknownErrorWithMessage(w, msg, s.Logger)

server/stores.go

@@ -25,6 +25,21 @@ func hasOrganizationContext(ctx context.Context) (string, bool) {
 	return orgID, true
 }
 
+const superAdminKey = "superadmin"
+
+func hasSuperAdminContext(ctx context.Context) (bool, bool) {
+	// prevents panic in case of nil context
+	if ctx == nil {
+		return false, false
+	}
+	sa, ok := ctx.Value(superAdminKey).(bool)
+	// should never happen
+	if !ok {
+		return false, false
+	}
+	return sa, true
+}
+
 // TODO: Comment
 // DataSource is ...
 // Having this as an interface is useful for testing
@@ -33,8 +48,6 @@ type DataStore interface {
 	Servers(ctx context.Context) chronograf.ServersStore
 	Layouts(ctx context.Context) chronograf.LayoutsStore
 	Users(ctx context.Context) chronograf.UsersStore
-	// TODO: remove
-	RawUsers(ctx context.Context) chronograf.UsersStore
 	Organizations(ctx context.Context) chronograf.OrganizationsStore
 	Dashboards(ctx context.Context) chronograf.DashboardsStore
 }
@@ -77,11 +90,15 @@ func (s *Store) Layouts(ctx context.Context) chronograf.LayoutsStore {
 }
 
 func (s *Store) Users(ctx context.Context) chronograf.UsersStore {
+	if superAdmin, ok := hasSuperAdminContext(ctx); ok && superAdmin {
+		return s.UsersStore
+	}
 	if org, ok := hasOrganizationContext(ctx); ok {
 		return organizations.NewUsersStore(s.UsersStore, org)
 	}
 
-	return s.UsersStore
+	// TODO: eventually have NoOpUserstore
+	return organizations.NewUsersStore(s.UsersStore, "")
 }
 
 func (s *Store) Dashboards(ctx context.Context) chronograf.DashboardsStore {
@@ -92,11 +109,6 @@ func (s *Store) Dashboards(ctx context.Context) chronograf.DashboardsStore {
 	return s.DashboardsStore
 }
 
-// TODO: remove me and put logic into Users Call
-func (s *Store) RawUsers(ctx context.Context) chronograf.UsersStore {
-	return s.UsersStore
-}
-
 func (s *Store) Organizations(ctx context.Context) chronograf.OrganizationsStore {
 	return s.OrganizationsStore
 }