mirror of
https://github.com/grafana/grafana.git
synced 2026-08-18 17:15:08 -05:00
Split Create User (#50502)
* 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:
@@ -3,6 +3,7 @@ package multildap
|
||||
import (
|
||||
"github.com/grafana/grafana/pkg/models"
|
||||
"github.com/grafana/grafana/pkg/services/ldap"
|
||||
"github.com/grafana/grafana/pkg/services/user"
|
||||
)
|
||||
|
||||
type MultiLDAPmock struct {
|
||||
@@ -10,7 +11,7 @@ type MultiLDAPmock struct {
|
||||
ID int64
|
||||
UserCalled bool
|
||||
LoginCalled bool
|
||||
UserInfo *models.User
|
||||
UserInfo *user.User
|
||||
AuthModule string
|
||||
ExpectedErr error
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user