[MM-55737] Add Request Context to UserStore.Save (#26109)

server/channels/app/users/helper_test.go

@@ -124,11 +124,11 @@ func (th *TestHelper) CreateUserOrGuest(guest bool) *model.User {
 
 	var err error
 	if guest {
-		if user, err = th.service.CreateUser(user, UserCreateOptions{Guest: true}); err != nil {
+		if user, err = th.service.CreateUser(th.Context, user, UserCreateOptions{Guest: true}); err != nil {
 			panic(err)
 		}
 	} else {
-		if user, err = th.service.CreateUser(user, UserCreateOptions{}); err != nil {
+		if user, err = th.service.CreateUser(th.Context, user, UserCreateOptions{}); err != nil {
 			panic(err)
 		}
 	}

server/channels/app/users/users.go

@@ -24,9 +24,9 @@ type UserCreateOptions struct {
 }
 
 // CreateUser creates a user
-func (us *UserService) CreateUser(user *model.User, opts UserCreateOptions) (*model.User, error) {
+func (us *UserService) CreateUser(rctx request.CTX, user *model.User, opts UserCreateOptions) (*model.User, error) {
 	if opts.FromImport {
-		return us.createUser(user)
+		return us.createUser(rctx, user)
 	}
 
 	user.Roles = model.SystemUserRoleId
@@ -54,17 +54,17 @@ func (us *UserService) CreateUser(user *model.User, opts UserCreateOptions) (*mo
 		user.Locale = *us.config().LocalizationSettings.DefaultClientLocale
 	}
 
-	return us.createUser(user)
+	return us.createUser(rctx, user)
 }
 
-func (us *UserService) createUser(user *model.User) (*model.User, error) {
+func (us *UserService) createUser(rctx request.CTX, user *model.User) (*model.User, error) {
 	user.MakeNonNil()
 
 	if err := us.isPasswordValid(user.Password); user.AuthService == "" && err != nil {
 		return nil, err
 	}
 
-	ruser, err := us.store.Save(user)
+	ruser, err := us.store.Save(rctx, user)
 	if err != nil {
 		return nil, err
 	}

server/channels/app/users/users_test.go

@@ -36,7 +36,7 @@ func TestFirstUserPromoted(t *testing.T) {
 	th := Setup(t)
 	defer th.TearDown()
 
-	user, err := th.service.CreateUser(&model.User{
+	user, err := th.service.CreateUser(th.Context, &model.User{
 		Username: model.NewId(),
 		Password: model.NewId(),
 		Email:    "user@example.com",
@@ -46,7 +46,7 @@ func TestFirstUserPromoted(t *testing.T) {
 
 	require.Equal(t, model.SystemAdminRoleId+" "+model.SystemUserRoleId, user.Roles)
 
-	user2, err := th.service.CreateUser(&model.User{
+	user2, err := th.service.CreateUser(th.Context, &model.User{
 		Username: model.NewId(),
 		Password: model.NewId(),
 		Email:    "user2@example.com",
@@ -67,7 +67,7 @@ func TestFirstUserPromoted(t *testing.T) {
 	_, err = th.dbStore.Bot().Save(b)
 	require.NoError(t, err)
 
-	user3, err := th.service.CreateUser(&model.User{
+	user3, err := th.service.CreateUser(th.Context, &model.User{
 		Username: model.NewId(),
 		Password: model.NewId(),
 		Email:    "user3@example.com",
@@ -77,7 +77,7 @@ func TestFirstUserPromoted(t *testing.T) {
 
 	require.Equal(t, model.SystemAdminRoleId+" "+model.SystemUserRoleId, user3.Roles)
 
-	user4, err := th.service.CreateUser(&model.User{
+	user4, err := th.service.CreateUser(th.Context, &model.User{
 		Username: model.NewId(),
 		Password: model.NewId(),
 		Email:    "user4@example.com",