Upgrading all the server libraries (#2643)

* Upgrading all the server libraries

* upgrading dependencies in the mattermost-plugin directory

* Executing go generate

* Upgrading the linux app

* Running go mod tidy everywhere

linux/Makefile

@@ -1,8 +1,8 @@
 .PHONY: run
 
 run:
-	go run ./main.go
+	go run -tags json1 ./main.go
 
 build:
 	mkdir -p bin
-	go build -o bin/focalboard-app
+	go build -tags json1 -o bin/focalboard-app

linux/go.mod

@@ -6,7 +6,7 @@ replace github.com/mattermost/focalboard/server => ../server
 
 require (
 	github.com/google/uuid v1.3.0
-	github.com/mattermost/focalboard/server v0.0.0-20210422230105-f5ae0b265a8d
-	github.com/mattermost/mattermost-server/v6 v6.0.0-20210913141218-bb659d03fde0
-	github.com/webview/webview v0.0.0-20200724072439-e0c01595b361
+	github.com/mattermost/focalboard/server v0.0.0-20220325164658-33557093b00d
+	github.com/mattermost/mattermost-server/v6 v6.5.0
+	github.com/webview/webview v0.0.0-20220314230258-a2b7746141c3
 )

mattermost-plugin/go.mod

@@ -5,8 +5,8 @@ go 1.16
 replace github.com/mattermost/focalboard/server => ../server
 
 require (
-	github.com/mattermost/focalboard/server v0.0.0-20210525112228-f43e4028dbdc
-	github.com/mattermost/mattermost-plugin-api v0.0.21
-	github.com/mattermost/mattermost-server/v6 v6.0.0-20211022142730-a6cca93ba3c3
-	github.com/stretchr/testify v1.7.0
+	github.com/mattermost/focalboard/server v0.0.0-20220325164658-33557093b00d
+	github.com/mattermost/mattermost-plugin-api v0.0.27
+	github.com/mattermost/mattermost-server/v6 v6.5.0
+	github.com/stretchr/testify v1.7.1
 )

mattermost-plugin/server/notifications.go

@@ -12,6 +12,7 @@ import (
 	"github.com/mattermost/focalboard/server/ws"
 
 	pluginapi "github.com/mattermost/mattermost-plugin-api"
+	apierrors "github.com/mattermost/mattermost-plugin-api/errors"
 
 	"github.com/mattermost/mattermost-server/v6/model"
 
@@ -113,5 +114,5 @@ func (da *pluginAPIAdapter) GetChannelMember(channelID string, userID string) (*
 }
 
 func (da *pluginAPIAdapter) IsErrNotFound(err error) bool {
-	return errors.Is(err, pluginapi.ErrNotFound)
+	return errors.Is(err, apierrors.ErrNotFound)
 }

server/go.mod

@@ -3,30 +3,40 @@ module github.com/mattermost/focalboard/server
 go 1.16
 
 require (
-	github.com/Masterminds/squirrel v1.5.0
+	github.com/Masterminds/squirrel v1.5.2
 	github.com/go-sql-driver/mysql v1.6.0
-	github.com/golang/mock v1.5.0
+	github.com/golang/mock v1.6.0
 	github.com/gorilla/mux v1.8.0
-	github.com/gorilla/websocket v1.4.2
+	github.com/gorilla/websocket v1.5.0
+	github.com/hashicorp/go-hclog v1.2.0 // indirect
+	github.com/klauspost/compress v1.15.1 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.12 // indirect
 	github.com/krolaw/zipstream v0.0.0-20180621105154-0a2661891f94
-	github.com/lib/pq v1.10.2
-	github.com/magiconair/properties v1.8.5 // indirect
-	github.com/mattermost/mattermost-plugin-api v0.0.21
-	github.com/mattermost/mattermost-server/v6 v6.0.0-20210913141218-bb659d03fde0
-	github.com/mattermost/morph v0.0.0-20220222074146-cff3f12ff131
+	github.com/lib/pq v1.10.4
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mattermost/mattermost-plugin-api v0.0.27
+	github.com/mattermost/mattermost-server/v6 v6.5.0
+	github.com/mattermost/morph v0.0.0-20220324143723-e4896385ec60
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible
-	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/minio/minio-go/v7 v7.0.23 // indirect
 	github.com/oklog/run v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.11.0
-	github.com/rudderlabs/analytics-go v3.3.1+incompatible
-	github.com/sergi/go-diff v1.0.0
-	github.com/spf13/afero v1.6.0 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.7.1
-	github.com/stretchr/testify v1.7.0
+	github.com/prometheus/client_golang v1.12.1
+	github.com/rs/xid v1.4.0 // indirect
+	github.com/rudderlabs/analytics-go v3.3.2+incompatible
+	github.com/sergi/go-diff v1.2.0
+	github.com/spf13/afero v1.8.2 // indirect
+	github.com/spf13/viper v1.10.1
+	github.com/stretchr/testify v1.7.1
 	github.com/wiggin77/merror v1.0.3
-	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	github.com/yuin/goldmark v1.4.11 // indirect
+	golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064
+	golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect
+	golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
+	golang.org/x/tools v0.1.10 // indirect
+	google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/ini.v1 v1.66.4 // indirect
+	lukechampine.com/uint128 v1.2.0 // indirect
+	modernc.org/sqlite v1.15.3 // indirect
 )

server/services/permissions/mmpermissions/mocks/mockpluginapi.go

@@ -186,6 +186,21 @@ func (mr *MockAPIMockRecorder) CreatePost(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreatePost", reflect.TypeOf((*MockAPI)(nil).CreatePost), arg0)
 }
 
+// CreateSession mocks base method.
+func (m *MockAPI) CreateSession(arg0 *model.Session) (*model.Session, *model.AppError) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "CreateSession", arg0)
+	ret0, _ := ret[0].(*model.Session)
+	ret1, _ := ret[1].(*model.AppError)
+	return ret0, ret1
+}
+
+// CreateSession indicates an expected call of CreateSession.
+func (mr *MockAPIMockRecorder) CreateSession(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSession", reflect.TypeOf((*MockAPI)(nil).CreateSession), arg0)
+}
+
 // CreateTeam mocks base method.
 func (m *MockAPI) CreateTeam(arg0 *model.Team) (*model.Team, *model.AppError) {
 	m.ctrl.T.Helper()
@@ -457,6 +472,20 @@ func (mr *MockAPIMockRecorder) ExecuteSlashCommand(arg0 interface{}) *gomock.Cal
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteSlashCommand", reflect.TypeOf((*MockAPI)(nil).ExecuteSlashCommand), arg0)
 }
 
+// ExtendSessionExpiry mocks base method.
+func (m *MockAPI) ExtendSessionExpiry(arg0 string, arg1 int64) *model.AppError {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ExtendSessionExpiry", arg0, arg1)
+	ret0, _ := ret[0].(*model.AppError)
+	return ret0
+}
+
+// ExtendSessionExpiry indicates an expected call of ExtendSessionExpiry.
+func (mr *MockAPIMockRecorder) ExtendSessionExpiry(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExtendSessionExpiry", reflect.TypeOf((*MockAPI)(nil).ExtendSessionExpiry), arg0, arg1)
+}
+
 // GetBot mocks base method.
 func (m *MockAPI) GetBot(arg0 string, arg1 bool) (*model.Bot, *model.AppError) {
 	m.ctrl.T.Helper()
@@ -1573,6 +1602,20 @@ func (mr *MockAPIMockRecorder) InstallPlugin(arg0, arg1 interface{}) *gomock.Cal
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InstallPlugin", reflect.TypeOf((*MockAPI)(nil).InstallPlugin), arg0, arg1)
 }
 
+// IsEnterpriseReady mocks base method.
+func (m *MockAPI) IsEnterpriseReady() bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IsEnterpriseReady")
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// IsEnterpriseReady indicates an expected call of IsEnterpriseReady.
+func (mr *MockAPIMockRecorder) IsEnterpriseReady() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsEnterpriseReady", reflect.TypeOf((*MockAPI)(nil).IsEnterpriseReady))
+}
+
 // KVCompareAndDelete mocks base method.
 func (m *MockAPI) KVCompareAndDelete(arg0 string, arg1 []byte) (bool, *model.AppError) {
 	m.ctrl.T.Helper()
@@ -2014,6 +2057,20 @@ func (mr *MockAPIMockRecorder) RemoveTeamIcon(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveTeamIcon", reflect.TypeOf((*MockAPI)(nil).RemoveTeamIcon), arg0)
 }
 
+// RemoveUserCustomStatus mocks base method.
+func (m *MockAPI) RemoveUserCustomStatus(arg0 string) *model.AppError {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "RemoveUserCustomStatus", arg0)
+	ret0, _ := ret[0].(*model.AppError)
+	return ret0
+}
+
+// RemoveUserCustomStatus indicates an expected call of RemoveUserCustomStatus.
+func (mr *MockAPIMockRecorder) RemoveUserCustomStatus(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveUserCustomStatus", reflect.TypeOf((*MockAPI)(nil).RemoveUserCustomStatus), arg0)
+}
+
 // RequestTrialLicense mocks base method.
 func (m *MockAPI) RequestTrialLicense(arg0 string, arg1 int, arg2, arg3 bool) *model.AppError {
 	m.ctrl.T.Helper()
@@ -2028,6 +2085,20 @@ func (mr *MockAPIMockRecorder) RequestTrialLicense(arg0, arg1, arg2, arg3 interf
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequestTrialLicense", reflect.TypeOf((*MockAPI)(nil).RequestTrialLicense), arg0, arg1, arg2, arg3)
 }
 
+// RevokeSession mocks base method.
+func (m *MockAPI) RevokeSession(arg0 string) *model.AppError {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "RevokeSession", arg0)
+	ret0, _ := ret[0].(*model.AppError)
+	return ret0
+}
+
+// RevokeSession indicates an expected call of RevokeSession.
+func (mr *MockAPIMockRecorder) RevokeSession(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevokeSession", reflect.TypeOf((*MockAPI)(nil).RevokeSession), arg0)
+}
+
 // RevokeUserAccessToken mocks base method.
 func (m *MockAPI) RevokeUserAccessToken(arg0 string) *model.AppError {
 	m.ctrl.T.Helper()
@@ -2042,6 +2113,20 @@ func (mr *MockAPIMockRecorder) RevokeUserAccessToken(arg0 interface{}) *gomock.C
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevokeUserAccessToken", reflect.TypeOf((*MockAPI)(nil).RevokeUserAccessToken), arg0)
 }
 
+// RolesGrantPermission mocks base method.
+func (m *MockAPI) RolesGrantPermission(arg0 []string, arg1 string) bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "RolesGrantPermission", arg0, arg1)
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// RolesGrantPermission indicates an expected call of RolesGrantPermission.
+func (mr *MockAPIMockRecorder) RolesGrantPermission(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RolesGrantPermission", reflect.TypeOf((*MockAPI)(nil).RolesGrantPermission), arg0, arg1)
+}
+
 // SaveConfig mocks base method.
 func (m *MockAPI) SaveConfig(arg0 *model.Config) *model.AppError {
 	m.ctrl.T.Helper()
@@ -2437,6 +2522,20 @@ func (mr *MockAPIMockRecorder) UpdateUserActive(arg0, arg1 interface{}) *gomock.
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateUserActive", reflect.TypeOf((*MockAPI)(nil).UpdateUserActive), arg0, arg1)
 }
 
+// UpdateUserCustomStatus mocks base method.
+func (m *MockAPI) UpdateUserCustomStatus(arg0 string, arg1 *model.CustomStatus) *model.AppError {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "UpdateUserCustomStatus", arg0, arg1)
+	ret0, _ := ret[0].(*model.AppError)
+	return ret0
+}
+
+// UpdateUserCustomStatus indicates an expected call of UpdateUserCustomStatus.
+func (mr *MockAPIMockRecorder) UpdateUserCustomStatus(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateUserCustomStatus", reflect.TypeOf((*MockAPI)(nil).UpdateUserCustomStatus), arg0, arg1)
+}
+
 // UpdateUserStatus mocks base method.
 func (m *MockAPI) UpdateUserStatus(arg0, arg1 string) (*model.Status, *model.AppError) {
 	m.ctrl.T.Helper()

server/services/store/sqlstore/migrate.go

@@ -18,7 +18,7 @@ import (
 	mysql "github.com/mattermost/morph/drivers/mysql"
 	postgres "github.com/mattermost/morph/drivers/postgres"
 	sqlite "github.com/mattermost/morph/drivers/sqlite"
-	mbindata "github.com/mattermost/morph/sources/go_bindata"
+	embedded "github.com/mattermost/morph/sources/embedded"
 
 	mysqldriver "github.com/go-sql-driver/mysql"
 	_ "github.com/lib/pq" // postgres driver
@@ -134,7 +134,7 @@ func (s *SQLStore) Migrate() error {
 		"plugin":   s.isPlugin,
 	}
 
-	migrationAssets := &mbindata.AssetSource{
+	migrationAssets := &embedded.AssetSource{
 		Names: assetNamesForDriver,
 		AssetFunc: func(name string) ([]byte, error) {
 			asset, mErr := assets.ReadFile(filepath.Join("migrations", name))
@@ -157,11 +157,10 @@ func (s *SQLStore) Migrate() error {
 		},
 	}
 
-	src, err := mbindata.WithInstance(migrationAssets)
+	src, err := embedded.WithInstance(migrationAssets)
 	if err != nil {
 		return err
 	}
-	defer src.Close()
 
 	opts := []morph.EngineOption{
 		morph.WithLock("mm-lock-key"),

server/ws/mocks/mockpluginapi.go

@@ -186,6 +186,21 @@ func (mr *MockAPIMockRecorder) CreatePost(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreatePost", reflect.TypeOf((*MockAPI)(nil).CreatePost), arg0)
 }
 
+// CreateSession mocks base method.
+func (m *MockAPI) CreateSession(arg0 *model.Session) (*model.Session, *model.AppError) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "CreateSession", arg0)
+	ret0, _ := ret[0].(*model.Session)
+	ret1, _ := ret[1].(*model.AppError)
+	return ret0, ret1
+}
+
+// CreateSession indicates an expected call of CreateSession.
+func (mr *MockAPIMockRecorder) CreateSession(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateSession", reflect.TypeOf((*MockAPI)(nil).CreateSession), arg0)
+}
+
 // CreateTeam mocks base method.
 func (m *MockAPI) CreateTeam(arg0 *model.Team) (*model.Team, *model.AppError) {
 	m.ctrl.T.Helper()
@@ -457,6 +472,20 @@ func (mr *MockAPIMockRecorder) ExecuteSlashCommand(arg0 interface{}) *gomock.Cal
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteSlashCommand", reflect.TypeOf((*MockAPI)(nil).ExecuteSlashCommand), arg0)
 }
 
+// ExtendSessionExpiry mocks base method.
+func (m *MockAPI) ExtendSessionExpiry(arg0 string, arg1 int64) *model.AppError {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ExtendSessionExpiry", arg0, arg1)
+	ret0, _ := ret[0].(*model.AppError)
+	return ret0
+}
+
+// ExtendSessionExpiry indicates an expected call of ExtendSessionExpiry.
+func (mr *MockAPIMockRecorder) ExtendSessionExpiry(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExtendSessionExpiry", reflect.TypeOf((*MockAPI)(nil).ExtendSessionExpiry), arg0, arg1)
+}
+
 // GetBot mocks base method.
 func (m *MockAPI) GetBot(arg0 string, arg1 bool) (*model.Bot, *model.AppError) {
 	m.ctrl.T.Helper()
@@ -1573,6 +1602,20 @@ func (mr *MockAPIMockRecorder) InstallPlugin(arg0, arg1 interface{}) *gomock.Cal
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InstallPlugin", reflect.TypeOf((*MockAPI)(nil).InstallPlugin), arg0, arg1)
 }
 
+// IsEnterpriseReady mocks base method.
+func (m *MockAPI) IsEnterpriseReady() bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IsEnterpriseReady")
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// IsEnterpriseReady indicates an expected call of IsEnterpriseReady.
+func (mr *MockAPIMockRecorder) IsEnterpriseReady() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsEnterpriseReady", reflect.TypeOf((*MockAPI)(nil).IsEnterpriseReady))
+}
+
 // KVCompareAndDelete mocks base method.
 func (m *MockAPI) KVCompareAndDelete(arg0 string, arg1 []byte) (bool, *model.AppError) {
 	m.ctrl.T.Helper()
@@ -2014,6 +2057,20 @@ func (mr *MockAPIMockRecorder) RemoveTeamIcon(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveTeamIcon", reflect.TypeOf((*MockAPI)(nil).RemoveTeamIcon), arg0)
 }
 
+// RemoveUserCustomStatus mocks base method.
+func (m *MockAPI) RemoveUserCustomStatus(arg0 string) *model.AppError {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "RemoveUserCustomStatus", arg0)
+	ret0, _ := ret[0].(*model.AppError)
+	return ret0
+}
+
+// RemoveUserCustomStatus indicates an expected call of RemoveUserCustomStatus.
+func (mr *MockAPIMockRecorder) RemoveUserCustomStatus(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveUserCustomStatus", reflect.TypeOf((*MockAPI)(nil).RemoveUserCustomStatus), arg0)
+}
+
 // RequestTrialLicense mocks base method.
 func (m *MockAPI) RequestTrialLicense(arg0 string, arg1 int, arg2, arg3 bool) *model.AppError {
 	m.ctrl.T.Helper()
@@ -2028,6 +2085,20 @@ func (mr *MockAPIMockRecorder) RequestTrialLicense(arg0, arg1, arg2, arg3 interf
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequestTrialLicense", reflect.TypeOf((*MockAPI)(nil).RequestTrialLicense), arg0, arg1, arg2, arg3)
 }
 
+// RevokeSession mocks base method.
+func (m *MockAPI) RevokeSession(arg0 string) *model.AppError {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "RevokeSession", arg0)
+	ret0, _ := ret[0].(*model.AppError)
+	return ret0
+}
+
+// RevokeSession indicates an expected call of RevokeSession.
+func (mr *MockAPIMockRecorder) RevokeSession(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevokeSession", reflect.TypeOf((*MockAPI)(nil).RevokeSession), arg0)
+}
+
 // RevokeUserAccessToken mocks base method.
 func (m *MockAPI) RevokeUserAccessToken(arg0 string) *model.AppError {
 	m.ctrl.T.Helper()
@@ -2042,6 +2113,20 @@ func (mr *MockAPIMockRecorder) RevokeUserAccessToken(arg0 interface{}) *gomock.C
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevokeUserAccessToken", reflect.TypeOf((*MockAPI)(nil).RevokeUserAccessToken), arg0)
 }
 
+// RolesGrantPermission mocks base method.
+func (m *MockAPI) RolesGrantPermission(arg0 []string, arg1 string) bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "RolesGrantPermission", arg0, arg1)
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// RolesGrantPermission indicates an expected call of RolesGrantPermission.
+func (mr *MockAPIMockRecorder) RolesGrantPermission(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RolesGrantPermission", reflect.TypeOf((*MockAPI)(nil).RolesGrantPermission), arg0, arg1)
+}
+
 // SaveConfig mocks base method.
 func (m *MockAPI) SaveConfig(arg0 *model.Config) *model.AppError {
 	m.ctrl.T.Helper()
@@ -2437,6 +2522,20 @@ func (mr *MockAPIMockRecorder) UpdateUserActive(arg0, arg1 interface{}) *gomock.
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateUserActive", reflect.TypeOf((*MockAPI)(nil).UpdateUserActive), arg0, arg1)
 }
 
+// UpdateUserCustomStatus mocks base method.
+func (m *MockAPI) UpdateUserCustomStatus(arg0 string, arg1 *model.CustomStatus) *model.AppError {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "UpdateUserCustomStatus", arg0, arg1)
+	ret0, _ := ret[0].(*model.AppError)
+	return ret0
+}
+
+// UpdateUserCustomStatus indicates an expected call of UpdateUserCustomStatus.
+func (mr *MockAPIMockRecorder) UpdateUserCustomStatus(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateUserCustomStatus", reflect.TypeOf((*MockAPI)(nil).UpdateUserCustomStatus), arg0, arg1)
+}
+
 // UpdateUserStatus mocks base method.
 func (m *MockAPI) UpdateUserStatus(arg0, arg1 string) (*model.Status, *model.AppError) {
 	m.ctrl.T.Helper()