[MI-3082]: Fixed the issue 198 'Added the logic to refresh and store the token'

server/mscalendar/client.go

@@ -7,7 +7,6 @@ import (
 	"context"
 
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/remote"
-	"github.com/mattermost/mattermost-plugin-mscalendar/server/serializer"
 )
 
 type Client interface {
@@ -21,9 +20,9 @@ func (m *mscalendar) MakeClient() (remote.Client, error) {
 		return nil, err
 	}
 
-	tokenHelpers := &serializer.UserTokenHelpers{
-		CheckUserStatus:      m.Store.MakeCheckUserStatus,
-		ChangeUserStatus:     m.Store.MakeChangeUserStatus,
+	tokenHelpers := &remote.UserTokenHelpers{
+		CheckUserStatus:      m.Store.CheckUserConnected,
+		ChangeUserStatus:     m.Store.DisconnectUserFromStoreIfNecessary,
 		RefreshAndStoreToken: m.Store.RefreshAndStoreToken,
 	}
 

server/mscalendar/notification.go

@@ -141,9 +141,9 @@ func (processor *notificationProcessor) processNotification(n *remote.Notificati
 	n.Subscription = sub.Remote
 	n.SubscriptionCreator = creator.Remote
 
-	tokenHelpers := &serializer.UserTokenHelpers{
-		CheckUserStatus:      processor.Store.MakeCheckUserStatus,
-		ChangeUserStatus:     processor.Store.MakeChangeUserStatus,
+	tokenHelpers := &remote.UserTokenHelpers{
+		CheckUserStatus:      processor.Store.CheckUserConnected,
+		ChangeUserStatus:     processor.Store.DisconnectUserFromStoreIfNecessary,
 		RefreshAndStoreToken: processor.Store.RefreshAndStoreToken,
 	}
 	client := processor.Remote.MakeUserClient(context.Background(), creator.OAuth2Token, sub.MattermostCreatorID, processor.Poster, tokenHelpers)

server/mscalendar/oauth2.go

@@ -13,7 +13,7 @@ import (
 	"golang.org/x/oauth2"
 
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/config"
-	"github.com/mattermost/mattermost-plugin-mscalendar/server/serializer"
+	"github.com/mattermost/mattermost-plugin-mscalendar/server/remote"
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/store"
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/utils/oauth2connect"
 )
@@ -72,9 +72,9 @@ func (app *oauth2App) CompleteOAuth2(authedUserID, code, state string) error {
 		return err
 	}
 
-	tokenHelpers := &serializer.UserTokenHelpers{
-		CheckUserStatus:      app.Store.MakeCheckUserStatus,
-		ChangeUserStatus:     app.Store.MakeChangeUserStatus,
+	tokenHelpers := &remote.UserTokenHelpers{
+		CheckUserStatus:      app.Store.CheckUserConnected,
+		ChangeUserStatus:     app.Store.DisconnectUserFromStoreIfNecessary,
 		RefreshAndStoreToken: app.Store.RefreshAndStoreToken,
 	}
 

server/plugin/plugin.go

@@ -167,7 +167,7 @@ func (p *Plugin) OnConfigurationChange() (err error) {
 
 		e.Dependencies.Poster = e.bot
 		e.Dependencies.Welcomer = mscalendarBot
-		e.Dependencies.Store = store.NewPluginStore(p.API, e.bot, e.Dependencies.Tracker)
+		e.Dependencies.Store = store.NewPluginStore(p.API, e.bot, e.bot, e.Dependencies.Tracker)
 		e.Dependencies.SettingsPanel = mscalendar.NewSettingsPanel(
 			e.bot,
 			e.Dependencies.Store,

server/remote/client.go

@@ -28,7 +28,6 @@ type Client interface {
 	GetMailboxSettings(remoteUserID string) (*MailboxSettings, error)
 	GetMe() (*serializer.User, error)
 	GetNotificationData(*Notification) (*Notification, error)
-	GetSchedule(requests []*ScheduleUserInfo, startTime, endTime *serializer.DateTime, availabilityViewInterval int) ([]*ScheduleInformation, error)
 	ListSubscriptions() ([]*serializer.Subscription, error)
 	RenewSubscription(subscriptionID string) (*serializer.Subscription, error)
 	TentativelyAcceptEvent(remoteUserID, eventID string) error

server/remote/msgraph/client.go

@@ -10,7 +10,7 @@ import (
 	msgraph "github.com/yaegashi/msgraph.go/v1.0"
 
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/config"
-	"github.com/mattermost/mattermost-plugin-mscalendar/server/serializer"
+	"github.com/mattermost/mattermost-plugin-mscalendar/server/remote"
 	"github.com/mattermost/mattermost-plugin-mscalendar/server/utils/bot"
 )
 
@@ -24,7 +24,7 @@ type client struct {
 
 	mattermostUserID string
 	conf             *config.Config
-	tokenHelpers     *serializer.UserTokenHelpers
+	tokenHelpers     *remote.UserTokenHelpers
 
 	bot.Logger
 	bot.Poster

server/remote/msgraph/create_calendar.go

@@ -15,14 +15,14 @@ import (
 // CreateCalendar creates a calendar
 func (c *client) CreateCalendar(remoteUserID string, calIn *remote.Calendar) (*remote.Calendar, error) {
 	var calOut = remote.Calendar{}
-	if c.tokenHelpers != nil && !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return nil, errors.New(ErrorUserInactive)
 	}
 
 	err := c.rbuilder.Users().ID(remoteUserID).Calendars().Request().JSONRequest(c.ctx, http.MethodPost, "", &calIn, &calOut)
 	if err != nil {
-		c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+		c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 		return nil, errors.Wrap(err, "msgraph CreateCalendar")
 	}
 	c.Logger.With(bot.LogContext{

server/remote/msgraph/create_event.go

@@ -14,14 +14,14 @@ import (
 // CreateEvent creates a calendar event
 func (c *client) CreateEvent(remoteUserID string, in *serializer.Event) (*serializer.Event, error) {
 	var out = serializer.Event{}
-	if c.tokenHelpers != nil && !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return nil, errors.New(ErrorUserInactive)
 	}
 
 	err := c.rbuilder.Users().ID(remoteUserID).Events().Request().JSONRequest(c.ctx, http.MethodPost, "", &in, &out)
 	if err != nil {
-		c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+		c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 		return nil, errors.Wrap(err, "msgraph CreateEvent")
 	}
 	return &out, nil

server/remote/msgraph/delete_calendar.go

@@ -10,13 +10,13 @@ import (
 )
 
 func (c *client) DeleteCalendar(remoteUserID string, calID string) error {
-	if c.tokenHelpers != nil && !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return errors.New(ErrorUserInactive)
 	}
 	err := c.rbuilder.Users().ID(remoteUserID).Calendars().ID(calID).Request().Delete(c.ctx)
 	if err != nil {
-		c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+		c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 		return errors.Wrap(err, "msgraph DeleteCalendar")
 	}
 	c.Logger.With(bot.LogContext{}).Infof("msgraph: DeleteCalendar deleted calendar `%v`.", calID)

server/remote/msgraph/event.go

@@ -14,30 +14,30 @@ import (
 
 func (c *client) GetEvent(remoteUserID, eventID string) (*serializer.Event, error) {
 	e := &serializer.Event{}
-	if !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return nil, errors.New(ErrorUserInactive)
 	}
 
 	err := c.rbuilder.Users().ID(remoteUserID).Events().ID(eventID).Request().JSONRequest(
 		c.ctx, http.MethodGet, "", nil, &e)
 	if err != nil {
-		c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+		c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 		return nil, errors.Wrap(err, "msgraph GetEvent")
 	}
 	return e, nil
 }
 
 func (c *client) AcceptEvent(remoteUserID, eventID string) error {
 	dummy := &msgraph.EventAcceptRequestParameter{}
-	if !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return errors.New(ErrorUserInactive)
 	}
 
 	err := c.rbuilder.Users().ID(remoteUserID).Events().ID(eventID).Accept(dummy).Request().Post(c.ctx)
 	if err != nil {
-		c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+		c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 		return errors.Wrap(err, "msgraph Accept Event")
 	}
 
@@ -46,29 +46,29 @@ func (c *client) AcceptEvent(remoteUserID, eventID string) error {
 
 func (c *client) DeclineEvent(remoteUserID, eventID string) error {
 	dummy := &msgraph.EventDeclineRequestParameter{}
-	if !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return errors.New(ErrorUserInactive)
 	}
 
 	err := c.rbuilder.Users().ID(remoteUserID).Events().ID(eventID).Decline(dummy).Request().Post(c.ctx)
 	if err != nil {
-		c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+		c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 		return errors.Wrap(err, "msgraph DeclineEvent")
 	}
 	return nil
 }
 
 func (c *client) TentativelyAcceptEvent(remoteUserID, eventID string) error {
 	dummy := &msgraph.EventTentativelyAcceptRequestParameter{}
-	if c.tokenHelpers != nil && !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return errors.New(ErrorUserInactive)
 	}
 
 	err := c.rbuilder.Users().ID(remoteUserID).Events().ID(eventID).TentativelyAccept(dummy).Request().Post(c.ctx)
 	if err != nil {
-		c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+		c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 		return errors.Wrap(err, "msgraph TentativelyAcceptEvent")
 	}
 	return nil

server/remote/msgraph/find_meeting_times.go

@@ -14,15 +14,15 @@ import (
 // FindMeetingTimes finds meeting time suggestions for a calendar event
 func (c *client) FindMeetingTimes(remoteUserID string, params *remote.FindMeetingTimesParameters) (*remote.MeetingTimeSuggestionResults, error) {
 	meetingsOut := &remote.MeetingTimeSuggestionResults{}
-	if c.tokenHelpers != nil && !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return nil, errors.New(ErrorUserInactive)
 	}
 
 	req := c.rbuilder.Users().ID(remoteUserID).FindMeetingTimes(nil).Request()
 	err := req.JSONRequest(c.ctx, http.MethodPost, "", &params, &meetingsOut)
 	if err != nil {
-		c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+		c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 		return nil, errors.Wrap(err, "msgraph FindMeetingTimes")
 	}
 

server/remote/msgraph/get_calendars.go

@@ -16,7 +16,7 @@ func (c *client) GetCalendars(remoteUserID string) ([]*remote.Calendar, error) {
 	var v struct {
 		Value []*remote.Calendar `json:"value"`
 	}
-	if c.tokenHelpers != nil && !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return nil, errors.New(ErrorUserInactive)
 	}
@@ -25,7 +25,7 @@ func (c *client) GetCalendars(remoteUserID string) ([]*remote.Calendar, error) {
 	req.Expand("children")
 	err := req.JSONRequest(c.ctx, http.MethodGet, "", nil, &v)
 	if err != nil {
-		c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+		c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 		return nil, errors.Wrap(err, "msgraph GetCalendars")
 	}
 	c.Logger.With(bot.LogContext{

server/remote/msgraph/get_default_calendar_view.go

@@ -33,7 +33,7 @@ type calendarViewBatchResponse struct {
 func (c *client) GetDefaultCalendarView(remoteUserID string, start, end time.Time) ([]*serializer.Event, error) {
 	paramStr := getQueryParamStringForCalendarView(start, end)
 
-	if c.tokenHelpers != nil && !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return nil, errors.New(ErrorUserInactive)
 	}
@@ -42,7 +42,7 @@ func (c *client) GetDefaultCalendarView(remoteUserID string, start, end time.Tim
 	err := c.rbuilder.Users().ID(remoteUserID).CalendarView().Request().JSONRequest(
 		c.ctx, http.MethodGet, paramStr, nil, res)
 	if err != nil {
-		c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+		c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 		return nil, errors.Wrap(err, "msgraph GetDefaultCalendarView")
 	}
 
@@ -51,11 +51,6 @@ func (c *client) GetDefaultCalendarView(remoteUserID string, start, end time.Tim
 
 func (c *client) DoBatchViewCalendarRequests(allParams []*remote.ViewCalendarParams) ([]*remote.ViewCalendarResponse, error) {
 	requests := []*singleRequest{}
-	if c.tokenHelpers != nil && !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
-		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
-		return nil, errors.New(ErrorUserInactive)
-	}
-
 	for _, params := range allParams {
 		u := getCalendarViewURL(params)
 		req := &singleRequest{
@@ -73,7 +68,6 @@ func (c *client) DoBatchViewCalendarRequests(allParams []*remote.ViewCalendarPar
 		batchRes := &calendarViewBatchResponse{}
 		err := c.batchRequest(req, batchRes)
 		if err != nil {
-			c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
 			return nil, errors.Wrap(err, "msgraph ViewCalendar batch request")
 		}
 

server/remote/msgraph/get_notification_data.go

@@ -16,7 +16,7 @@ import (
 func (c *client) GetNotificationData(orig *remote.Notification) (*remote.Notification, error) {
 	n := *orig
 	wh := n.Webhook.(*webhook)
-	if c.tokenHelpers != nil && !c.tokenHelpers.CheckUserStatus(c.Logger, c.mattermostUserID) {
+	if !c.tokenHelpers.CheckUserStatus(c.mattermostUserID) {
 		c.Logger.Warnf(LogUserInactive, c.mattermostUserID)
 		return nil, errors.New(ErrorUserInactive)
 	}
@@ -26,7 +26,7 @@ func (c *client) GetNotificationData(orig *remote.Notification) (*remote.Notific
 		event := serializer.Event{}
 		_, err := c.CallJSON(http.MethodGet, wh.Resource, nil, &event)
 		if err != nil {
-			c.tokenHelpers.ChangeUserStatus(err, c.Logger, c.mattermostUserID, c.Poster)
+			c.tokenHelpers.ChangeUserStatus(err, c.mattermostUserID)
 			c.Logger.With(bot.LogContext{
 				"Resource":       wh.Resource,
 				"subscriptionID": wh.SubscriptionID,