mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-03 08:02:36 +09:00 
			
		
		
		
	Fix SSPI user creation (#28948)
Fixes #28945 Setting the avatar is wrong and creating a random password is equal to leave it empty.
This commit is contained in:
		@@ -11,7 +11,6 @@ import (
 | 
				
			|||||||
	"sync"
 | 
						"sync"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"code.gitea.io/gitea/models/auth"
 | 
						"code.gitea.io/gitea/models/auth"
 | 
				
			||||||
	"code.gitea.io/gitea/models/avatars"
 | 
					 | 
				
			||||||
	"code.gitea.io/gitea/models/db"
 | 
						"code.gitea.io/gitea/models/db"
 | 
				
			||||||
	user_model "code.gitea.io/gitea/models/user"
 | 
						user_model "code.gitea.io/gitea/models/user"
 | 
				
			||||||
	"code.gitea.io/gitea/modules/base"
 | 
						"code.gitea.io/gitea/modules/base"
 | 
				
			||||||
@@ -167,12 +166,9 @@ func (s *SSPI) shouldAuthenticate(req *http.Request) (shouldAuth bool) {
 | 
				
			|||||||
func (s *SSPI) newUser(ctx context.Context, username string, cfg *sspi.Source) (*user_model.User, error) {
 | 
					func (s *SSPI) newUser(ctx context.Context, username string, cfg *sspi.Source) (*user_model.User, error) {
 | 
				
			||||||
	email := gouuid.New().String() + "@localhost.localdomain"
 | 
						email := gouuid.New().String() + "@localhost.localdomain"
 | 
				
			||||||
	user := &user_model.User{
 | 
						user := &user_model.User{
 | 
				
			||||||
		Name:            username,
 | 
							Name:     username,
 | 
				
			||||||
		Email:           email,
 | 
							Email:    email,
 | 
				
			||||||
		Passwd:          gouuid.New().String(),
 | 
							Language: cfg.DefaultLanguage,
 | 
				
			||||||
		Language:        cfg.DefaultLanguage,
 | 
					 | 
				
			||||||
		UseCustomAvatar: true,
 | 
					 | 
				
			||||||
		Avatar:          avatars.DefaultAvatarLink(),
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	emailNotificationPreference := user_model.EmailNotificationsDisabled
 | 
						emailNotificationPreference := user_model.EmailNotificationsDisabled
 | 
				
			||||||
	overwriteDefault := &user_model.CreateUserOverwriteOptions{
 | 
						overwriteDefault := &user_model.CreateUserOverwriteOptions{
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user