From 02d60a9b934a70b5e39c353a148605962b134fc3 Mon Sep 17 00:00:00 2001 From: Ibrahim Serdar Acikgoz Date: Wed, 2 Jun 2021 20:12:24 +0300 Subject: [PATCH] hotfix: user import issue where the user roles were overwritten for the import path (#17703) * fix an user import issue where the user roles were overwritten * reflect review comments Co-authored-by: Mattermod --- services/users/users.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/users/users.go b/services/users/users.go index 2a4ce4ca98..888e0e98b4 100644 --- a/services/users/users.go +++ b/services/users/users.go @@ -32,6 +32,10 @@ func New(s store.UserStore, cfgFn func() *model.Config) *UserService { // CreateUser creates a user func (us *UserService) CreateUser(user *model.User, opts UserCreateOptions) (*model.User, error) { + if opts.FromImport { + return us.createUser(user) + } + user.Roles = model.SYSTEM_USER_ROLE_ID if opts.Guest { user.Roles = model.SYSTEM_GUEST_ROLE_ID @@ -51,7 +55,7 @@ func (us *UserService) CreateUser(user *model.User, opts UserCreateOptions) (*mo if err != nil { return nil, UserCountError } - if count <= 0 && !opts.FromImport { + if count <= 0 { user.Roles = model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID } @@ -59,12 +63,7 @@ func (us *UserService) CreateUser(user *model.User, opts UserCreateOptions) (*mo user.Locale = *us.config().LocalizationSettings.DefaultClientLocale } - ruser, err := us.createUser(user) - if err != nil { - return nil, err - } - - return ruser, nil + return us.createUser(user) } func (us *UserService) createUser(user *model.User) (*model.User, error) {