Skip to content

Commit 5574ad1

Browse files
committed
Revert "Respect default setting.Service.RegisterEmailConfirm and setting.Service.RegisterManualConfirm where needed"
This reverts commit ee95d3e.
1 parent dc26370 commit 5574ad1

File tree

5 files changed

+17
-4
lines changed

5 files changed

+17
-4
lines changed

routers/web/auth/oauth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ func SignInOAuthCallback(ctx *context.Context) {
877877
}
878878

879879
overwriteDefault := &user_model.CreateUserOverwriteOptions{
880-
IsActive: util.OptionalBoolOf(!(setting.OAuth2Client.RegisterEmailConfirm || setting.Service.RegisterManualConfirm)),
880+
IsActive: util.OptionalBoolOf(!setting.OAuth2Client.RegisterEmailConfirm),
881881
}
882882

883883
setUserGroupClaims(authSource, u, &gothUser)

services/auth/reverseproxy.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
user_model "code.gitea.io/gitea/models/user"
1313
"code.gitea.io/gitea/modules/log"
1414
"code.gitea.io/gitea/modules/setting"
15+
"code.gitea.io/gitea/modules/util"
1516
"code.gitea.io/gitea/modules/web/middleware"
1617
"code.gitea.io/gitea/services/mailer"
1718

@@ -109,7 +110,11 @@ func (r *ReverseProxy) newUser(req *http.Request) *user_model.User {
109110
Email: email,
110111
}
111112

112-
if err := user_model.CreateUser(user); err != nil {
113+
overwriteDefault := user_model.CreateUserOverwriteOptions{
114+
IsActive: util.OptionalBoolTrue,
115+
}
116+
117+
if err := user_model.CreateUser(user, &overwriteDefault); err != nil {
113118
// FIXME: should I create a system notice?
114119
log.Error("CreateUser: %v", err)
115120
return nil

services/auth/source/ldap/source_authenticate.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
9797
}
9898
overwriteDefault := &user_model.CreateUserOverwriteOptions{
9999
IsRestricted: util.OptionalBoolOf(sr.IsRestricted),
100+
IsActive: util.OptionalBoolTrue,
100101
}
101102

102103
err := user_model.CreateUser(user, overwriteDefault)

services/auth/source/pam/source_authenticate.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
user_model "code.gitea.io/gitea/models/user"
1313
"code.gitea.io/gitea/modules/auth/pam"
1414
"code.gitea.io/gitea/modules/setting"
15+
"code.gitea.io/gitea/modules/util"
1516
"code.gitea.io/gitea/services/mailer"
1617

1718
"github.com/google/uuid"
@@ -59,8 +60,11 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
5960
LoginSource: source.authSource.ID,
6061
LoginName: userName, // This is what the user typed in
6162
}
63+
overwriteDefault := &user_model.CreateUserOverwriteOptions{
64+
IsActive: util.OptionalBoolTrue,
65+
}
6266

63-
if err := user_model.CreateUser(user); err != nil {
67+
if err := user_model.CreateUser(user, overwriteDefault); err != nil {
6468
return user, err
6569
}
6670

services/auth/source/smtp/source_authenticate.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,11 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
7575
LoginSource: source.authSource.ID,
7676
LoginName: userName,
7777
}
78+
overwriteDefault := &user_model.CreateUserOverwriteOptions{
79+
IsActive: util.OptionalBoolTrue,
80+
}
7881

79-
if err := user_model.CreateUser(user); err != nil {
82+
if err := user_model.CreateUser(user, overwriteDefault); err != nil {
8083
return user, err
8184
}
8285

0 commit comments

Comments
 (0)