peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge d2d8a413a9 into 7be5935c55

Browse Source
This commit is contained in:
Rémy Boulanouar 2018-07-17 00:43:17 +00:00 committed by GitHub
commit 040d75c955
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
models/login_source.go
View File

@ -393,6 +393,19 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
return nil, ErrUserNotExist{0, login, 0} return nil, ErrUserNotExist{0, login, 0}
} }
// Update User if exist
isExist, err := IsUserExist(0, sr.Username)
if err != nil {
return nil, err
} else if isExist {
user.FullName = composeFullName(sr.Name, sr.Surname, sr.Username)
user.Email = sr.Mail
// Change existing admin flag only if AdminFilter option is set
if len(source.LDAP().AdminFilter) > 0 {
user.IsAdmin = sr.IsAdmin
}
}
if !autoRegister { if !autoRegister {
return user, nil return user, nil
} }