Add status change confirmation

server/command/availability.go

@@ -4,6 +4,15 @@
 package command
 
 func (c *Command) availability(parameters ...string) (string, error) {
+	authorized, err := c.MSCalendar.IsAuthorizedAdmin(c.Args.UserId)
+	if err != nil {
+		return "", err
+	}
+
+	if !authorized {
+		return "Not authorized", nil
+	}
+
 	switch {
 	case len(parameters) == 0:
 		resString, err := c.MSCalendar.Sync(c.Args.UserId)

server/command/connect_test.go

@@ -51,7 +51,6 @@ func TestConnect(t *testing.T) {
 
 			conf := &config.Config{
 				PluginURL: "http://localhost",
-				BotUserID: "bot_user_id",
 			}
 
 			mscal := mock_mscalendar.NewMockMSCalendar(ctrl)

server/command/disconnect_test.go

@@ -51,7 +51,6 @@ func TestDisconnect(t *testing.T) {
 
 			conf := &config.Config{
 				PluginURL: "http://localhost",
-				BotUserID: "bot_user_id",
 			}
 
 			mscal := mock_mscalendar.NewMockMSCalendar(ctrl)

server/config/config.go

@@ -20,7 +20,6 @@ type StoredConfig struct {
 type Config struct {
 	StoredConfig
 
-	BotUserID              string
 	BuildDate              string
 	BuildHash              string
 	BuildHashShort         string

server/jobs/job_manager_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/mattermost/mattermost-plugin-api/cluster"
-	"github.com/mattermost/mattermost-plugin-mscalendar/server/config"
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/jobs/mock_cluster"
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/mscalendar"
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/mscalendar/mock_plugin_api"
@@ -29,9 +28,7 @@ func newTestEnv(ctrl *gomock.Controller) mscalendar.Env {
 	mockPluginAPI := mock_plugin_api.NewMockPluginAPI(ctrl)
 
 	logger := &bot.NilLogger{}
-	conf := &config.Config{BotUserID: "bot_mm_id"}
 	return mscalendar.Env{
-		Config: conf,
 		Dependencies: &mscalendar.Dependencies{
 			Store:     s,
 			Logger:    logger,

server/mscalendar/availability.go

@@ -13,7 +13,6 @@ import (
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/store"
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/utils"
 	"github.com/mattermost/mattermost-server/v5/model"
-	"github.com/pkg/errors"
 )
 
 const (
@@ -39,14 +38,7 @@ func (m *mscalendar) Sync(mattermostUserID string) (string, error) {
 }
 
 func (m *mscalendar) SyncAll() (string, error) {
-	isAdmin, err := m.IsAuthorizedAdmin(m.actingUser.MattermostUserID)
-	if err != nil {
-		return "", err
-	}
-	if !isAdmin {
-		return "", errors.Errorf("Non-admin user attempting SyncAll %s", m.actingUser.MattermostUserID)
-	}
-	err = m.Filter(withSuperuserClient)
+	err := m.Filter(withSuperuserClient)
 	if err != nil {
 		return "", err
 	}

server/mscalendar/availability_test.go

@@ -312,16 +312,14 @@ func makeStatusSyncTestEnv(ctrl *gomock.Controller) (Env, remote.Client) {
 	mockPluginAPI := mock_plugin_api.NewMockPluginAPI(ctrl)
 	logger := mock_bot.NewMockLogger(ctrl)
 
-	conf := &config.Config{BotUserID: "bot_mm_id"}
 	env := Env{
-		Config: conf,
+		Config: &config.Config{},
 		Dependencies: &Dependencies{
-			Store:             s,
-			Logger:            logger,
-			Poster:            poster,
-			Remote:            mockRemote,
-			PluginAPI:         mockPluginAPI,
-			IsAuthorizedAdmin: func(mattermostUserID string) (bool, error) { return true, nil },
+			Store:     s,
+			Logger:    logger,
+			Poster:    poster,
+			Remote:    mockRemote,
+			PluginAPI: mockPluginAPI,
 		},
 	}
 

server/mscalendar/daily_summary.go

@@ -102,14 +102,6 @@ func (m *mscalendar) SetDailySummaryEnabled(user *User, enable bool) (*store.Dai
 }
 
 func (m *mscalendar) ProcessAllDailySummary(now time.Time) error {
-	isAdmin, err := m.IsAuthorizedAdmin(m.actingUser.MattermostUserID)
-	if err != nil {
-		return err
-	}
-	if !isAdmin {
-		return errors.Errorf("Non-admin user attempting ProcessAllDailySummary %s", m.actingUser.MattermostUserID)
-	}
-
 	dsumIndex, err := m.Store.LoadDailySummaryIndex()
 	if err != nil {
 		return err

server/mscalendar/daily_summary_test.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/golang/mock/gomock"
-	"github.com/mattermost/mattermost-plugin-mscalendar/server/config"
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/mscalendar/mock_plugin_api"
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/remote"
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/remote/mock_remote"
@@ -23,24 +22,6 @@ func TestProcessAllDailySummary(t *testing.T) {
 		err           string
 		runAssertions func(deps *Dependencies, client remote.Client)
 	}{
-		{
-			name: "Error fetching user admin",
-			err:  "admin store error",
-			runAssertions: func(deps *Dependencies, client remote.Client) {
-				deps.IsAuthorizedAdmin = func(string) (bool, error) {
-					return false, errors.New("admin store error")
-				}
-			},
-		},
-		{
-			name: "User is not admin",
-			err:  "Non-admin user attempting ProcessAllDailySummary bot_mm_id",
-			runAssertions: func(deps *Dependencies, client remote.Client) {
-				deps.IsAuthorizedAdmin = func(string) (bool, error) {
-					return false, nil
-				}
-			},
-		},
 		{
 			name: "Error fetching index",
 			err:  "index store error",
@@ -159,16 +140,13 @@ Wednesday February 12
 			mockPluginAPI := mock_plugin_api.NewMockPluginAPI(ctrl)
 
 			logger := mock_bot.NewMockLogger(ctrl)
-			conf := &config.Config{BotUserID: "bot_mm_id"}
 			env := Env{
-				Config: conf,
 				Dependencies: &Dependencies{
-					Store:             s,
-					Logger:            logger,
-					Poster:            poster,
-					Remote:            mockRemote,
-					PluginAPI:         mockPluginAPI,
-					IsAuthorizedAdmin: func(mattermostUserID string) (bool, error) { return true, nil },
+					Store:     s,
+					Logger:    logger,
+					Poster:    poster,
+					Remote:    mockRemote,
+					PluginAPI: mockPluginAPI,
 				},
 			}
 

server/mscalendar/filters.go

@@ -3,8 +3,6 @@
 
 package mscalendar
 
-import "github.com/mattermost/mattermost-plugin-mscalendar/server/remote"
-
 type filterf func(*mscalendar) error
 
 func (m *mscalendar) Filter(filters ...filterf) error {
@@ -44,14 +42,7 @@ func withClient(m *mscalendar) error {
 		return nil
 	}
 
-	var client remote.Client
-	var err error
-	if m.actingUser.MattermostUserID == m.Config.BotUserID {
-		client, err = m.MakeSuperuserClient()
-
-	} else {
-		client, err = m.MakeClient()
-	}
+	client, err := m.MakeClient()
 
 	if err != nil {
 		return err

server/mscalendar/mscalendar.go

@@ -25,13 +25,12 @@ type MSCalendar interface {
 
 // Dependencies contains all API dependencies
 type Dependencies struct {
-	Logger            bot.Logger
-	PluginAPI         PluginAPI
-	Poster            bot.Poster
-	Remote            remote.Remote
-	Store             store.Store
-	SettingsPanel     settingspanel.Panel
-	IsAuthorizedAdmin func(string) (bool, error)
+	Logger        bot.Logger
+	PluginAPI     PluginAPI
+	Poster        bot.Poster
+	Remote        remote.Remote
+	Store         store.Store
+	SettingsPanel settingspanel.Panel
 }
 
 type PluginAPI interface {
@@ -56,9 +55,6 @@ type mscalendar struct {
 }
 
 func New(env Env, actingMattermostUserID string) MSCalendar {
-	if actingMattermostUserID == "" {
-		actingMattermostUserID = env.Config.BotUserID
-	}
 	return &mscalendar{
 		Env:        env,
 		actingUser: NewUser(actingMattermostUserID),

server/mscalendar/notification_test.go

@@ -130,7 +130,7 @@ func TestProcessNotification(t *testing.T) {
 			mockPluginAPI := mock_plugin_api.NewMockPluginAPI(ctrl)
 			mockClient := mock_remote.NewMockClient(ctrl)
 
-			conf := &config.Config{BotUserID: "bot_mm_id", PluginVersion: "x.x.x"}
+			conf := &config.Config{PluginVersion: "x.x.x"}
 			env := Env{
 				Config: conf,
 				Dependencies: &Dependencies{

server/mscalendar/oauth2_test.go

@@ -363,18 +363,16 @@ func newOAuth2TestApp(ctrl *gomock.Controller) (oauth2connect.App, Env) {
 			OAuth2ClientSecret: "fakeclientsecret",
 		},
 		PluginURL: "http://localhost",
-		BotUserID: "bot-user-id",
 	}
 
 	env := Env{
 		Config: conf,
 		Dependencies: &Dependencies{
-			Store:             mock_store.NewMockStore(ctrl),
-			Logger:            &bot.NilLogger{},
-			Poster:            mock_bot.NewMockPoster(ctrl),
-			Remote:            remote.Makers[msgraph.Kind](conf, &bot.NilLogger{}),
-			PluginAPI:         mock_plugin_api.NewMockPluginAPI(ctrl),
-			IsAuthorizedAdmin: func(mattermostUserID string) (bool, error) { return false, nil },
+			Store:     mock_store.NewMockStore(ctrl),
+			Logger:    &bot.NilLogger{},
+			Poster:    mock_bot.NewMockPoster(ctrl),
+			Remote:    remote.Makers[msgraph.Kind](conf, &bot.NilLogger{}),
+			PluginAPI: mock_plugin_api.NewMockPluginAPI(ctrl),
 		},
 	}
 

server/mscalendar/user.go

@@ -5,6 +5,7 @@ package mscalendar
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/mattermost/mattermost-server/v5/model"
 	"github.com/pkg/errors"
@@ -168,7 +169,18 @@ func (m *mscalendar) GetRemoteUser(mattermostUserID string) (*remote.User, error
 }
 
 func (m *mscalendar) IsAuthorizedAdmin(mattermostUserID string) (bool, error) {
-	return m.Dependencies.IsAuthorizedAdmin(mattermostUserID)
+	for _, userID := range strings.Split(m.AdminUserIDs, ",") {
+		if userID == mattermostUserID {
+			return true, nil
+		}
+	}
+
+	ok, err := m.PluginAPI.IsSysAdmin(mattermostUserID)
+	if err != nil {
+		return false, err
+	}
+
+	return ok, nil
 }
 
 func (m *mscalendar) GetUserSettings(user *User) (*store.Settings, error) {

server/plugin/plugin.go

@@ -127,11 +127,9 @@ func (p *Plugin) OnConfigurationChange() (err error) {
 		e.Dependencies.Remote = remote.Makers[msgraph.Kind](e.Config, e.Logger)
 
 		e.bot = e.bot.WithConfig(stored.BotConfig)
-		e.Config.BotUserID = e.bot.MattermostUserID()
 		e.Dependencies.Logger = e.bot
 		e.Dependencies.Poster = e.bot
 		e.Dependencies.Store = store.NewPluginStore(p.API, e.bot)
-		e.Dependencies.IsAuthorizedAdmin = p.IsAuthorizedAdmin
 		e.Dependencies.SettingsPanel = mscalendar.NewSettingsPanel(
 			e.bot,
 			e.Dependencies.Store,
@@ -216,21 +214,6 @@ func (p *Plugin) ServeHTTP(pc *plugin.Context, w http.ResponseWriter, req *http.
 	env.httpHandler.ServeHTTP(w, req)
 }
 
-func (p *Plugin) IsAuthorizedAdmin(mattermostUserID string) (bool, error) {
-	env := p.getEnv()
-	if mattermostUserID == env.BotUserID {
-		return true, nil
-	}
-
-	for _, userID := range strings.Split(env.Config.AdminUserIDs, ",") {
-		if userID == mattermostUserID {
-			return true, nil
-		}
-	}
-
-	return env.PluginAPI.IsSysAdmin(mattermostUserID)
-}
-
 func (p *Plugin) getEnv() Env {
 	p.envLock.RLock()
 	defer p.envLock.RUnlock()