mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Always store primary email address into email_address table and also the state (#15956)
* Always store primary email address into email_address table and also the state * Add lower_email to not convert email to lower as what's added * Fix fixture * Fix tests * Use BeforeInsert to save lower email * Fix v180 migration * fix tests * Fix test * Remove wrong submited codes * Fix test * Fix test * Fix test * Add test for v181 migration * remove change user's email to lower * Revert change on user's email column * Fix lower email * Fix test * Fix test
This commit is contained in:
		@@ -74,9 +74,6 @@ const (
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
var (
 | 
			
		||||
	// ErrEmailNotExist e-mail does not exist error
 | 
			
		||||
	ErrEmailNotExist = errors.New("E-mail does not exist")
 | 
			
		||||
 | 
			
		||||
	// ErrEmailNotActivated e-mail address has not been activated error
 | 
			
		||||
	ErrEmailNotActivated = errors.New("E-mail address has not been activated")
 | 
			
		||||
 | 
			
		||||
@@ -876,15 +873,6 @@ func CreateUser(u *User) (err error) {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	u.Email = strings.ToLower(u.Email)
 | 
			
		||||
	isExist, err = sess.
 | 
			
		||||
		Where("email=?", u.Email).
 | 
			
		||||
		Get(new(User))
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	} else if isExist {
 | 
			
		||||
		return ErrEmailAlreadyUsed{u.Email}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if err = ValidateEmail(u.Email); err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
@@ -915,6 +903,17 @@ func CreateUser(u *User) (err error) {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// insert email address
 | 
			
		||||
	if _, err := sess.Insert(&EmailAddress{
 | 
			
		||||
		UID:         u.ID,
 | 
			
		||||
		Email:       u.Email,
 | 
			
		||||
		LowerEmail:  strings.ToLower(u.Email),
 | 
			
		||||
		IsActivated: u.IsActive,
 | 
			
		||||
		IsPrimary:   true,
 | 
			
		||||
	}); err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return sess.Commit()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user