Change default email domain for LDAP users (#25425)

Zettat123 · web-flow · commit a55ff0dd9943 · 2023-06-22T08:16:12.000Z
Fixes #21169 Change `localhost` to `localhost.local`
diff --git a/services/auth/source/ldap/source_authenticate.go b/services/auth/source/ldap/source_authenticate.go
@@ -76,7 +76,7 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
 		}
 
 		if len(sr.Mail) == 0 {
-			sr.Mail = fmt.Sprintf("%s@localhost", sr.Username)
+			sr.Mail = fmt.Sprintf("%s@localhost.local", sr.Username)
 		}
 
 		user = &user_model.User{
diff --git a/services/auth/source/ldap/source_sync.go b/services/auth/source/ldap/source_sync.go
@@ -104,7 +104,7 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error {
 		}
 
 		if len(su.Mail) == 0 {
-			su.Mail = fmt.Sprintf("%s@localhost", su.Username)
+			su.Mail = fmt.Sprintf("%s@localhost.local", su.Username)
 		}
 
 		fullName := composeFullName(su.Name, su.Surname, su.Username)

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func (source Source) Authenticate(user user_model.User, userName, password str`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`if len(sr.Mail) == 0 {`
`79`		`- sr.Mail = fmt.Sprintf("%s@localhost", sr.Username)`
	`79`	`+ sr.Mail = fmt.Sprintf("%s@localhost.local", sr.Username)`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`user = &user_model.User{`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`if len(su.Mail) == 0 {`
`107`		`- su.Mail = fmt.Sprintf("%s@localhost", su.Username)`
	`107`	`+ su.Mail = fmt.Sprintf("%s@localhost.local", su.Username)`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`fullName := composeFullName(su.Name, su.Surname, su.Username)`