diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-22 23:21:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 23:21:55 +0800 |
| commit | baed01f24753afb600a2984dcb9bcda0bb8502b6 (patch) | |
| tree | 5621ef980b6b0067a21c86be7e4808d83c0538ab /services/auth/source/ldap/source_authenticate.go | |
| parent | c2ab19888f92fbdec4276a16d224e8de80d1d1dd (diff) | |
| download | gitea-baed01f24753afb600a2984dcb9bcda0bb8502b6.tar.gz gitea-baed01f24753afb600a2984dcb9bcda0bb8502b6.zip | |
Remove unnecessary attributes of User struct (#17745)
* Remove unnecessary functions of User struct
* Move more database methods out of user struct
* Move more database methods out of user struct
* Fix template failure
* Fix bug
* Remove finished FIXME
* remove unnecessary code
Diffstat (limited to 'services/auth/source/ldap/source_authenticate.go')
| -rw-r--r-- | services/auth/source/ldap/source_authenticate.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/auth/source/ldap/source_authenticate.go b/services/auth/source/ldap/source_authenticate.go index 2719b5b715..99a99801a4 100644 --- a/services/auth/source/ldap/source_authenticate.go +++ b/services/auth/source/ldap/source_authenticate.go @@ -9,8 +9,10 @@ import ( "strings" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/login" "code.gitea.io/gitea/services/mailer" + user_service "code.gitea.io/gitea/services/user" ) // Authenticate queries if login/password is valid against the LDAP directory pool, @@ -47,7 +49,7 @@ func (source *Source) Authenticate(user *models.User, userName, password string) cols = append(cols, "is_restricted") } if len(cols) > 0 { - err = models.UpdateUserCols(user, cols...) + err = models.UpdateUserCols(db.DefaultContext, user, cols...) if err != nil { return nil, err } @@ -97,7 +99,7 @@ func (source *Source) Authenticate(user *models.User, userName, password string) } if err == nil && len(source.AttributeAvatar) > 0 { - _ = user.UploadAvatar(sr.Avatar) + _ = user_service.UploadAvatar(user, sr.Avatar) } return user, err |