diff --git a/app/authentication.go b/app/authentication.go index ed4f7d3e02..899776b81d 100644 --- a/app/authentication.go +++ b/app/authentication.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/mfa" ) diff --git a/app/channel_test.go b/app/channel_test.go index 1afb6ec0f8..3f7fd4c297 100644 --- a/app/channel_test.go +++ b/app/channel_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" ) diff --git a/app/email/helper_test.go b/app/email/helper_test.go index f61401d91b..2aabf04a3e 100644 --- a/app/email/helper_test.go +++ b/app/email/helper_test.go @@ -10,10 +10,10 @@ import ( "path/filepath" "testing" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/config" "github.com/mattermost/mattermost-server/v6/model" "github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/mlog" "github.com/mattermost/mattermost-server/v6/shared/templates" "github.com/mattermost/mattermost-server/v6/store" diff --git a/app/email/service.go b/app/email/service.go index b81e30931d..a1886f2647 100644 --- a/app/email/service.go +++ b/app/email/service.go @@ -11,8 +11,8 @@ import ( "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/templates" "github.com/mattermost/mattermost-server/v6/store" ) diff --git a/app/import_functions.go b/app/import_functions.go index 69e49dadb7..dfd0ec719d 100644 --- a/app/import_functions.go +++ b/app/import_functions.go @@ -17,8 +17,8 @@ import ( "strings" "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/mlog" "github.com/mattermost/mattermost-server/v6/store" "github.com/mattermost/mattermost-server/v6/utils" diff --git a/app/oauth.go b/app/oauth.go index c573877ab5..b298996bc6 100644 --- a/app/oauth.go +++ b/app/oauth.go @@ -19,9 +19,9 @@ import ( "time" "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/einterfaces" "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/i18n" "github.com/mattermost/mattermost-server/v6/shared/mlog" "github.com/mattermost/mattermost-server/v6/store" diff --git a/app/server.go b/app/server.go index edb3286726..c0ccf1ebd8 100644 --- a/app/server.go +++ b/app/server.go @@ -40,6 +40,7 @@ import ( "github.com/mattermost/mattermost-server/v6/app/featureflag" "github.com/mattermost/mattermost-server/v6/app/imaging" "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/audit" "github.com/mattermost/mattermost-server/v6/config" "github.com/mattermost/mattermost-server/v6/einterfaces" @@ -58,7 +59,6 @@ import ( "github.com/mattermost/mattermost-server/v6/services/timezones" "github.com/mattermost/mattermost-server/v6/services/tracing" "github.com/mattermost/mattermost-server/v6/services/upgrader" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/filestore" "github.com/mattermost/mattermost-server/v6/shared/i18n" "github.com/mattermost/mattermost-server/v6/shared/mail" diff --git a/app/server_test.go b/app/server_test.go index 4016847bdd..d0d1231719 100644 --- a/app/server_test.go +++ b/app/server_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/config" "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/filestore" "github.com/mattermost/mattermost-server/v6/shared/mlog" "github.com/mattermost/mattermost-server/v6/store/storetest" diff --git a/app/session.go b/app/session.go index 589d44c050..7eeb40bf37 100644 --- a/app/session.go +++ b/app/session.go @@ -10,9 +10,9 @@ import ( "net/http" "os" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/audit" "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/mlog" "github.com/mattermost/mattermost-server/v6/store" ) diff --git a/app/team.go b/app/team.go index 28900cc7d8..0086463e06 100644 --- a/app/team.go +++ b/app/team.go @@ -18,9 +18,9 @@ import ( "github.com/mattermost/mattermost-server/v6/app/email" "github.com/mattermost/mattermost-server/v6/app/imaging" "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/model" "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/i18n" "github.com/mattermost/mattermost-server/v6/shared/mlog" "github.com/mattermost/mattermost-server/v6/store" diff --git a/app/user.go b/app/user.go index 2f7c60420e..6ed290238e 100644 --- a/app/user.go +++ b/app/user.go @@ -19,10 +19,10 @@ import ( "github.com/mattermost/mattermost-server/v6/app/email" "github.com/mattermost/mattermost-server/v6/app/imaging" "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/einterfaces" "github.com/mattermost/mattermost-server/v6/model" "github.com/mattermost/mattermost-server/v6/plugin" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/i18n" "github.com/mattermost/mattermost-server/v6/shared/mfa" "github.com/mattermost/mattermost-server/v6/shared/mlog" diff --git a/app/user_test.go b/app/user_test.go index ee3d0caba0..5233cf794b 100644 --- a/app/user_test.go +++ b/app/user_test.go @@ -18,11 +18,11 @@ import ( "github.com/stretchr/testify/require" "github.com/mattermost/mattermost-server/v6/app/request" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/einterfaces" "github.com/mattermost/mattermost-server/v6/einterfaces/mocks" "github.com/mattermost/mattermost-server/v6/model" oauthgitlab "github.com/mattermost/mattermost-server/v6/model/gitlab" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/store" storemocks "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" "github.com/mattermost/mattermost-server/v6/utils/testutils" diff --git a/services/users/bot_default_image.go b/app/users/bot_default_image.go similarity index 100% rename from services/users/bot_default_image.go rename to app/users/bot_default_image.go diff --git a/services/users/constants.go b/app/users/constants.go similarity index 100% rename from services/users/constants.go rename to app/users/constants.go diff --git a/services/users/errors.go b/app/users/errors.go similarity index 100% rename from services/users/errors.go rename to app/users/errors.go diff --git a/services/users/helper_test.go b/app/users/helper_test.go similarity index 100% rename from services/users/helper_test.go rename to app/users/helper_test.go diff --git a/services/users/main_test.go b/app/users/main_test.go similarity index 100% rename from services/users/main_test.go rename to app/users/main_test.go diff --git a/services/users/password.go b/app/users/password.go similarity index 100% rename from services/users/password.go rename to app/users/password.go diff --git a/services/users/password_test.go b/app/users/password_test.go similarity index 100% rename from services/users/password_test.go rename to app/users/password_test.go diff --git a/services/users/profile_picture.go b/app/users/profile_picture.go similarity index 100% rename from services/users/profile_picture.go rename to app/users/profile_picture.go diff --git a/services/users/profile_picture_test.go b/app/users/profile_picture_test.go similarity index 100% rename from services/users/profile_picture_test.go rename to app/users/profile_picture_test.go diff --git a/services/users/service.go b/app/users/service.go similarity index 100% rename from services/users/service.go rename to app/users/service.go diff --git a/services/users/service_test.go b/app/users/service_test.go similarity index 100% rename from services/users/service_test.go rename to app/users/service_test.go diff --git a/services/users/session.go b/app/users/session.go similarity index 100% rename from services/users/session.go rename to app/users/session.go diff --git a/services/users/session_test.go b/app/users/session_test.go similarity index 100% rename from services/users/session_test.go rename to app/users/session_test.go diff --git a/services/users/users.go b/app/users/users.go similarity index 100% rename from services/users/users.go rename to app/users/users.go diff --git a/services/users/users_test.go b/app/users/users_test.go similarity index 100% rename from services/users/users_test.go rename to app/users/users_test.go diff --git a/services/users/utils.go b/app/users/utils.go similarity index 100% rename from services/users/utils.go rename to app/users/utils.go diff --git a/app/web_hub_test.go b/app/web_hub_test.go index ef949c3412..32de04a2cb 100644 --- a/app/web_hub_test.go +++ b/app/web_hub_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/mattermost/mattermost-server/v6/app/users" "github.com/mattermost/mattermost-server/v6/model" - "github.com/mattermost/mattermost-server/v6/services/users" "github.com/mattermost/mattermost-server/v6/shared/i18n" "github.com/mattermost/mattermost-server/v6/store/storetest/mocks" )