Skip to content

Commit

Permalink
Honor REGISTER_MANUAL_CONFIRM when doing openid registration (#14548)
Browse files Browse the repository at this point in the history
REGISTER_MANUAL_CONFIRM is not honored when doing performing an openid registration. The new account is directly accessible.

With this patch, the manual confirm flag gets honored in the same way as a "normal" registration.
  • Loading branch information
ganguin authored Feb 5, 2021
1 parent 32c4563 commit 4457d0e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion routers/user/auth_openid.go
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ func RegisterOpenIDPost(ctx *context.Context) {
Name: form.UserName,
Email: form.Email,
Passwd: password,
IsActive: !setting.Service.RegisterEmailConfirm,
IsActive: !(setting.Service.RegisterEmailConfirm || setting.Service.RegisterManualConfirm),
}
//nolint: dupl
if err := models.CreateUser(u); err != nil {
Expand Down

0 comments on commit 4457d0e

Please sign in to comment.