Move cluster, webhub and store out of Server (#20899)

app/user.go

@@ -59,7 +59,7 @@ func (a *App) CreateUserWithToken(c request.CTX, user *model.User, token *model.
 
 	tokenData := model.MapFromJSON(strings.NewReader(token.Extra))
 
-	team, nErr := a.Srv().Store.Team().Get(tokenData["teamId"])
+	team, nErr := a.Srv().Store().Team().Get(tokenData["teamId"])
 	if nErr != nil {
 		var nfErr *store.ErrNotFound
 		switch {
@@ -70,7 +70,7 @@ func (a *App) CreateUserWithToken(c request.CTX, user *model.User, token *model.
 		}
 	}
 
-	channels, nErr := a.Srv().Store.Channel().GetChannelsByIds(strings.Split(tokenData["channels"], " "), false)
+	channels, nErr := a.Srv().Store().Channel().GetChannelsByIds(strings.Split(tokenData["channels"], " "), false)
 	if nErr != nil {
 		return nil, model.NewAppError("CreateUserWithToken", "app.channel.get_channels_by_ids.app_error", nil, "", http.StatusInternalServerError).Wrap(nErr)
 	}
@@ -121,7 +121,7 @@ func (a *App) CreateUserWithInviteId(c request.CTX, user *model.User, inviteId,
 		return nil, err
 	}
 
-	team, nErr := a.Srv().Store.Team().GetByInviteId(inviteId)
+	team, nErr := a.Srv().Store().Team().GetByInviteId(inviteId)
 	if nErr != nil {
 		var nfErr *store.ErrNotFound
 		switch {
@@ -206,7 +206,7 @@ func (a *App) IsUserSignUpAllowed() *model.AppError {
 }
 
 func (a *App) IsFirstUserAccount() bool {
-	return a.ch.srv.userService.IsFirstUserAccount()
+	return a.ch.srv.platform.IsFirstUserAccount()
 }
 
 // CreateUser creates a user and sets several fields of the returned User struct to
@@ -284,7 +284,7 @@ func (a *App) createUserOrGuest(c request.CTX, user *model.User, guest bool) (*m
 		preferences = append(preferences, model.Preference{UserId: ruser.Id, Category: model.PreferenceCategoryInsights, Name: model.PreferenceNameInsights, Value: "{\"insights_modal_viewed\":false}"})
 	}
 
-	if err := a.Srv().Store.Preference().Save(preferences); err != nil {
+	if err := a.Srv().Store().Preference().Save(preferences); err != nil {
 		c.Logger().Warn("Encountered error saving user preferences", mlog.Err(err))
 	}
 
@@ -345,7 +345,7 @@ func (a *App) CreateOAuthUser(c *request.Context, service string, userData io.Re
 			return nil, model.NewAppError("CreateOAuthUser", "api.user.create_oauth_user.already_attached.app_error", map[string]any{"Service": service, "Auth": model.UserAuthServiceEmail}, "email="+user.Email, http.StatusBadRequest)
 		}
 		if provider.IsSameUser(userByEmail, user) {
-			if _, err := a.Srv().Store.User().UpdateAuthData(userByEmail.Id, user.AuthService, user.AuthData, "", false); err != nil {
+			if _, err := a.Srv().Store().User().UpdateAuthData(userByEmail.Id, user.AuthService, user.AuthData, "", false); err != nil {
 				// if the user is not updated, write a warning to the log, but don't prevent user login
 				c.Logger().Warn("Error attempting to update user AuthData", mlog.Err(err))
 			}
@@ -513,7 +513,7 @@ func (a *App) GetUsersNotInTeamEtag(teamID string, restrictionsHash string) stri
 }
 
 func (a *App) GetUsersInChannel(options *model.UserGetOptions) ([]*model.User, *model.AppError) {
-	users, err := a.Srv().Store.User().GetProfilesInChannel(options)
+	users, err := a.Srv().Store().User().GetProfilesInChannel(options)
 	if err != nil {
 		return nil, model.NewAppError("GetUsersInChannel", "app.user.get_profiles.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -522,7 +522,7 @@ func (a *App) GetUsersInChannel(options *model.UserGetOptions) ([]*model.User, *
 }
 
 func (a *App) GetUsersInChannelByStatus(options *model.UserGetOptions) ([]*model.User, *model.AppError) {
-	users, err := a.Srv().Store.User().GetProfilesInChannelByStatus(options)
+	users, err := a.Srv().Store().User().GetProfilesInChannelByStatus(options)
 	if err != nil {
 		return nil, model.NewAppError("GetUsersInChannelByStatus", "app.user.get_profiles.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -531,7 +531,7 @@ func (a *App) GetUsersInChannelByStatus(options *model.UserGetOptions) ([]*model
 }
 
 func (a *App) GetUsersInChannelByAdmin(options *model.UserGetOptions) ([]*model.User, *model.AppError) {
-	users, err := a.Srv().Store.User().GetProfilesInChannelByAdmin(options)
+	users, err := a.Srv().Store().User().GetProfilesInChannelByAdmin(options)
 	if err != nil {
 		return nil, model.NewAppError("GetUsersInChannelByAdmin", "app.user.get_profiles.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -580,7 +580,7 @@ func (a *App) GetUsersInChannelPageByAdmin(options *model.UserGetOptions, asAdmi
 }
 
 func (a *App) GetUsersNotInChannel(teamID string, channelID string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) {
-	users, err := a.Srv().Store.User().GetProfilesNotInChannel(teamID, channelID, groupConstrained, offset, limit, viewRestrictions)
+	users, err := a.Srv().Store().User().GetProfilesNotInChannel(teamID, channelID, groupConstrained, offset, limit, viewRestrictions)
 	if err != nil {
 		return nil, model.NewAppError("GetUsersNotInChannel", "app.user.get_profiles.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -633,7 +633,7 @@ func (a *App) GetUsersWithoutTeam(options *model.UserGetOptions) ([]*model.User,
 
 // GetTeamGroupUsers returns the users who are associated to the team via GroupTeams and GroupMembers.
 func (a *App) GetTeamGroupUsers(teamID string) ([]*model.User, *model.AppError) {
-	users, err := a.Srv().Store.User().GetTeamGroupUsers(teamID)
+	users, err := a.Srv().Store().User().GetTeamGroupUsers(teamID)
 	if err != nil {
 		return nil, model.NewAppError("GetTeamGroupUsers", "app.user.get_profiles.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -643,7 +643,7 @@ func (a *App) GetTeamGroupUsers(teamID string) ([]*model.User, *model.AppError)
 
 // GetChannelGroupUsers returns the users who are associated to the channel via GroupChannels and GroupMembers.
 func (a *App) GetChannelGroupUsers(channelID string) ([]*model.User, *model.AppError) {
-	users, err := a.Srv().Store.User().GetChannelGroupUsers(channelID)
+	users, err := a.Srv().Store().User().GetChannelGroupUsers(channelID)
 	if err != nil {
 		return nil, model.NewAppError("GetChannelGroupUsers", "app.user.get_profiles.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -661,7 +661,7 @@ func (a *App) GetUsersByIds(userIDs []string, options *store.UserGetByIdsOpts) (
 }
 
 func (a *App) GetUsersByGroupChannelIds(c *request.Context, channelIDs []string, asAdmin bool) (map[string][]*model.User, *model.AppError) {
-	usersByChannelId, err := a.Srv().Store.User().GetProfileByGroupChannelIdsForUser(c.Session().UserId, channelIDs)
+	usersByChannelId, err := a.Srv().Store().User().GetProfileByGroupChannelIdsForUser(c.Session().UserId, channelIDs)
 	if err != nil {
 		return nil, model.NewAppError("GetUsersByGroupChannelIds", "app.user.get_profile_by_group_channel_ids_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -770,7 +770,7 @@ func (a *App) SetDefaultProfileImage(c request.CTX, user *model.User) *model.App
 		return err
 	}
 
-	if err := a.Srv().Store.User().ResetLastPictureUpdate(user.Id); err != nil {
+	if err := a.Srv().Store().User().ResetLastPictureUpdate(user.Id); err != nil {
 		c.Logger().Warn("Failed to reset last picture update", mlog.Err(err))
 	}
 
@@ -846,7 +846,7 @@ func (a *App) SetProfileImageFromFile(c request.CTX, userID string, file io.Read
 		return model.NewAppError("SetProfileImage", "api.user.upload_profile_user.upload_profile.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.User().UpdateLastPictureUpdate(userID); err != nil {
+	if err := a.Srv().Store().User().UpdateLastPictureUpdate(userID); err != nil {
 		c.Logger().Warn("Error with updating last picture update", mlog.Err(err))
 	}
 	a.invalidateUserCacheAndPublish(userID)
@@ -972,14 +972,20 @@ func (a *App) DeactivateGuests(c *request.Context) *model.AppError {
 		return model.NewAppError("DeactivateGuests", "app.user.update_active_for_multiple_users.updating.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
+	for _, userID := range userIDs {
+		if err := a.Srv().Platform().RevokeAllSessions(userID); err != nil {
+			return model.NewAppError("DeactivateGuests", "app.user.update_active_for_multiple_users.updating.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
+		}
+	}
+
 	for _, userID := range userIDs {
 		if err := a.userDeactivated(c, userID); err != nil {
 			return err
 		}
 	}
 
-	a.Srv().Store.Channel().ClearCaches()
-	a.Srv().Store.User().ClearCaches()
+	a.Srv().Store().Channel().ClearCaches()
+	a.Srv().Store().User().ClearCaches()
 
 	message := model.NewWebSocketEvent(model.WebsocketEventGuestsDeactivated, "", "", "", nil, "")
 	a.Publish(message)
@@ -1055,7 +1061,7 @@ func (a *App) PatchUser(c request.CTX, userID string, patch *model.UserPatch, as
 
 func (a *App) UpdateUserAuth(userID string, userAuth *model.UserAuth) (*model.UserAuth, *model.AppError) {
 	userAuth.Password = ""
-	if _, err := a.Srv().Store.User().UpdateAuthData(userID, userAuth.AuthService, userAuth.AuthData, "", false); err != nil {
+	if _, err := a.Srv().Store().User().UpdateAuthData(userID, userAuth.AuthService, userAuth.AuthData, "", false); err != nil {
 		var invErr *store.ErrInvalidInput
 		switch {
 		case errors.As(err, &invErr):
@@ -1100,7 +1106,7 @@ func (a *App) isUniqueToGroupNames(val string) *model.AppError {
 		return nil
 	}
 	var notFoundErr *store.ErrNotFound
-	group, err := a.Srv().Store.Group().GetByName(val, model.GroupSearchOpts{})
+	group, err := a.Srv().Store().Group().GetByName(val, model.GroupSearchOpts{})
 	if err != nil && !errors.As(err, &notFoundErr) {
 		return model.NewAppError("isUniqueToGroupNames", model.NoTranslation, nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1291,7 +1297,7 @@ func (a *App) UpdatePassword(user *model.User, newPassword string) *model.AppErr
 
 	hashedPassword := model.HashPassword(newPassword)
 
-	if err := a.Srv().Store.User().UpdatePassword(user.Id, hashedPassword); err != nil {
+	if err := a.Srv().Store().User().UpdatePassword(user.Id, hashedPassword); err != nil {
 		return model.NewAppError("UpdatePassword", "api.user.update_password.failed.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
@@ -1324,7 +1330,7 @@ func (a *App) UpdateHashedPasswordByUserId(userID, newHashedPassword string) *mo
 }
 
 func (a *App) UpdateHashedPassword(user *model.User, newHashedPassword string) *model.AppError {
-	if err := a.Srv().Store.User().UpdatePassword(user.Id, newHashedPassword); err != nil {
+	if err := a.Srv().Store().User().UpdatePassword(user.Id, newHashedPassword); err != nil {
 		return model.NewAppError("UpdatePassword", "api.user.update_password.failed.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
@@ -1420,7 +1426,7 @@ func (a *App) CreatePasswordRecoveryToken(userID, email string) (*model.Token, *
 
 	token := model.NewToken(TokenTypePasswordRecovery, string(jsonData))
 
-	if err := a.Srv().Store.Token().Save(token); err != nil {
+	if err := a.Srv().Store().Token().Save(token); err != nil {
 		var appErr *model.AppError
 		switch {
 		case errors.As(err, &appErr):
@@ -1434,7 +1440,7 @@ func (a *App) CreatePasswordRecoveryToken(userID, email string) (*model.Token, *
 }
 
 func (a *App) GetPasswordRecoveryToken(token string) (*model.Token, *model.AppError) {
-	rtoken, err := a.Srv().Store.Token().GetByToken(token)
+	rtoken, err := a.Srv().Store().Token().GetByToken(token)
 	if err != nil {
 		return nil, model.NewAppError("GetPasswordRecoveryToken", "api.user.reset_password.invalid_link.app_error", nil, "", http.StatusBadRequest).Wrap(err)
 	}
@@ -1445,7 +1451,7 @@ func (a *App) GetPasswordRecoveryToken(token string) (*model.Token, *model.AppEr
 }
 
 func (a *App) GetTokenById(token string) (*model.Token, *model.AppError) {
-	rtoken, err := a.Srv().Store.Token().GetByToken(token)
+	rtoken, err := a.Srv().Store().Token().GetByToken(token)
 
 	if err != nil {
 		var status int
@@ -1464,7 +1470,7 @@ func (a *App) GetTokenById(token string) (*model.Token, *model.AppError) {
 }
 
 func (a *App) DeleteToken(token *model.Token) *model.AppError {
-	err := a.Srv().Store.Token().Delete(token.Token)
+	err := a.Srv().Store().Token().Delete(token.Token)
 	if err != nil {
 		return model.NewAppError("DeleteToken", "app.recover.delete.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1490,14 +1496,14 @@ func (a *App) UpdateUserRolesWithUser(c request.CTX, user *model.User, newRoles
 	user.Roles = newRoles
 	uchan := make(chan store.StoreResult, 1)
 	go func() {
-		userUpdate, err := a.Srv().Store.User().Update(user, true)
+		userUpdate, err := a.Srv().Store().User().Update(user, true)
 		uchan <- store.StoreResult{Data: userUpdate, NErr: err}
 		close(uchan)
 	}()
 
 	schan := make(chan store.StoreResult, 1)
 	go func() {
-		id, err := a.Srv().Store.Session().UpdateRoles(user.Id, newRoles)
+		id, err := a.Srv().Store().Session().UpdateRoles(user.Id, newRoles)
 		schan <- store.StoreResult{Data: id, NErr: err}
 		close(schan)
 	}()
@@ -1545,47 +1551,47 @@ func (a *App) PermanentDeleteUser(c *request.Context, user *model.User) *model.A
 		return err
 	}
 
-	if err := a.Srv().Store.Session().PermanentDeleteSessionsByUser(user.Id); err != nil {
+	if err := a.Srv().Store().Session().PermanentDeleteSessionsByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.session.permanent_delete_sessions_by_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.UserAccessToken().DeleteAllForUser(user.Id); err != nil {
+	if err := a.Srv().Store().UserAccessToken().DeleteAllForUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.user_access_token.delete.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.OAuth().PermanentDeleteAuthDataByUser(user.Id); err != nil {
+	if err := a.Srv().Store().OAuth().PermanentDeleteAuthDataByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.oauth.permanent_delete_auth_data_by_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.Webhook().PermanentDeleteIncomingByUser(user.Id); err != nil {
+	if err := a.Srv().Store().Webhook().PermanentDeleteIncomingByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.webhooks.permanent_delete_incoming_by_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.Webhook().PermanentDeleteOutgoingByUser(user.Id); err != nil {
+	if err := a.Srv().Store().Webhook().PermanentDeleteOutgoingByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.webhooks.permanent_delete_outgoing_by_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.Command().PermanentDeleteByUser(user.Id); err != nil {
+	if err := a.Srv().Store().Command().PermanentDeleteByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.user.permanentdeleteuser.internal_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.Preference().PermanentDeleteByUser(user.Id); err != nil {
+	if err := a.Srv().Store().Preference().PermanentDeleteByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.preference.permanent_delete_by_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.Channel().PermanentDeleteMembersByUser(user.Id); err != nil {
+	if err := a.Srv().Store().Channel().PermanentDeleteMembersByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.channel.permanent_delete_members_by_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.Group().PermanentDeleteMembersByUser(user.Id); err != nil {
+	if err := a.Srv().Store().Group().PermanentDeleteMembersByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.group.permanent_delete_members_by_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.Post().PermanentDeleteByUser(user.Id); err != nil {
+	if err := a.Srv().Store().Post().PermanentDeleteByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.post.permanent_delete_by_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.Bot().PermanentDelete(user.Id); err != nil {
+	if err := a.Srv().Store().Bot().PermanentDelete(user.Id); err != nil {
 		var invErr *store.ErrInvalidInput
 		switch {
 		case errors.As(err, &invErr):
@@ -1595,7 +1601,7 @@ func (a *App) PermanentDeleteUser(c *request.Context, user *model.User) *model.A
 		}
 	}
 
-	infos, err := a.Srv().Store.FileInfo().GetForUser(user.Id)
+	infos, err := a.Srv().Store().FileInfo().GetForUser(user.Id)
 	if err != nil {
 		c.Logger().Warn("Error getting file list for user from FileInfoStore", mlog.Err(err))
 	}
@@ -1656,19 +1662,19 @@ func (a *App) PermanentDeleteUser(c *request.Context, user *model.User) *model.A
 		}
 	}
 
-	if _, err := a.Srv().Store.FileInfo().PermanentDeleteByUser(user.Id); err != nil {
+	if _, err := a.Srv().Store().FileInfo().PermanentDeleteByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.file_info.permanent_delete_by_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.User().PermanentDelete(user.Id); err != nil {
+	if err := a.Srv().Store().User().PermanentDelete(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.user.permanent_delete.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.Audit().PermanentDeleteByUser(user.Id); err != nil {
+	if err := a.Srv().Store().Audit().PermanentDeleteByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.audit.permanent_delete_by_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
-	if err := a.Srv().Store.Team().RemoveAllMembersByUser(user.Id); err != nil {
+	if err := a.Srv().Store().Team().RemoveAllMembersByUser(user.Id); err != nil {
 		return model.NewAppError("PermanentDeleteUser", "app.team.remove_member.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
@@ -1684,7 +1690,7 @@ func (a *App) PermanentDeleteUser(c *request.Context, user *model.User) *model.A
 }
 
 func (a *App) PermanentDeleteAllUsers(c *request.Context) *model.AppError {
-	users, err := a.Srv().Store.User().GetAll()
+	users, err := a.Srv().Store().User().GetAll()
 	if err != nil {
 		return model.NewAppError("PermanentDeleteAllUsers", "app.user.get.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1770,7 +1776,7 @@ func (a *App) VerifyEmailFromToken(c request.CTX, userSuppliedTokenString string
 }
 
 func (a *App) GetVerifyEmailToken(token string) (*model.Token, *model.AppError) {
-	rtoken, err := a.Srv().Store.Token().GetByToken(token)
+	rtoken, err := a.Srv().Store().Token().GetByToken(token)
 	if err != nil {
 		return nil, model.NewAppError("GetVerifyEmailToken", "api.user.verify_email.bad_link.app_error", nil, "", http.StatusBadRequest).Wrap(err)
 	}
@@ -1782,7 +1788,7 @@ func (a *App) GetVerifyEmailToken(token string) (*model.Token, *model.AppError)
 
 // GetTotalUsersStats is used for the DM list total
 func (a *App) GetTotalUsersStats(viewRestrictions *model.ViewUsersRestrictions) (*model.UsersStats, *model.AppError) {
-	count, err := a.Srv().Store.User().Count(model.UserCountOptions{
+	count, err := a.Srv().Store().User().Count(model.UserCountOptions{
 		IncludeBotAccounts: true,
 		ViewRestrictions:   viewRestrictions,
 	})
@@ -1797,7 +1803,7 @@ func (a *App) GetTotalUsersStats(viewRestrictions *model.ViewUsersRestrictions)
 
 // GetFilteredUsersStats is used to get a count of users based on the set of filters supported by UserCountOptions.
 func (a *App) GetFilteredUsersStats(options *model.UserCountOptions) (*model.UsersStats, *model.AppError) {
-	count, err := a.Srv().Store.User().Count(*options)
+	count, err := a.Srv().Store().User().Count(*options)
 	if err != nil {
 		return nil, model.NewAppError("GetFilteredUsersStats", "app.user.get_total_users_count.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1808,7 +1814,7 @@ func (a *App) GetFilteredUsersStats(options *model.UserCountOptions) (*model.Use
 }
 
 func (a *App) VerifyUserEmail(userID, email string) *model.AppError {
-	if _, err := a.Srv().Store.User().VerifyEmail(userID, email); err != nil {
+	if _, err := a.Srv().Store().User().VerifyEmail(userID, email); err != nil {
 		return model.NewAppError("VerifyUserEmail", "app.user.verify_email.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
@@ -1849,7 +1855,7 @@ func (a *App) SearchUsers(props *model.UserSearch, options *model.UserSearchOpti
 
 func (a *App) SearchUsersInChannel(channelID string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) {
 	term = strings.TrimSpace(term)
-	users, err := a.Srv().Store.User().SearchInChannel(channelID, term, options)
+	users, err := a.Srv().Store().User().SearchInChannel(channelID, term, options)
 	if err != nil {
 		return nil, model.NewAppError("SearchUsersInChannel", "app.user.search.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1862,7 +1868,7 @@ func (a *App) SearchUsersInChannel(channelID string, term string, options *model
 
 func (a *App) SearchUsersNotInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) {
 	term = strings.TrimSpace(term)
-	users, err := a.Srv().Store.User().SearchNotInChannel(teamID, channelID, term, options)
+	users, err := a.Srv().Store().User().SearchNotInChannel(teamID, channelID, term, options)
 	if err != nil {
 		return nil, model.NewAppError("SearchUsersNotInChannel", "app.user.search.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1877,7 +1883,7 @@ func (a *App) SearchUsersNotInChannel(teamID string, channelID string, term stri
 func (a *App) SearchUsersInTeam(teamID, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) {
 	term = strings.TrimSpace(term)
 
-	users, err := a.Srv().Store.User().Search(teamID, term, options)
+	users, err := a.Srv().Store().User().Search(teamID, term, options)
 	if err != nil {
 		return nil, model.NewAppError("SearchUsersInTeam", "app.user.search.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1891,7 +1897,7 @@ func (a *App) SearchUsersInTeam(teamID, term string, options *model.UserSearchOp
 
 func (a *App) SearchUsersNotInTeam(notInTeamId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) {
 	term = strings.TrimSpace(term)
-	users, err := a.Srv().Store.User().SearchNotInTeam(notInTeamId, term, options)
+	users, err := a.Srv().Store().User().SearchNotInTeam(notInTeamId, term, options)
 	if err != nil {
 		return nil, model.NewAppError("SearchUsersNotInTeam", "app.user.search.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1905,7 +1911,7 @@ func (a *App) SearchUsersNotInTeam(notInTeamId string, term string, options *mod
 
 func (a *App) SearchUsersWithoutTeam(term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) {
 	term = strings.TrimSpace(term)
-	users, err := a.Srv().Store.User().SearchWithoutTeam(term, options)
+	users, err := a.Srv().Store().User().SearchWithoutTeam(term, options)
 	if err != nil {
 		return nil, model.NewAppError("SearchUsersWithoutTeam", "app.user.search.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1919,7 +1925,7 @@ func (a *App) SearchUsersWithoutTeam(term string, options *model.UserSearchOptio
 
 func (a *App) SearchUsersInGroup(groupID string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) {
 	term = strings.TrimSpace(term)
-	users, err := a.Srv().Store.User().SearchInGroup(groupID, term, options)
+	users, err := a.Srv().Store().User().SearchInGroup(groupID, term, options)
 	if err != nil {
 		return nil, model.NewAppError("SearchUsersInGroup", "app.user.search.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1933,7 +1939,7 @@ func (a *App) SearchUsersInGroup(groupID string, term string, options *model.Use
 
 func (a *App) SearchUsersNotInGroup(groupID string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) {
 	term = strings.TrimSpace(term)
-	users, err := a.Srv().Store.User().SearchNotInGroup(groupID, term, options)
+	users, err := a.Srv().Store().User().SearchNotInGroup(groupID, term, options)
 	if err != nil {
 		return nil, model.NewAppError("SearchUsersNotInGroup", "app.user.search.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1948,7 +1954,7 @@ func (a *App) SearchUsersNotInGroup(groupID string, term string, options *model.
 func (a *App) AutocompleteUsersInChannel(teamID string, channelID string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, *model.AppError) {
 	term = strings.TrimSpace(term)
 
-	autocomplete, err := a.Srv().Store.User().AutocompleteUsersInChannel(teamID, channelID, term, options)
+	autocomplete, err := a.Srv().Store().User().AutocompleteUsersInChannel(teamID, channelID, term, options)
 	if err != nil {
 		return nil, model.NewAppError("AutocompleteUsersInChannel", "app.user.search.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -1967,7 +1973,7 @@ func (a *App) AutocompleteUsersInChannel(teamID string, channelID string, term s
 func (a *App) AutocompleteUsersInTeam(teamID string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInTeam, *model.AppError) {
 	term = strings.TrimSpace(term)
 
-	users, err := a.Srv().Store.User().Search(teamID, term, options)
+	users, err := a.Srv().Store().User().Search(teamID, term, options)
 	if err != nil {
 		return nil, model.NewAppError("AutocompleteUsersInTeam", "app.user.search.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -2016,7 +2022,7 @@ func (a *App) UpdateOAuthUserAttrs(userData io.Reader, user *model.User, provide
 	}
 
 	if userAttrsChanged {
-		users, err := a.Srv().Store.User().Update(user, true)
+		users, err := a.Srv().Store().User().Update(user, true)
 		if err != nil {
 			var appErr *model.AppError
 			var invErr *store.ErrInvalidInput
@@ -2071,7 +2077,7 @@ func (a *App) FilterNonGroupChannelMembers(userIDs []string, channel *model.Chan
 // and returns the list of normal users present in userIDs but not in groupUsers.
 func (a *App) filterNonGroupUsers(userIDs []string, groupUsers []*model.User) ([]string, error) {
 	nonMemberIds := []string{}
-	users, err := a.Srv().Store.User().GetProfileByIds(context.Background(), userIDs, nil, false)
+	users, err := a.Srv().Store().User().GetProfileByIds(context.Background(), userIDs, nil, false)
 	if err != nil {
 		return nil, err
 	}
@@ -2118,7 +2124,7 @@ func (a *App) UserCanSeeOtherUser(userID string, otherUserId string) (bool, *mod
 	}
 
 	if len(restrictions.Teams) > 0 {
-		result, err := a.Srv().Store.Team().UserBelongsToTeams(otherUserId, restrictions.Teams)
+		result, err := a.Srv().Store().Team().UserBelongsToTeams(otherUserId, restrictions.Teams)
 		if err != nil {
 			return false, model.NewAppError("UserCanSeeOtherUser", "app.team.user_belongs_to_teams.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 		}
@@ -2141,7 +2147,7 @@ func (a *App) UserCanSeeOtherUser(userID string, otherUserId string) (bool, *mod
 }
 
 func (a *App) userBelongsToChannels(userID string, channelIDs []string) (bool, *model.AppError) {
-	belongs, err := a.Srv().Store.Channel().UserBelongsToChannels(userID, channelIDs)
+	belongs, err := a.Srv().Store().Channel().UserBelongsToChannels(userID, channelIDs)
 	if err != nil {
 		return false, model.NewAppError("userBelongsToChannels", "app.channel.user_belongs_to_channels.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -2154,7 +2160,7 @@ func (a *App) GetViewUsersRestrictions(userID string) (*model.ViewUsersRestricti
 		return nil, nil
 	}
 
-	teamIDs, nErr := a.Srv().Store.Team().GetUserTeamIds(userID, true)
+	teamIDs, nErr := a.Srv().Store().Team().GetUserTeamIds(userID, true)
 	if nErr != nil {
 		return nil, model.NewAppError("GetViewUsersRestrictions", "app.team.get_user_team_ids.app_error", nil, "", http.StatusInternalServerError).Wrap(nErr)
 	}
@@ -2166,7 +2172,7 @@ func (a *App) GetViewUsersRestrictions(userID string) (*model.ViewUsersRestricti
 		}
 	}
 
-	userChannelMembers, err := a.Srv().Store.Channel().GetAllChannelMembersForUser(userID, true, true)
+	userChannelMembers, err := a.Srv().Store().Channel().GetAllChannelMembersForUser(userID, true, true)
 	if err != nil {
 		return nil, model.NewAppError("GetViewUsersRestrictions", "app.channel.get_channels.get.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -2187,7 +2193,7 @@ func (a *App) PromoteGuestToUser(c *request.Context, user *model.User, requestor
 	if nErr != nil {
 		return model.NewAppError("PromoteGuestToUser", "app.user.promote_guest.user_update.app_error", nil, "", http.StatusInternalServerError).Wrap(nErr)
 	}
-	userTeams, nErr := a.Srv().Store.Team().GetTeamsByUserId(user.Id)
+	userTeams, nErr := a.Srv().Store().Team().GetTeamsByUserId(user.Id)
 	if nErr != nil {
 		return model.NewAppError("PromoteGuestToUser", "app.team.get_all.app_error", nil, "", http.StatusInternalServerError).Wrap(nErr)
 	}
@@ -2204,7 +2210,7 @@ func (a *App) PromoteGuestToUser(c *request.Context, user *model.User, requestor
 		c.Logger().Warn("Failed to get user on promote guest to user", mlog.Err(err))
 	} else {
 		a.sendUpdatedUserEvent(*promotedUser)
-		if uErr := a.ch.srv.userService.UpdateSessionsIsGuest(promotedUser.Id, promotedUser.IsGuest()); uErr != nil {
+		if uErr := a.ch.srv.platform.UpdateSessionsIsGuest(promotedUser.Id, promotedUser.IsGuest()); uErr != nil {
 			c.Logger().Warn("Unable to update user sessions", mlog.String("user_id", promotedUser.Id), mlog.Err(uErr))
 		}
 	}
@@ -2249,7 +2255,7 @@ func (a *App) DemoteUserToGuest(c request.CTX, user *model.User) *model.AppError
 	}
 
 	a.sendUpdatedUserEvent(*demotedUser)
-	if uErr := a.ch.srv.userService.UpdateSessionsIsGuest(demotedUser.Id, demotedUser.IsGuest()); uErr != nil {
+	if uErr := a.ch.srv.platform.UpdateSessionsIsGuest(demotedUser.Id, demotedUser.IsGuest()); uErr != nil {
 		c.Logger().Warn("Unable to update user sessions", mlog.String("user_id", demotedUser.Id), mlog.Err(uErr))
 	}
 
@@ -2318,7 +2324,7 @@ func (a *App) invalidateUserCacheAndPublish(userID string) {
 // relationship with a user. That means any user sharing any channel, including
 // direct and group channels.
 func (a *App) GetKnownUsers(userID string) ([]string, *model.AppError) {
-	users, err := a.Srv().Store.User().GetKnownUsers(userID)
+	users, err := a.Srv().Store().User().GetKnownUsers(userID)
 	if err != nil {
 		return nil, model.NewAppError("GetKnownUsers", "app.user.get_known_users.get_users.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -2328,7 +2334,7 @@ func (a *App) GetKnownUsers(userID string) ([]string, *model.AppError) {
 
 // ConvertBotToUser converts a bot to user.
 func (a *App) ConvertBotToUser(c request.CTX, bot *model.Bot, userPatch *model.UserPatch, sysadmin bool) (*model.User, *model.AppError) {
-	user, nErr := a.Srv().Store.User().Get(c.Context(), bot.UserId)
+	user, nErr := a.Srv().Store().User().Get(c.Context(), bot.UserId)
 	if nErr != nil {
 		var nfErr *store.ErrNotFound
 		switch {
@@ -2361,7 +2367,7 @@ func (a *App) ConvertBotToUser(c request.CTX, bot *model.Bot, userPatch *model.U
 		return nil, err
 	}
 
-	appErr := a.Srv().Store.Bot().PermanentDelete(bot.UserId)
+	appErr := a.Srv().Store().Bot().PermanentDelete(bot.UserId)
 	if appErr != nil {
 		return nil, model.NewAppError("ConvertBotToUser", "app.user.convert_bot_to_user.app_error", nil, "", http.StatusInternalServerError).Wrap(appErr)
 	}
@@ -2375,7 +2381,7 @@ func (a *App) GetThreadsForUser(userID, teamID string, options model.GetUserThre
 
 	if !options.ThreadsOnly {
 		eg.Go(func() error {
-			totalUnreadThreads, err := a.Srv().Store.Thread().GetTotalUnreadThreads(userID, teamID, options)
+			totalUnreadThreads, err := a.Srv().Store().Thread().GetTotalUnreadThreads(userID, teamID, options)
 			if err != nil {
 				return errors.Wrapf(err, "failed to count unread threads for user id=%s", userID)
 			}
@@ -2389,7 +2395,7 @@ func (a *App) GetThreadsForUser(userID, teamID string, options model.GetUserThre
 		// and send back duplicate values down below.
 		if !options.Unread {
 			eg.Go(func() error {
-				totalCount, err := a.Srv().Store.Thread().GetTotalThreads(userID, teamID, options)
+				totalCount, err := a.Srv().Store().Thread().GetTotalThreads(userID, teamID, options)
 				if err != nil {
 					return errors.Wrapf(err, "failed to count threads for user id=%s", userID)
 				}
@@ -2400,7 +2406,7 @@ func (a *App) GetThreadsForUser(userID, teamID string, options model.GetUserThre
 		}
 
 		eg.Go(func() error {
-			totalUnreadMentions, err := a.Srv().Store.Thread().GetTotalUnreadMentions(userID, teamID, options)
+			totalUnreadMentions, err := a.Srv().Store().Thread().GetTotalUnreadMentions(userID, teamID, options)
 			if err != nil {
 				return errors.Wrapf(err, "failed to count threads for user id=%s", userID)
 			}
@@ -2412,7 +2418,7 @@ func (a *App) GetThreadsForUser(userID, teamID string, options model.GetUserThre
 
 	if !options.TotalsOnly {
 		eg.Go(func() error {
-			threads, err := a.Srv().Store.Thread().GetThreadsForUser(userID, teamID, options)
+			threads, err := a.Srv().Store().Thread().GetThreadsForUser(userID, teamID, options)
 			if err != nil {
 				return errors.Wrapf(err, "failed to get threads for user id=%s", userID)
 			}
@@ -2439,7 +2445,7 @@ func (a *App) GetThreadsForUser(userID, teamID string, options model.GetUserThre
 }
 
 func (a *App) GetThreadMembershipForUser(userId, threadId string) (*model.ThreadMembership, *model.AppError) {
-	threadMembership, err := a.Srv().Store.Thread().GetMembershipForUser(userId, threadId)
+	threadMembership, err := a.Srv().Store().Thread().GetMembershipForUser(userId, threadId)
 	if err != nil {
 		return nil, model.NewAppError("GetThreadMembershipForUser", "app.user.get_thread_membership_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -2450,7 +2456,7 @@ func (a *App) GetThreadMembershipForUser(userId, threadId string) (*model.Thread
 }
 
 func (a *App) GetThreadForUser(teamID string, threadMembership *model.ThreadMembership, extended bool) (*model.ThreadResponse, *model.AppError) {
-	thread, err := a.Srv().Store.Thread().GetThreadForUser(teamID, threadMembership, extended)
+	thread, err := a.Srv().Store().Thread().GetThreadForUser(teamID, threadMembership, extended)
 	if err != nil {
 		return nil, model.NewAppError("GetThreadForUser", "app.user.get_threads_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -2463,7 +2469,7 @@ func (a *App) GetThreadForUser(teamID string, threadMembership *model.ThreadMemb
 }
 
 func (a *App) UpdateThreadsReadForUser(userID, teamID string) *model.AppError {
-	nErr := a.Srv().Store.Thread().MarkAllAsReadByTeam(userID, teamID)
+	nErr := a.Srv().Store().Thread().MarkAllAsReadByTeam(userID, teamID)
 	if nErr != nil {
 		return model.NewAppError("UpdateThreadsReadForUser", "app.user.update_threads_read_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(nErr)
 	}
@@ -2480,11 +2486,11 @@ func (a *App) UpdateThreadFollowForUser(userID, teamID, threadID string, state b
 		UpdateViewedTimestamp: state,
 		UpdateParticipants:    false,
 	}
-	_, err := a.Srv().Store.Thread().MaintainMembership(userID, threadID, opts)
+	_, err := a.Srv().Store().Thread().MaintainMembership(userID, threadID, opts)
 	if err != nil {
 		return model.NewAppError("UpdateThreadFollowForUser", "app.user.update_thread_follow_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
-	thread, err := a.Srv().Store.Thread().Get(threadID)
+	thread, err := a.Srv().Store().Thread().Get(threadID)
 	if err != nil {
 		return model.NewAppError("UpdateThreadFollowForUser", "app.user.update_thread_follow_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -2508,7 +2514,7 @@ func (a *App) UpdateThreadFollowForUserFromChannelAdd(c request.CTX, userID, tea
 		UpdateViewedTimestamp: false,
 		UpdateParticipants:    false,
 	}
-	tm, err := a.Srv().Store.Thread().MaintainMembership(userID, threadID, opts)
+	tm, err := a.Srv().Store().Thread().MaintainMembership(userID, threadID, opts)
 	if err != nil {
 		return model.NewAppError("UpdateThreadFollowForUserFromChannelAdd", "app.user.update_thread_follow_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -2526,13 +2532,14 @@ func (a *App) UpdateThreadFollowForUserFromChannelAdd(c request.CTX, userID, tea
 		return appErr
 	}
 	tm.LastViewed = post.CreateAt - 1
-	_, err = a.Srv().Store.Thread().UpdateMembership(tm)
+	_, err = a.Srv().Store().Thread().UpdateMembership(tm)
 	if err != nil {
 		return model.NewAppError("UpdateThreadFollowForUserFromChannelAdd", "app.user.update_thread_follow_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 
 	message := model.NewWebSocketEvent(model.WebsocketEventThreadUpdated, teamID, "", userID, nil, "")
-	userThread, err := a.Srv().Store.Thread().GetThreadForUser(teamID, tm, true)
+	userThread, err := a.Srv().Store().Thread().GetThreadForUser(teamID, tm, true)
+
 	if err != nil {
 		var errNotFound *store.ErrNotFound
 		if errors.As(err, &errNotFound) {
@@ -2583,13 +2590,13 @@ func (a *App) UpdateThreadReadForUser(c request.CTX, currentSessionId, userID, t
 		Following:       true,
 		UpdateFollowing: true,
 	}
-	membership, storeErr := a.Srv().Store.Thread().MaintainMembership(userID, threadID, opts)
+	membership, storeErr := a.Srv().Store().Thread().MaintainMembership(userID, threadID, opts)
 	if storeErr != nil {
 		return nil, model.NewAppError("UpdateThreadReadForUser", "app.user.update_thread_read_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(storeErr)
 	}
 
 	previousUnreadMentions := membership.UnreadMentions
-	previousUnreadReplies, nErr := a.Srv().Store.Thread().GetThreadUnreadReplyCount(membership)
+	previousUnreadReplies, nErr := a.Srv().Store().Thread().GetThreadUnreadReplyCount(membership)
 	if nErr != nil {
 		return nil, model.NewAppError("UpdateThreadReadForUser", "app.user.update_thread_read_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(nErr)
 	}
@@ -2602,14 +2609,14 @@ func (a *App) UpdateThreadReadForUser(c request.CTX, currentSessionId, userID, t
 	if err != nil {
 		return nil, err
 	}
-	_, nErr = a.Srv().Store.Thread().UpdateMembership(membership)
+	_, nErr = a.Srv().Store().Thread().UpdateMembership(membership)
 	if nErr != nil {
 		return nil, model.NewAppError("UpdateThreadReadForUser", "app.user.update_thread_read_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(nErr)
 	}
 
 	membership.LastViewed = timestamp
 
-	nErr = a.Srv().Store.Thread().MarkAsRead(userID, threadID, timestamp)
+	nErr = a.Srv().Store().Thread().MarkAsRead(userID, threadID, timestamp)
 	if nErr != nil {
 		return nil, model.NewAppError("UpdateThreadReadForUser", "app.user.update_thread_read_for_user.app_error", nil, "", http.StatusInternalServerError).Wrap(nErr)
 	}
@@ -2636,7 +2643,7 @@ func (a *App) UpdateThreadReadForUser(c request.CTX, currentSessionId, userID, t
 }
 
 func (a *App) GetUsersWithInvalidEmails(page int, perPage int) ([]*model.User, *model.AppError) {
-	users, err := a.Srv().Store.User().GetUsersWithInvalidEmails(page, perPage, *a.Config().TeamSettings.RestrictCreationToDomains)
+	users, err := a.Srv().Store().User().GetUsersWithInvalidEmails(page, perPage, *a.Config().TeamSettings.RestrictCreationToDomains)
 	if err != nil {
 		return nil, model.NewAppError("GetUsersPage", "app.user.get_profiles.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}