IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Split Create User (#50502)

Browse Source 
* Split Create User

* Use new create user and User from package user

* Add service to wire

* Making create user work

* Replace user from user pkg

* One more

* Move Insert to orguser Service/Store

* Remove unnecessary conversion

* Cleaunp

* Fix Get User and add fakes

* Fixing get org id for user logic, adding fakes and other adjustments

* Add some tests for ourguser service and store

* Fix insert org logic

* Add comment about deprecation

* Fix after merge with main

* Move orguser service/store to org service/store

* Remove orguser from wire

* Unimplement new Create user and use User from pkg user

* Fix wire generation

* Fix lint

* Fix lint - use only User and CrateUserCommand from user pkg

* Remove User and CreateUserCommand from models

* Fix lint 2
This commit is contained in:
idafurjes
2022-06-28 14:32:25 +02:00
committed by GitHub
parent 2429fe1c70
commit 6c43eb0b4d
105 changed files with 1524 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/api/login_test.go
View File

@@ -30,6 +30,7 @@ import (
"github.com/grafana/grafana/pkg/services/secrets"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
)
@@ -331,8 +332,8 @@ func TestLoginPostRedirect(t *testing.T) {
return hs.LoginPost(c)
})
user := &models.User{
Id: 42,
user := &user.User{
ID: 42,
Email: "",
}
@@ -614,14 +615,14 @@ func TestLoginPostRunLokingHook(t *testing.T) {
testHook := loginHookTest{}
hookService.AddLoginHook(testHook.LoginHook)
testUser := &models.User{
Id: 42,
testUser := &user.User{
ID: 42,
Email: "",
}
testCases := []struct {
desc string
authUser *models.User
authUser *user.User
authModule string
authErr error
info models.LoginInfo
@@ -680,7 +681,7 @@ func TestLoginPostRunLokingHook(t *testing.T) {
if c.info.User != nil {
require.NotEmpty(t, info.User)
assert.Equal(t, c.info.User.Id, info.User.Id)
assert.Equal(t, c.info.User.ID, info.User.ID)
}
})
}
@@ -716,7 +717,7 @@ func (m *mockSocialService) GetConnector(string) (social.SocialConnector, error)
}
type fakeAuthenticator struct {
ExpectedUser *models.User
ExpectedUser *user.User
ExpectedAuthModule string
ExpectedError error
}