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:
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

View File

@ -3,7 +3,9 @@ package models
import (
"time"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
"golang.org/x/oauth2"
)
@ -40,7 +42,7 @@ type ExternalUserInfo struct {
type LoginInfo struct {
AuthModule string
User *User
User *user.User
ExternalUser ExternalUserInfo
LoginUsername string
HTTPStatus int
@ -59,7 +61,7 @@ type UpsertUserCommand struct {
ExternalUser *ExternalUserInfo
SignupAllowed bool
Result *User
Result *user.User
}
type SetAuthInfoCommand struct {
@ -87,7 +89,7 @@ type LoginUserQuery struct {
ReqContext *ReqContext
Username string
Password string
User *User
User *user.User
IpAddress string
AuthModule string
Cfg *setting.Cfg