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_sync.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_sync.go')
| -rw-r--r-- | services/auth/source/ldap/source_sync.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/auth/source/ldap/source_sync.go b/services/auth/source/ldap/source_sync.go index 4508d1514a..89f84ae20c 100644 --- a/services/auth/source/ldap/source_sync.go +++ b/services/auth/source/ldap/source_sync.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/log" + user_service "code.gitea.io/gitea/services/user" ) // Sync causes this ldap source to synchronize its users with the db @@ -123,7 +124,7 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error { } if err == nil && len(source.AttributeAvatar) > 0 { - _ = usr.UploadAvatar(su.Avatar) + _ = user_service.UploadAvatar(usr, su.Avatar) } } else if updateExisting { // Synchronize SSH Public Key if that attribute is set @@ -152,7 +153,7 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error { } usr.IsActive = true - err = models.UpdateUserCols(usr, "full_name", "email", "is_admin", "is_restricted", "is_active") + err = models.UpdateUserCols(db.DefaultContext, usr, "full_name", "email", "is_admin", "is_restricted", "is_active") if err != nil { log.Error("SyncExternalUsers[%s]: Error updating user %s: %v", source.loginSource.Name, usr.Name, err) } @@ -160,7 +161,7 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error { if usr.IsUploadAvatarChanged(su.Avatar) { if err == nil && len(source.AttributeAvatar) > 0 { - _ = usr.UploadAvatar(su.Avatar) + _ = user_service.UploadAvatar(usr, su.Avatar) } } @@ -193,7 +194,7 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error { log.Trace("SyncExternalUsers[%s]: Deactivating user %s", source.loginSource.Name, usr.Name) usr.IsActive = false - err = models.UpdateUserCols(usr, "is_active") + err = models.UpdateUserCols(db.DefaultContext, usr, "is_active") if err != nil { log.Error("SyncExternalUsers[%s]: Error deactivating user %s: %v", source.loginSource.Name, usr.Name, err) } |