Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2026-06-23 18:09:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

db: remove db.User.LoginType field (#6122)

Browse Source
This commit is contained in:
Kousik Mitra
2020-04-19 02:02:53 +05:30
committed by GitHub
parent c0fd6042fd
commit 5a52ee75e3
5 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/db/login_source.go
View File

@@ -105,7 +105,6 @@ func LoginViaLDAP(login, password string, source *LoginSource, autoRegister bool
Name: username,
FullName: composeFullName(fn, sn, username),
Email: mail,
LoginType: source.Type,
LoginSource: source.ID,
LoginName: login,
IsActive: true,
@@ -245,7 +244,6 @@ func LoginViaSMTP(login, password string, sourceID int64, cfg *SMTPConfig, autoR
Name: strings.ToLower(username),
Email: login,
Passwd: password,
LoginType: LoginSMTP,
LoginSource: sourceID,
LoginName: login,
IsActive: true,
@@ -281,7 +279,6 @@ func LoginViaPAM(login, password string, sourceID int64, cfg *PAMConfig, autoReg
Name: login,
Email: login,
Passwd: password,
LoginType: LoginPAM,
LoginSource: sourceID,
LoginName: login,
IsActive: true,
@@ -317,7 +314,6 @@ func LoginViaGitHub(login, password string, sourceID int64, cfg *GitHubConfig, a
Email: email,
Website: url,
Passwd: password,
LoginType: LoginGitHub,
LoginSource: sourceID,
LoginName: login,
IsActive: true,

9
internal/db/user.go
View File

@@ -53,10 +53,9 @@ type User struct {
Name string `xorm:"UNIQUE NOT NULL" gorm:"NOT NULL"`
FullName string
// Email is the primary email address (to be used for communication)
Email string `xorm:"NOT NULL" gorm:"NOT NULL"`
Passwd string `xorm:"NOT NULL" gorm:"NOT NULL"`
LoginType LoginType // TODO: Remove me https://github.com/gogs/gogs/issues/6117.
LoginSource int64 `xorm:"NOT NULL DEFAULT 0" gorm:"NOT NULL;DEFAULT:0"`
Email string `xorm:"NOT NULL" gorm:"NOT NULL"`
Passwd string `xorm:"NOT NULL" gorm:"NOT NULL"`
LoginSource int64 `xorm:"NOT NULL DEFAULT 0" gorm:"NOT NULL;DEFAULT:0"`
LoginName string
Type UserType
OwnedOrgs []*User `xorm:"-" gorm:"-" json:"-"`
@@ -142,7 +141,7 @@ func (u *User) APIFormat() *api.User {
// returns true if user login type is LoginPlain.
func (u *User) IsLocal() bool {
return u.LoginType <= LoginPlain
return u.LoginSource <= 0
}
// HasForkedRepo checks if user has already forked a repository with given ID.

2
internal/db/users.go
View File

@@ -98,7 +98,7 @@ func (db *users) Authenticate(login, password string, loginSourceID int64) (*Use
}
// Validate password hash fetched from database for local accounts.
if user.LoginType == LoginNotype || user.LoginType == LoginPlain {
if user.IsLocal() {
if user.ValidatePassword(password) {
return user, nil
}