test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Respect default setting.Service.RegisterEmailConfirm and setting.Service.RegisterManualConfirm where needed

This commit is contained in:
Jimmy Praet 2022-04-10 08:52:46 +02:00
parent a8dc6ec0f0
commit ee95d3e8dc
5 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
routers/web/auth/oauth.go
View File

@ -877,7 +877,7 @@ func SignInOAuthCallback(ctx *context.Context) {
}
overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm),
IsActive: util.OptionalBoolOf(!(setting.OAuth2Client.RegisterEmailConfirm || setting.Service.RegisterManualConfirm)),
}
setUserGroupClaims(authSource, u, &gothUser)

7
services/auth/reverseproxy.go
View File

@ -12,7 +12,6 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web/middleware"
"code.gitea.io/gitea/services/mailer"
@ -110,11 +109,7 @@ func (r *ReverseProxy) newUser(req *http.Request) *user_model.User {
Email: email,
}
overwriteDefault := user_model.CreateUserOverwriteOptions{
IsActive: util.OptionalBoolTrue,
}
if err := user_model.CreateUser(user, &overwriteDefault); err != nil {
if err := user_model.CreateUser(user); err != nil {
// FIXME: should I create a system notice?
log.Error("CreateUser: %v", err)
return nil

1
services/auth/source/ldap/source_authenticate.go
View File

@ -97,7 +97,6 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
}
overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsRestricted: util.OptionalBoolOf(sr.IsRestricted),
IsActive: util.OptionalBoolTrue,
}
err := user_model.CreateUser(user, overwriteDefault)

6
services/auth/source/pam/source_authenticate.go
View File

@ -12,7 +12,6 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/auth/pam"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/services/mailer"
"github.com/google/uuid"
@ -60,11 +59,8 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
LoginSource: source.authSource.ID,
LoginName: userName, // This is what the user typed in
}
overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsActive: util.OptionalBoolTrue,
}
if err := user_model.CreateUser(user, overwriteDefault); err != nil {
if err := user_model.CreateUser(user); err != nil {
return user, err
}

5
services/auth/source/smtp/source_authenticate.go
View File

@ -75,11 +75,8 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
LoginSource: source.authSource.ID,
LoginName: userName,
}
overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsActive: util.OptionalBoolTrue,
}
if err := user_model.CreateUser(user, overwriteDefault); err != nil {
if err := user_model.CreateUser(user); err != nil {
return user, err
}