updated snapshot and fix test

server/api/api.go

@@ -41,7 +41,6 @@ type API struct {
 	MattermostAuth  bool
 	logger          mlog.LoggerIFace
 	audit           *audit.Audit
-	isPlugin        bool
 }
 
 func NewAPI(
@@ -51,7 +50,6 @@ func NewAPI(
 	permissions permissions.PermissionsService,
 	logger mlog.LoggerIFace,
 	audit *audit.Audit,
-	isPlugin bool,
 ) *API {
 	return &API{
 		app:             app,
@@ -60,7 +58,6 @@ func NewAPI(
 		permissions:     permissions,
 		logger:          logger,
 		audit:           audit,
-		isPlugin:        isPlugin,
 	}
 }
 

server/api/auth.go

@@ -19,13 +19,11 @@ import (
 
 func (a *API) registerAuthRoutes(r *mux.Router) {
 	// personal-server specific routes. These are not needed in plugin mode.
-	if !a.isPlugin {
-		r.HandleFunc("/login", a.handleLogin).Methods("POST")
-		r.HandleFunc("/logout", a.sessionRequired(a.handleLogout)).Methods("POST")
-		r.HandleFunc("/register", a.handleRegister).Methods("POST")
-		r.HandleFunc("/teams/{teamID}/regenerate_signup_token", a.sessionRequired(a.handlePostTeamRegenerateSignupToken)).Methods("POST")
-		r.HandleFunc("/users/{userID}/changepassword", a.sessionRequired(a.handleChangePassword)).Methods("POST")
-	}
+	r.HandleFunc("/login", a.handleLogin).Methods("POST")
+	r.HandleFunc("/logout", a.sessionRequired(a.handleLogout)).Methods("POST")
+	r.HandleFunc("/register", a.handleRegister).Methods("POST")
+	r.HandleFunc("/teams/{teamID}/regenerate_signup_token", a.sessionRequired(a.handlePostTeamRegenerateSignupToken)).Methods("POST")
+	r.HandleFunc("/users/{userID}/changepassword", a.sessionRequired(a.handleChangePassword)).Methods("POST")
 }
 
 func (a *API) handleLogin(w http.ResponseWriter, r *http.Request) {

server/server/params.go

@@ -23,7 +23,6 @@ type Params struct {
 	NotifyBackends     []notify.Backend
 	PermissionsService permissions.PermissionsService
 	ServicesAPI        model.ServicesAPI
-	IsPlugin           bool
 }
 
 func (p Params) CheckValid() error {

server/server/server.go

@@ -143,7 +143,7 @@ func New(params Params) (*Server, error) {
 	}
 	app := app.New(params.Cfg, wsAdapter, appServices)
 
-	focalboardAPI := api.NewAPI(app, params.SingleUserToken, params.Cfg.AuthMode, params.PermissionsService, params.Logger, auditService, params.IsPlugin)
+	focalboardAPI := api.NewAPI(app, params.SingleUserToken, params.Cfg.AuthMode, params.PermissionsService, params.Logger, auditService)
 
 	// Local router for admin APIs
 	localRouter := mux.NewRouter()
@@ -228,7 +228,6 @@ func NewStore(config *config.Configuration, isSingleUser bool, logger mlog.Logge
 		TablePrefix:      config.DBTablePrefix,
 		Logger:           logger,
 		DB:               sqlDB,
-		IsPlugin:         false,
 		IsSingleUser:     isSingleUser,
 	}
 

server/services/store/sqlstore/data_migrations.go

@@ -154,22 +154,6 @@ func (s *SQLStore) RunCategoryUUIDIDMigration() error {
 		return txErr
 	}
 
-	if s.isPlugin {
-		if err := s.createCategories(tx); err != nil {
-			if rollbackErr := tx.Rollback(); rollbackErr != nil {
-				s.logger.Error("category UUIDs insert categories transaction rollback error", mlog.Err(rollbackErr), mlog.String("methodName", "setSystemSetting"))
-			}
-			return err
-		}
-
-		if err := s.createCategoryBoards(tx); err != nil {
-			if rollbackErr := tx.Rollback(); rollbackErr != nil {
-				s.logger.Error("category UUIDs insert category boards transaction rollback error", mlog.Err(rollbackErr), mlog.String("methodName", "setSystemSetting"))
-			}
-			return err
-		}
-	}
-
 	if err := s.setSystemSetting(tx, CategoryUUIDIDMigrationKey, strconv.FormatBool(true)); err != nil {
 		if rollbackErr := tx.Rollback(); rollbackErr != nil {
 			s.logger.Error("category UUIDs transaction rollback error", mlog.Err(rollbackErr), mlog.String("methodName", "setSystemSetting"))
@@ -349,87 +333,6 @@ func (s *SQLStore) createCategoryBoards(db sq.BaseRunner) error {
 	return nil
 }
 
-// We no longer support boards existing in DMs and private
-// group messages. This function migrates all boards
-// belonging to a DM to the best possible team.
-func (s *SQLStore) RunTeamLessBoardsMigration() error {
-	if !s.isPlugin {
-		return nil
-	}
-
-	setting, err := s.GetSystemSetting(TeamLessBoardsMigrationKey)
-	if err != nil {
-		return fmt.Errorf("cannot get teamless boards migration state: %w", err)
-	}
-
-	// If the migration is already completed, do not run it again.
-	if hasAlreadyRun, _ := strconv.ParseBool(setting); hasAlreadyRun {
-		return nil
-	}
-
-	boards, err := s.getDMBoards(s.db)
-	if err != nil {
-		return err
-	}
-
-	s.logger.Debug("Migrating teamless boards to a team", mlog.Int("count", len(boards)))
-
-	// cache for best suitable team for a DM. Since a DM can
-	// contain multiple boards, caching this avoids
-	// duplicate queries for the same DM.
-	channelToTeamCache := map[string]string{}
-
-	tx, err := s.db.BeginTx(context.Background(), nil)
-	if err != nil {
-		s.logger.Error("error starting transaction in runTeamLessBoardsMigration", mlog.Err(err))
-		return err
-	}
-
-	for i := range boards {
-		// check the cache first
-		teamID, ok := channelToTeamCache[boards[i].ChannelID]
-
-		// query DB if entry not found in cache
-		if !ok {
-			teamID, err = s.getBestTeamForBoard(s.db, boards[i])
-			if err != nil {
-				// don't let one board's error spoil
-				// the mood for others
-				s.logger.Error("could not find the best team for board during team less boards migration. Continuing", mlog.String("boardID", boards[i].ID))
-				continue
-			}
-		}
-
-		channelToTeamCache[boards[i].ChannelID] = teamID
-		boards[i].TeamID = teamID
-
-		query := s.getQueryBuilder(tx).
-			Update(s.tablePrefix+"boards").
-			Set("team_id", teamID).
-			Set("type", model.BoardTypePrivate).
-			Where(sq.Eq{"id": boards[i].ID})
-
-		if _, err := query.Exec(); err != nil {
-			s.logger.Error("failed to set team id for board", mlog.String("board_id", boards[i].ID), mlog.String("team_id", teamID), mlog.Err(err))
-			return err
-		}
-	}
-
-	if err := s.setSystemSetting(tx, TeamLessBoardsMigrationKey, strconv.FormatBool(true)); err != nil {
-		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			s.logger.Error("transaction rollback error", mlog.Err(rollbackErr), mlog.String("methodName", "runTeamLessBoardsMigration"))
-		}
-		return fmt.Errorf("cannot mark migration as completed: %w", err)
-	}
-
-	if err := tx.Commit(); err != nil {
-		s.logger.Error("failed to commit runTeamLessBoardsMigration transaction", mlog.Err(err))
-		return err
-	}
-
-	return nil
-}
-
 func (s *SQLStore) getDMBoards(tx sq.BaseRunner) ([]*model.Board, error) {
 	conditions := sq.And{
 		sq.Eq{"team_id": ""},
@@ -554,79 +457,6 @@ func (s *SQLStore) getBoardUserTeams(tx sq.BaseRunner, board *model.Board) (map[
 	return userTeams, nil
 }
 
-func (s *SQLStore) RunDeletedMembershipBoardsMigration() error {
-	if !s.isPlugin {
-		return nil
-	}
-
-	setting, err := s.GetSystemSetting(DeletedMembershipBoardsMigrationKey)
-	if err != nil {
-		return fmt.Errorf("cannot get deleted membership boards migration state: %w", err)
-	}
-
-	// If the migration is already completed, do not run it again.
-	if hasAlreadyRun, _ := strconv.ParseBool(setting); hasAlreadyRun {
-		return nil
-	}
-
-	boards, err := s.getDeletedMembershipBoards(s.db)
-	if err != nil {
-		return err
-	}
-
-	if len(boards) == 0 {
-		s.logger.Debug("No boards with owner not anymore on their team found, marking runDeletedMembershipBoardsMigration as done")
-		if sErr := s.SetSystemSetting(DeletedMembershipBoardsMigrationKey, strconv.FormatBool(true)); sErr != nil {
-			return fmt.Errorf("cannot mark migration as completed: %w", sErr)
-		}
-		return nil
-	}
-
-	s.logger.Debug("Migrating boards with owner not anymore on their team", mlog.Int("count", len(boards)))
-
-	tx, err := s.db.BeginTx(context.Background(), nil)
-	if err != nil {
-		s.logger.Error("error starting transaction in runDeletedMembershipBoardsMigration", mlog.Err(err))
-		return err
-	}
-
-	for i := range boards {
-		teamID, err := s.getBestTeamForBoard(s.db, boards[i])
-		if err != nil {
-			// don't let one board's error spoil
-			// the mood for others
-			s.logger.Error("could not find the best team for board during deleted membership boards migration. Continuing", mlog.String("boardID", boards[i].ID))
-			continue
-		}
-
-		boards[i].TeamID = teamID
-
-		query := s.getQueryBuilder(tx).
-			Update(s.tablePrefix+"boards").
-			Set("team_id", teamID).
-			Where(sq.Eq{"id": boards[i].ID})
-
-		if _, err := query.Exec(); err != nil {
-			s.logger.Error("failed to set team id for board", mlog.String("board_id", boards[i].ID), mlog.String("team_id", teamID), mlog.Err(err))
-			return err
-		}
-	}
-
-	if err := s.setSystemSetting(tx, DeletedMembershipBoardsMigrationKey, strconv.FormatBool(true)); err != nil {
-		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			s.logger.Error("transaction rollback error", mlog.Err(rollbackErr), mlog.String("methodName", "runDeletedMembershipBoardsMigration"))
-		}
-		return fmt.Errorf("cannot mark migration as completed: %w", err)
-	}
-
-	if err := tx.Commit(); err != nil {
-		s.logger.Error("failed to commit runDeletedMembershipBoardsMigration transaction", mlog.Err(err))
-		return err
-	}
-
-	return nil
-}
-
 // getDeletedMembershipBoards retrieves those boards whose creator is
 // associated to the board's team with a deleted team membership.
 func (s *SQLStore) getDeletedMembershipBoards(tx sq.BaseRunner) ([]*model.Board, error) {
@@ -661,7 +491,7 @@ func (s *SQLStore) RunFixCollationsAndCharsetsMigration() error {
 	var collation string
 	var charSet string
 	var err error
-	if !s.isPlugin || os.Getenv("FOCALBOARD_UNIT_TESTING") == "1" {
+	if os.Getenv("FOCALBOARD_UNIT_TESTING") == "1" {
 		collation = "utf8mb4_general_ci"
 		charSet = "utf8mb4"
 	} else {

server/services/store/sqlstore/helpers_test.go

@@ -32,7 +32,6 @@ func SetupTests(t *testing.T) (store.Store, func()) {
 		TablePrefix:      "test_",
 		Logger:           logger,
 		DB:               sqlDB,
-		IsPlugin:         false,
 	}
 	store, err := New(storeParams)
 	require.NoError(t, err)

server/services/store/sqlstore/migrate.go

@@ -74,19 +74,6 @@ func (s *SQLStore) getMigrationConnection() (*sql.DB, error) {
 }
 
 func (s *SQLStore) Migrate() error {
-	if s.isPlugin {
-		mutex, mutexErr := s.NewMutexFn("Boards_dbMutex")
-		if mutexErr != nil {
-			return fmt.Errorf("error creating database mutex: %w", mutexErr)
-		}
-
-		s.logger.Debug("Acquiring cluster lock for Focalboard migrations")
-		mutex.Lock()
-		defer func() {
-			s.logger.Debug("Releasing cluster lock for Focalboard migrations")
-			mutex.Unlock()
-		}()
-	}
 
 	if err := s.EnsureSchemaMigrationFormat(); err != nil {
 		return err
@@ -152,7 +139,6 @@ func (s *SQLStore) Migrate() error {
 		"postgres":   s.dbType == model.PostgresDBType,
 		"sqlite":     s.dbType == model.SqliteDBType,
 		"mysql":      s.dbType == model.MysqlDBType,
-		"plugin":     s.isPlugin,
 		"singleUser": s.isSingleUser,
 	}
 
@@ -228,14 +214,6 @@ func (s *SQLStore) runMigrationSequence(engine *morph.Morph, driver drivers.Driv
 		return mErr
 	}
 
-	if mErr := s.RunTeamLessBoardsMigration(); mErr != nil {
-		return fmt.Errorf("error running teamless boards migration: %w", mErr)
-	}
-
-	if mErr := s.RunDeletedMembershipBoardsMigration(); mErr != nil {
-		return fmt.Errorf("error running deleted membership boards migration: %w", mErr)
-	}
-
 	if mErr := s.ensureMigrationsAppliedUpToVersion(engine, driver, categoriesUUIDIDMigrationRequiredVersion); mErr != nil {
 		return mErr
 	}

server/services/store/sqlstore/migrationstests/boards_migrator_test.go

@@ -210,7 +210,6 @@ func (bm *BoardsMigrator) Setup() error {
 		TablePrefix:      tablePrefix,
 		Logger:           logger,
 		DB:               bm.db,
-		IsPlugin:         bm.withMattermostMigrations,
 		NewMutexFn: func(name string) (*cluster.Mutex, error) {
 			return nil, fmt.Errorf("not implemented")
 		},
@@ -247,7 +246,6 @@ func (bm *BoardsMigrator) MigrateToStep(step int) error {
 
 func (bm *BoardsMigrator) Interceptors() map[int]func() error {
 	return map[int]func() error{
-		18: bm.store.RunDeletedMembershipBoardsMigration,
 		35: func() error {
 			return bm.store.RunDeDuplicateCategoryBoardsMigration(35)
 		},