tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-03 09:07:19 +00:00
Code Releases Activity

Move login related structs and functions to models/login (#17093)

Browse Source 
* Move login related structs and functions to models/login

* Fix test

* Fix lint

* Fix lint

* Fix lint of windows

* Fix lint

* Fix test

* Fix test

* Only load necessary fixtures when preparing unit tests envs

* Fix lint

* Fix test

* Fix test

* Fix error log

* Fix error log

* Fix error log

* remove unnecessary change

* fix error log

* merge main branch
This commit is contained in:
Lunny Xiao
2021-09-24 19:32:56 +08:00
committed by GitHub
parent 4a2655098f
commit 5842a55b31
142 changed files with 1050 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/auth/signin.go
View File

@ -9,6 +9,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/login"
"code.gitea.io/gitea/modules/log"
// Register the sources
@ -21,7 +22,7 @@ import (
)
// UserSignIn validates user name and password.
func UserSignIn(username, password string) (*models.User, *models.LoginSource, error) {
func UserSignIn(username, password string) (*models.User, *login.Source, error) {
var user *models.User
if strings.Contains(username, "@") {
user = &models.User{Email: strings.ToLower(strings.TrimSpace(username))}
@ -50,7 +51,7 @@ func UserSignIn(username, password string) (*models.User, *models.LoginSource, e
}
if hasUser {
source, err := models.GetLoginSourceByID(user.LoginSource)
source, err := login.GetSourceByID(user.LoginSource)
if err != nil {
return nil, nil, err
}
@ -78,7 +79,7 @@ func UserSignIn(username, password string) (*models.User, *models.LoginSource, e
return user, source, nil
}
sources, err := models.AllActiveLoginSources()
sources, err := login.AllActiveSources()
if err != nil {
return nil, nil, err
}